From ecdd9a4d6edd769a3e2c3b0604e4637d94fa1a51 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 23 Mar 2024 11:19:24 +0000 Subject: revert default to activity type Article until we have a more stable solution to override it for platforms which do not support it --- Zotlabs/Module/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index b158ed4e0..0324bf662 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -404,7 +404,7 @@ class Item extends Controller { $pagetitle = ((x($_REQUEST, 'pagetitle')) ? escape_tags($_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']) : 'Article'); + $obj_type = ((x($_REQUEST, 'obj_type')) ? escape_tags($_REQUEST['obj_type']) : 'Note'); // allow API to bulk load a bunch of imported items with sending out a bunch of posts. $nopush = ((x($_REQUEST, 'nopush')) ? intval($_REQUEST['nopush']) : 0); -- cgit v1.2.3 From 0dc959d9fe40bddce5e99b8162bb0e770fc28ed9 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 24 Mar 2024 09:58:21 +0000 Subject: Deprecate *_config() functions in core. --- Zotlabs/Access/PermissionRoles.php | 4 +- Zotlabs/Daemon/Cache_query.php | 7 +- Zotlabs/Daemon/Checksites.php | 4 +- Zotlabs/Daemon/Cron.php | 21 +-- Zotlabs/Daemon/Cron_daily.php | 7 +- Zotlabs/Daemon/Cron_weekly.php | 4 +- Zotlabs/Daemon/Directory.php | 3 +- Zotlabs/Daemon/Expire.php | 16 +- Zotlabs/Daemon/Master.php | 2 +- Zotlabs/Daemon/Notifier.php | 7 +- Zotlabs/Daemon/Onepoll.php | 5 +- Zotlabs/Daemon/Poller.php | 16 +- Zotlabs/Daemon/Thumbnail.php | 7 +- Zotlabs/Extend/Route.php | 5 +- Zotlabs/Extend/Widget.php | 5 +- Zotlabs/Identity/OAuth2Server.php | 6 +- Zotlabs/Lib/Apps.php | 9 +- Zotlabs/Lib/Cache.php | 9 +- Zotlabs/Lib/Connect.php | 5 +- Zotlabs/Lib/Crypto.php | 3 +- Zotlabs/Lib/DB_Upgrade.php | 29 ++-- Zotlabs/Lib/DReport.php | 4 +- Zotlabs/Lib/Enotify.php | 9 +- Zotlabs/Lib/Libsync.php | 5 +- Zotlabs/Lib/Libzot.php | 43 +++--- Zotlabs/Lib/Libzotdir.php | 27 ++-- Zotlabs/Lib/QueueWorker.php | 23 +-- Zotlabs/Lib/ThreadItem.php | 17 ++- Zotlabs/Lib/Zotfinger.php | 3 +- Zotlabs/Module/Acl.php | 7 +- Zotlabs/Module/Admin.php | 4 +- Zotlabs/Module/Admin/Accounts.php | 6 +- Zotlabs/Module/Admin/Addons.php | 7 +- Zotlabs/Module/Admin/Dbsync.php | 14 +- Zotlabs/Module/Admin/Features.php | 44 +++--- Zotlabs/Module/Admin/Logs.php | 49 ++++--- Zotlabs/Module/Admin/Profs.php | 57 ++++---- Zotlabs/Module/Admin/Queueworker.php | 17 ++- Zotlabs/Module/Admin/Security.php | 73 +++++----- Zotlabs/Module/Admin/Site.php | 257 +++++++++++++++++---------------- Zotlabs/Module/Admin/Themes.php | 5 +- Zotlabs/Module/Api.php | 4 +- Zotlabs/Module/Apps.php | 4 +- Zotlabs/Module/Channel.php | 3 +- Zotlabs/Module/Cover_photo.php | 7 +- Zotlabs/Module/Dircensor.php | 6 +- Zotlabs/Module/Directory.php | 16 +- Zotlabs/Module/Dirsearch.php | 7 +- Zotlabs/Module/Display.php | 3 +- Zotlabs/Module/Email_validation.php | 9 +- Zotlabs/Module/Fhublocs.php | 3 +- Zotlabs/Module/Go.php | 9 +- Zotlabs/Module/Group.php | 7 +- Zotlabs/Module/Home.php | 13 +- Zotlabs/Module/Import.php | 9 +- Zotlabs/Module/Invite.php | 23 +-- Zotlabs/Module/Linkinfo.php | 3 +- Zotlabs/Module/Lostpass.php | 10 +- Zotlabs/Module/New_channel.php | 11 +- Zotlabs/Module/Profile_photo.php | 3 +- Zotlabs/Module/Profiles.php | 5 +- Zotlabs/Module/Profperm.php | 87 +++++------ Zotlabs/Module/Pubsites.php | 5 +- Zotlabs/Module/Pubstream.php | 13 +- Zotlabs/Module/Regate.php | 9 +- Zotlabs/Module/Regdir.php | 31 ++-- Zotlabs/Module/Register.php | 55 +++---- Zotlabs/Module/Search.php | 7 +- Zotlabs/Module/Service_limits.php | 14 +- Zotlabs/Module/Settings/Account.php | 4 +- Zotlabs/Module/Settings/Channel.php | 7 +- Zotlabs/Module/Settings/Display.php | 7 +- Zotlabs/Module/Settings/Privacy.php | 3 +- Zotlabs/Module/Setup.php | 7 +- Zotlabs/Module/Siteinfo.php | 7 +- Zotlabs/Module/Sse.php | 5 +- Zotlabs/Module/Sse_bs.php | 7 +- Zotlabs/Module/Well_known.php | 3 +- Zotlabs/Module/Wfinger.php | 3 +- Zotlabs/Photo/PhotoDriver.php | 5 +- Zotlabs/Photo/PhotoGd.php | 8 +- Zotlabs/Photo/PhotoImagick.php | 8 +- Zotlabs/Render/Comanche.php | 28 ++-- Zotlabs/Render/SmartyTemplate.php | 2 +- Zotlabs/Storage/Browser.php | 7 +- Zotlabs/Storage/Directory.php | 9 +- Zotlabs/Storage/File.php | 3 +- Zotlabs/Thumbs/Pdf.php | 3 +- Zotlabs/Thumbs/Video.php | 3 +- Zotlabs/Update/_1103.php | 6 +- Zotlabs/Update/_1226.php | 7 +- Zotlabs/Update/_1236.php | 11 +- Zotlabs/Update/_1242.php | 6 +- Zotlabs/Update/_1243.php | 12 +- Zotlabs/Web/HTTPSig.php | 5 +- Zotlabs/Web/Router.php | 5 +- Zotlabs/Web/Session.php | 13 +- Zotlabs/Widget/Newmember.php | 6 +- Zotlabs/Widget/Pinned.php | 4 +- Zotlabs/Widget/Pubtagcloud.php | 8 +- Zotlabs/Widget/Rating.php | 4 +- boot.php | 56 +++---- doc/dev-function-overview.md | 10 +- doc/developer_function_primer.bb | 4 + include/account.php | 51 +++---- include/attach.php | 7 +- include/auth.php | 15 +- include/bbcode.php | 9 +- include/channel.php | 27 ++-- include/cli_startup.php | 4 +- include/config.php | 65 +++++++++ include/connections.php | 7 +- include/contact_widgets.php | 3 +- include/conversation.php | 5 +- include/crypto.php | 8 +- include/event.php | 3 +- include/features.php | 80 +++++----- include/feedutils.php | 8 +- include/hubloc.php | 9 +- include/import.php | 3 +- include/items.php | 11 +- include/language.php | 7 +- include/nav.php | 13 +- include/network.php | 89 ++++++------ include/oauth.php | 60 ++++---- include/oauth2.php | 10 +- include/oembed.php | 20 +-- include/permissions.php | 8 +- include/photo/photo_driver.php | 7 +- include/photos.php | 9 +- include/plugin.php | 9 +- include/security.php | 4 +- include/socgraph.php | 3 +- include/statistics_fns.php | 22 +-- include/taxonomy.php | 3 +- include/text.php | 21 +-- include/zid.php | 3 +- tests/unit/Photo/PhotoGdTest.php | 17 +-- tests/unit/Web/HttpSigTest.php | 5 +- util/addons | 20 +-- util/config | 17 ++- util/db_update.php | 4 +- util/service_class | 34 +++-- util/storageconv | 21 +-- view/theme/redbasic/php/theme_init.php | 6 +- 145 files changed, 1223 insertions(+), 1011 deletions(-) diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php index 2078b52a8..5dfedfcd7 100644 --- a/Zotlabs/Access/PermissionRoles.php +++ b/Zotlabs/Access/PermissionRoles.php @@ -2,6 +2,8 @@ namespace Zotlabs\Access; +use Zotlabs\Lib\Config; + /** * @brief PermissionRoles class. * @@ -247,7 +249,7 @@ class PermissionRoles { break; } - $x = get_config('system','role_perms'); + $x = Config::Get('system','role_perms'); // let system settings over-ride any or all if($x && is_array($x) && array_key_exists($role,$x)) diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php index cd9597e9a..8e5c6b2ea 100644 --- a/Zotlabs/Daemon/Cache_query.php +++ b/Zotlabs/Daemon/Cache_query.php @@ -3,6 +3,7 @@ namespace Zotlabs\Daemon; use Zotlabs\Lib\Cache; +use Zotlabs\Lib\Config; class Cache_query { @@ -13,14 +14,14 @@ class Cache_query { $key = $argv[1]; - $pid = get_config('procid', $key, false); + $pid = Config::Get('procid', $key, false); if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) { logger($key . ': procedure already run with pid ' . $pid, LOGGER_DEBUG); return; } $pid = getmypid(); - set_config('procid', $key, $pid); + Config::Set('procid', $key, $pid); array_shift($argv); array_shift($argv); @@ -31,7 +32,7 @@ class Cache_query { if($r) Cache::set($key, serialize($r)); - del_config('procid', $key); + Config::Delete('procid', $key); return; } diff --git a/Zotlabs/Daemon/Checksites.php b/Zotlabs/Daemon/Checksites.php index eacf8c6bc..8f6319edb 100644 --- a/Zotlabs/Daemon/Checksites.php +++ b/Zotlabs/Daemon/Checksites.php @@ -2,6 +2,8 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; + require_once('include/hubloc.php'); class Checksites { @@ -19,7 +21,7 @@ class Checksites { if ($site_id) $sql_options = " and site_url = '" . dbesc($argv[1]) . "' "; - $days = intval(get_config('system', 'sitecheckdays')); + $days = intval(Config::Get('system', 'sitecheckdays')); if ($days < 1) $days = 30; diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index e0fa2d629..d2c863572 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -2,6 +2,7 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; use Zotlabs\Lib\Libzotdir; @@ -9,7 +10,7 @@ class Cron { static public function run($argc, $argv) { - $maxsysload = intval(get_config('system', 'maxloadavg')); + $maxsysload = intval(Config::Get('system', 'maxloadavg')); if ($maxsysload < 1) $maxsysload = 50; if (function_exists('sys_getloadavg')) { @@ -24,7 +25,7 @@ class Cron { // Check for a lockfile. If it exists, but is over an hour old, it's stale. Ignore it. $lockfile = 'store/[data]/cron'; if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) - && (!get_config('system', 'override_cron_lockfile'))) { + && (!Config::Get('system', 'override_cron_lockfile'))) { logger("cron: Already running"); return; } @@ -41,7 +42,7 @@ class Cron { // Pull remote changes and push local changes. // potential issue: how do we keep from creating an endless update loop? - $dirmode = get_config('system', 'directory_mode'); + $dirmode = Config::Get('system', 'directory_mode'); if ($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { Libzotdir::sync_directories($dirmode); @@ -64,7 +65,7 @@ class Cron { require_once('include/account.php'); remove_expired_registrations(); - $interval = get_config('queueworker', 'queue_interval', 500000); + $interval = Config::Get('queueworker', 'queue_interval', 500000); // expire any expired items @@ -124,13 +125,13 @@ class Cron { $r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s", intval(PHOTO_CACHE), db_utcnow(), - db_quoteinterval(get_config('system', 'cache_expire_days', 7) . ' DAY') + db_quoteinterval(Config::Get('system', 'cache_expire_days', 7) . ' DAY') ); if ($r) { q("DELETE FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s", intval(PHOTO_CACHE), db_utcnow(), - db_quoteinterval(get_config('system', 'cache_expire_days', 7) . ' DAY') + db_quoteinterval(Config::Get('system', 'cache_expire_days', 7) . ' DAY') ); foreach ($r as $rr) { $file = dbunescbin($rr['content']); @@ -185,13 +186,13 @@ class Cron { // FIXME: add birthday updates, both locally and for xprof for use // by directory servers - $d1 = intval(get_config('system', 'last_expire_day')); + $d1 = intval(Config::Get('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')); + $h1 = intval(Config::Get('system', 'cron_hour')); $h2 = intval(datetime_convert('UTC', 'UTC', 'now', 'G')); @@ -225,7 +226,7 @@ class Cron { // pull in some public posts if allowed - $disable_externals = get_config('system', 'disable_discover_tab') || get_config('system', 'disable_discover_tab') === false || get_config('system', 'site_firehose'); + $disable_externals = Config::Get('system', 'disable_discover_tab') || Config::Get('system', 'disable_discover_tab') === false || Config::Get('system', 'site_firehose'); if (!$disable_externals) Master::Summon(['Externals']); @@ -245,7 +246,7 @@ class Cron { if (!$restart) Master::Summon(array('Cronhooks')); - set_config('system', 'lastcron', datetime_convert()); + Config::Set('system', 'lastcron', datetime_convert()); //All done - clear the lockfile //@unlink($lockfile); diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php index 98379be1b..3bc267f08 100644 --- a/Zotlabs/Daemon/Cron_daily.php +++ b/Zotlabs/Daemon/Cron_daily.php @@ -2,6 +2,7 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzotdir; class Cron_daily { @@ -68,7 +69,7 @@ class Cron_daily { // Clean up cache q("DELETE FROM cache WHERE updated < %s - INTERVAL %s", db_utcnow(), - db_quoteinterval(get_config('system', 'cache_expire_days', 7) . ' DAY') + db_quoteinterval(Config::Get('system', 'cache_expire_days', 7) . ' DAY') ); //update statistics in config @@ -82,7 +83,7 @@ class Cron_daily { // expire old delivery reports - $keep_reports = intval(get_config('system', 'expire_delivery_reports')); + $keep_reports = intval(Config::Get('system', 'expire_delivery_reports')); if ($keep_reports === 0) $keep_reports = 10; @@ -103,7 +104,7 @@ class Cron_daily { $date = datetime_convert(); call_hooks('cron_daily', $date); - set_config('system', 'last_expire_day', intval(datetime_convert('UTC', 'UTC', 'now', 'd'))); + Config::Set('system', 'last_expire_day', intval(datetime_convert('UTC', 'UTC', 'now', 'd'))); /** * End Cron Daily diff --git a/Zotlabs/Daemon/Cron_weekly.php b/Zotlabs/Daemon/Cron_weekly.php index 75fb94700..f9ea5aae7 100644 --- a/Zotlabs/Daemon/Cron_weekly.php +++ b/Zotlabs/Daemon/Cron_weekly.php @@ -2,6 +2,8 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; + class Cron_weekly { static public function run($argc, $argv) { @@ -44,7 +46,7 @@ class Cron_weekly { db_utcnow(), db_quoteinterval('14 DAY') ); - $dirmode = intval(get_config('system', 'directory_mode')); + $dirmode = intval(Config::Get('system', 'directory_mode')); if ($dirmode === DIRECTORY_MODE_SECONDARY || $dirmode === DIRECTORY_MODE_PRIMARY) { logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . urlencode(z_root()) . '&realm=' . urlencode(get_directory_realm())), true)); } diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php index 19adf8273..1c4c29ac2 100644 --- a/Zotlabs/Daemon/Directory.php +++ b/Zotlabs/Daemon/Directory.php @@ -2,6 +2,7 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Libzotdir; use Zotlabs\Lib\Queue; @@ -25,7 +26,7 @@ class Directory { logger('directory update', LOGGER_DEBUG); - $dirmode = get_config('system', 'directory_mode'); + $dirmode = Config::Get('system', 'directory_mode'); if ($dirmode === false) $dirmode = DIRECTORY_MODE_NORMAL; diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php index 6ab67150f..ad52a6b71 100644 --- a/Zotlabs/Daemon/Expire.php +++ b/Zotlabs/Daemon/Expire.php @@ -2,6 +2,8 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; + require_once('include/items.php'); class Expire { @@ -10,14 +12,14 @@ class Expire { cli_startup(); - $pid = get_config('procid', 'expire', false); + $pid = Config::Get('procid', 'expire', false); if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) { logger('procedure already run with pid ' . $pid, LOGGER_DEBUG); return; } $pid = getmypid(); - set_config('procid', 'expire', $pid); + Config::Set('procid', 'expire', $pid); // perform final cleanup on previously delete items @@ -38,13 +40,13 @@ class Expire { db_quoteinterval('36 DAY') ); - if (intval(get_config('system', 'optimize_items'))) + if (intval(Config::Get('system', 'optimize_items'))) q("optimize table item"); logger('expire: start with pid ' . $pid, LOGGER_DEBUG); - $site_expire = intval(get_config('system', 'default_expire_days', 30)); - $commented_days = intval(get_config('system', 'active_expire_days', 7)); + $site_expire = intval(Config::Get('system', 'default_expire_days', 30)); + $commented_days = intval(Config::Get('system', 'active_expire_days', 7)); logger('site_expire: ' . $site_expire); @@ -84,7 +86,7 @@ class Expire { // this should probably just fetch the channel_expire_days from the sys channel, // but there's no convenient way to set it. - $expire_days = get_config('system', 'sys_expire_days'); + $expire_days = Config::Get('system', 'sys_expire_days'); if ($expire_days === false) $expire_days = 30; @@ -101,7 +103,7 @@ class Expire { logger('Expire: sys: done', LOGGER_DEBUG); } - del_config('procid', 'expire'); + Config::Delete('procid', 'expire'); return; } diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index c9ed91aaa..d28e462dd 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -37,7 +37,7 @@ class Master { return; } - $phpbin = get_config('system', 'phpbin', 'php'); + $phpbin = Config::Get('system', 'phpbin', 'php'); proc_run($phpbin, 'Zotlabs/Daemon/Master.php', $arr); */ } diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 4e7ca3911..20134b8fe 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -2,8 +2,9 @@ namespace Zotlabs\Daemon; -use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Config; +use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Queue; require_once('include/html2plain.php'); @@ -668,7 +669,7 @@ class Notifier { ); // only create delivery reports for normal undeleted items - if (is_array($target_item) && (!$target_item['item_deleted']) && (!get_config('system', 'disable_dreport'))) { + if (is_array($target_item) && (!$target_item['item_deleted']) && (!Config::Get('system', 'disable_dreport'))) { q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s', '%s','%s','%s','%s','%s','%s','%s' ) ", dbesc($target_item['mid']), @@ -698,7 +699,7 @@ class Notifier { do_delivery(self::$deliveries); } - if ($dead_hosts && is_array($target_item) && (!$target_item['item_deleted']) && (!get_config('system', 'disable_dreport'))) { + if ($dead_hosts && is_array($target_item) && (!$target_item['item_deleted']) && (!Config::Get('system', 'disable_dreport'))) { foreach ($dead_hosts as $deceased_host) { $r = q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s', '%s','%s','%s','%s','%s','%s','%s' ) ", diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 973bcf402..e525d138c 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -5,6 +5,7 @@ namespace Zotlabs\Daemon; use Zotlabs\Lib\Activity; use Zotlabs\Lib\ActivityStreams; use Zotlabs\Lib\ASCollection; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; require_once('include/socgraph.php'); @@ -25,7 +26,7 @@ class Onepoll { } $sql_extra = ''; - $allow_feeds = get_config('system', 'feed_contacts'); + $allow_feeds = Config::Get('system', 'feed_contacts'); if(!$allow_feeds) { $sql_extra = ' and abook_feed = 0 '; } @@ -125,7 +126,7 @@ class Onepoll { if ($fetch_feed) { - $max = intval(get_config('system', 'max_imported_posts', 30)); + $max = intval(Config::Get('system', 'max_imported_posts', 30)); if (intval($max)) { $cl = Activity::get_actor_collections($contact['abook_xchan']); diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index 77a428ec3..2103310b9 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -2,11 +2,13 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; + class Poller { static public function run($argc, $argv) { - $maxsysload = intval(get_config('system', 'maxloadavg')); + $maxsysload = intval(Config::Get('system', 'maxloadavg')); if ($maxsysload < 1) $maxsysload = 50; if (function_exists('sys_getloadavg')) { @@ -17,7 +19,7 @@ class Poller { } } - $interval = get_config('queueworker', 'queue_interval', 500000); + $interval = Config::Get('queueworker', 'queue_interval', 500000); logger('poller: start'); @@ -43,13 +45,13 @@ class Poller { reload_plugins(); // Only poll from those with suitable relationships - $abandon_days = intval(get_config('system', 'account_abandon_days', 0)); + $abandon_days = intval(Config::Get('system', 'account_abandon_days', 0)); $abandon_sql = (($abandon_days) ? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days) . ' DAY')) : '' ); - $allow_feeds = get_config('system', 'feed_contacts'); + $allow_feeds = Config::Get('system', 'feed_contacts'); if(!$allow_feeds) { $sql_extra .= ' and abook_feed = 0 '; } @@ -81,7 +83,7 @@ class Poller { if (intval($contact['abook_feed'])) { $min = service_class_fetch($contact['abook_channel'], 'minimum_feedcheck_minutes'); if (!$min) - $min = intval(get_config('system', 'minimum_feedcheck_minutes')); + $min = intval(Config::Get('system', 'minimum_feedcheck_minutes')); if (!$min) $min = 60; @@ -167,7 +169,7 @@ class Poller { } } - $dirmode = intval(get_config('system', 'directory_mode')); + $dirmode = intval(Config::Get('system', 'directory_mode')); if ($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { $r = q("SELECT * FROM updates WHERE ud_update = 1 AND (ud_last = '%s' OR ud_last > %s - INTERVAL %s)", @@ -195,7 +197,7 @@ class Poller { } } - set_config('system', 'lastpoll', datetime_convert()); + Config::Set('system', 'lastpoll', datetime_convert()); return; } diff --git a/Zotlabs/Daemon/Thumbnail.php b/Zotlabs/Daemon/Thumbnail.php index fa9570658..85fcb8b72 100644 --- a/Zotlabs/Daemon/Thumbnail.php +++ b/Zotlabs/Daemon/Thumbnail.php @@ -2,6 +2,7 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Config; class Thumbnail { @@ -19,9 +20,9 @@ class Thumbnail { $attach = $c[0]; - $preview_style = intval(get_config('system', 'thumbnail_security', 0)); - $preview_width = intval(get_config('system', 'thumbnail_width', 300)); - $preview_height = intval(get_config('system', 'thumbnail_height', 300)); + $preview_style = intval(Config::Get('system', 'thumbnail_security', 0)); + $preview_width = intval(Config::Get('system', 'thumbnail_width', 300)); + $preview_height = intval(Config::Get('system', 'thumbnail_height', 300)); $p = [ 'attach' => $attach, diff --git a/Zotlabs/Extend/Route.php b/Zotlabs/Extend/Route.php index f7b90ec6e..95b83e11b 100644 --- a/Zotlabs/Extend/Route.php +++ b/Zotlabs/Extend/Route.php @@ -2,6 +2,7 @@ namespace Zotlabs\Extend; +use Zotlabs\Lib\Config; class Route { @@ -38,11 +39,11 @@ class Route { } static function get() { - return get_config('system','routes',[]); + return Config::Get('system','routes',[]); } static function set($r) { - return set_config('system','routes',$r); + return Config::Set('system','routes',$r); } } diff --git a/Zotlabs/Extend/Widget.php b/Zotlabs/Extend/Widget.php index dee64c61b..6ab95237d 100644 --- a/Zotlabs/Extend/Widget.php +++ b/Zotlabs/Extend/Widget.php @@ -2,6 +2,7 @@ namespace Zotlabs\Extend; +use Zotlabs\Lib\Config; class Widget { @@ -38,10 +39,10 @@ class Widget { } static function get() { - return get_config('system','widgets',[]); + return Config::Get('system','widgets',[]); } static function set($r) { - return set_config('system','widgets',$r); + return Config::Set('system','widgets',$r); } } diff --git a/Zotlabs/Identity/OAuth2Server.php b/Zotlabs/Identity/OAuth2Server.php index b747b95db..67326b599 100644 --- a/Zotlabs/Identity/OAuth2Server.php +++ b/Zotlabs/Identity/OAuth2Server.php @@ -2,6 +2,8 @@ namespace Zotlabs\Identity; +use Zotlabs\Lib\Config; + class OAuth2Server extends \OAuth2\Server { public function __construct(OAuth2Storage $storage, $config = null) { @@ -24,8 +26,8 @@ class OAuth2Server extends \OAuth2\Server { $keyStorage = new \OAuth2\Storage\Memory( [ 'keys' => [ - 'public_key' => get_config('system', 'pubkey'), - 'private_key' => get_config('system', 'prvkey') + 'public_key' => Config::Get('system', 'pubkey'), + 'private_key' => Config::Get('system', 'prvkey') ] ]); diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 1c05d69b1..0dc405ea9 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -3,6 +3,7 @@ namespace Zotlabs\Lib; use App; +use Zotlabs\Lib\Config; require_once('include/plugin.php'); require_once('include/channel.php'); @@ -65,7 +66,7 @@ class Apps { } static public function get_base_apps() { - $x = get_config('system','base_apps',[ + $x = Config::Get('system','base_apps',[ 'Connections', 'Contact Roles', 'Network', @@ -301,7 +302,7 @@ class Apps { break; default: if($config) - $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true); + $unset = ((Config::Get('system', $require[0]) == $require[1]) ? false : true); else $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); if($unset) @@ -523,7 +524,7 @@ class Apps { break; default: if($config) - $unset = ((get_config('system', $require[0]) === $require[1]) ? false : true); + $unset = ((Config::Get('system', $require[0]) === $require[1]) ? false : true); else $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); if($unset) @@ -960,7 +961,7 @@ class Apps { $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order'); - $x = (($uid) ? get_pconfig($uid,'system',$conf) : get_config('system',$conf)); + $x = (($uid) ? get_pconfig($uid,'system',$conf) : Config::Get('system',$conf)); if(($x) && (! is_array($x))) { $y = explode(',',$x); $y = array_map('trim',$y); diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php index f3f520496..4b5beb2aa 100644 --- a/Zotlabs/Lib/Cache.php +++ b/Zotlabs/Lib/Cache.php @@ -2,10 +2,11 @@ namespace Zotlabs\Lib; - /** - * cache api - */ +use Zotlabs\Lib\Config; +/** + * cache api + */ class Cache { /** @@ -23,7 +24,7 @@ class Cache { $r = q("SELECT v FROM cache WHERE k = '%s' AND updated > %s - INTERVAL %s LIMIT 1", dbesc($hash), db_utcnow(), - db_quoteinterval(($age ? $age : get_config('system','object_cache_days', '30') . ' DAY')) + db_quoteinterval(($age ? $age : Config::Get('system','object_cache_days', '30') . ' DAY')) ); if ($r) diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index 4de41526b..b8e7a5c4e 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -5,8 +5,7 @@ namespace Zotlabs\Lib; use App; use Zotlabs\Access\Permissions; use Zotlabs\Daemon\Master; - - +use Zotlabs\Lib\Config; class Connect { @@ -96,7 +95,7 @@ class Connect { $wf = discover_by_webbie($url,$protocol); if (! $wf) { - $feeds = get_config('system','feed_contacts'); + $feeds = Config::Get('system','feed_contacts'); if (($feeds) && (in_array($protocol, [ '', 'feed', 'rss' ]))) { $d = discover_by_url($url); diff --git a/Zotlabs/Lib/Crypto.php b/Zotlabs/Lib/Crypto.php index 188c6bd81..46a25d3b5 100644 --- a/Zotlabs/Lib/Crypto.php +++ b/Zotlabs/Lib/Crypto.php @@ -3,6 +3,7 @@ namespace Zotlabs\Lib; use Exception; +use Zotlabs\Lib\Config; class Crypto { @@ -44,7 +45,7 @@ class Crypto { 'encrypt_key' => false ]; - $conf = get_config('system', 'openssl_conf_file'); + $conf = Config::Get('system', 'openssl_conf_file'); if ($conf) { $openssl_options['config'] = $conf; diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php index b6e3f7b7b..981c354a4 100644 --- a/Zotlabs/Lib/DB_Upgrade.php +++ b/Zotlabs/Lib/DB_Upgrade.php @@ -2,6 +2,7 @@ namespace Zotlabs\Lib; +use Zotlabs\Lib\Config; class DB_Upgrade { @@ -13,9 +14,9 @@ class DB_Upgrade { $this->config_name = 'db_version'; $this->func_prefix = '_'; - $build = get_config('system', 'db_version', 0); + $build = Config::Get('system', 'db_version', 0); if(! intval($build)) - $build = set_config('system', 'db_version', $db_revision); + $build = Config::Set('system', 'db_version', $db_revision); if($build == $db_revision) { // Nothing to be done. @@ -27,7 +28,7 @@ class DB_Upgrade { logger('Critical: check_config unable to determine database schema version'); return; } - + $current = intval($db_revision); if($stored < $current) { @@ -38,7 +39,7 @@ class DB_Upgrade { for($x = $stored + 1; $x <= $current; $x ++) { $s = '_' . $x; $cls = '\\Zotlabs\Update\\' . $s ; - if(! class_exists($cls)) { + if(! class_exists($cls)) { return; } @@ -52,10 +53,10 @@ class DB_Upgrade { Config::Load('database'); - if(get_config('database', $s)) + if(Config::Get('database', $s)) break; - set_config('database',$s, '1'); - + Config::Set('database',$s, '1'); + $c = new $cls(); @@ -65,10 +66,10 @@ class DB_Upgrade { $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. + // a lockfile. $lockfile = 'store/[data]/mailsent'; @@ -77,7 +78,7 @@ class DB_Upgrade { @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']) ); @@ -86,7 +87,7 @@ class DB_Upgrade { [ 'toEmail' => \App::$config['system']['admin_email'], 'messageSubject' => sprintf( t('Update Error at %s'), z_root()), - 'textVersion' => replace_macros(get_intltext_template('update_fail_eml.tpl'), + 'textVersion' => replace_macros(get_intltext_template('update_fail_eml.tpl'), [ '$sitename' => \App::$config['system']['sitename'], '$siteurl' => z_root(), @@ -104,11 +105,11 @@ class DB_Upgrade { pop_lang(); } else { - set_config('database',$s, 'success'); + Config::Set('database',$s, 'success'); } } } - set_config('system', 'db_version', $db_revision); + Config::Set('system', 'db_version', $db_revision); } } -} \ No newline at end of file +} diff --git a/Zotlabs/Lib/DReport.php b/Zotlabs/Lib/DReport.php index 71e39a9d7..ac8e0d377 100644 --- a/Zotlabs/Lib/DReport.php +++ b/Zotlabs/Lib/DReport.php @@ -1,6 +1,8 @@ intval(get_config('system', 'force_queue_threshold', 3000))) { + if (intval($x[0]['total']) > intval(Config::Get('system', 'force_queue_threshold', 3000))) { logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); Queue::update($hash); continue; diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 3495ede06..89157bf5e 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -3,10 +3,11 @@ namespace Zotlabs\Lib; use App; -use Zotlabs\Web\HTTPSig; -use Zotlabs\Access\Permissions; use Zotlabs\Access\PermissionLimits; +use Zotlabs\Access\Permissions; use Zotlabs\Daemon\Master; +use Zotlabs\Lib\Config; +use Zotlabs\Web\HTTPSig; require_once('include/crypto.php'); @@ -101,12 +102,12 @@ class Libzot { */ static function build_packet($channel, $type = 'activity', $recipients = null, $msg = [], $encoding = 'activitystreams', $remote_key = null, $methods = '') { - $sig_method = get_config('system', 'signature_algorithm', 'sha256'); + $sig_method = Config::Get('system', 'signature_algorithm', 'sha256'); $data = [ 'type' => $type, 'encoding' => $encoding, 'sender' => $channel['channel_hash'], - 'site_id' => self::make_xchan_hash(z_root(), get_config('system', 'pubkey')), + 'site_id' => self::make_xchan_hash(z_root(), Config::Get('system', 'pubkey')), 'version' => System::get_zot_revision(), ]; @@ -661,7 +662,7 @@ class Libzot { */ call_hooks('import_xchan', $arr); - $dirmode = intval(get_config('system', 'directory_mode', DIRECTORY_MODE_NORMAL)); + $dirmode = intval(Config::Get('system', 'directory_mode', DIRECTORY_MODE_NORMAL)); $changed = false; $what = ''; @@ -710,7 +711,7 @@ class Libzot { // 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'); + $dirmode = Config::Get('system', 'directory_mode'); if (((isset($arr['site']['directory_mode']) && $arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) $arr['searchable'] = false; @@ -1008,7 +1009,7 @@ class Libzot { logger('Headers: ' . print_r($arr['header'], true), LOGGER_DATA, LOG_DEBUG); } - $x = Crypto::unencapsulate($x, get_config('system', 'prvkey')); + $x = Crypto::unencapsulate($x, Config::Get('system', 'prvkey')); if ($x && !is_array($x)) { $x = json_decode($x, true); @@ -1416,7 +1417,7 @@ class Libzot { $include_sys = false; if ($msg['type'] === 'activity') { - $disable_discover_tab = get_config('system', 'disable_discover_tab') || get_config('system', 'disable_discover_tab') === false; + $disable_discover_tab = Config::Get('system', 'disable_discover_tab') || Config::Get('system', 'disable_discover_tab') === false; if (!$disable_discover_tab) $include_sys = true; @@ -1632,8 +1633,8 @@ class Libzot { continue; } - $incl = get_config('system','pubstream_incl'); - $excl = get_config('system','pubstream_excl'); + $incl = Config::Get('system','pubstream_incl'); + $excl = Config::Get('system','pubstream_excl'); if(($incl || $excl) && !MessageFilter::evaluate($arr, $incl, $excl)) { $local_public = false; @@ -2924,8 +2925,8 @@ class Libzot { */ static function site_info() { - $signing_key = get_config('system', 'prvkey'); - $sig_method = get_config('system', 'signature_algorithm', 'sha256'); + $signing_key = Config::Get('system', 'prvkey'); + $sig_method = Config::Get('system', 'signature_algorithm', 'sha256'); $ret = []; $ret['site'] = []; @@ -2934,10 +2935,10 @@ class Libzot { $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'); + $ret['site']['sitekey'] = Config::Get('system', 'pubkey'); $ret['site']['directory_mode'] = 'normal'; - $dirmode = get_config('system', 'directory_mode'); + $dirmode = Config::Get('system', 'directory_mode'); if ($dirmode == DIRECTORY_MODE_PRIMARY) $ret['site']['directory_mode'] = 'primary'; @@ -2956,7 +2957,7 @@ class Libzot { if ($dirmode != DIRECTORY_MODE_STANDALONE) { - $register_policy = intval(get_config('system', 'register_policy')); + $register_policy = intval(Config::Get('system', 'register_policy')); if ($register_policy == REGISTER_CLOSED) $ret['site']['register_policy'] = 'closed'; @@ -2966,7 +2967,7 @@ class Libzot { $ret['site']['register_policy'] = 'open'; - $access_policy = intval(get_config('system', 'access_policy')); + $access_policy = intval(Config::Get('system', 'access_policy')); if ($access_policy == ACCESS_PRIVATE) $ret['site']['access_policy'] = 'private'; @@ -2982,7 +2983,7 @@ class Libzot { require_once('include/channel.php'); $ret['site']['channels'] = channel_total(); - $ret['site']['admin'] = get_config('system', 'admin_email'); + $ret['site']['admin'] = Config::Get('system', 'admin_email'); $visible_plugins = []; if (is_array(App::$plugins) && count(App::$plugins)) { @@ -2993,10 +2994,10 @@ class Libzot { } $ret['site']['plugins'] = $visible_plugins; - $ret['site']['sitehash'] = get_config('system', 'location_hash'); - $ret['site']['sitename'] = get_config('system', 'sitename'); - $ret['site']['sellpage'] = get_config('system', 'sellpage'); - $ret['site']['location'] = get_config('system', 'site_location'); + $ret['site']['sitehash'] = Config::Get('system', 'location_hash'); + $ret['site']['sitename'] = Config::Get('system', 'sitename'); + $ret['site']['sellpage'] = Config::Get('system', 'sellpage'); + $ret['site']['location'] = Config::Get('system', 'site_location'); $ret['site']['realm'] = get_directory_realm(); $ret['site']['project'] = System::get_platform_name(); $ret['site']['version'] = System::get_project_version(); diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php index ca3902a9e..25f308fc2 100644 --- a/Zotlabs/Lib/Libzotdir.php +++ b/Zotlabs/Lib/Libzotdir.php @@ -2,6 +2,7 @@ namespace Zotlabs\Lib; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Zotfinger; use Zotlabs\Lib\Webfinger; @@ -20,7 +21,7 @@ class Libzotdir { static function find_upstream_directory($dirmode) { - $preferred = get_config('system','directory_server'); + $preferred = Config::Get('system','directory_server'); // Thwart attempts to use a private directory @@ -47,17 +48,17 @@ class Libzotdir { $directory_fallback_servers = get_directory_fallback_servers(); - $dirmode = intval(get_config('system','directory_mode')); + $dirmode = intval(Config::Get('system','directory_mode')); if ($dirmode == DIRECTORY_MODE_NORMAL) { $toss = mt_rand(0,count($directory_fallback_servers)); $preferred = $directory_fallback_servers[$toss]; if(! $preferred) { $preferred = DIRECTORY_FALLBACK_MASTER; } - set_config('system','directory_server',$preferred); + Config::Set('system','directory_server',$preferred); } else { - set_config('system','directory_server',z_root()); + Config::Set('system','directory_server',z_root()); } } if($preferred) { @@ -77,7 +78,7 @@ class Libzotdir { static function check_upstream_directory() { - $directory = get_config('system', 'directory_server'); + $directory = Config::Get('system', 'directory_server'); // it's possible there is no directory server configured and the local hub is being used. // If so, default to preserving the absence of a specific server setting. @@ -94,7 +95,7 @@ class Libzotdir { } if (! $isadir) - set_config('system', 'directory_server', ''); + Config::Set('system', 'directory_server', ''); } @@ -106,7 +107,7 @@ class Libzotdir { $ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false); if($ret === false) - $ret = get_config('directory', $setting); + $ret = Config::Get('directory', $setting); // 'safemode' is the default if there is no observer or no established preference. @@ -114,7 +115,7 @@ class Libzotdir { if($setting === 'safemode' && $ret === false) $ret = 1; - if($setting === 'globaldir' && intval(get_config('system','localdir_hide'))) + if($setting === 'globaldir' && intval(Config::Get('system','localdir_hide'))) $ret = 1; return $ret; @@ -133,7 +134,7 @@ class Libzotdir { $globaldir = self::get_directory_setting($observer, 'globaldir'); $pubforums = self::get_directory_setting($observer, 'pubforums'); - $hide_local = intval(get_config('system','localdir_hide')); + $hide_local = intval(Config::Get('system','localdir_hide')); if($hide_local) $globaldir = 1; @@ -141,7 +142,7 @@ class Libzotdir { // Build urls without order and pubforums so it's easy to tack on the changed value // Probably there's an easier way to do this - $directory_sort_order = get_config('system','directory_sort_order'); + $directory_sort_order = Config::Get('system','directory_sort_order'); if(! $directory_sort_order) $directory_sort_order = 'date'; @@ -232,7 +233,7 @@ class Libzotdir { if (! $r) return; - $dir_trusted_hosts = array_merge(get_directory_fallback_servers(), get_config('system', 'trusted_directory_servers', [])); + $dir_trusted_hosts = array_merge(get_directory_fallback_servers(), Config::Get('system', 'trusted_directory_servers', [])); foreach ($r as $rr) { if (! $rr['site_directory']) @@ -244,7 +245,7 @@ class Libzotdir { // It will take about a month for a new directory to obtain the full current repertoire of channels. /** @FIXME Go back and pick up earlier ratings if this is a new directory server. These do not get refreshed. */ - $token = get_config('system','realm_token'); + $token = Config::Get('system','realm_token'); $syncdate = (($rr['site_sync'] <= NULL_DATE) ? datetime_convert('UTC','UTC','now - 2 days') : $rr['site_sync']); $x = z_fetch_url($rr['site_directory'] . '?f=&sync=' . urlencode($syncdate) . (($token) ? '&t=' . $token : '')); @@ -696,7 +697,7 @@ class Libzotdir { static function update($hash, $addr, $bump_date = true, $flag = null) { - $dirmode = intval(get_config('system', 'directory_mode')); + $dirmode = intval(Config::Get('system', 'directory_mode')); if($dirmode == DIRECTORY_MODE_NORMAL) { return; diff --git a/Zotlabs/Lib/QueueWorker.php b/Zotlabs/Lib/QueueWorker.php index 68e747b0f..ce239809f 100644 --- a/Zotlabs/Lib/QueueWorker.php +++ b/Zotlabs/Lib/QueueWorker.php @@ -4,6 +4,7 @@ namespace Zotlabs\Lib; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Exception\UnableToBuildUuidException; +use Zotlabs\Lib\Config; class QueueWorker { @@ -84,7 +85,7 @@ class QueueWorker { $workers = self::GetWorkerCount(); if ($workers < self::$maxworkers) { logger($workers . '/' . self::$maxworkers . ' workers active', LOGGER_DEBUG); - $phpbin = get_config('system', 'phpbin', 'php'); + $phpbin = Config::Get('system', 'phpbin', 'php'); proc_run($phpbin, 'Zotlabs/Daemon/Master.php', ['Queueworker']); } } @@ -132,18 +133,18 @@ class QueueWorker { public static function GetWorkerCount() { if (self::$maxworkers == 0) { - self::$maxworkers = get_config('queueworker', 'max_queueworkers', 4); + self::$maxworkers = Config::Get('queueworker', 'max_queueworkers', 4); self::$maxworkers = self::$maxworkers > 3 ? self::$maxworkers : 4; } if (self::$workermaxage == 0) { - self::$workermaxage = get_config('queueworker', 'max_queueworker_age'); + self::$workermaxage = Config::Get('queueworker', 'max_queueworker_age'); self::$workermaxage = self::$workermaxage > 120 ? self::$workermaxage : 300; } self::qstart(); // skip locked is preferred but is not supported by mariadb < 10.6 which is still used a lot - hence make it optional - $sql_quirks = ((get_config('system', 'db_skip_locked_supported')) ? 'SKIP LOCKED' : 'NOWAIT'); + $sql_quirks = ((Config::Get('system', 'db_skip_locked_supported')) ? 'SKIP LOCKED' : 'NOWAIT'); $r = q("SELECT workerq_id FROM workerq WHERE workerq_reservationid IS NOT NULL AND workerq_processtimeout < %s FOR UPDATE $sql_quirks", db_utcnow() @@ -199,7 +200,7 @@ class QueueWorker { self::qstart(); // skip locked is preferred but is not supported by mariadb < 10.6 which is still used a lot - hence make it optional - $sql_quirks = ((get_config('system', 'db_skip_locked_supported')) ? 'SKIP LOCKED' : 'NOWAIT'); + $sql_quirks = ((Config::Get('system', 'db_skip_locked_supported')) ? 'SKIP LOCKED' : 'NOWAIT'); $work = dbq("SELECT workerq_id, workerq_cmd FROM workerq WHERE workerq_reservationid IS NULL ORDER BY workerq_priority DESC, workerq_id ASC LIMIT 1 FOR UPDATE $sql_quirks"); @@ -236,12 +237,12 @@ class QueueWorker { } public static function Process() { - $sleep = intval(get_config('queueworker', 'queue_worker_sleep', 100)); - $auto_queue_worker_sleep = get_config('queueworker', 'auto_queue_worker_sleep', 0); + $sleep = intval(Config::Get('queueworker', 'queue_worker_sleep', 100)); + $auto_queue_worker_sleep = Config::Get('queueworker', 'auto_queue_worker_sleep', 0); if (!self::GetWorkerID()) { if ($auto_queue_worker_sleep) { - set_config('queueworker', 'queue_worker_sleep', $sleep + 100); + Config::Set('queueworker', 'queue_worker_sleep', $sleep + 100); } logger('Unable to get worker ID. Exiting.', LOGGER_DEBUG); @@ -250,7 +251,7 @@ class QueueWorker { if ($auto_queue_worker_sleep && $sleep > 100) { $next_sleep = $sleep - 100; - set_config('queueworker', 'queue_worker_sleep', (($next_sleep < 100) ? 100 : $next_sleep)); + Config::Set('queueworker', 'queue_worker_sleep', (($next_sleep < 100) ? 100 : $next_sleep)); } $jobs = 0; @@ -259,7 +260,7 @@ class QueueWorker { self::$workersleep = $sleep; self::$workersleep = ((intval(self::$workersleep) > 100) ? intval(self::$workersleep) : 100); - if (function_exists('sys_getloadavg') && get_config('queueworker', 'load_average_sleep')) { + if (function_exists('sys_getloadavg') && Config::Get('queueworker', 'load_average_sleep')) { // very experimental! $load_average_sleep = true; } @@ -287,7 +288,7 @@ class QueueWorker { if ($workers < self::$maxworkers) { logger($workers . '/' . self::$maxworkers . ' workers active', LOGGER_DEBUG); - $phpbin = get_config('system', 'phpbin', 'php'); + $phpbin = Config::Get('system', 'phpbin', 'php'); proc_run($phpbin, 'Zotlabs/Daemon/Master.php', ['Queueworker']); } diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 8f364e945..290a7b0c2 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -3,8 +3,9 @@ namespace Zotlabs\Lib; use App; -use Zotlabs\Lib\Apps; use Zotlabs\Access\AccessList; +use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; require_once('include/text.php'); @@ -41,7 +42,7 @@ class ThreadItem { $this->data = $data; $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); - $this->threaded = get_config('system','thread_allow'); + $this->threaded = Config::Get('system','thread_allow'); $observer = \App::get_observer(); @@ -70,7 +71,7 @@ class ThreadItem { // allow a site to configure the order and content of the reaction emoji list if($this->toplevel) { - $x = get_config('system','reactions'); + $x = Config::Get('system','reactions'); if($x && is_array($x) && count($x)) { $this->reactions = $x; } @@ -347,12 +348,12 @@ class ThreadItem { $dreport = ''; - $keep_reports = intval(get_config('system','expire_delivery_reports')); + $keep_reports = intval(Config::Get('system','expire_delivery_reports')); if($keep_reports === 0) $keep_reports = 10; $dreport_link = ''; - if((intval($item['item_type']) == ITEM_TYPE_POST) && (! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0) { + if((intval($item['item_type']) == ITEM_TYPE_POST) && (! Config::Get('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 = '?mid=' . $item['mid']; } @@ -397,7 +398,7 @@ class ThreadItem { $json_mids = json_encode($mids); // Pinned item processing - $allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false); + $allowed_type = (in_array($item['item_type'], Config::Get('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($midb64, $pinned_items)) ? true : false); @@ -549,7 +550,7 @@ class ThreadItem { $result['children'] = array(); $nb_children = count($children); - $visible_comments = get_config('system','expanded_comments'); + $visible_comments = Config::Get('system','expanded_comments'); if($visible_comments === false) $visible_comments = 3; @@ -826,7 +827,7 @@ class ThreadItem { */ private function get_comment_box() { - if(!$this->is_toplevel() && !get_config('system','thread_allow')) { + if(!$this->is_toplevel() && !Config::Get('system','thread_allow')) { return ''; } diff --git a/Zotlabs/Lib/Zotfinger.php b/Zotlabs/Lib/Zotfinger.php index ccf64d6d1..2a16fc8cf 100644 --- a/Zotlabs/Lib/Zotfinger.php +++ b/Zotlabs/Lib/Zotfinger.php @@ -2,6 +2,7 @@ namespace Zotlabs\Lib; +use Zotlabs\Lib\Config; use Zotlabs\Web\HTTPSig; class Zotfinger { @@ -75,7 +76,7 @@ class Zotfinger { $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); + $result['data'] = json_decode(Crypto::unencapsulate($result['data'],Config::Get('system','prvkey')),true); } logger('decrypted: ' . print_r($result,true), LOGGER_DATA); diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index b98f5621e..1de7a3d02 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -2,8 +2,9 @@ namespace Zotlabs\Module; -use Zotlabs\Lib\Libzotdir; use Zotlabs\Lib\AccessList; +use Zotlabs\Lib\Config; +use Zotlabs\Lib\Libzotdir; require_once 'include/acl_selectors.php'; @@ -414,7 +415,7 @@ class Acl extends \Zotlabs\Web\Controller { return; } - $dirmode = intval(get_config('system','directory_mode')); + $dirmode = intval(Config::Get('system','directory_mode')); $search = ((x($_REQUEST,'search')) ? htmlentities($_REQUEST['search'],ENT_COMPAT,'UTF-8',false) : ''); if(! $search || mb_strlen($search) < 2) return array(); @@ -443,7 +444,7 @@ class Acl extends \Zotlabs\Web\Controller { $url = $directory['url'] . '/dirsearch'; } - $token = get_config('system','realm_token'); + $token = Config::Get('system','realm_token'); $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 100); if($url) { diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 59a9e22b2..89eaeccfe 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -8,6 +8,8 @@ namespace Zotlabs\Module; +use Zotlabs\Lib\Config; + require_once('include/account.php'); /** @@ -149,7 +151,7 @@ class Admin extends \Zotlabs\Web\Controller { '$vmaster' => array( t('Repository version (master)'), $vmaster), '$vdev' => array( t('Repository version (dev)'), $vdev), '$upgrade' => $upgrade, - '$build' => get_config('system', 'db_version') + '$build' => Config::Get('system', 'db_version') )); } diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php index b067b4bf6..6f7cb0311 100644 --- a/Zotlabs/Module/Admin/Accounts.php +++ b/Zotlabs/Module/Admin/Accounts.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module\Admin; - +use Zotlabs\Lib\Config; class Accounts { @@ -76,7 +76,7 @@ class Accounts { if ( $ac['success'] ) { $rc .= '✔'; - $auto_create = get_config('system','auto_channel_create',1); + $auto_create = Config::Get('system','auto_channel_create',1); if($auto_create) { $reonar = json_decode($rs[0]['reg_stuff'], true); @@ -87,7 +87,7 @@ class Accounts { if($reonar['chan.did1']) set_aconfig($ac['account']['account_id'], 'register', 'channel_address', $reonar['chan.did1']); - $permissions_role = get_config('system','default_permissions_role'); + $permissions_role = Config::Get('system','default_permissions_role'); if($permissions_role) set_aconfig($ac['account']['account_id'], 'register', 'permissions_role', $permissions_role); diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php index e088353e3..b7cfb651c 100644 --- a/Zotlabs/Module/Admin/Addons.php +++ b/Zotlabs/Module/Admin/Addons.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module\Admin; use App; +use \Zotlabs\Lib\Config; use \Zotlabs\Storage\GitRepo; use \Michelf\MarkdownExtra; @@ -276,7 +277,7 @@ class Addons { if ($idz !== false) { unset(App::$plugins[$idz]); uninstall_plugin($plugin); - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); } } $info['disabled'] = 1-intval($x); @@ -297,7 +298,7 @@ class Addons { $pinstalled = true; info( sprintf( t("Plugin %s enabled."), $plugin ) ); } - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); if($pinstalled) { @require_once("addon/$plugin/$plugin.php"); @@ -395,7 +396,7 @@ class Addons { if ($idz !== false) { unset(App::$plugins[$idz]); uninstall_plugin($id); - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); } } $info['disabled'] = 1-intval($x); diff --git a/Zotlabs/Module/Admin/Dbsync.php b/Zotlabs/Module/Admin/Dbsync.php index b68e7bbc2..9f202993d 100644 --- a/Zotlabs/Module/Admin/Dbsync.php +++ b/Zotlabs/Module/Admin/Dbsync.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module\Admin; - +use Zotlabs\Lib\Config; class Dbsync { @@ -12,10 +12,10 @@ class Dbsync { if(argc() > 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))); + Config::Delete('database', 'update_r' . intval(argv(3))); + Config::Set('database', '_' . intval(argv(3)), 'success'); + if(intval(Config::Get('system','db_version')) < intval(argv(3))) + Config::Set('system','db_version',intval(argv(3))); info( t('Update has been marked successful') . EOL); goaway(z_root() . '/admin/dbsync'); } @@ -33,7 +33,7 @@ class Dbsync { } elseif($retval === UPDATE_SUCCESS) { $o .= sprintf( t('Update %s was successfully applied.'), $s); - set_config('database',$s, 'success'); + Config::Set('database',$s, 'success'); } else $o .= sprintf( t('Verifying update %s did not return a status. Unknown if it succeeded.'), $s); @@ -60,7 +60,7 @@ class Dbsync { } elseif($retval === UPDATE_SUCCESS) { $o .= sprintf( t('Update %s was successfully applied.'), $s); - set_config('database',$s, 'success'); + Config::Set('database',$s, 'success'); } else $o .= sprintf( t('Update %s did not return a status. It cannot be determined if it was successful.'), $s); diff --git a/Zotlabs/Module/Admin/Features.php b/Zotlabs/Module/Admin/Features.php index 504caae79..e0b3a3fd4 100644 --- a/Zotlabs/Module/Admin/Features.php +++ b/Zotlabs/Module/Admin/Features.php @@ -2,53 +2,53 @@ namespace Zotlabs\Module\Admin; - +use Zotlabs\Lib\Config; class Features { - + function post() { - + check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features'); - + logger('postvars: ' . print_r($_POST,true)); - + $arr = array(); $features = get_features(false); - + foreach($features as $fname => $fdata) { foreach(array_slice($fdata,1) as $f) { $feature = $f[0]; - + if(array_key_exists('feature_' . $feature,$_POST)) $val = intval($_POST['feature_' . $feature]); else $val = 0; - set_config('feature',$feature,$val); - + Config::Set('feature',$feature,$val); + if(array_key_exists('featurelock_' . $feature,$_POST)) - set_config('feature_lock',$feature,$val); + Config::Set('feature_lock',$feature,$val); else - del_config('feature_lock',$feature); + Config::Delete('feature_lock',$feature); } } - + goaway(z_root() . '/admin/features' ); - + } - + function get() { - + if((argc() > 1) && (argv(1) === 'features')) { $arr = array(); $features = get_features(false); - + foreach($features as $fname => $fdata) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach(array_slice($fdata,1) as $f) { - - $set = get_config('feature',$f[0]); + + $set = Config::Get('feature',$f[0]); if($set === false) $set = $f[3]; $arr[$fname][1][] = array( @@ -57,7 +57,7 @@ class Features { ); } } - + $tpl = get_markup_template("admin_settings_features.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("admin_manage_features"), @@ -65,10 +65,10 @@ class Features { '$features' => $arr, '$submit' => t('Submit'), )); - + return $o; } } - -} \ No newline at end of file + +} diff --git a/Zotlabs/Module/Admin/Logs.php b/Zotlabs/Module/Admin/Logs.php index c83fc6a9a..73c890e26 100644 --- a/Zotlabs/Module/Admin/Logs.php +++ b/Zotlabs/Module/Admin/Logs.php @@ -2,11 +2,12 @@ namespace Zotlabs\Module\Admin; +use Zotlabs\Lib\Config; class Logs { - + /** * @brief POST handler for logs admin page. * @@ -15,20 +16,20 @@ class Logs { function post() { if (x($_POST, 'page_logs')) { check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); - + $logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : ''); $debugging = ((x($_POST,'debugging')) ? true : false); $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); - - set_config('system','logfile', $logfile); - set_config('system','debugging', $debugging); - set_config('system','loglevel', $loglevel); + + Config::Set('system','logfile', $logfile); + Config::Set('system','debugging', $debugging); + Config::Set('system','loglevel', $loglevel); } - + info( t('Log settings updated.') ); goaway(z_root() . '/admin/logs' ); } - + /** * @brief Logs admin page. * @@ -36,7 +37,7 @@ class Logs { */ function get() { - + $log_choices = Array( LOGGER_NORMAL => 'Normal', LOGGER_TRACE => 'Trace', @@ -44,15 +45,15 @@ class Logs { LOGGER_DATA => 'Data', LOGGER_ALL => 'All' ); - + $t = get_markup_template('admin_logs.tpl'); - - $f = get_config('system', 'logfile'); - + + $f = Config::Get('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 + $data = t("Error trying to open $f log file.\r\n
Check to see if file $f exist and is readable."); } else { @@ -77,7 +78,7 @@ class Logs { fclose($fp); } } - + return replace_macros($t, array( '$title' => t('Administration'), '$page' => t('Logs'), @@ -85,17 +86,17 @@ class Logs { '$clear' => t('Clear'), '$data' => $data, '$baseurl' => z_root(), - '$logname' => get_config('system','logfile'), - + '$logname' => Config::Get('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), - + '$debugging' => array('debugging', t("Debugging"),Config::Get('system','debugging'), ""), + '$logfile' => array('logfile', t("Log file"), Config::Get('system','logfile'), t("Must be writable by web server. Relative to your top-level webserver directory.")), + '$loglevel' => array('loglevel', t("Log level"), Config::Get('system','loglevel'), "", $log_choices), + '$form_security_token' => get_form_security_token('admin_logs'), )); } - -} \ No newline at end of file + +} diff --git a/Zotlabs/Module/Admin/Profs.php b/Zotlabs/Module/Admin/Profs.php index eb2501d43..9965cab19 100644 --- a/Zotlabs/Module/Admin/Profs.php +++ b/Zotlabs/Module/Admin/Profs.php @@ -2,11 +2,12 @@ namespace Zotlabs\Module\Admin; +use Zotlabs\Lib\Config; class Profs { function post() { - + if(array_key_exists('basic',$_REQUEST)) { $arr = explode(',',$_REQUEST['basic']); array_walk($arr,'array_trim'); @@ -19,9 +20,9 @@ class Profs { } } if(! $narr) - del_config('system','profile_fields_basic'); + Config::Delete('system','profile_fields_basic'); else - set_config('system','profile_fields_basic',$narr); + Config::Set('system','profile_fields_basic',$narr); if(array_key_exists('advanced',$_REQUEST)) { @@ -36,15 +37,15 @@ class Profs { } } if(! $narr) - del_config('system','profile_fields_advanced'); + Config::Delete('system','profile_fields_advanced'); else - set_config('system','profile_fields_advanced',$narr); + Config::Set('system','profile_fields_advanced',$narr); } goaway(z_root() . '/admin/profs'); } - - + + if(array_key_exists('field_name',$_REQUEST)) { if($_REQUEST['id']) { $r = q("update profdef set field_name = '%s', field_type = '%s', field_desc = '%s' field_help = '%s', field_inputs = '%s' where id = %d", @@ -66,24 +67,24 @@ class Profs { ); } } - - + + // add to chosen array basic or advanced - + goaway(z_root() . '/admin/profs'); } - + function get() { - + if((argc() > 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'); + + goaway(z_root() . '/admin/profs'); } - + if((argc() > 2) && argv(2) === 'new') { return replace_macros(get_markup_template('profdef_edit.tpl'),array( '$header' => t('New Profile Field'), @@ -94,7 +95,7 @@ class Profs { '$submit' => t('Save') )); } - + if((argc() > 2) && intval(argv(2))) { $r = q("select * from profdef where id = %d limit 1", intval(argv(2)) @@ -103,7 +104,7 @@ class Profs { notice( t('Field definition not found') . EOL); goaway(z_root() . '/admin/profs'); } - + return replace_macros(get_markup_template('profdef_edit.tpl'),array( '$id' => intval($r[0]['id']), '$header' => t('Edit Profile Field'), @@ -114,7 +115,7 @@ class Profs { '$submit' => t('Save') )); } - + $basic = ''; $barr = array(); $fields = get_profile_fields_basic(); @@ -129,7 +130,7 @@ class Profs { $barr[] = trim($k); } } - + $advanced = ''; $fields = get_profile_fields_advanced(); if(! $fields) @@ -143,7 +144,7 @@ class Profs { $advanced .= trim($k); } } - + $all = ''; $fields = get_profile_fields_advanced(1); if($fields) { @@ -153,7 +154,7 @@ class Profs { $all .= trim($k); } } - + $r = q("select * from profdef where true"); if($r) { foreach($r as $rr) { @@ -162,8 +163,8 @@ class Profs { $all .= $rr['field_name']; } } - - + + $o = replace_macros(get_markup_template('admin_profiles.tpl'),array( '$title' => t('Profile Fields'), '$basic' => array('basic',t('Basic Profile Fields'),$basic,''), @@ -174,17 +175,17 @@ class Profs { '$cust_fields' => $r, '$edit' => t('Edit'), '$drop' => t('Delete'), - '$new' => t('Create Custom Field'), + '$new' => t('Create Custom Field'), '$submit' => t('Submit') )); - + return $o; - - + + } -} \ No newline at end of file +} diff --git a/Zotlabs/Module/Admin/Queueworker.php b/Zotlabs/Module/Admin/Queueworker.php index a4f38d07c..c98df6ac0 100644 --- a/Zotlabs/Module/Admin/Queueworker.php +++ b/Zotlabs/Module/Admin/Queueworker.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module\Admin; use App; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; class Queueworker extends Controller { @@ -17,18 +18,18 @@ class Queueworker extends Controller { $maxqueueworkers = intval($_POST['queueworker_maxworkers']); $maxqueueworkers = ($maxqueueworkers > 3) ? $maxqueueworkers : 4; - set_config('queueworker', 'max_queueworkers', $maxqueueworkers); + Config::Set('queueworker', 'max_queueworkers', $maxqueueworkers); $maxworkerage = intval($_POST['queueworker_max_age']); $maxworkerage = ($maxworkerage >= 120) ? $maxworkerage : 300; - set_config('queueworker', 'queueworker_max_age', $maxworkerage); + Config::Set('queueworker', 'queueworker_max_age', $maxworkerage); $queueworkersleep = intval($_POST['queue_worker_sleep']); $queueworkersleep = ($queueworkersleep > 100) ? $queueworkersleep : 100; - set_config('queueworker', 'queue_worker_sleep', $queueworkersleep); + Config::Set('queueworker', 'queue_worker_sleep', $queueworkersleep); $auto_queue_worker_sleep = intval($_POST['auto_queue_worker_sleep']); - set_config('queueworker', 'auto_queue_worker_sleep', $auto_queue_worker_sleep); + Config::Set('queueworker', 'auto_queue_worker_sleep', $auto_queue_worker_sleep); goaway(z_root() . '/admin/queueworker'); } @@ -54,7 +55,7 @@ class Queueworker extends Controller { } } - $maxqueueworkers = get_config('queueworker', 'max_queueworkers', 4); + $maxqueueworkers = Config::Get('queueworker', 'max_queueworkers', 4); $maxqueueworkers = ($maxqueueworkers > 3) ? $maxqueueworkers : 4; $sc = ''; @@ -68,7 +69,7 @@ class Queueworker extends Controller { ] ]); - $workermaxage = get_config('queueworker', 'queueworker_max_age'); + $workermaxage = Config::Get('queueworker', 'queueworker_max_age'); $workermaxage = ($workermaxage >= 120) ? $workermaxage : 300; $sc .= replace_macros(get_markup_template('field_input.tpl'), [ @@ -80,10 +81,10 @@ class Queueworker extends Controller { ] ]); - $queueworkersleep = get_config('queueworker', 'queue_worker_sleep'); + $queueworkersleep = Config::Get('queueworker', 'queue_worker_sleep'); $queueworkersleep = ($queueworkersleep > 100) ? $queueworkersleep : 100; - $auto_queue_worker_sleep = get_config('queueworker', 'auto_queue_worker_sleep', 0); + $auto_queue_worker_sleep = Config::Get('queueworker', 'auto_queue_worker_sleep', 0); $sc .= replace_macros(get_markup_template('field_input.tpl'), [ '$field' => [ diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 499572170..559097df2 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module\Admin; +use Zotlabs\Lib\Config; class Security { @@ -11,53 +12,53 @@ class Security { $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); $not_allowed_email = ((x($_POST,'not_allowed_email')) ? notags(trim($_POST['not_allowed_email'])) : ''); - set_config('system','allowed_email', $allowed_email); - set_config('system','not_allowed_email', $not_allowed_email); + Config::Set('system','allowed_email', $allowed_email); + Config::Set('system','not_allowed_email', $not_allowed_email); $block_public = ((x($_POST,'block_public')) ? True : False); - set_config('system','block_public',$block_public); + Config::Set('system','block_public',$block_public); $cloud_noroot = ((x($_POST,'cloud_noroot')) ? 1 : 0); - set_config('system','cloud_disable_siteroot',1 - $cloud_noroot); + Config::Set('system','cloud_disable_siteroot',1 - $cloud_noroot); $cloud_disksize = ((x($_POST,'cloud_disksize')) ? 1 : 0); - set_config('system','cloud_report_disksize',$cloud_disksize); + Config::Set('system','cloud_report_disksize',$cloud_disksize); $ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); - set_config('system','whitelisted_sites',$ws); + Config::Set('system','whitelisted_sites',$ws); $bs = $this->trim_array_elems(explode("\n",$_POST['blacklisted_sites'])); - set_config('system','blacklisted_sites',$bs); + Config::Set('system','blacklisted_sites',$bs); $wc = $this->trim_array_elems(explode("\n",$_POST['whitelisted_channels'])); - set_config('system','whitelisted_channels',$wc); + Config::Set('system','whitelisted_channels',$wc); $bc = $this->trim_array_elems(explode("\n",$_POST['blacklisted_channels'])); - set_config('system','blacklisted_channels',$bc); + Config::Set('system','blacklisted_channels',$bc); $embed_sslonly = ((x($_POST,'embed_sslonly')) ? True : False); - set_config('system','embed_sslonly',$embed_sslonly); + Config::Set('system','embed_sslonly',$embed_sslonly); $we = $this->trim_array_elems(explode("\n",$_POST['embed_allow'])); - set_config('system','embed_allow',$we); + Config::Set('system','embed_allow',$we); $be = $this->trim_array_elems(explode("\n",$_POST['embed_deny'])); - set_config('system','embed_deny',$be); + Config::Set('system','embed_deny',$be); $thumbnail_security = ((x($_POST,'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0); - set_config('system', 'thumbnail_security' , $thumbnail_security); + Config::Set('system', 'thumbnail_security' , $thumbnail_security); $inline_pdf = ((x($_POST,'inline_pdf')) ? intval($_POST['inline_pdf']) : 0); - set_config('system', 'inline_pdf' , $inline_pdf); + Config::Set('system', 'inline_pdf' , $inline_pdf); $ts = ((x($_POST,'transport_security')) ? True : False); - set_config('system','transport_security_header',$ts); + Config::Set('system','transport_security_header',$ts); $cs = ((x($_POST,'content_security')) ? True : False); - set_config('system','content_security_policy',$cs); + Config::Set('system','content_security_policy',$cs); $trusted_directory_servers = $this->trim_array_elems(explode("\n", $_POST['trusted_directory_servers'])); - set_config('system', 'trusted_directory_servers', $trusted_directory_servers); + Config::Set('system', 'trusted_directory_servers', $trusted_directory_servers); goaway(z_root() . '/admin/security'); } @@ -66,31 +67,31 @@ class Security { function get() { - $whitesites = get_config('system','whitelisted_sites'); + $whitesites = Config::Get('system','whitelisted_sites'); $whitesites_str = ((is_array($whitesites)) ? implode("\n",$whitesites) : ''); - $blacksites = get_config('system','blacklisted_sites'); + $blacksites = Config::Get('system','blacklisted_sites'); $blacksites_str = ((is_array($blacksites)) ? implode("\n",$blacksites) : ''); - $whitechannels = get_config('system','whitelisted_channels'); + $whitechannels = Config::Get('system','whitelisted_channels'); $whitechannels_str = ((is_array($whitechannels)) ? implode("\n",$whitechannels) : ''); - $blackchannels = get_config('system','blacklisted_channels'); + $blackchannels = Config::Get('system','blacklisted_channels'); $blackchannels_str = ((is_array($blackchannels)) ? implode("\n",$blackchannels) : ''); - $whiteembeds = get_config('system','embed_allow'); + $whiteembeds = Config::Get('system','embed_allow'); $whiteembeds_str = ((is_array($whiteembeds)) ? implode("\n",$whiteembeds) : ''); - $blackembeds = get_config('system','embed_deny'); + $blackembeds = Config::Get('system','embed_deny'); $blackembeds_str = ((is_array($blackembeds)) ? implode("\n",$blackembeds) : ''); - $trusted_directory_servers = get_config('system', 'trusted_directory_servers'); + $trusted_directory_servers = Config::Get('system', 'trusted_directory_servers'); $trusted_directory_servers_str = ((is_array($trusted_directory_servers)) ? implode("\n", $trusted_directory_servers) : ''); - $is_dir = (intval(get_config('system', 'directory_mode', DIRECTORY_MODE_NORMAL)) !== DIRECTORY_MODE_NORMAL); + $is_dir = (intval(Config::Get('system', 'directory_mode', DIRECTORY_MODE_NORMAL)) !== DIRECTORY_MODE_NORMAL); - $embed_coop = intval(get_config('system','embed_coop')); + $embed_coop = intval(Config::Get('system','embed_coop')); if((! $whiteembeds) && (! $blackembeds)) { $embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."); @@ -105,22 +106,22 @@ class Security { '$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.")), - '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system','cloud_disable_siteroot')), t('The cloud root directory lists all channel names which provide public files') ], - '$cloud_disksize' => [ 'cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system','cloud_report_disksize')), '' ], - '$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.")), + '$block_public' => array('block_public', t("Block public"), Config::Get('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), + '$cloud_noroot' => [ 'cloud_noroot', t('Provide a cloud root directory'), 1 - intval(Config::Get('system','cloud_disable_siteroot')), t('The cloud root directory lists all channel names which provide public files') ], + '$cloud_disksize' => [ 'cloud_disksize', t('Show total disk space available to cloud uploads'), intval(Config::Get('system','cloud_report_disksize')), '' ], + '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(Config::Get('system','transport_security_header')),''), + '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(Config::Get('system','content_security_policy')),''), + '$allowed_email' => array('allowed_email', t("Allowed email domains"), Config::Get('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"), Config::Get('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.")), '$whitelisted_sites' => array('whitelisted_sites', t('Allow communications only from these sites'), $whitesites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), '$blacklisted_sites' => array('blacklisted_sites', t('Block communications from these sites'), $blacksites_str, ''), '$whitelisted_channels' => array('whitelisted_channels', t('Allow communications only from these channels'), $whitechannels_str, t('One channel (hash) per line. Leave empty to allow from any channel by default')), '$blacklisted_channels' => array('blacklisted_channels', t('Block communications from these channels'), $blackchannels_str, ''), - '$embed_sslonly' => array('embed_sslonly',t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system','embed_sslonly')),''), + '$embed_sslonly' => array('embed_sslonly',t('Only allow embeds from secure (SSL) websites and links.'), intval(Config::Get('system','embed_sslonly')),''), '$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. By default embedded content is filtered.')), '$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $blackembeds_str, ''), - '$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), '' ], + '$thumbnail_security' => [ 'thumbnail_security', t("Allow SVG thumbnails in file browser"), Config::Get('system','thumbnail_security',0), t("WARNING: SVG images may contain malicious code.") ], + '$inline_pdf' => [ 'inline_pdf', t("Allow embedded (inline) PDF files"), Config::Get('system','inline_pdf',0), '' ], '$trusted_directory_servers' => (($is_dir) ? ['trusted_directory_servers', t('Additional trusted directory server URLs'), $trusted_directory_servers_str, t('Accept directory flags (spam, nsfw) from those servers. One per line like https://example.tld')] : ''), diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index dae5e7c77..abc56d298 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module\Admin; +use Zotlabs\Lib\Config; class Site { @@ -125,8 +126,8 @@ class Site { //logger( print_r( $this->msgbg, true) ); //logger( print_r( $this->joo, true) ); if ($this->error === 0) { - set_config('system', 'register_duty', $this->register_duty); - set_config('system', 'register_duty_jso', $this->joo); + Config::Set('system', 'register_duty', $this->register_duty); + Config::Set('system', 'register_duty_jso', $this->joo); } else { notice('ZAR0130E,' . t('Errors') . ': ' . $this->error . EOL . $this->msgfg . EOL); } @@ -134,87 +135,87 @@ class Site { } // <-hilmar] - set_config('system', 'feed_contacts', $feed_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', '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', 'max_daily_registrations', $register_perday); - set_config('system', 'register_sameip', $register_sameip); - set_config('system', 'register_delay', $reg_delay); - set_config('system', 'register_expire', $reg_expire); - 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', 'pubstream_incl',$pub_incl); - set_config('system', 'pubstream_excl',$pub_excl); + Config::Set('system', 'feed_contacts', $feed_contacts); + Config::Set('system', 'delivery_interval', $delivery_interval); + Config::Set('system', 'delivery_batch_count', $delivery_batch_count); + Config::Set('system', 'poll_interval', $poll_interval); + Config::Set('system', 'maxloadavg', $maxloadavg); + Config::Set('system', 'frontpage', $frontpage); + Config::Set('system', 'sellpage', $site_sellpage); + Config::Set('system', 'workflow_channel_next', $first_page); + Config::Set('system', 'site_location', $site_location); + Config::Set('system', 'mirror_frontpage', $mirror_frontpage); + Config::Set('system', 'sitename', $sitename); + Config::Set('system', 'login_on_homepage', $login_on_homepage); + Config::Set('system', 'enable_context_help', $enable_context_help); + Config::Set('system', 'verify_email', $verify_email); + Config::Set('system', 'max_daily_registrations', $register_perday); + Config::Set('system', 'register_sameip', $register_sameip); + Config::Set('system', 'register_delay', $reg_delay); + Config::Set('system', 'register_expire', $reg_expire); + Config::Set('system', 'default_expire_days', $default_expire_days); + Config::Set('system', 'active_expire_days', $active_expire_days); + Config::Set('system', 'reply_address', $reply_address); + Config::Set('system', 'from_email', $from_email); + Config::Set('system', 'from_email_name' , $from_email_name); + Config::Set('system', 'imagick_convert_path' , $imagick_path); + Config::Set('system', 'default_permissions_role', $permissions_role); + Config::Set('system', 'pubstream_incl',$pub_incl); + Config::Set('system', 'pubstream_excl',$pub_excl); if($directory_server) - set_config('system','directory_server',$directory_server); + Config::Set('system','directory_server',$directory_server); if ($banner == '') { - del_config('system', 'banner'); + Config::Delete('system', 'banner'); } else { - set_config('system', 'banner', $banner); + Config::Set('system', 'banner', $banner); } if ($admininfo == ''){ - del_config('system', 'admininfo'); + Config::Delete('system', 'admininfo'); } else { require_once('include/text.php'); linkify_tags($admininfo, local_channel()); - set_config('system', 'admininfo', $admininfo); + Config::Set('system', 'admininfo', $admininfo); } - set_config('system','siteinfo',$siteinfo); - //set_config('system', 'language', $language); - set_config('system', 'theme', $theme); + Config::Set('system','siteinfo',$siteinfo); + //Config::Set('system', 'language', $language); + Config::Set('system', 'theme', $theme); // if ( $theme_mobile === '---' ) { - // del_config('system', 'mobile_theme'); + // Config::Delete('system', 'mobile_theme'); // } else { - // set_config('system', 'mobile_theme', $theme_mobile); + // Config::Set('system', 'mobile_theme', $theme_mobile); // } - // set_config('system','site_channel', $site_channel); - set_config('system','maximagesize', $maximagesize); - - set_config('system','register_policy', $register_policy); - set_config('system','register_wo_email', $register_wo_email); - set_config('system','minimum_age', $minimum_age); - set_config('system','auto_channel_create', $reg_autochannel); - set_config('system', 'invitation_only', $invitation_only); - set_config('system', 'invitation_also', $invitation_also); - 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','allowed_sites', $allowed_sites); - set_config('system','publish_all', $force_publish); - set_config('system','disable_discover_tab', $disable_discover_tab); - set_config('system','site_firehose', $site_firehose); - set_config('system','open_pubstream', $open_pubstream); - //set_config('system','force_queue_threshold', $force_queue); - - set_config('system','no_community_page', $no_community_page); - set_config('system','no_utf', $no_utf); - - set_config('system','sse_enabled', $sse_enabled); - - set_config('system','verifyssl', $verifyssl); - set_config('system','proxyuser', $proxyuser); - set_config('system','proxy', $proxy); - set_config('system','curl_timeout', $timeout); + // Config::Set('system','site_channel', $site_channel); + Config::Set('system','maximagesize', $maximagesize); + + Config::Set('system','register_policy', $register_policy); + Config::Set('system','register_wo_email', $register_wo_email); + Config::Set('system','minimum_age', $minimum_age); + Config::Set('system','auto_channel_create', $reg_autochannel); + Config::Set('system', 'invitation_only', $invitation_only); + Config::Set('system', 'invitation_also', $invitation_also); + Config::Set('system','access_policy', $access_policy); + Config::Set('system','account_abandon_days', $abandon_days); + Config::Set('system','register_text', $register_text); + Config::Set('system','allowed_sites', $allowed_sites); + Config::Set('system','publish_all', $force_publish); + Config::Set('system','disable_discover_tab', $disable_discover_tab); + Config::Set('system','site_firehose', $site_firehose); + Config::Set('system','open_pubstream', $open_pubstream); + //Config::Set('system','force_queue_threshold', $force_queue); + + Config::Set('system','no_community_page', $no_community_page); + Config::Set('system','no_utf', $no_utf); + + Config::Set('system','sse_enabled', $sse_enabled); + + Config::Set('system','verifyssl', $verifyssl); + Config::Set('system','proxyuser', $proxyuser); + Config::Set('system','proxy', $proxy); + Config::Set('system','curl_timeout', $timeout); info( t('Site settings updated.') . EOL); goaway(z_root() . '/admin/site' ); @@ -263,7 +264,7 @@ class Site { } $dir_choices = null; - $dirmode = get_config('system', 'directory_mode', DIRECTORY_MODE_NORMAL); + $dirmode = Config::Get('system', 'directory_mode', DIRECTORY_MODE_NORMAL); $realm = get_directory_realm(); // directory server should not be set or settable unless we are a directory client @@ -291,14 +292,14 @@ class Site { /* Banner */ - $banner = get_config('system', 'banner'); + $banner = Config::Get('system', 'banner'); if($banner === false) - $banner = get_config('system','sitename'); + $banner = Config::Get('system','sitename'); $banner = htmlspecialchars($banner); /* Admin Info */ - $admininfo = get_config('system', 'admininfo'); + $admininfo = Config::Get('system', 'admininfo'); /* Register policy */ $register_choices = Array( @@ -306,8 +307,8 @@ class Site { REGISTER_APPROVE => t("Yes - with approval"), REGISTER_OPEN => t("Yes") ); - $this->register_duty = get_config('system', 'register_duty', '-:-'); - $register_perday = get_config('system','max_daily_registrations', 50); + $this->register_duty = Config::Get('system', 'register_duty', '-:-'); + $register_perday = Config::Get('system','max_daily_registrations', 50); /* Acess policy */ $access_choices = Array( @@ -317,7 +318,7 @@ class Site { ACCESS_TIERED => t("My site offers free accounts with optional paid upgrades") ); - $discover_tab = get_config('system','disable_discover_tab'); + $discover_tab = Config::Get('system','disable_discover_tab'); // $disable public streams by default if($discover_tab === false) @@ -326,7 +327,7 @@ class Site { $discover_tab = (1 - $discover_tab); $perm_roles = \Zotlabs\Access\PermissionRoles::channel_roles(); - $default_role = get_config('system', 'default_permissions_role', 'personal'); + $default_role = Config::Get('system', 'default_permissions_role', 'personal'); if (!in_array($default_role, array_keys($perm_roles))) { $default_role = 'personal'; @@ -334,8 +335,8 @@ class Site { $role = array('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'); + $homelogin = Config::Get('system','login_on_homepage'); + $enable_context_help = Config::Get('system','enable_context_help'); // for reuse reg_delay and reg_expire $reg_rabots = array( @@ -347,7 +348,7 @@ class Site { 'y' => t('Year(s)') ); $regdelay_n = $regdelay_u = false; - $regdelay = get_config('system','register_delay'); + $regdelay = Config::Get('system','register_delay'); if ($regdelay) list($regdelay_n, $regdelay_u) = array(substr($regdelay,0,-1),substr($regdelay,-1)); $reg_delay = replace_macros(get_markup_template('field_duration.qmc.tpl'), @@ -369,7 +370,7 @@ class Site { ) ); $regexpire_n = $regexpire_u = false; - $regexpire = get_config('system','register_expire'); + $regexpire = Config::Get('system','register_expire'); if ($regexpire) list($regexpire_n, $regexpire_u) = array(substr($regexpire,0,-1),substr($regexpire,-1)); $reg_expire = replace_macros(get_markup_template('field_duration.qmc.tpl'), @@ -406,38 +407,38 @@ class Site { '$baseurl' => z_root(), // name, label, value, help string, extra data... - '$sitename' => array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''), + '$sitename' => array('sitename', t("Site name"), htmlspecialchars(Config::Get('system','sitename'), ENT_QUOTES, 'UTF-8'),''), '$banner' => array('banner', t("Banner/Logo"), $banner, t('Unfiltered HTML/CSS/JS is allowed')), '$admininfo' => array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here")), - '$siteinfo' => array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here")), - '$theme' => array('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' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), - // '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), - '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), - '$maximagesize' => array('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.")), - '$minimum_age' => array('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' => array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), t("This is displayed on the public server site list."), $access_choices), + '$siteinfo' => array('siteinfo', t('Site Information'), Config::Get('system','siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here")), + '$theme' => array('theme', t("System theme"), Config::Get('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), + // '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::Get('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), + // '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), Config::Get('system','site_channel'), t("Site Channel")), + '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),Config::Get('system','feed_contacts'),t('(Heavy system resource usage)')), + '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(Config::Get('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), + '$minimum_age' => array('minimum_age', t("Minimum age"), (x(Config::Get('system','minimum_age'))?Config::Get('system','minimum_age'):13), t("Minimum age (in years) for who may register on this site.")), + '$access_policy' => array('access_policy', t("Which best describes the types of account offered by this hub?"), Config::Get('system','access_policy'), t("This is displayed on the public server site list."), $access_choices), // Register // [hilmar-> '$register_text' => [ 'register_text', t("Register text"), - htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), + htmlspecialchars(Config::Get('system','register_text'), ENT_QUOTES, 'UTF-8'), t("This text will be displayed prominently at the registration page") ], '$register_policy' => [ 'register_policy', t("Does this site allow new member registration?"), - get_config('system','register_policy'), + Config::Get('system','register_policy'), "", $register_choices, ], '$register_duty' => [ 'register_duty', t('Configure the registration open days/hours'), - get_config('system', 'register_duty', '-:-'), + Config::Get('system', 'register_duty', '-:-'), t('Empty or \'-:-\' value will keep registration open 24/7 (default)') . EOL . t('Weekdays and hours must be separated by colon \':\', From-To ranges with a dash `-` example: 1:800-1200') . EOL . t('Weekday:Hour pairs must be separated by space \' \' example: 1:900-1700 2:900-1700') . EOL . @@ -448,13 +449,13 @@ class Site { '$register_perday' => [ 'register_perday', t('Max account registrations per day'), - get_config('system', 'max_daily_registrations', 50), + Config::Get('system', 'max_daily_registrations', 50), t('Unlimited if zero or no value - default 50') ], '$register_sameip' => [ 'register_sameip', t('Max account registrations from same IP'), - get_config('system', 'register_sameip', 3), + Config::Get('system', 'register_sameip', 3), t('Unlimited if zero or no value - default 3') ], '$reg_delay' => $reg_delay, @@ -462,70 +463,70 @@ class Site { '$reg_autochannel' => [ 'auto_channel_create', t("Auto channel create"), - get_config('system','auto_channel_create', 1), + Config::Get('system','auto_channel_create', 1), t("If disabled the channel will be created in a separate step during the registration process") ], '$invitation_only' => [ 'invitation_only', t("Require invite code"), - get_config('system', 'invitation_only', 0) + Config::Get('system', 'invitation_only', 0) ], '$invitation_also' => [ 'invitation_also', t("Allow invite code"), - get_config('system', 'invitation_also', 0) + Config::Get('system', 'invitation_also', 0) ], '$verify_email' => [ 'verify_email', t("Require email address"), - get_config('system','verify_email'), + Config::Get('system','verify_email'), t("The provided email address will be verified (recommended)") ], '$abandon_days' => [ 'abandon_days', t('Abandon account after x days'), - get_config('system','account_abandon_days'), + Config::Get('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.') ], // <-hilmar] '$role' => $role, - '$frontpage' => array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")), - '$mirror_frontpage' => array('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')), - '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), - '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory")), + '$frontpage' => array('frontpage', t("Site homepage to show visitors (default: login box)"), Config::Get('system','frontpage'), t("example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")), + '$mirror_frontpage' => array('mirror_frontpage', t("Preserve site homepage URL"), Config::Get('system','mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')), + '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), Config::Get('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), + '$force_publish' => array('publish_all', t("Force publish"), Config::Get('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory")), '$disable_discover_tab' => array('disable_discover_tab', t('Enable public stream'), $discover_tab, t('Enable the public stream. Warning: this content is unmoderated')), - '$site_firehose' => array('site_firehose', t('Site only public stream'), get_config('system','site_firehose'), t('Restrict the public stream to content originating at this site')), - '$open_pubstream' => array('open_pubstream', t('Allow anybody on the internet to access the public streams'), get_config('system','open_pubstream',1), t('Disable to require authentication before viewing')), - '$incl' => array('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' => array('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')), + '$site_firehose' => array('site_firehose', t('Site only public stream'), Config::Get('system','site_firehose'), t('Restrict the public stream to content originating at this site')), + '$open_pubstream' => array('open_pubstream', t('Allow anybody on the internet to access the public streams'), Config::Get('system','open_pubstream',1), t('Disable to require authentication before viewing')), + '$incl' => array('pub_incl',t('Only import Public stream posts with this text'), Config::Get('system','pubstream_incl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$excl' => array('pub_excl',t('Do not import Public stream posts with this text'), Config::Get('system','pubstream_excl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), '$login_on_homepage' => array('login_on_homepage', t("Login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.")), '$enable_context_help' => array('enable_context_help', t("Enable context help"),((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0) , t("Display contextual help for the current page when the help button is pressed.")), - '$reply_address' => [ 'reply_address', t('Reply-to email address for system generated email.'), get_config('system','reply_address','noreply@' . \App::get_hostname()),'' ], - '$from_email' => [ 'from_email', t('Sender (From) email address for system generated email.'), get_config('system','from_email','Administrator@' . \App::get_hostname()),'' ], - '$from_email_name' => [ 'from_email_name', t('Name of email sender for system generated email.'), get_config('system','from_email_name',\Zotlabs\Lib\System::get_site_name()),'' ], - - '$directory_server' => (($dir_choices) ? array('directory_server', t("Directory Server URL"), get_config('system','directory_server'), t("Default directory server"), $dir_choices) : null), - - '$sse_enabled' => array('sse_enabled', t('Enable SSE Notifications'), get_config('system', 'sse_enabled', 0), t('If disabled, traditional polling will be used. Warning: this setting might not be suited for shared hosting')), - - '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), - '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), - '$timeout' => array('timeout', t("Network 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).")), - '$delivery_interval' => array('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' => array('delivery_batch_count', t('Deliveries per process'),(x(get_config('system','delivery_batch_count'))?get_config('system','delivery_batch_count'):1), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")), - //'$force_queue' => array('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' => array('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' => array('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' => array('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' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days', 30)), t('0 for no expiration of imported content')), - '$active_expire_days' => array('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' => array('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' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Default: profiles')), - '$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')), + '$reply_address' => [ 'reply_address', t('Reply-to email address for system generated email.'), Config::Get('system','reply_address','noreply@' . \App::get_hostname()),'' ], + '$from_email' => [ 'from_email', t('Sender (From) email address for system generated email.'), Config::Get('system','from_email','Administrator@' . \App::get_hostname()),'' ], + '$from_email_name' => [ 'from_email_name', t('Name of email sender for system generated email.'), Config::Get('system','from_email_name',\Zotlabs\Lib\System::get_site_name()),'' ], + + '$directory_server' => (($dir_choices) ? array('directory_server', t("Directory Server URL"), Config::Get('system','directory_server'), t("Default directory server"), $dir_choices) : null), + + '$sse_enabled' => array('sse_enabled', t('Enable SSE Notifications'), Config::Get('system', 'sse_enabled', 0), t('If disabled, traditional polling will be used. Warning: this setting might not be suited for shared hosting')), + + '$proxyuser' => array('proxyuser', t("Proxy user"), Config::Get('system','proxyuser'), ""), + '$proxy' => array('proxy', t("Proxy URL"), Config::Get('system','proxy'), ""), + '$timeout' => array('timeout', t("Network timeout"), (x(Config::Get('system','curl_timeout'))?Config::Get('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), + '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(Config::Get('system','delivery_interval'))?Config::Get('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' => array('delivery_batch_count', t('Deliveries per process'),(x(Config::Get('system','delivery_batch_count'))?Config::Get('system','delivery_batch_count'):1), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")), + //'$force_queue' => array('force_queue', t("Queue Threshold"), Config::Get('system','force_queue_threshold',3000), t("Always defer immediate delivery if queue contains more than this number of entries.")), + '$poll_interval' => array('poll_interval', t("Poll interval"), (x(Config::Get('system','poll_interval'))?Config::Get('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), + '$imagick_path' => array('imagick_path', t("Path to ImageMagick convert program"), Config::Get('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' => array('maxloadavg', t("Maximum Load Average"), ((intval(Config::Get('system','maxloadavg')) > 0)?Config::Get('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), + '$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(Config::Get('system','default_expire_days', 30)), t('0 for no expiration of imported content')), + '$active_expire_days' => array('active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(Config::Get('system','active_expire_days',7)), ''), + '$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), Config::Get('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())), + '$first_page' => array('first_page', t('Page to display after creating a new channel'), Config::Get('system','workflow_channel_next','profiles'), t('Default: profiles')), + '$location' => array('site_location', t('Optional: site location'), Config::Get('system','site_location',''), t('Region or country')), '$form_security_token' => get_form_security_token("admin_site"), )); } diff --git a/Zotlabs/Module/Admin/Themes.php b/Zotlabs/Module/Admin/Themes.php index 7f615afa8..6793f56b1 100644 --- a/Zotlabs/Module/Admin/Themes.php +++ b/Zotlabs/Module/Admin/Themes.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module\Admin; use \Michelf\MarkdownExtra; +use Zotlabs\Lib\Config; /** * @brief Admin area theme settings. @@ -37,7 +38,7 @@ class Themes { * @return string with parsed HTML */ function get(){ - $allowed_themes_str = get_config('system', 'allowed_themes'); + $allowed_themes_str = Config::Get('system', 'allowed_themes'); $allowed_themes_raw = explode(',', $allowed_themes_str); $allowed_themes = array(); if(count($allowed_themes_raw)) @@ -100,7 +101,7 @@ class Themes { info(sprintf('Theme %s disabled.', $theme)); } - set_config('system', 'allowed_themes', $s); + Config::Set('system', 'allowed_themes', $s); goaway(z_root() . '/admin/themes' ); } diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php index 5b835ac51..8574ae1cd 100644 --- a/Zotlabs/Module/Api.php +++ b/Zotlabs/Module/Api.php @@ -1,6 +1,8 @@ callback_url != null) { diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index a955d572a..a8817111e 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -1,7 +1,7 @@ get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$cat' => $cat, '$title' => (($available) ? t('Available Apps') : t('Installed Apps')), '$apps' => $apps, diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 4e6811a10..f3855b7e8 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -6,6 +6,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Lib\Activity; use Zotlabs\Lib\ActivityStreams; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Crypto; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\PermissionDescription; @@ -176,7 +177,7 @@ class Channel extends Controller { function get($update = 0, $load = false) { - $noscript_content = get_config('system', 'noscript_content', '1'); + $noscript_content = Config::Get('system', 'noscript_content', '1'); $category = $datequery = $datequery2 = ''; diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index f4f9480c0..4b9fc4cce 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -1,6 +1,7 @@ $max_thumb || intval($r[0]['width']) > $max_thumb) { - $imagick_path = get_config('system','imagick_convert_path'); + $imagick_path = Config::Get('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { $fname = dbunescbin($r[0]['content']); @@ -428,7 +429,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){ - $max_length = get_config('system','max_image_length'); + $max_length = Config::Get('system','max_image_length'); if(! $max_length) $max_length = MAX_IMAGE_LENGTH; if($max_length > 0) diff --git a/Zotlabs/Module/Dircensor.php b/Zotlabs/Module/Dircensor.php index 4ce3a81c4..7caefa37c 100644 --- a/Zotlabs/Module/Dircensor.php +++ b/Zotlabs/Module/Dircensor.php @@ -3,9 +3,9 @@ namespace Zotlabs\Module; use App; -use Zotlabs\Web\Controller; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzotdir; - +use Zotlabs\Web\Controller; class Dircensor extends Controller { @@ -14,7 +14,7 @@ class Dircensor extends Controller { return; } - $dirmode = intval(get_config('system','directory_mode')); + $dirmode = intval(Config::Get('system','directory_mode')); if(!in_array($dirmode, [DIRECTORY_MODE_PRIMARY, DIRECTORY_MODE_SECONDARY, DIRECTORY_MODE_STANDALONE])) { return; diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 13353c108..88e2dd59b 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -3,9 +3,9 @@ namespace Zotlabs\Module; use App; -use Zotlabs\Web\Controller; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzotdir; - +use Zotlabs\Web\Controller; require_once('include/socgraph.php'); require_once('include/bbcode.php'); @@ -73,7 +73,7 @@ class Directory extends Controller { return; } - if(get_config('system','block_public_directory',false) && (! get_observer_hash())) { + if(Config::Get('system','block_public_directory',false) && (! get_observer_hash())) { notice( t('Public access denied.') . EOL); return; } @@ -145,7 +145,7 @@ class Directory extends Controller { $tpl = get_markup_template('directory_header.tpl'); - $dirmode = intval(get_config('system','directory_mode')); + $dirmode = intval(Config::Get('system','directory_mode')); $directory_admin = false; @@ -165,7 +165,7 @@ class Directory extends Controller { $url = $directory['url'] . '/dirsearch'; } - $token = get_config('system','realm_token'); + $token = Config::Get('system','realm_token'); logger('mod_directory: URL = ' . $url, LOGGER_DEBUG); @@ -184,11 +184,11 @@ class Directory extends Controller { if($url) { - $numtags = get_config('system','directorytags'); + $numtags = Config::Get('system','directorytags'); $kw = ((intval($numtags) > 0) ? intval($numtags) : 50); - if(get_config('system','disable_directory_keywords')) + if(Config::Get('system','disable_directory_keywords')) $kw = 0; if (intval($safe_mode) === 0 && $directory_admin) @@ -213,7 +213,7 @@ class Directory extends Controller { if(! is_null($pubforums)) $query .= '&pubforums=' . intval($pubforums); - $directory_sort_order = get_config('system','directory_sort_order'); + $directory_sort_order = Config::Get('system','directory_sort_order'); if(! $directory_sort_order) $directory_sort_order = 'date'; diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index a5c3f41c0..a90c2104a 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; use App; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; class Dirsearch extends Controller { @@ -17,7 +18,7 @@ class Dirsearch extends Controller { // logger('request: ' . print_r($_REQUEST,true)); - $dirmode = intval(get_config('system','directory_mode')); + $dirmode = intval(Config::Get('system','directory_mode')); if($dirmode == DIRECTORY_MODE_NORMAL) { $ret['message'] = t('This site is not a directory server'); @@ -26,7 +27,7 @@ class Dirsearch extends Controller { $access_token = $_REQUEST['t'] ?? ''; - $token = get_config('system','realm_token'); + $token = Config::Get('system','realm_token'); if($token && $access_token != $token) { $ret['message'] = t('This directory server requires an access token'); json_return_and_die($ret); @@ -79,7 +80,7 @@ class Dirsearch extends Controller { $forums = ((array_key_exists('pubforums',$_REQUEST)) ? intval($_REQUEST['pubforums']) : 0); - if(get_config('system','disable_directory_keywords')) + if(Config::Get('system','disable_directory_keywords')) $kw = 0; diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index f08aedc95..451ddeb1f 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; use App; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; class Display extends Controller { @@ -12,7 +13,7 @@ class Display extends Controller { function get($update = 0, $load = false) { - $noscript_content = (get_config('system', 'noscript_content', '1') && (! $update)); + $noscript_content = (Config::Get('system', 'noscript_content', '1') && (! $update)); $module_format = 'html'; diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php index c1ba9a01a..c5799560f 100644 --- a/Zotlabs/Module/Email_validation.php +++ b/Zotlabs/Module/Email_validation.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; +use Zotlabs\Lib\Config; class Email_validation extends \Zotlabs\Web\Controller { @@ -12,8 +13,8 @@ class Email_validation extends \Zotlabs\Web\Controller { // This will redirect internally on success unless the channel is auto_created if(account_approve(trim(basename($_POST['token'])))) { $success = true; - if(get_config('system','auto_channel_create')) { - $next_page = get_config('system', 'workflow_channel_next', 'profiles'); + if(Config::Get('system','auto_channel_create')) { + $next_page = Config::Get('system', 'workflow_channel_next', 'profiles'); } if($next_page) { goaway(z_root() . '/' . $next_page); @@ -40,9 +41,9 @@ class Email_validation extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$token' => [ 'token', t('Validation token'),'','' ], ]); - + return $o; } -} \ No newline at end of file +} diff --git a/Zotlabs/Module/Fhublocs.php b/Zotlabs/Module/Fhublocs.php index a4d335a94..6cfee94f0 100644 --- a/Zotlabs/Module/Fhublocs.php +++ b/Zotlabs/Module/Fhublocs.php @@ -1,6 +1,7 @@ t('View your personal stream (this may be empty until you add some connections)'), ]; - - $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); - $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); + + $site_firehose = ((intval(Config::Get('system','site_firehose',0))) ? true : false); + $net_firehose = ((Config::Get('system','disable_discover_tab',1)) ? false : true); if($site_firehose || $net_firehose) { $options['pubstream'] = t('View the public stream. Warning: this content is not moderated'); @@ -64,4 +65,4 @@ class Go extends \Zotlabs\Web\Controller { } -} \ No newline at end of file +} diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php index 1dce08757..63fdee7f0 100644 --- a/Zotlabs/Module/Group.php +++ b/Zotlabs/Module/Group.php @@ -2,10 +2,11 @@ namespace Zotlabs\Module; use App; -use Zotlabs\Web\Controller; +use Zotlabs\Lib\AccessList; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; -use Zotlabs\Lib\AccessList; +use Zotlabs\Web\Controller; class Group extends Controller { @@ -123,7 +124,7 @@ class Group extends Controller { // Switch to text mode interface if we have more than 'n' contacts or group members $switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit'); if($switchtotext === false) - $switchtotext = get_config('system','groupedit_image_limit'); + $switchtotext = Config::Get('system','groupedit_image_limit'); if($switchtotext === false) $switchtotext = 400; diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 8d78960cc..691ca1af9 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module; use App; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; use Zotlabs\Web\Controller; use Zotlabs\Web\HTTPSig; @@ -20,7 +21,7 @@ class Home extends Controller { call_hooks('home_init', $ret); if (Libzot::is_zot_request()) { - $key = get_config('system', 'prvkey'); + $key = Config::Get('system', 'prvkey'); $ret = json_encode(Libzot::site_info()); $headers = ['Content-Type' => 'application/x-zot+json', 'Digest' => HTTPSig::generate_digest_header($ret)]; @@ -38,7 +39,7 @@ class Home extends Controller { if (local_channel() && $channel && $channel['xchan_url'] && !$splash) { $dest = $ret['startpage'] ?? ''; if (!$dest) - $dest = get_config('system', 'startpage'); + $dest = Config::Get('system', 'startpage'); if (!$dest) $dest = z_root() . '/hq'; @@ -78,7 +79,7 @@ class Home extends Controller { if ($o) return $o; - $frontpage = get_config('system', 'frontpage'); + $frontpage = Config::Get('system', 'frontpage'); if ($frontpage) { if (strpos($frontpage, 'include:') !== false) { $file = trim(str_replace('include:', '', $frontpage)); @@ -91,7 +92,7 @@ class Home extends Controller { } if (strpos($frontpage, 'http') !== 0) $frontpage = z_root() . '/' . $frontpage; - if (intval(get_config('system', 'mirror_frontpage'))) { + if (intval(Config::Get('system', 'mirror_frontpage'))) { $o = '' . t('$Projectname') . ''; echo $o; killme(); @@ -99,11 +100,11 @@ class Home extends Controller { goaway($frontpage); } - $sitename = get_config('system', 'sitename'); + $sitename = Config::Get('system', 'sitename'); if ($sitename) $o .= '

' . sprintf(t('Welcome to %s'), $sitename) . '

'; - $loginbox = get_config('system', 'login_on_homepage'); + $loginbox = Config::Get('system', 'login_on_homepage'); if (intval($loginbox) || $loginbox === false) $o .= login(true); diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index c8a9ac5ed..e8968c6bd 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -9,6 +9,7 @@ require_once('include/perm_upgrade.php'); use App; use URLify; use Zotlabs\Daemon\Master; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; use Zotlabs\Web\Controller; @@ -168,7 +169,7 @@ class Import extends Controller { if ($newname) { $x = false; - if (get_config('system', 'unicode_usernames')) { + if (Config::Get('system', 'unicode_usernames')) { $x = punify(mb_strtolower($newname)); } @@ -227,10 +228,10 @@ class Import extends Controller { 'hubloc_url_sig' => Libzot::sign(z_root(), $channel['channel_prvkey']), 'hubloc_host' => App::get_hostname(), 'hubloc_callback' => z_root() . '/zot', - 'hubloc_sitekey' => get_config('system', 'pubkey'), + 'hubloc_sitekey' => Config::Get('system', 'pubkey'), 'hubloc_updated' => datetime_convert(), 'hubloc_id_url' => channel_url($channel), - 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')) + 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), Config::Get('system', 'pubkey')) ] ); @@ -536,7 +537,7 @@ class Import extends Controller { $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); + //$poll_interval = Config::Get('system', 'poll_interval', 3); $page = 0; Master::Summon(['Content_importer', sprintf('%d', $page), $since, $until, $channel['channel_address'], urlencode($hz_server)]); diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index bb552e4c7..3e1e98f89 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; /** @@ -76,7 +77,7 @@ class Invite extends Controller { $feedbk = ''; $isajax = is_ajax(); $eol = $isajax ? "\n" : EOL; - $policy = intval(get_config('system','register_policy')); + $policy = intval(Config::Get('system','register_policy')); if ($policy == REGISTER_CLOSED) { notice( 'ZAI0212E,' . t('Register is closed') . ')' . EOL); return; @@ -85,13 +86,13 @@ class Invite extends Controller { $flags = 0; elseif ($policy == REGISTER_APPROVE) $flags = ACCOUNT_PENDING; - $flags = ($flags | intval(get_config('system','verify_email'))); + $flags = ($flags | intval(Config::Get('system','verify_email'))); // how many max recipients in one mail submit - $maxto = get_config('system','invitation_max_recipients', 'na'); + $maxto = Config::Get('system','invitation_max_recipients', 'na'); If (is_site_admin()) { // set, if admin is operator, default to 12 - if ($maxto === 'na') set_config('system','invitation_max_recipients', 12); + if ($maxto === 'na') Config::Set('system','invitation_max_recipients', 12); } $maxto = ($maxto === 'na') ? 12 : $maxto; @@ -323,7 +324,7 @@ class Invite extends Controller { return Apps::app_render($papp, 'module'); } - if (! (get_config('system','invitation_also') || get_config('system','invitation_only')) ) { + if (! (Config::Get('system','invitation_also') || Config::Get('system','invitation_only')) ) { $o = 'ZAI0103E,' . t('Invites not proposed by configuration') . '. '; $o .= t('Contact the site admin'); return $o; @@ -331,7 +332,7 @@ class Invite extends Controller { // invitation_by_user may still not configured, the default 'na' will tell this // if configured, 0 disables invitations by users, other numbers are how many invites a user may propagate - $invuser = get_config('system','invitation_by_user', 'na'); + $invuser = Config::Get('system','invitation_by_user', 'na'); // if the mortal user drives the invitation If (! is_site_admin()) { @@ -352,7 +353,7 @@ class Invite extends Controller { } else { // general deity admin invite limit infinite (theoretical) - if ($invuser === 'na') set_config('system','invitation_by_user', 4); + if ($invuser === 'na') Config::Set('system','invitation_by_user', 4); // for display only $invuser = '∞'; } @@ -385,11 +386,11 @@ class Invite extends Controller { $wehave = ($r ? $r[0]['ct'] : 0); // invites max for all users except admins - $invmaxau = intval(get_config('system','invitations_max_users')); + $invmaxau = intval(Config::Get('system','invitations_max_users')); if(! $invmaxau) { $invmaxau = 50; if (is_site_admin()) { - set_config('system','invitations_max_users',intval($invmaxau)); + Config::Set('system','invitations_max_users',intval($invmaxau)); } } @@ -519,7 +520,7 @@ class Invite extends Controller { $ts = replace_macros(get_intltext_template('invite.'.$t1.'.subject.tpl'), array( '$projectname' => t('$Projectname'), - '$invite_loc' => get_config('system','sitename') + '$invite_loc' => Config::Get('system','sitename') ) ); @@ -569,7 +570,7 @@ class Invite extends Controller { function calcdue($duri=false) { // expirations, duration interval if ($duri===false) - $duri = get_config('system','register_expire', '2d'); + $duri = Config::Get('system','register_expire', '2d'); if ( preg_match( '/^[0-9]{1,2}[ihdwmy]{1}$/', $duri ) ) { $durq = substr($duri, -1); $durn = substr($duri, 0, -1); diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 081966dba..8eb9a8c6d 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -1,6 +1,7 @@ get_config('system','sitename'), + '$sitename' => Config::Get('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'); + $subject = email_header_encode(sprintf( t('Password reset requested at %s'),Config::Get('system','sitename')), 'UTF-8'); $res = z_mail( [ 'toEmail' => $email, - 'messageSubject' => sprintf( t('Password reset requested at %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Password reset requested at %s'), Config::Get('system','sitename')), 'textVersion' => $message, ] ); @@ -114,7 +114,7 @@ class Lostpass extends \Zotlabs\Web\Controller { $res = z_mail( [ 'toEmail' => $email, - 'messageSubject' => sprintf( t('Your password has changed at %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Your password has changed at %s'), Config::Get('system','sitename')), 'textVersion' => $message, ] ); diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index 24dbe2944..48fcd9e10 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; use URLify; +use Zotlabs\Lib\Config; require_once('include/channel.php'); require_once('include/permissions.php'); @@ -20,7 +21,7 @@ class New_channel extends \Zotlabs\Web\Controller { $x = false; - if(get_config('system','unicode_usernames')) { + if(Config::Get('system','unicode_usernames')) { $x = punify(mb_strtolower($n)); } @@ -55,7 +56,7 @@ class New_channel extends \Zotlabs\Web\Controller { $x = false; - if(get_config('system','unicode_usernames')) { + if(Config::Get('system','unicode_usernames')) { $x = punify(mb_strtolower($n)); } @@ -117,7 +118,7 @@ class New_channel extends \Zotlabs\Web\Controller { change_channel($result['channel']['channel_id']); - $next_page = get_config('system', 'workflow_channel_next', 'profiles'); + $next_page = Config::Get('system', 'workflow_channel_next', 'profiles'); goaway(z_root() . '/' . $next_page); } @@ -138,7 +139,7 @@ class New_channel extends \Zotlabs\Web\Controller { intval($aid) ); if($r && (! intval($r[0]['total']))) { - $default_role = get_config('system','default_permissions_role','personal'); + $default_role = Config::Get('system','default_permissions_role','personal'); } $limit = account_service_class_fetch(get_account_id(),'total_identities'); @@ -163,7 +164,7 @@ class New_channel extends \Zotlabs\Web\Controller { $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')) { + if(! Config::Get('system','unicode_usernames')) { $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _'); } $nick_help .= ''; diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index dc47d213b..8c9d4d90c 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -4,6 +4,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Daemon\Master; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; use Zotlabs\Web\Controller; @@ -599,7 +600,7 @@ class Profile_photo extends Controller { function profile_photo_crop_ui_head($ph, $hash, $smallest) { - $max_length = get_config('system', 'max_image_length'); + $max_length = Config::Get('system', 'max_image_length'); if (!$max_length) { $max_length = MAX_IMAGE_LENGTH; diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 15252d6e6..58e5857ed 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -1,6 +1,7 @@ '; } else { @@ -716,7 +717,7 @@ class Profiles extends \Zotlabs\Web\Controller { //$vctmp = (($vc) ? \Sabre\VObject\Reader::read($vc) : null); //$vcard = (($vctmp) ? get_vcard_array($vctmp,$r[0]['id']) : [] ); - $f = get_config('system','birthday_input_format'); + $f = Config::Get('system','birthday_input_format'); if(! $f) $f = 'ymd'; diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php index 900e2f981..842197415 100644 --- a/Zotlabs/Module/Profperm.php +++ b/Zotlabs/Module/Profperm.php @@ -1,6 +1,7 @@ 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)), @@ -52,8 +53,8 @@ class Profperm extends \Zotlabs\Web\Controller { 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)), @@ -63,21 +64,21 @@ class Profperm extends \Zotlabs\Web\Controller { 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 = array(); 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", @@ -91,42 +92,42 @@ class Profperm extends \Zotlabs\Web\Controller { intval($change), intval(local_channel()) ); - + } - - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash + + $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 = array(); 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;'; @@ -135,14 +136,14 @@ class Profperm extends \Zotlabs\Web\Controller { } $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) { @@ -152,17 +153,17 @@ class Profperm extends \Zotlabs\Web\Controller { } } } - + $o .= '
'; - + if($change) { echo $o; killme(); } $o .= '
'; return $o; - + } - - + + } diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php index 032406be4..cbaa66042 100644 --- a/Zotlabs/Module/Pubsites.php +++ b/Zotlabs/Module/Pubsites.php @@ -1,12 +1,13 @@ '; diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index c40751fdc..d60eb88df 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; require_once('include/conversation.php'); require_once('include/acl_selectors.php'); @@ -26,19 +27,19 @@ class Pubstream extends \Zotlabs\Web\Controller { return login(); } - if(! intval(get_config('system','open_pubstream',1))) { + if(! intval(Config::Get('system','open_pubstream',1))) { if(! get_observer_hash()) { return login(); } } - $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); + $net_firehose = ((Config::Get('system','disable_discover_tab',1)) ? false : true); if(!$net_firehose) { return ''; } - $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); + $site_firehose = ((intval(Config::Get('system','site_firehose',0))) ? true : false); $mid = $_REQUEST['mid'] ?? ''; $identifier = 'uuid'; @@ -107,7 +108,7 @@ class Pubstream extends \Zotlabs\Web\Controller { nav_set_selected(t('Public Stream')); - $maxheight = get_config('system','home_divmore_height'); + $maxheight = Config::Get('system','home_divmore_height'); if(! $maxheight) $maxheight = 400; @@ -172,7 +173,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $site_firehose_sql = " and owner_xchan in (select channel_hash from channel where channel_system = 0 and channel_removed = 0) "; } - if(get_config('system','public_list_mode')) + if(Config::Get('system','public_list_mode')) $page_mode = 'list'; else $page_mode = 'client'; @@ -196,7 +197,7 @@ class Pubstream extends \Zotlabs\Web\Controller { if($update) { - $ordering = get_config('system', 'pubstream_ordering', 'commented'); + $ordering = Config::Get('system', 'pubstream_ordering', 'commented'); if($load) { if($mid) { diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index ac6273951..8158416bd 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Connect; use Zotlabs\Daemon\Master; @@ -58,7 +59,7 @@ class Regate extends \Zotlabs\Web\Controller { // normally, that should never happen here // log suitable for fail2ban also $logmsg = 'ZAR1230S Unexpected registration verification request for ' - . get_config('system','sitename') . ' arrived from § ' . $ip . ' §'; + . Config::Get('system','sitename') . ' arrived from § ' . $ip . ' §'; zar_log($logmsg); goaway(z_root()); } @@ -118,7 +119,7 @@ class Regate extends \Zotlabs\Web\Controller { $isa = ($isa && ($isa['account_roles'] && ACCOUNT_ROLE_ADMIN)); // approve contra invite by admin - if ($isa && get_config('system','register_policy') == REGISTER_APPROVE) { + if ($isa && Config::Get('system','register_policy') == REGISTER_APPROVE) { $flags &= $flags ^ ACCOUNT_PENDING; } @@ -159,7 +160,7 @@ class Regate extends \Zotlabs\Web\Controller { $nextpage = 'new_channel'; - $auto_create = get_config('system', 'auto_channel_create', 1); + $auto_create = Config::Get('system', 'auto_channel_create', 1); if($auto_create) { @@ -179,7 +180,7 @@ class Regate extends \Zotlabs\Web\Controller { if($reonar['chan.did1']) set_aconfig($cra['account']['account_id'], 'register', 'channel_address', $reonar['chan.did1']); - $permissions_role = get_config('system','default_permissions_role'); + $permissions_role = Config::Get('system','default_permissions_role'); if($permissions_role) set_aconfig($cra['account']['account_id'], 'register', 'permissions_role', $permissions_role); diff --git a/Zotlabs/Module/Regdir.php b/Zotlabs/Module/Regdir.php index e49f89231..70e021715 100644 --- a/Zotlabs/Module/Regdir.php +++ b/Zotlabs/Module/Regdir.php @@ -1,6 +1,7 @@ false); - + $url = $_REQUEST['url']; $access_token = $_REQUEST['t']; $valid = 0; - + // we probably don't need the realm as we will find out in the probe. // What we may want to do is throw an error if you're trying to register in a different realm // so this configuration issue can be discovered. - + $realm = $_REQUEST['realm']; if(! $realm) $realm = DIRECTORY_REALM; - + if($realm === DIRECTORY_REALM) { $valid = 1; } else { - $token = get_config('system','realm_token'); + $token = Config::Get('system','realm_token'); if($token && $access_token != $token) { $result['message'] = 'This realm requires an access token'; return; } $valid = 1; } - - $dirmode = intval(get_config('system','directory_mode')); - + + $dirmode = intval(Config::Get('system','directory_mode')); + if ($dirmode == DIRECTORY_MODE_NORMAL) { $ret['message'] = t('This site is not a directory server'); json_return_and_die($ret); } - + $m = null; if ($url) { $m = parse_url($url); - + if ((! $m) || (! z_dns_check($m['host']))) { $result['message'] = 'unparseable url'; json_return_and_die($result); } - + $j = Zotfinger::exec($url); if($j) { $result['success'] = true; @@ -79,7 +80,7 @@ class Regdir extends Controller { } else { - + if ($dirmode == DIRECTORY_MODE_STANDALONE) { $r = array(array('site_url' => z_root())); } else { @@ -93,7 +94,7 @@ class Regdir extends Controller { $result['directories'] = array(); foreach ($r as $rr) $result['directories'][] = $rr['site_url']; - + json_return_and_die($result); } } diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 5a50b4de0..428b68178 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module; use App; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; require_once('include/security.php'); @@ -63,7 +64,7 @@ class Register extends Controller { $act = q("SELECT COUNT(*) AS act FROM account")[0]['act']; $is247 = false; $ip = $_SERVER['REMOTE_ADDR']; - $sameip = intval(get_config('system','register_sameip', 3)); + $sameip = intval(Config::Get('system','register_sameip', 3)); $arr = $_POST; $invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : ''); $name = ''; @@ -73,10 +74,10 @@ class Register extends Controller { $password2 = ((x($arr,'password2')) ? trim($arr['password2']) : ''); $register_msg = ((x($arr,'register_msg')) ? notags(trim($arr['register_msg'])) : ''); $reonar = []; - $auto_create = get_config('system','auto_channel_create', 1); + $auto_create = Config::Get('system','auto_channel_create', 1); $duty = zar_register_dutystate(); - if (!get_config('system', 'register_duty_jso')) { + if (!Config::Get('system', 'register_duty_jso')) { // if not yet configured default to true $duty = array( 'isduty' => true, 'atfrm' => '', 'nowfmt' => ''); } @@ -107,7 +108,7 @@ class Register extends Controller { } } - $email_verify = get_config('system', 'verify_email'); + $email_verify = Config::Get('system', 'verify_email'); if ($email_verify && !$email) { notice(t('Email address required') . EOL); return; @@ -180,9 +181,9 @@ class Register extends Controller { return; } - $policy = get_config('system','register_policy'); - $invonly = get_config('system','invitation_only'); - $invalso = get_config('system','invitation_also'); + $policy = Config::Get('system','register_policy'); + $invonly = Config::Get('system','invitation_only'); + $invalso = Config::Get('system','invitation_also'); switch($policy) { @@ -306,11 +307,11 @@ class Register extends Controller { if($policy == REGISTER_OPEN || $policy == REGISTER_APPROVE ) { - $cfgdelay = get_config('system', 'register_delay', '0i'); + $cfgdelay = Config::Get('system', 'register_delay', '0i'); $reg_delayed = calculate_adue( $cfgdelay ); $regdelay = (($reg_delayed) ? datetime_convert(date_default_timezone_get(), 'UTC', $reg_delayed['due']) : $now); - $cfgexpire = get_config('system', 'register_expire', '3d'); + $cfgexpire = Config::Get('system', 'register_expire', '3d'); $reg_expires = calculate_adue( $cfgexpire ); $regexpire = (($reg_expires) ? datetime_convert(date_default_timezone_get(), 'UTC', $reg_expires['due']) : datetime_convert('UTC', 'UTC', 'now + 99 years')); @@ -323,12 +324,12 @@ class Register extends Controller { $didx = 'e'; push_lang(($reg['lang']) ? $reg['lang'] : App::$language); - $reonar['from'] = get_config('system', 'from_email'); + $reonar['from'] = Config::Get('system', 'from_email'); $reonar['to'] = $email; - $reonar['subject'] = sprintf( t('Registration confirmation for %s'), get_config('system','sitename')); + $reonar['subject'] = sprintf( t('Registration confirmation for %s'), Config::Get('system','sitename')); $reonar['txttemplate']= replace_macros(get_intltext_template('register_verify_member.tpl'), [ - '$sitename' => get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$siteurl' => z_root(), '$email' => $email, '$timeframe' => [$regdelay, $regexpire], @@ -430,8 +431,8 @@ class Register extends Controller { $registration_is = ''; $other_sites = ''; - if(intval(get_config('system','register_policy')) === REGISTER_CLOSED) { - if(intval(get_config('system','directory_mode')) === DIRECTORY_MODE_STANDALONE) { + if(intval(Config::Get('system','register_policy')) === REGISTER_CLOSED) { + if(intval(Config::Get('system','directory_mode')) === DIRECTORY_MODE_STANDALONE) { notice(t('Registration on this hub is disabled.') . EOL); return; } @@ -440,24 +441,24 @@ class Register extends Controller { return $mod->get(); } - if(intval(get_config('system','register_policy')) == REGISTER_APPROVE) { + if(intval(Config::Get('system','register_policy')) == REGISTER_APPROVE) { $registration_is = t('Registration on this hub is by approval only.'); $other_sites = '' . t('Register at another affiliated hub in case when prefered') . ''; } $duty = zar_register_dutystate(); - if (!get_config('system', 'register_duty_jso')) { + if (!Config::Get('system', 'register_duty_jso')) { // if not yet configured default to true $duty = array( 'isduty' => true, 'atfrm' => '', 'nowfmt' => ''); } $invitations = false; - if(intval(get_config('system','invitation_only'))) { + if(intval(Config::Get('system','invitation_only'))) { $invitations = true; $registration_is = t('Registration on this hub is by invitation only.'); $other_sites = '' . t('Register at another affiliated hub') . ''; - } elseif (intval(get_config('system','invitation_also'))) { + } elseif (intval(Config::Get('system','invitation_also'))) { $invitations = true; } @@ -466,7 +467,7 @@ class Register extends Controller { $duty['atform'] = 'disabled'; // Configurable terms of service link - $tosurl = get_config('system','tos_url'); + $tosurl = Config::Get('system','tos_url'); if(! $tosurl) $tosurl = z_root() . '/help/TermsOfService'; @@ -475,21 +476,21 @@ class Register extends Controller { // 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')) { + if(Config::Get('system','no_age_restriction')) { $label_tos = sprintf( t('I accept the %s for this website'), $toslink); } else { - $age = get_config('system','minimum_age'); + $age = Config::Get('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 = 1 - intval(get_config('system','no_termsofservice')); + $enable_tos = 1 - intval(Config::Get('system','no_termsofservice')); - $auto_create = get_config('system', 'auto_channel_create', 1); - $email_verify = get_config('system','verify_email'); + $auto_create = Config::Get('system', 'auto_channel_create', 1); + $email_verify = Config::Get('system','verify_email'); $emailval = ((x($_REQUEST,'email')) ? strip_tags(trim($_REQUEST['email'])) : ""); $email = ['email', @@ -506,7 +507,7 @@ class Register extends Controller { $invite_code = array('invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")); $name = array('name', t('Your name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real name is preferred'), '', '', $duty['atform']); - $nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')); + $nickhub = '@' . str_replace(array('http://','https://','/'), '', Config::Get('system','baseurl')); $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), t('Your nickname will be used to create an easy to remember channel address'), '', '', $duty['atform']); $tos = array('tos', $label_tos, ((x($_REQUEST,'tos')) ? $_REQUEST['tos'] : ''), '', [t('No'),t('Yes')], $duty['atform']); @@ -520,7 +521,7 @@ class Register extends Controller { '$title' => t('Registration'), '$reg_is' => $registration_is, '$register_msg' => $register_msg, - '$registertext' => bbcode(get_config('system','register_text')), + '$registertext' => bbcode(Config::Get('system','register_text')), '$other_sites' => $other_sites, '$msg' => $opal['msg'], '$invitations' => $invitations, @@ -551,7 +552,7 @@ class Register extends Controller { // check against register, account $rear = array( 'is' => false, 'rn' => 0, 'an' => 0, 'msg' => '' ); - $max_dailies = intval(get_config('system', 'max_daily_registrations', 50)); + $max_dailies = intval(Config::Get('system', 'max_daily_registrations', 50)); if ($max_dailies) { diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 9511c0389..3753e2a5f 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -3,11 +3,12 @@ namespace Zotlabs\Module; use App; -use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Activity; use Zotlabs\Lib\ActivityStreams; -use Zotlabs\Web\Controller; +use Zotlabs\Lib\Config; +use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Zotfinger; +use Zotlabs\Web\Controller; class Search extends Controller { @@ -18,7 +19,7 @@ class Search extends Controller { function get($update = 0, $load = false) { - if ((get_config('system', 'block_public')) || (get_config('system', 'block_public_search'))) { + if ((Config::Get('system', 'block_public')) || (Config::Get('system', 'block_public_search'))) { if ((!local_channel()) && (!remote_channel())) { notice(t('Public access denied.') . EOL); return; diff --git a/Zotlabs/Module/Service_limits.php b/Zotlabs/Module/Service_limits.php index 2a1f78054..aa27f7a9c 100644 --- a/Zotlabs/Module/Service_limits.php +++ b/Zotlabs/Module/Service_limits.php @@ -1,20 +1,20 @@ 0) { if(! validate_email($email)) $errs[] = t('Not valid email.'); - $adm = trim(get_config('system','admin_email')); + $adm = trim(Config::Get('system','admin_email')); if(($adm) && (strcasecmp($email,$adm) == 0)) { $errs[] = t('Protected email address. Cannot change to that email.'); $email = \App::$account['account_email']; diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 1e0c2a2db..b46208879 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -7,6 +7,7 @@ use Zotlabs\Access\PermissionLimits; use Zotlabs\Access\PermissionRoles; use Zotlabs\Daemon\Master; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; require_once('include/selectors.php'); @@ -183,11 +184,11 @@ class Channel { $subdir = ((strlen(App::get_path())) ? '
' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); $webbie = $nickname . '@' . App::get_hostname(); $intl_nickname = unpunify($nickname) . '@' . unpunify(App::get_hostname()); - $disable_discover_tab = intval(get_config('system', 'disable_discover_tab', 1)) == 1; - $site_firehose = intval(get_config('system', 'site_firehose', 0)) == 1; + $disable_discover_tab = intval(Config::Get('system', 'disable_discover_tab', 1)) == 1; + $site_firehose = intval(Config::Get('system', 'site_firehose', 0)) == 1; $expire = $channel['channel_expire_days']; - $sys_expire = get_config('system', 'default_expire_days'); + $sys_expire = Config::Get('system', 'default_expire_days'); $tpl_addr = get_markup_template("settings_nick_set.tpl"); $prof_addr = replace_macros($tpl_addr, [ diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php index ee9692014..a7fccea47 100644 --- a/Zotlabs/Module/Settings/Display.php +++ b/Zotlabs/Module/Settings/Display.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module\Settings; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; class Display { @@ -85,7 +86,7 @@ class Display { $yes_no = array(t('No'),t('Yes')); - $default_theme = get_config('system','theme'); + $default_theme = Config::Get('system','theme'); if(! $default_theme) $default_theme = 'redbasic'; @@ -95,7 +96,7 @@ class Display { $theme = (($existing_theme) ? $existing_theme : $default_theme); - $allowed_themes_str = get_config('system','allowed_themes'); + $allowed_themes_str = Config::Get('system','allowed_themes'); $allowed_themes_raw = explode(',',$allowed_themes_str); $allowed_themes = array(); if(count($allowed_themes_raw)) @@ -121,7 +122,7 @@ class Display { $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))){ + if (!$is_experimental or ($is_experimental && (Config::Get('experimentals','exp_themes')==1 or Config::Get('experimentals','exp_themes')===false))){ $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f); if (! $is_library) { $themes[$f] = $theme_name; diff --git a/Zotlabs/Module/Settings/Privacy.php b/Zotlabs/Module/Settings/Privacy.php index 316b1306e..ed14fa94c 100644 --- a/Zotlabs/Module/Settings/Privacy.php +++ b/Zotlabs/Module/Settings/Privacy.php @@ -6,6 +6,7 @@ use App; use Zotlabs\Access\PermissionLimits; use Zotlabs\Access\Permissions; use Zotlabs\Daemon\Master; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Group; use Zotlabs\Lib\Libsync; @@ -81,7 +82,7 @@ class Privacy { $help_txt = t('Advise: set to "Anybody on the internet" and use privacy groups to restrict access'); $limits = PermissionLimits::Get(local_channel()); - $anon_comments = get_config('system', 'anonymous_comments', true); + $anon_comments = Config::Get('system', 'anonymous_comments', true); foreach ($global_perms as $k => $perm) { $options = []; diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 83faf85dc..74b10de25 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -8,6 +8,7 @@ namespace Zotlabs\Module; * @todo This setup module could need some love and improvements. */ +use Zotlabs\Lib\Config; /** * @brief Initialisation for the setup module. @@ -760,11 +761,11 @@ class Setup extends \Zotlabs\Web\Controller { */ function what_next() { // install the standard theme - set_config('system', 'allowed_themes', 'redbasic'); + Config::Set('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'); + Config::Set('system','imagick_convert_path','/usr/bin/convert'); } @@ -783,7 +784,7 @@ class Setup extends \Zotlabs\Web\Controller { $x = curl_version(); if(stristr($x['ssl_version'],'openssl')) - set_config('system','curl_ssl_ciphers','ALL:!eNULL'); + Config::Set('system','curl_ssl_ciphers','ALL:!eNULL'); // Create a system channel require_once ('include/channel.php'); diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index 18eb703a2..df6a334d8 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -1,6 +1,7 @@ t('Site Name'), '$sitename' => \Zotlabs\Lib\System::get_site_name(), '$headline' => t('Site Information'), - '$site_about' => bbcode(get_config('system','siteinfo')), + '$site_about' => bbcode(Config::Get('system','siteinfo')), '$admin_headline' => t('Administrator'), - '$admin_about' => bbcode(get_config('system','admininfo')), + '$admin_about' => bbcode(Config::Get('system','admininfo')), '$terms' => t('Terms of Service'), '$prj_header' => t('Software and Project information'), '$prj_name' => t('This site is powered by $Projectname'), @@ -33,7 +34,7 @@ class Siteinfo extends \Zotlabs\Web\Controller { '$additional_text' => t('Additional federated transport protocols:'), '$additional_fed' => implode(', ', $federated), - '$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())), + '$prj_version' => ((Config::Get('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())), '$prj_linktxt' => t('Project homepage'), '$prj_srctxt' => t('Developer homepage'), '$prj_link' => \Zotlabs\Lib\System::get_project_link(), diff --git a/Zotlabs/Module/Sse.php b/Zotlabs/Module/Sse.php index 8b46dcafd..5baa90128 100644 --- a/Zotlabs/Module/Sse.php +++ b/Zotlabs/Module/Sse.php @@ -4,6 +4,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; use Zotlabs\Lib\Enotify; use Zotlabs\Lib\XConfig; @@ -22,7 +23,7 @@ class Sse extends Controller { killme(); } - if(! intval(get_config('system','open_pubstream',1))) { + if(! intval(Config::Get('system','open_pubstream',1))) { if(! get_observer_hash()) { killme(); } @@ -52,7 +53,7 @@ class Sse extends Controller { $sleep = 1000000; // microseconds - self::$sse_enabled = get_config('system', 'sse_enabled', 0); + self::$sse_enabled = Config::Get('system', 'sse_enabled', 0); if(self::$sse_enabled) { diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index 9fb295c4b..a18301a1a 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -4,6 +4,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Config; use Zotlabs\Web\Controller; use Zotlabs\Lib\Enotify; use Zotlabs\Lib\XConfig; @@ -424,7 +425,7 @@ class Sse_bs extends Controller { return $result; } - if(! intval(get_config('system','open_pubstream',1))) { + if(! intval(Config::Get('system','open_pubstream',1))) { if(! get_observer_hash()) { $result['pubs']['offset'] = -1; return $result; @@ -459,7 +460,7 @@ class Sse_bs extends Controller { $uids = " AND uid IN ( " . $sys['channel_id'] . " ) "; - $site_firehose = get_config('system', 'site_firehose', 0); + $site_firehose = Config::Get('system', 'site_firehose', 0); if($site_firehose) { $uids = " AND uid IN ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) AND item_private = 0 AND item_wall = 1 "; } @@ -732,7 +733,7 @@ class Sse_bs extends Controller { if(! self::$uid && ! is_site_admin()) return $result; - $policy = intval(get_config('system','register_policy')); + $policy = intval(Config::Get('system','register_policy')); if(($policy & REGISTER_APPROVE) != REGISTER_APPROVE) return $result; diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php index 9cc31a7d3..a90397d2f 100644 --- a/Zotlabs/Module/Well_known.php +++ b/Zotlabs/Module/Well_known.php @@ -1,6 +1,7 @@ get_config('system','pubkey') + 'https://w3id.org/security/v1#publicKeyPem' => Config::Get('system','pubkey') ]; $result['links'] = [ [ diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php index fc34f87a9..e8b42ec1b 100644 --- a/Zotlabs/Photo/PhotoDriver.php +++ b/Zotlabs/Photo/PhotoDriver.php @@ -2,6 +2,7 @@ namespace Zotlabs\Photo; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Hashpath; /** @@ -443,7 +444,7 @@ abstract class PhotoDriver { $p['display_path'] = $arr['display_path'] ?? ''; $p['width'] = $arr['width'] ?? $this->getWidth(); $p['height'] = $arr['height'] ?? $this->getHeight(); - $p['expires'] = $arr['expires'] ?? gmdate('Y-m-d H:i:s', time() + get_config('system', 'photo_cache_time', 86400)); + $p['expires'] = $arr['expires'] ?? gmdate('Y-m-d H:i:s', time() + Config::Get('system', 'photo_cache_time', 86400)); $p['profile'] = $arr['profile'] ?? 0; if(! intval($p['imgscale'])) @@ -508,7 +509,7 @@ abstract class PhotoDriver { $arr['imgscale'] = $scale; - if(boolval(get_config('system','photo_storage_type', 1))) { + if(boolval(Config::Get('system','photo_storage_type', 1))) { $arr['os_storage'] = 1; diff --git a/Zotlabs/Photo/PhotoGd.php b/Zotlabs/Photo/PhotoGd.php index 6854be0ab..4a47f97ee 100644 --- a/Zotlabs/Photo/PhotoGd.php +++ b/Zotlabs/Photo/PhotoGd.php @@ -2,6 +2,8 @@ namespace Zotlabs\Photo; +use Zotlabs\Lib\Config; + /** * @brief GD photo driver. * @@ -157,14 +159,14 @@ class PhotoGd extends PhotoDriver { switch($this->getType()){ case 'image/png': - $quality = get_config('system', 'png_quality'); + $quality = Config::Get('system', 'png_quality'); if((! $quality) || ($quality > 9)) $quality = PNG_QUALITY; \imagepng($this->image, NULL, $quality); break; case 'image/webp': - $quality = get_config('system', 'webp_quality'); + $quality = Config::Get('system', 'webp_quality'); if((! $quality) || ($quality > 100)) $quality = WEBP_QUALITY; \imagewebp($this->image, NULL, $quality); @@ -174,7 +176,7 @@ class PhotoGd extends PhotoDriver { // gd can lack imagejpeg(), but we verify during installation it is available default: - $quality = get_config('system', 'jpeg_quality'); + $quality = Config::Get('system', 'jpeg_quality'); if((! $quality) || ($quality > 100)) $quality = JPEG_QUALITY; \imagejpeg($this->image, NULL, $quality); diff --git a/Zotlabs/Photo/PhotoImagick.php b/Zotlabs/Photo/PhotoImagick.php index 0a08d19e6..59f276480 100644 --- a/Zotlabs/Photo/PhotoImagick.php +++ b/Zotlabs/Photo/PhotoImagick.php @@ -2,6 +2,8 @@ namespace Zotlabs\Photo; +use Zotlabs\Lib\Config; + /** * @brief ImageMagick photo driver. */ @@ -57,7 +59,7 @@ class PhotoImagick extends PhotoDriver { switch($this->getType()) { case 'image/png': - $quality = get_config('system', 'png_quality'); + $quality = Config::Get('system', 'png_quality'); if((! $quality) || ($quality > 9)) $quality = PNG_QUALITY; /* @@ -73,14 +75,14 @@ class PhotoImagick extends PhotoDriver { break; case 'image/jpeg': - $quality = get_config('system', 'jpeg_quality'); + $quality = Config::Get('system', 'jpeg_quality'); if((! $quality) || ($quality > 100)) $quality = JPEG_QUALITY; $this->image->setCompressionQuality($quality); break; case 'image/webp': - $quality = get_config('system', 'webp_quality'); + $quality = Config::Get('system', 'webp_quality'); if((! $quality) || ($quality > 100)) $quality = WEBP_QUALITY; $this->image->setCompressionQuality($quality); diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 7288c7fd7..ba0d77c39 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -2,6 +2,8 @@ namespace Zotlabs\Render; +use Zotlabs\Lib\Config; + require_once('include/security.php'); require_once('include/menu.php'); @@ -157,7 +159,7 @@ class Comanche { * @brief Replace conditional variables with real values. * * Currently supported condition variables: - * * $config.xxx.yyy - get_config with cat = xxx and k = yyy + * * $config.xxx.yyy - Config::Get 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 @@ -172,7 +174,7 @@ class Comanche { if($v) { $x = explode('.', $v); if($x[0] == 'config') - return get_config($x[1],$x[2]); + return Config::Get($x[1],$x[2]); elseif($x[0] === 'request') return $_SERVER['REQUEST_URI']; elseif($x[0] === 'local_channel') { @@ -208,18 +210,18 @@ class Comanche { * * 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 Config::Get('system','foo') contains the string 'baz'; + * - [if $config.system.foo == baz] which will check if Config::Get('system','foo') is the string 'baz'; + * - [if $config.system.foo != baz] which will check if Config::Get('system','foo') is not the string 'baz'; + * - [if $config.system.foo >= 3] which will check if Config::Get('system','foo') is greater than or equal to 3; + * - [if $config.system.foo > 3] which will check if Config::Get('system','foo') is greater than 3; + * - [if $config.system.foo <= 3] which will check if Config::Get('system','foo') is less than or equal to 3; + * - [if $config.system.foo < 3] which will check if Config::Get('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'); - * - [if !$config.system.foo] which will check for a return of a false condition for get_config('system','foo'); + * - [if $config.system.foo {} baz] which will check if 'baz' is an array element in Config::Get('system','foo') + * - [if $config.system.foo {*} baz] which will check if 'baz' is an array key in Config::Get('system','foo') + * - [if $config.system.foo] which will check for a return of a true condition for Config::Get('system','foo'); + * - [if !$config.system.foo] which will check for a return of a false condition for Config::Get('system','foo'); * * The values 0, '', an empty array, and an unset value will all evaluate to false. * diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php index 2cb96521b..79f03637b 100644 --- a/Zotlabs/Render/SmartyTemplate.php +++ b/Zotlabs/Render/SmartyTemplate.php @@ -11,7 +11,7 @@ class SmartyTemplate implements TemplateEngine { public function __construct() { - // Cannot use get_config() here because it is called during installation when there is no DB. + // Cannot use Config::Get() 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'])) diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 912b4442d..e7f71c8c8 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -4,6 +4,7 @@ namespace Zotlabs\Storage; use Sabre\DAV; use App; +use Zotlabs\Lib\Config; /** * @brief Provides a DAV frontend for the webbrowser. @@ -101,7 +102,7 @@ class Browser extends DAV\Browser\Plugin { $folder_list = attach_folder_select_list($channel_id); - $siteroot_disabled = get_config('system', 'cloud_disable_siteroot'); + $siteroot_disabled = Config::Get('system', 'cloud_disable_siteroot'); $is_root_folder = (($path === 'cloud/' . $nick) ? true : false); $parent_path = ''; @@ -210,7 +211,7 @@ class Browser extends DAV\Browser\Plugin { // types $photo_icon = ''; - $preview_style = intval(get_config('system','thumbnail_security',0)); + $preview_style = intval(Config::Get('system','thumbnail_security',0)); $is_creator = (($data['creator'] === get_observer_hash()) ? true : false); @@ -474,7 +475,7 @@ class Browser extends DAV\Browser\Plugin { $limit = engr_units_to_bytes(service_class_fetch($this->auth->owner_id, 'attach_upload_limit')); } - if((! $limit) && get_config('system','cloud_report_disksize')) { + if((! $limit) && Config::Get('system','cloud_report_disksize')) { $limit = engr_units_to_bytes(disk_free_space('store')); } diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 333251f69..b62f268d3 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -3,6 +3,7 @@ namespace Zotlabs\Storage; use Sabre\DAV; +use Zotlabz\Lib\Config; use Zotlabs\Lib\Libsync; /** @@ -89,7 +90,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo logger('children for ' . $this->ext_path, LOGGER_DATA); $this->log(); - if (get_config('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { + if (Config::Get('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { throw new DAV\Exception\Forbidden('Permission denied.'); } @@ -111,7 +112,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo public function getChild($name) { logger($name, LOGGER_DATA); - if (get_config('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { + if (Config::Get('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { throw new DAV\Exception\Forbidden('Permission denied.'); } @@ -360,7 +361,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo intval($c[0]['channel_id']) ); - $maxfilesize = get_config('system', 'maxfilesize'); + $maxfilesize = Config::Get('system', 'maxfilesize'); if (($maxfilesize) && ($size > $maxfilesize)) { attach_delete($c[0]['channel_id'], $hash); return; @@ -776,7 +777,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo function ChannelList(&$auth) { $ret = []; - if (intval(get_config('system','cloud_disable_siteroot'))) { + if (intval(Config::Get('system','cloud_disable_siteroot'))) { return $ret; } diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index ff379e2e9..642dd4515 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -3,6 +3,7 @@ namespace Zotlabs\Storage; use Sabre\DAV; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; /** @@ -240,7 +241,7 @@ class File extends DAV\Node implements DAV\IFile { // There is an Exception "InsufficientStorage" or "PaymentRequired" for // our service class from SabreDAV we could use. - $maxfilesize = get_config('system', 'maxfilesize'); + $maxfilesize = Config::Get('system', 'maxfilesize'); if (($maxfilesize) && ($size > $maxfilesize)) { attach_delete($c[0]['channel_id'], $this->data['hash']); return; diff --git a/Zotlabs/Thumbs/Pdf.php b/Zotlabs/Thumbs/Pdf.php index 6f9111ed3..52afc09a3 100644 --- a/Zotlabs/Thumbs/Pdf.php +++ b/Zotlabs/Thumbs/Pdf.php @@ -2,6 +2,7 @@ namespace Zotlabs\Thumbs; +use Zotlabs\Lib\Config; class Pdf { @@ -29,7 +30,7 @@ class Pdf { fclose($ostream); } - $imagick_path = get_config('system','imagick_convert_path'); + $imagick_path = Config::Get('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path)) { $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -resize ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); // logger('imagick thumbnail command: ' . $cmd); diff --git a/Zotlabs/Thumbs/Video.php b/Zotlabs/Thumbs/Video.php index 9df27d703..1da500370 100644 --- a/Zotlabs/Thumbs/Video.php +++ b/Zotlabs/Thumbs/Video.php @@ -2,6 +2,7 @@ namespace Zotlabs\Thumbs; +use Zotlabs\Lib\Config; class Video { @@ -47,7 +48,7 @@ class Video { logger('ffmpeg not found in path. Video thumbnails may fail.'); } - $imagick_path = get_config('system','imagick_convert_path'); + $imagick_path = Config::Get('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path)) { $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -resize ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); // logger('imagick thumbnail command: ' . $cmd); diff --git a/Zotlabs/Update/_1103.php b/Zotlabs/Update/_1103.php index 3f9a9286c..a32c81fe9 100644 --- a/Zotlabs/Update/_1103.php +++ b/Zotlabs/Update/_1103.php @@ -2,13 +2,15 @@ namespace Zotlabs\Update; +use Zotlabs\Lib\Config; + class _1103 { function run() { $x = curl_version(); if(stristr($x['ssl_version'],'openssl')) - set_config('system','curl_ssl_ciphers','ALL:!eNULL'); + Config::Set('system','curl_ssl_ciphers','ALL:!eNULL'); return UPDATE_SUCCESS; } -} \ No newline at end of file +} diff --git a/Zotlabs/Update/_1226.php b/Zotlabs/Update/_1226.php index 6e5a0e319..526fc867b 100644 --- a/Zotlabs/Update/_1226.php +++ b/Zotlabs/Update/_1226.php @@ -2,6 +2,7 @@ namespace Zotlabs\Update; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; class _1226 { @@ -17,7 +18,7 @@ class _1226 { $r = ($r1 && $r2); } else { - $r = q("ALTER TABLE `channel` ADD `channel_portable_id` char(191) NOT NULL DEFAULT '' , + $r = q("ALTER TABLE `channel` ADD `channel_portable_id` char(191) NOT NULL DEFAULT '' , ADD INDEX `channel_portable_id` (`channel_portable_id`)"); } @@ -52,7 +53,7 @@ class _1226 { $rec['xchan_hash'] = $zhash; $rec['xchan_guid_sig'] = 'sha256.' . $rec['xchan_guid_sig']; $rec['xchan_network'] = 'zot6'; - + xchan_store_lowlevel($rec); } $x = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' limit 1", @@ -67,7 +68,7 @@ class _1226 { $rec['hubloc_url_sig'] = 'sha256.' . $rec['hubloc_url_sig']; $rec['hubloc_callback'] = z_root() . '/zot'; $rec['hubloc_id_url'] = channel_url($rv); - $rec['hubloc_site_id'] = Libzot::make_xchan_hash(z_root(),get_config('system','pubkey')); + $rec['hubloc_site_id'] = Libzot::make_xchan_hash(z_root(),Config::Get('system','pubkey')); hubloc_store_lowlevel($rec); } } diff --git a/Zotlabs/Update/_1236.php b/Zotlabs/Update/_1236.php index e57338e16..b5bfdaad8 100644 --- a/Zotlabs/Update/_1236.php +++ b/Zotlabs/Update/_1236.php @@ -2,15 +2,16 @@ namespace Zotlabs\Update; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; class _1236 { function run() { - - $r = q("SELECT channel.channel_address, channel.channel_hash, xchan.xchan_guid, channel.channel_pubkey, channel.channel_portable_id FROM channel - LEFT JOIN xchan ON channel_hash = xchan_hash - WHERE xchan.xchan_network = 'zot' + + $r = q("SELECT channel.channel_address, channel.channel_hash, xchan.xchan_guid, channel.channel_pubkey, channel.channel_portable_id FROM channel + LEFT JOIN xchan ON channel_hash = xchan_hash + WHERE xchan.xchan_network = 'zot' AND channel.channel_removed = 0" ); @@ -102,7 +103,7 @@ class _1236 { $rec['hubloc_url_sig'] = 'sha256.' . $rec['hubloc_url_sig']; $rec['hubloc_callback'] = z_root() . '/zot'; $rec['hubloc_id_url'] = channel_url($rr); - $rec['hubloc_site_id'] = Libzot::make_xchan_hash(z_root(),get_config('system','pubkey')); + $rec['hubloc_site_id'] = Libzot::make_xchan_hash(z_root(),Config::Get('system','pubkey')); $hubloc = hubloc_store_lowlevel($rec); } diff --git a/Zotlabs/Update/_1242.php b/Zotlabs/Update/_1242.php index c2c9a66d0..0a4265984 100644 --- a/Zotlabs/Update/_1242.php +++ b/Zotlabs/Update/_1242.php @@ -2,6 +2,8 @@ namespace Zotlabs\Update; +use Zotlabs\Lib\Config; + class _1242 { function run() { @@ -10,7 +12,7 @@ class _1242 { if ($pp['v'][0] === '{') { $a = json_decode($pp['v'], true); if (isset($a['encrypted'])) { - $v = crypto_unencapsulate($a, get_config('system', 'prvkey')); + $v = crypto_unencapsulate($a, Config::Get('system', 'prvkey')); set_pconfig($pp['uid'], $pp['cat'], $pp['k'], obscurify($v)); } } @@ -18,4 +20,4 @@ class _1242 { return UPDATE_SUCCESS; } -} \ No newline at end of file +} diff --git a/Zotlabs/Update/_1243.php b/Zotlabs/Update/_1243.php index 850cb1d6c..05845ad47 100644 --- a/Zotlabs/Update/_1243.php +++ b/Zotlabs/Update/_1243.php @@ -2,15 +2,17 @@ namespace Zotlabs\Update; +use Zotlabs\Lib\Config; + class _1243 { function run() { - - $x = get_config('system','filesystem_storage_thumbnails'); - del_config('system','filesystem_storage_thumbnails'); + + $x = Config::Get('system','filesystem_storage_thumbnails'); + Config::Delete('system','filesystem_storage_thumbnails'); if ($x !== false) - set_config('system','photo_storage_type', intval($x)); - + Config::Set('system','photo_storage_type', intval($x)); + return UPDATE_SUCCESS; } diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 793b8cb45..7c289ff5f 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -5,6 +5,7 @@ namespace Zotlabs\Web; use DateTime; use DateTimeZone; use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Crypto; use Zotlabs\Lib\Keyutils; use Zotlabs\Lib\Webfinger; @@ -528,7 +529,7 @@ class HTTPSig { // TODO: should we default to hs2019? cavage-http-signatures-12 is not very wide spread yet - if (get_config('system', 'use_hs2019', false) && $algorithm === 'rsa-sha256') { + if (Config::Get('system', 'use_hs2019', false) && $algorithm === 'rsa-sha256') { $algorithm = 'hs2019'; } @@ -673,7 +674,7 @@ class HTTPSig { $iv = $key = $alg = $data = null; if (!$prvkey) { - $prvkey = get_config('system', 'prvkey'); + $prvkey = Config::Get('system', 'prvkey'); } $matches = []; diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index 2876fcc3c..f2604b95d 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -4,6 +4,7 @@ namespace Zotlabs\Web; use App; use Zotlabs\Extend\Route; +use Zotlabs\Lib\Config; use Exception; /** @@ -154,7 +155,7 @@ class Router { // 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)) { + if(file_exists('.well-known/.htaccess') && Config::Get('system','fix_apache_acme',true)) { rename('.well-known/.htaccess','.well-known/.htaccess.old'); } } @@ -173,7 +174,7 @@ class Router { killme(); } - if(get_config('system','log_404',true)) { + if(Config::Get('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: ' diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php index 14c054d20..ec26e6b0d 100644 --- a/Zotlabs/Web/Session.php +++ b/Zotlabs/Web/Session.php @@ -10,6 +10,7 @@ namespace Zotlabs\Web; * session info. */ +use Zotlabs\Lib\Config; class Session { @@ -24,7 +25,7 @@ class Session { ini_set('session.use_only_cookies', 1); ini_set('session.cookie_httponly', 1); - $this->custom_handler = boolval(get_config('system', 'session_custom', false)); + $this->custom_handler = boolval(Config::Get('system', 'session_custom', false)); /* * Set our session storage functions. @@ -33,8 +34,8 @@ class Session { 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)); + $session_save_handler = strval(Config::Get('system', 'session_save_handler', Null)); + $session_save_path = strval(Config::Get('system', 'session_save_path', Null)); if(is_null($session_save_handler) || is_null($session_save_path)) { logger('Session save handler or path not set', LOGGER_NORMAL, LOG_ERR); @@ -48,8 +49,8 @@ class Session { else { ini_set('session.save_handler', $session_save_handler); ini_set('session.save_path', $session_save_path); - ini_set('session.gc_probability', intval(get_config('system', 'session_gc_probability', 1))); - ini_set('session.gc_divisor', intval(get_config('system', 'session_gc_divisor', 100))); + ini_set('session.gc_probability', intval(Config::Get('system', 'session_gc_probability', 1))); + ini_set('session.gc_divisor', intval(Config::Get('system', 'session_gc_divisor', 100))); } } } @@ -212,7 +213,7 @@ class Session { $paranoia = intval(get_pconfig($_SESSION['uid'], 'system', 'paranoia')); if(! $paranoia) - $paranoia = intval(get_config('system', 'paranoia')); + $paranoia = intval(Config::Get('system', 'paranoia')); switch($paranoia) { case 0: diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php index 70a858fb0..79bdf9f9f 100644 --- a/Zotlabs/Widget/Newmember.php +++ b/Zotlabs/Widget/Newmember.php @@ -7,6 +7,8 @@ namespace Zotlabs\Widget; +use Zotlabs\Lib\Config; + class Newmember { function widget($arr) { @@ -66,8 +68,8 @@ class Newmember { ] ]; - $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); - $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); + $site_firehose = ((intval(Config::Get('system','site_firehose',0))) ? true : false); + $net_firehose = ((Config::Get('system','disable_discover_tab',1)) ? false : true); // hack to put this in the correct spot of the array diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php index 1380c156b..2ba170fe8 100644 --- a/Zotlabs/Widget/Pinned.php +++ b/Zotlabs/Widget/Pinned.php @@ -1,6 +1,8 @@ uid) return $ret; - $this->allowed_types = get_config('system', 'pin_types', [ ITEM_TYPE_POST ]); + $this->allowed_types = Config::Get('system', 'pin_types', [ ITEM_TYPE_POST ]); $items = $this->list($types); diff --git a/Zotlabs/Widget/Pubtagcloud.php b/Zotlabs/Widget/Pubtagcloud.php index 90bf5eb97..8119d0c73 100644 --- a/Zotlabs/Widget/Pubtagcloud.php +++ b/Zotlabs/Widget/Pubtagcloud.php @@ -7,6 +7,8 @@ namespace Zotlabs\Widget; +use Zotlabs\Lib\Config; + class Pubtagcloud { function widget($arr) { @@ -16,19 +18,19 @@ class Pubtagcloud { return EMPTY_STR; } - if(! intval(get_config('system','open_pubstream',1))) { + if(! intval(Config::Get('system','open_pubstream',1))) { if(! get_observer_hash()) { return EMPTY_STR; } } - $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); + $net_firehose = ((Config::Get('system','disable_discover_tab',1)) ? false : true); if(!$net_firehose) { return ''; } - $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); + $site_firehose = ((intval(Config::Get('system','site_firehose',0))) ? true : false); $safemode = get_xconfig(get_observer_hash(),'directory','safemode',1); diff --git a/Zotlabs/Widget/Rating.php b/Zotlabs/Widget/Rating.php index 20c27ff1c..f8986ac93 100644 --- a/Zotlabs/Widget/Rating.php +++ b/Zotlabs/Widget/Rating.php @@ -8,12 +8,14 @@ namespace Zotlabs\Widget; +use Zotlabs\Lib\Config; + class Rating { function widget($arr) { - $rating_enabled = get_config('system','rating_enabled'); + $rating_enabled = Config::Get('system','rating_enabled'); if(! $rating_enabled) { return; } diff --git a/boot.php b/boot.php index 1dc29051e..cdfa15855 100644 --- a/boot.php +++ b/boot.php @@ -1249,7 +1249,7 @@ class App { '$metas' => self::$meta->get(), '$plugins' => $x['header'], '$update_interval' => $interval, - '$sse_enabled' => get_config('system', 'sse_enabled', 0), + '$sse_enabled' => Config::Get('system', 'sse_enabled', 0), '$head_css' => head_get_css(), '$head_js' => head_get_js(), '$linkrel' => head_get_links(), @@ -1495,9 +1495,9 @@ function is_ajax() { */ function check_config() { - $saved = get_config('system', 'urlverify'); + $saved = Config::Get('system', 'urlverify'); if (!$saved) - set_config('system', 'urlverify', bin2hex(z_root())); + Config::Set('system', 'urlverify', bin2hex(z_root())); if (($saved) && ($saved != bin2hex(z_root()))) { // our URL changed. Do something. @@ -1513,7 +1513,7 @@ function check_config() { // only change the url to an ip address if it was already an ip and not a dns name if ((!$is_ip_addr) || ($is_ip_addr && $was_ip_addr)) { fix_system_urls($oldurl, z_root()); - set_config('system', 'urlverify', bin2hex(z_root())); + Config::Set('system', 'urlverify', bin2hex(z_root())); } else logger('Attempt to change baseurl from a DNS name to an IP address was refused.'); @@ -1713,9 +1713,9 @@ function login($register = false, $form_id = 'main_login', $hiddens = false, $lo // your site. - $register_policy = get_config('system', 'register_policy'); + $register_policy = Config::Get('system', 'register_policy'); - $reglink = get_config('system', 'register_link', z_root() . '/' . ((intval($register_policy) === REGISTER_CLOSED) ? 'pubsites' : 'register')); + $reglink = Config::Get('system', 'register_link', z_root() . '/' . ((intval($register_policy) === REGISTER_CLOSED) ? 'pubsites' : 'register')); if ($reglink !== 'none') { $reg = [ @@ -1736,7 +1736,7 @@ function login($register = false, $form_id = 'main_login', $hiddens = false, $lo $_SESSION['login_return_url'] = App::$query_string; } - $email_required = get_config('system', 'verify_email'); + $email_required = Config::Get('system', 'verify_email'); $lname_label = (($email_required) ? t('Email or nickname') : t('Nickname')); $o .= replace_macros($tpl, [ @@ -1854,13 +1854,13 @@ function can_view_public_stream() { return false; } - if (!(intval(get_config('system', 'open_pubstream', 1)))) { + if (!(intval(Config::Get('system', 'open_pubstream', 1)))) { if (!get_observer_hash()) { return false; } } - $net_firehose = ((get_config('system', 'disable_discover_tab', 1)) ? false : true); + $net_firehose = ((Config::Get('system', 'disable_discover_tab', 1)) ? false : true); if (!$net_firehose) { return false; @@ -2001,7 +2001,7 @@ function info($s) { * @return int */ function get_max_import_size() { - return (intval(get_config('system', 'max_import_size'))); + return (intval(Config::Get('system', 'max_import_size'))); } @@ -2055,7 +2055,7 @@ function proc_run() { proc_close(proc_open($cmd, [], $foo)); } else { - if (get_config('system', 'use_proc_open')) + if (Config::Get('system', 'use_proc_open')) proc_close(proc_open($cmdline . " &", [], $foo)); else exec($cmdline . ' > /dev/null &'); @@ -2333,7 +2333,7 @@ function construct_page() { $uid = ((App::$profile_uid) ? App::$profile_uid : local_channel()); - $navbar = get_config('system', 'navbar', 'default'); + $navbar = Config::Get('system', 'navbar', 'default'); if ($uid) { $navbar = get_pconfig($uid, 'system', 'navbar', $navbar); } @@ -2533,7 +2533,7 @@ function head_get_icon() { * @return string */ function get_directory_realm() { - if ($x = get_config('system', 'directory_realm')) + if ($x = Config::Get('system', 'directory_realm')) return $x; return DIRECTORY_REALM; @@ -2546,13 +2546,13 @@ function get_directory_realm() { */ function get_directory_primary() { - $dirmode = intval(get_config('system', 'directory_mode')); + $dirmode = intval(Config::Get('system', 'directory_mode')); if ($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_PRIMARY) { return z_root(); } - if ($x = get_config('system', 'directory_primary')) + if ($x = Config::Get('system', 'directory_primary')) return $x; return DIRECTORY_FALLBACK_MASTER; @@ -2565,13 +2565,13 @@ function get_directory_primary() { * @return string relative date of last completed poller execution */ function get_poller_runtime() { - $t = get_config('system', 'lastpoll'); + $t = Config::Get('system', 'lastpoll'); return relative_date($t); } function z_get_upload_dir() { - $upload_dir = get_config('system', 'uploaddir'); + $upload_dir = Config::Get('system', 'uploaddir'); if (!$upload_dir) $upload_dir = ini_get('upload_tmp_dir'); if (!$upload_dir) @@ -2581,7 +2581,7 @@ function z_get_upload_dir() { } function z_get_temp_dir() { - $temp_dir = get_config('system', 'tempdir'); + $temp_dir = Config::Get('system', 'tempdir'); if (!$temp_dir) $temp_dir = sys_get_temp_dir(); @@ -2637,12 +2637,12 @@ function check_for_new_perms() { if (Permissions::version() != PermissionRoles::version()) return; - $pregistered = get_config('system', 'perms'); + $pregistered = Config::Get('system', 'perms'); $pcurrent = array_keys(Permissions::Perms()); if (!$pregistered) { - set_config('system', 'perms', $pcurrent); + Config::Set('system', 'perms', $pcurrent); return; } @@ -2699,7 +2699,7 @@ function check_for_new_perms() { // We should probably call perms_refresh here, but this should get pushed in 24 hours and there is no urgency if ($found_new_perm) - set_config('system', 'perms', $pcurrent); + Config::Set('system', 'perms', $pcurrent); } @@ -2708,17 +2708,17 @@ function check_for_new_perms() { */ function check_cron_broken() { - $d = get_config('system', 'lastcron'); + $d = Config::Get('system', 'lastcron'); if ((!$d) || ($d < datetime_convert('UTC', 'UTC', 'now - 4 hours'))) { Zotlabs\Daemon\Master::Summon(['Cron']); - set_config('system', 'lastcron', datetime_convert()); + Config::Set('system', 'lastcron', datetime_convert()); } - $t = get_config('system', 'lastcroncheck'); + $t = Config::Get('system', 'lastcroncheck'); if (!$t) { // never checked before. Start the timer. - set_config('system', 'lastcroncheck', datetime_convert()); + Config::Set('system', 'lastcroncheck', datetime_convert()); return; } @@ -2727,7 +2727,7 @@ function check_cron_broken() { return; } - set_config('system', 'lastcroncheck', datetime_convert()); + Config::Set('system', 'lastcroncheck', datetime_convert()); if (($d) && ($d > datetime_convert('UTC', 'UTC', 'now - 3 days'))) { // Scheduled tasks have run successfully in the last 3 days. @@ -2759,7 +2759,7 @@ function check_cron_broken() { */ function observer_prohibited($allow_account = false) { if ($allow_account) { - return (((get_config('system', 'block_public')) && (!get_account_id()) && (!remote_channel())) ? true : false); + return (((Config::Get('system', 'block_public')) && (!get_account_id()) && (!remote_channel())) ? true : false); } - return (((get_config('system', 'block_public')) && (!local_channel()) && (!remote_channel())) ? true : false); + return (((Config::Get('system', 'block_public')) && (!local_channel()) && (!remote_channel())) ? true : false); } diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md index cd2526ead..4dccc8cef 100644 --- a/doc/dev-function-overview.md +++ b/doc/dev-function-overview.md @@ -21,11 +21,15 @@ returns an xchan structure representing the current viewer if authenticated (loc * get_config($family,$key), get_pconfig($uid,$family,$key) -Returns the config setting for $family and $key or false if unset. +Returns the config setting for $family and $key or false if unset. + +Deprecated: Use Zotlabs\Lib\Config::Get instead. * set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value) -Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). +Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). + +Deprecated: Use Zotlabs\Lib\Config::Set instead. * dbesc() @@ -33,7 +37,7 @@ Always escape strings being used in DB queries. This function returns the escape * q($sql,$var1...) -Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. +Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. * t($string) diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb index 48af9523d..f39954d73 100644 --- a/doc/developer_function_primer.bb +++ b/doc/developer_function_primer.bb @@ -20,10 +20,14 @@ returns an xchan structure representing the current viewer if authenticated (loc Returns the config setting for $family and $key or false if unset. +Deprecated: Use Zotlabs\Lib\Config::Get instead. + [b] set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b] Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). The xconfig version get/sets the value for a specific xchan hash - generally used for remote users. +Deprecated: Use Zotlabs\Lib\Config::Set instead. + [b]dbesc()[/b] Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() diff --git a/include/account.php b/include/account.php index a1fb0f159..884c07389 100644 --- a/include/account.php +++ b/include/account.php @@ -4,6 +4,7 @@ * @brief Somme account related functions. */ +use Zotlabs\Lib\Config; use Zotlabs\Lib\Crypto; require_once('include/config.php'); @@ -83,8 +84,8 @@ function check_account_invite($invite_code) { $result = array('error' => false, 'message' => ''); // [hilmar -> - $using_invites = (get_config('system','invitation_only') - || get_config('system','invitation_also')); + $using_invites = (Config::Get('system','invitation_only') + || Config::Get('system','invitation_also')); if($using_invites) { @@ -118,7 +119,7 @@ function check_account_invite($invite_code) { function check_account_admin($arr) { if(is_site_admin()) return true; - $admin_email = trim(get_config('system','admin_email')); + $admin_email = trim(Config::Get('system','admin_email')); if(strlen($admin_email) && $admin_email === trim($arr['email'])) return true; return false; @@ -182,7 +183,7 @@ function create_account_IS_OBSOLETE($arr) { $roles = ((x($arr,'account_roles')) ? intval($arr['account_roles']) : 0 ); $expires = ((x($arr,'expires')) ? intval($arr['expires']) : NULL_DATE); - $default_service_class = get_config('system','default_service_class'); + $default_service_class = Config::Get('system','default_service_class'); if($default_service_class === false) $default_service_class = ''; @@ -209,10 +210,10 @@ function create_account_IS_OBSOLETE($arr) { // Ensure that there is a host keypair. - if ((! get_config('system', 'pubkey')) && (! get_config('system', 'prvkey'))) { + if ((! Config::Get('system', 'pubkey')) && (! Config::Get('system', 'prvkey'))) { $hostkey = Crypto::new_keypair(4096); - set_config('system', 'pubkey', $hostkey['pubkey']); - set_config('system', 'prvkey', $hostkey['prvkey']); + Config::Set('system', 'pubkey', $hostkey['pubkey']); + Config::Set('system', 'prvkey', $hostkey['prvkey']); } $invite_result = check_account_invite($invite_code); @@ -319,7 +320,7 @@ function create_account_from_register($arr) { // account $expires = NULL_DATE; - $default_service_class = get_config('system','default_service_class'); + $default_service_class = Config::Get('system','default_service_class'); if($default_service_class === false) $default_service_class = ''; @@ -420,7 +421,7 @@ function verify_email_address($arr) { $email_msg = replace_macros(get_intltext_template('register_verify_member.tpl'), [ - '$sitename' => get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$siteurl' => z_root(), '$email' => $arr['email'], '$uid' => 1, @@ -432,7 +433,7 @@ function verify_email_address($arr) { $res = z_mail( [ 'toEmail' => $arr['email'], - 'messageSubject' => sprintf( t('Registration confirmation for %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Registration confirmation for %s'), Config::Get('system','sitename')), 'textVersion' => $email_msg, ] ); @@ -488,7 +489,7 @@ function verify_email_addressNOP($arr) { $email_msg = replace_macros(get_intltext_template('register_verify_member.tpl'), [ - '$sitename' => get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$siteurl' => z_root(), '$email' => $arr['email'], '$uid' => $account['account_id'], @@ -500,7 +501,7 @@ function verify_email_addressNOP($arr) { $res = z_mail( [ 'toEmail' => $arr['email'], - 'messageSubject' => sprintf( t('Registration confirmation for %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Registration confirmation for %s'), Config::Get('system','sitename')), 'textVersion' => $email_msg, ] ); @@ -564,7 +565,7 @@ function send_reg_approval_email($arr) { push_lang('en'); $email_msg = replace_macros(get_intltext_template('register_verify_eml.tpl'), array( - '$sitename' => get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$siteurl' => z_root(), '$email' => $arr['email'], '$uid' => $arr['account']['account_id'], @@ -575,7 +576,7 @@ function send_reg_approval_email($arr) { $res = z_mail( [ 'toEmail' => $admin['email'], - 'messageSubject' => sprintf( t('Registration request at %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Registration request at %s'), Config::Get('system','sitename')), 'textVersion' => $email_msg, ] ); @@ -594,7 +595,7 @@ function send_reg_approval_email($arr) { function send_register_success_email($email,$password) { $email_msg = replace_macros(get_intltext_template('register_open_eml.tpl'), array( - '$sitename' => get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$siteurl' => z_root(), '$email' => $email, '$password' => t('your registration password'), @@ -603,7 +604,7 @@ function send_register_success_email($email,$password) { $res = z_mail( [ 'toEmail' => $email, - 'messageSubject' => sprintf( t('Registration details for %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Registration details for %s'), Config::Get('system','sitename')), 'textVersion' => $email_msg, ] ); @@ -681,7 +682,7 @@ function account_allow($hash) { $email_tpl = get_intltext_template("register_open_eml.tpl"); $email_msg = replace_macros($email_tpl, array( - '$sitename' => get_config('system','sitename'), + '$sitename' => Config::Get('system','sitename'), '$siteurl' => z_root(), '$username' => $account[0]['account_email'], '$email' => $account[0]['account_email'], @@ -692,14 +693,14 @@ function account_allow($hash) { $res = z_mail( [ 'toEmail' => $account[0]['account_email'], - 'messageSubject' => sprintf( t('Registration details for %s'), get_config('system','sitename')), + 'messageSubject' => sprintf( t('Registration details for %s'), Config::Get('system','sitename')), 'textVersion' => $email_msg, ] ); pop_lang(); - if(get_config('system', 'auto_channel_create', 1)) + if(Config::Get('system', 'auto_channel_create', 1)) auto_channel_create($register[0]['uid']); if ($res) { @@ -844,7 +845,7 @@ function account_approve($hash) { if(! $account) return $ret; - if(get_config('system','auto_channel_create')) + if(Config::Get('system','auto_channel_create')) auto_channel_create($register[0]['reg_uid']); else { $_SESSION['login_return_url'] = 'new_channel'; @@ -992,7 +993,7 @@ function downgrade_accounts() { if(! $r) return; - $basic = get_config('system','default_service_class'); + $basic = Config::Get('system','default_service_class'); foreach($r as $rr) { if(($basic) && ($rr['account_service_class']) && ($rr['account_service_class'] != $basic)) { @@ -1135,7 +1136,7 @@ function service_class_fetch($uid, $property) { if(! x($service_class)) return false; // everything is allowed - $arr = get_config('service_class', $service_class); + $arr = Config::Get('service_class', $service_class); if(! is_array($arr) || (! count($arr))) return false; @@ -1169,7 +1170,7 @@ function account_service_class_fetch($aid, $property) { if(! isset($service_class)) return false; // everything is allowed - $arr = get_config('service_class', $service_class); + $arr = Config::Get('service_class', $service_class); if(! is_array($arr) || (! count($arr))) return false; @@ -1179,7 +1180,7 @@ function account_service_class_fetch($aid, $property) { function upgrade_link($bbcode = false) { - $l = get_config('service_class', 'upgrade_link'); + $l = Config::Get('service_class', 'upgrade_link'); if(! $l) return ''; if($bbcode) @@ -1208,7 +1209,7 @@ function get_account_techlevel($account_id = 0) { function zar_log($msg='') { - if(get_config('system', 'register_logfile', 0)) { + if(Config::Get('system', 'register_logfile', 0)) { file_put_contents('./zar.log', date('Y-m-d_H:i:s') . ' ' . $msg . ', ip: § ' . $_SERVER['REMOTE_ADDR'] . ' §' . "\n", FILE_APPEND); } diff --git a/include/attach.php b/include/attach.php index e5a2900b3..efefc73a4 100644 --- a/include/attach.php +++ b/include/attach.php @@ -11,11 +11,12 @@ * @todo Also an 'append' option to the storage function might be a useful addition. */ -use Zotlabs\Lib\Libsync; -use Zotlabs\Lib\Activity; use Zotlabs\Access\PermissionLimits; use Zotlabs\Daemon\Master; use Zotlabs\Lib\AccessList; +use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Config; +use Zotlabs\Lib\Libsync; require_once('include/permissions.php'); require_once('include/security.php'); @@ -801,7 +802,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { // Check storage limits if($options !== 'update') { - $maxfilesize = get_config('system','maxfilesize'); + $maxfilesize = Config::Get('system','maxfilesize'); if(($maxfilesize) && ($filesize > $maxfilesize)) { logger('quota_exceeded'); diff --git a/include/auth.php b/include/auth.php index 5956b89e2..0cd48bce3 100644 --- a/include/auth.php +++ b/include/auth.php @@ -9,8 +9,9 @@ * Also provides a function for OpenID identiy matching. */ -use Zotlabs\Lib\Libzot; use Zotlabs\Lib\AConfig; +use Zotlabs\Lib\Config; +use Zotlabs\Lib\Libzot; use Zotlabs\Module\Totp_check; require_once('include/api_auth.php'); @@ -43,8 +44,8 @@ function account_verify_password($login, $pass) { $ret = [ 'account' => null, 'channel' => null, 'xchan' => null ]; $login = punify($login); - $email_verify = get_config('system', 'verify_email'); - $register_policy = get_config('system', 'register_policy'); + $email_verify = Config::Get('system', 'verify_email'); + $register_policy = Config::Get('system', 'register_policy'); if(!$login || !$pass) return null; @@ -170,7 +171,7 @@ function account_verify_password($login, $pass) { * Error message to display for failed login. */ function log_failed_login($errormsg) { - $authlog = get_config('system', 'authlog'); + $authlog = Config::Get('system', 'authlog'); if ($authlog) @file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $errormsg . PHP_EOL, FILE_APPEND); } @@ -208,10 +209,10 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && if(x($_SESSION, 'visitor_id') && (! x($_SESSION, 'uid'))) { // if our authenticated guest is allowed to take control of the admin channel, make it so. - $admins = get_config('system', 'remote_admin'); + $admins = Config::Get('system', 'remote_admin'); if($admins && is_array($admins) && in_array($_SESSION['visitor_id'], $admins)) { $x = q("select * from account where account_email = '%s' and account_email != '' and ( account_flags & %d )>0 limit 1", - dbesc(get_config('system', 'admin_email')), + dbesc(Config::Get('system', 'admin_email')), intval(ACCOUNT_ROLE_ADMIN) ); if($x) { @@ -328,7 +329,7 @@ else { $error = 'authenticate: failed login attempt: ' . notags(trim($username)) . ' from IP ' . $_SERVER['REMOTE_ADDR']; logger($error); // Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention - $authlog = get_config('system', 'authlog'); + $authlog = Config::Get('system', 'authlog'); if ($authlog) @file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND); notice( t('Login failed.') . EOL ); diff --git a/include/bbcode.php b/include/bbcode.php index db4147c1e..87c09a775 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -4,8 +4,9 @@ * @brief BBCode related functions for parsing, etc. */ -use Zotlabs\Lib\SvgSanitizer; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\SvgSanitizer; require_once('include/oembed.php'); require_once('include/event.php'); @@ -111,7 +112,7 @@ function tryzrlvideo($match) { if($zrl) $link = zid($link); - $static_link = get_config('system','video_default_poster','images/video_poster.jpg'); + $static_link = Config::Get('system','video_default_poster','images/video_poster.jpg'); if($static_link) $poster = 'poster="' . escape_tags($static_link) . '" ' ; @@ -1133,7 +1134,7 @@ function parseIdentityAwareHTML($Text) { $Text = str_replace('[observer.photo]','', $Text); } - $Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$Text); + $Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),Config::Get('system','sitename')),$Text); // Unhide all [noparse] contained bbtags unspacefying them @@ -1242,7 +1243,7 @@ function bbcode($text, $options = []) { $text = $x['body']; $saved_images = $x['images']; - $text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$text); + $text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),Config::Get('system','sitename')),$text); // Replace any html brackets with HTML Entities to prevent executing HTML or script // Don't use strip_tags here because it breaks [url] search by replacing & with amp diff --git a/include/channel.php b/include/channel.php index a82794bfd..568ad052a 100644 --- a/include/channel.php +++ b/include/channel.php @@ -9,6 +9,7 @@ use Zotlabs\Access\PermissionRoles; use Zotlabs\Access\PermissionLimits; use Zotlabs\Access\Permissions; use Zotlabs\Daemon\Master; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Crypto; use Zotlabs\Lib\System; use Zotlabs\Render\Comanche; @@ -108,11 +109,11 @@ function create_sys_channel() { // Ensure that there is a host keypair. - if ((! get_config('system', 'pubkey')) && (! get_config('system', 'prvkey'))) { + if ((! Config::Get('system', 'pubkey')) && (! Config::Get('system', 'prvkey'))) { require_once('include/crypto.php'); $hostkey = Crypto::new_keypair(4096); - set_config('system', 'pubkey', $hostkey['pubkey']); - set_config('system', 'prvkey', $hostkey['prvkey']); + Config::Set('system', 'pubkey', $hostkey['pubkey']); + Config::Set('system', 'prvkey', $hostkey['prvkey']); } create_identity([ @@ -357,10 +358,10 @@ function create_identity($arr) { '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_site_id' => Libzot::make_xchan_hash(z_root(),Config::Get('system','pubkey')), 'hubloc_host' => App::get_hostname(), 'hubloc_callback' => z_root() . '/zot', - 'hubloc_sitekey' => get_config('system','pubkey'), + 'hubloc_sitekey' => Config::Get('system','pubkey'), 'hubloc_network' => 'zot6', 'hubloc_updated' => datetime_convert() ] @@ -493,7 +494,7 @@ function create_identity($arr) { // otherwise it could get annoying. Don't make this list too big // or it will impact registration time. - $accts = get_config('system','auto_follow'); + $accts = Config::Get('system','auto_follow'); if(($accts) && (! $total_identities)) { if(! is_array($accts)) $accts = array($accts); @@ -1591,7 +1592,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $details = $reddress = true; $connect_url = ''; $connect = ''; - $default_cover = get_config('system', 'default_cover_photo', 'hubzilla'); + $default_cover = Config::Get('system', 'default_cover_photo', 'hubzilla'); $default_cover_url = z_root() . '/images/default_cover_photos/' . $default_cover . '/425.png'; @@ -2040,7 +2041,7 @@ function get_theme_uid() { * @return string with path to profile photo */ function get_default_profile_photo($size = 300) { - $scheme = get_config('system','default_profile_photo'); + $scheme = Config::Get('system','default_profile_photo'); if(! $scheme) $scheme = 'rainbow_man'; @@ -2171,7 +2172,7 @@ function is_public_profile() { if(! local_channel()) return false; - if(intval(get_config('system','block_public'))) + if(intval(Config::Get('system','block_public'))) return false; $channel = App::get_channel(); @@ -2186,7 +2187,7 @@ function is_public_profile() { function get_profile_fields_basic($filter = 0) { - $profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null); + $profile_fields_basic = (($filter == 0) ? Config::Get('system','profile_fields_basic') : null); if(! $profile_fields_basic) $profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); @@ -2202,7 +2203,7 @@ function get_profile_fields_basic($filter = 0) { function get_profile_fields_advanced($filter = 0) { $basic = get_profile_fields_basic($filter); - $profile_fields_advanced = (($filter == 0) ? get_config('system','profile_fields_advanced') : null); + $profile_fields_advanced = (($filter == 0) ? Config::Get('system','profile_fields_advanced') : null); if(! $profile_fields_advanced) $profile_fields_advanced = array('address','locality','postal_code','partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education'); @@ -2423,7 +2424,7 @@ function get_zcard($channel, $observer_hash = '', $args = array()) { $cover = $r[0]; $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; } else { - $default_cover = get_config('system', 'default_cover_photo', 'hubzilla'); + $default_cover = Config::Get('system', 'default_cover_photo', 'hubzilla'); $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.png' ]; } @@ -2500,7 +2501,7 @@ function get_zcard_embed($channel, $observer_hash = '', $args = array()) { $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; } else { - $default_cover = get_config('system', 'default_cover_photo', 'hubzilla'); + $default_cover = Config::Get('system', 'default_cover_photo', 'hubzilla'); $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.png' ]; } diff --git a/include/cli_startup.php b/include/cli_startup.php index b9e7d124d..012b29fbf 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -2,11 +2,13 @@ require_once('boot.php'); +use Zotlabs\Lib\Config; + // Everything we need to boot standalone 'background' processes function cli_startup() { sys_boot(); - App::set_baseurl(get_config('system','baseurl')); + App::set_baseurl(Config::Get('system','baseurl')); } diff --git a/include/config.php b/include/config.php index ec3547a82..674d5afe4 100644 --- a/include/config.php +++ b/include/config.php @@ -31,18 +31,83 @@ use Zotlabs\Lib as Zlib; +/** + * Loads the hub's configuration from database to a cached storage. + * + * Retrieve a category ($family) of config variables from database to a cached + * storage in the global App::$config[$family]. + * + * @param string $family The category of the configuration value + * + * @return Nothing + * + * @deprecated + * This function is deprecated, use Zotlabs\Lib\Config::Load + * instead. + */ function load_config($family) { Zlib\Config::Load($family); } +/** + * Get a particular config variable given the category name ($family) + * and a key. + * + * Get a particular config variable from the given category ($family) and the + * $key from a cached storage in App::$config[$family]. If a key is found in the + * DB but does not exist in local config cache, pull it into the cache so we + * do not have to hit the DB again for this item. + * + * Returns false if not set. + * + * @param string $family The category of the configuration value + * @param string $key The configuration key to query + * @param string $default (optional) default false + * + * @return mixed|false Return value or false on error or if not set + * + * @deprecated + * This function is deprecated, use Zotlabs\Lib\Config::Get + * instead. + */ function get_config($family, $key, $default = false) { return Zlib\Config::Get($family,$key,$default); } +/** + * Sets a configuration value for the hub. + * + * Stores a config value ($value) in the category ($family) under the key ($key). + * + * @param string $family The category of the configuration value + * @param string $key The configuration key to set + * @param mixed $value The value to store in the configuration + * + * @return mixed|false Return the set value, or false if the database update failed + * + * @deprecated + * This function is deprecated, use Zotlabs\Lib\Config::Set + * instead. + */ function set_config($family, $key, $value) { return Zlib\Config::Set($family,$key,$value); } +/** + * Deletes the given key from the hub's configuration database. + * + * Removes the configured value from the stored cache in App::$config[$family] + * and removes it from the database. + * + * @param string $family The category of the configuration value + * @param string $key The configuration key to delete + * + * @return mixed + * + * @deprecated + * This function is deprecated, use Zotlabs\Lib\Config::Delete + * instead. + */ function del_config($family, $key) { return Zlib\Config::Delete($family,$key); } diff --git a/include/connections.php b/include/connections.php index 9a6ee7d8d..e5cc90411 100644 --- a/include/connections.php +++ b/include/connections.php @@ -1,6 +1,7 @@ ' diff --git a/include/conversation.php b/include/conversation.php index 79fe12d54..3992f06f6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,7 +1,8 @@ false ); - $conf = get_config('system','openssl_conf_file'); + $conf = Config::Get('system','openssl_conf_file'); if($conf) $openssl_options['config'] = $conf; @@ -460,12 +462,12 @@ function convert_salmon_key($key) { function z_obscure($s) { - return json_encode(crypto_encapsulate($s,get_config('system','pubkey'))); + return json_encode(crypto_encapsulate($s,Config::Get('system','pubkey'))); } function z_unobscure($s) { if(strpos($s,"{\"") !== 0) return $s; - return crypto_unencapsulate(json_decode($s,true),get_config('system','prvkey')); + return crypto_unencapsulate(json_decode($s,true),Config::Get('system','prvkey')); } diff --git a/include/event.php b/include/event.php index 701f3c330..ef73fc9b5 100644 --- a/include/event.php +++ b/include/event.php @@ -8,6 +8,7 @@ use Sabre\VObject; use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; use Zotlabs\Access\AccessList; @@ -237,7 +238,7 @@ function ical_wrapper($ev) { $o .= "BEGIN:VCALENDAR"; $o .= "\r\nVERSION:2.0"; $o .= "\r\nMETHOD:PUBLISH"; - $o .= "\r\nPRODID:-//" . get_config('system','sitename') . "//" . Zotlabs\Lib\System::get_platform_name() . "//" . strtoupper(App::$language). "\r\n"; + $o .= "\r\nPRODID:-//" . Config::Get('system','sitename') . "//" . Zotlabs\Lib\System::get_platform_name() . "//" . strtoupper(App::$language). "\r\n"; if(array_key_exists('dtstart', $ev)) $o .= format_event_ical($ev); else { diff --git a/include/features.php b/include/features.php index e57859aa8..d527f60e6 100644 --- a/include/features.php +++ b/include/features.php @@ -4,17 +4,15 @@ * Features management */ - - - +use Zotlabs\Lib\Config; function feature_enabled($uid,$feature) { - $x = get_config('feature_lock',$feature); + $x = Config::Get('feature_lock',$feature); if($x === false) { $x = get_pconfig($uid,'feature',$feature); if($x === false) { - $x = get_config('feature',$feature); + $x = Config::Get('feature',$feature); if($x === false) $x = get_feature_default($feature); } @@ -38,7 +36,7 @@ function get_feature_default($feature) { function feature_level($feature,$def) { - $x = get_config('feature_level',$feature); + $x = Config::Get('feature_level',$feature); if($x !== false) return intval($x); return $def; @@ -86,7 +84,7 @@ function get_features($filtered = true, $level = (-1)) { t('Start calendar week on Monday'), t('Default is Sunday'), false, - get_config('feature_lock','cal_first_day') + Config::Get('feature_lock','cal_first_day') ], [ @@ -94,7 +92,7 @@ function get_features($filtered = true, $level = (-1)) { t('Event Timezone Selection'), t('Allow event creation in timezones other than your own.'), false, - get_config('feature_lock','event_tz_select'), + Config::Get('feature_lock','event_tz_select'), ] ], @@ -108,7 +106,7 @@ function get_features($filtered = true, $level = (-1)) { t('Search by Date'), t('Ability to select posts by date ranges'), false, - get_config('feature_lock','archives') + Config::Get('feature_lock','archives') ], [ @@ -116,7 +114,7 @@ function get_features($filtered = true, $level = (-1)) { t('Tag Cloud'), t('Provide a personal tag cloud on your channel page'), false, - get_config('feature_lock','tagadelic'), + Config::Get('feature_lock','tagadelic'), ], [ @@ -124,7 +122,7 @@ function get_features($filtered = true, $level = (-1)) { t('Use blog/list mode'), t('Comments will be displayed separately'), false, - get_config('feature_lock','channel_list_mode'), + Config::Get('feature_lock','channel_list_mode'), ] ], @@ -137,7 +135,7 @@ function get_features($filtered = true, $level = (-1)) { t('Connection Filtering'), t('Filter incoming posts from connections based on keywords/content'), false, - get_config('feature_lock','connfilter') + Config::Get('feature_lock','connfilter') ] ], @@ -150,7 +148,7 @@ function get_features($filtered = true, $level = (-1)) { t('Community Tagging'), t('Ability to tag existing posts'), false, - get_config('feature_lock','commtag'), + Config::Get('feature_lock','commtag'), ], */ [ @@ -158,7 +156,7 @@ function get_features($filtered = true, $level = (-1)) { t('Emoji Reactions'), t('Add emoji reaction ability to posts'), true, - get_config('feature_lock','emojis'), + Config::Get('feature_lock','emojis'), ], [ @@ -166,7 +164,7 @@ function get_features($filtered = true, $level = (-1)) { t('Dislike Posts'), t('Ability to dislike posts/comments'), false, - get_config('feature_lock','dislike'), + Config::Get('feature_lock','dislike'), ], [ @@ -174,7 +172,7 @@ function get_features($filtered = true, $level = (-1)) { t('Star Posts'), t('Ability to mark special posts with a star indicator'), false, - get_config('feature_lock','star_posts'), + Config::Get('feature_lock','star_posts'), ], [ @@ -182,7 +180,7 @@ function get_features($filtered = true, $level = (-1)) { t('Reply on comment'), t('Ability to reply on selected comment'), false, - get_config('feature_lock','reply_to'), + Config::Get('feature_lock','reply_to'), ] ], @@ -196,7 +194,7 @@ function get_features($filtered = true, $level = (-1)) { t('Advanced Directory Search'), t('Allows creation of complex directory search queries'), false, - get_config('feature_lock','advanced_dirsearch'), + Config::Get('feature_lock','advanced_dirsearch'), ] ], @@ -210,7 +208,7 @@ function get_features($filtered = true, $level = (-1)) { t('Post Categories'), t('Add categories to your posts'), false, - get_config('feature_lock','categories'), + Config::Get('feature_lock','categories'), ], [ @@ -218,7 +216,7 @@ function get_features($filtered = true, $level = (-1)) { 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'), + Config::Get('feature_lock','large_photos'), ], [ @@ -226,7 +224,7 @@ function get_features($filtered = true, $level = (-1)) { t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key'), false, - get_config('feature_lock','content_encrypt'), + Config::Get('feature_lock','content_encrypt'), ], [ @@ -234,7 +232,7 @@ function get_features($filtered = true, $level = (-1)) { t('Disable Comments'), t('Provide the option to disable comments for a post'), false, - get_config('feature_lock','disable_comments'), + Config::Get('feature_lock','disable_comments'), ], [ @@ -242,7 +240,7 @@ function get_features($filtered = true, $level = (-1)) { t('Delayed Posting'), t('Allow posts to be published at a later date'), false, - get_config('feature_lock','delayed_posting'), + Config::Get('feature_lock','delayed_posting'), ], [ @@ -250,7 +248,7 @@ function get_features($filtered = true, $level = (-1)) { t('Content Expiration'), t('Remove posts/comments and/or private messages at a future time'), false, - get_config('feature_lock','content_expire'), + Config::Get('feature_lock','content_expire'), ], [ @@ -258,7 +256,7 @@ function get_features($filtered = true, $level = (-1)) { 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'), + Config::Get('feature_lock','suppress_duplicates'), ], [ @@ -266,7 +264,7 @@ function get_features($filtered = true, $level = (-1)) { 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'), + Config::Get('feature_lock','auto_save_draft'), ] ], @@ -280,7 +278,7 @@ function get_features($filtered = true, $level = (-1)) { t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'), false, - get_config('feature_lock','nav_channel_select'), + Config::Get('feature_lock','nav_channel_select'), ] ], @@ -294,7 +292,7 @@ function get_features($filtered = true, $level = (-1)) { t('Events Filter'), t('Ability to display only events'), false, - get_config('feature_lock','events_tab') + Config::Get('feature_lock','events_tab') ], [ @@ -302,7 +300,7 @@ function get_features($filtered = true, $level = (-1)) { t('Polls Filter'), t('Ability to display only polls'), false, - get_config('feature_lock','polls_tab') + Config::Get('feature_lock','polls_tab') ], [ @@ -310,7 +308,7 @@ function get_features($filtered = true, $level = (-1)) { t('Saved Searches'), t('Save search terms for re-use'), false, - get_config('feature_lock','savedsearch') + Config::Get('feature_lock','savedsearch') ], [ @@ -318,7 +316,7 @@ function get_features($filtered = true, $level = (-1)) { t('Saved Folders'), t('Ability to file posts under folders'), false, - get_config('feature_lock','filing'), + Config::Get('feature_lock','filing'), ], [ @@ -326,7 +324,7 @@ function get_features($filtered = true, $level = (-1)) { 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') + Config::Get('feature_lock','order_tab') ], [ @@ -334,7 +332,7 @@ function get_features($filtered = true, $level = (-1)) { t('Contact Filter'), t('Ability to display only posts of a selected contact'), false, - get_config('feature_lock','name_tab') + Config::Get('feature_lock','name_tab') ], [ @@ -342,7 +340,7 @@ function get_features($filtered = true, $level = (-1)) { t('Forum Filter'), t('Ability to display only posts of a specific forum'), false, - get_config('feature_lock','forums_tab') + Config::Get('feature_lock','forums_tab') ], [ @@ -350,7 +348,7 @@ function get_features($filtered = true, $level = (-1)) { t('Personal Posts Filter'), t('Ability to display only posts that you\'ve interacted on'), false, - get_config('feature_lock','personal_tab') + Config::Get('feature_lock','personal_tab') ], [ @@ -358,7 +356,7 @@ function get_features($filtered = true, $level = (-1)) { t('Use blog/list mode'), t('Comments will be displayed separately'), false, - get_config('feature_lock','network_list_mode'), + Config::Get('feature_lock','network_list_mode'), ] ], @@ -372,7 +370,7 @@ function get_features($filtered = true, $level = (-1)) { t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'), false, - get_config('feature_lock','photo_location'), + Config::Get('feature_lock','photo_location'), ], [ @@ -380,7 +378,7 @@ function get_features($filtered = true, $level = (-1)) { t('Flag Adult Photos'), t('Provide photo edit option to hide inappropriate photos from default album view'), false, - get_config('feature_lock','adult_photo_flagging'), + Config::Get('feature_lock','adult_photo_flagging'), ] ], @@ -394,7 +392,7 @@ function get_features($filtered = true, $level = (-1)) { t('Advanced Profiles'), t('Additional profile sections and selections'), false, - get_config('feature_lock','advanced_profiles') + Config::Get('feature_lock','advanced_profiles') ], [ @@ -402,7 +400,7 @@ function get_features($filtered = true, $level = (-1)) { t('Profile Import/Export'), t('Save and load profile details across sites/channels'), false, - get_config('feature_lock','profile_export') + Config::Get('feature_lock','profile_export') ], [ @@ -410,7 +408,7 @@ function get_features($filtered = true, $level = (-1)) { t('Multiple Profiles'), t('Ability to create multiple profiles'), false, - get_config('feature_lock','multi_profiles') + Config::Get('feature_lock','multi_profiles') ] ] diff --git a/include/feedutils.php b/include/feedutils.php index f05c15414..a50214746 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -4,6 +4,8 @@ * @brief Some functions to work with XML feeds. */ +use Zotlabs\Lib\Config; + /** * @brief Return an Atom feed for channel. * @@ -1037,7 +1039,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { - $sys_expire = intval(get_config('system', 'default_expire_days')); + $sys_expire = intval(Config::Get('system', 'default_expire_days')); $chn_expire = intval($importer['channel_expire_days']); $expire_days = $sys_expire; @@ -1325,7 +1327,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { // but save the thread_parent in case we need to refer to it later. if($importer['channel_system']) { - if( ! \Zotlabs\Lib\MessageFilter::evaluate($datarray,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { + if( ! \Zotlabs\Lib\MessageFilter::evaluate($datarray,Config::Get('system','pubstream_incl'),Config::Get('system','pubstream_excl'))) { continue; } } @@ -1481,7 +1483,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { } if($importer['channel_system']) { - if( ! \Zotlabs\Lib\MessageFilter::evaluate($datarray,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { + if( ! \Zotlabs\Lib\MessageFilter::evaluate($datarray,Config::Get('system','pubstream_incl'),Config::Get('system','pubstream_excl'))) { continue; } } diff --git a/include/hubloc.php b/include/hubloc.php index 4d2980a6b..982455f9c 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -5,6 +5,7 @@ */ use Zotlabs\Daemon\Master; +use Zotlabs\Lib\Config; /** * @brief Create an array for hubloc table and insert record. @@ -129,7 +130,7 @@ function remove_obsolete_hublocs() { $r = q("select hubloc_id from hubloc where hubloc_url = '%s' and hubloc_sitekey = '%s'", dbesc(z_root()), - dbesc(get_config('system', 'pubkey')) + dbesc(Config::Get('system', 'pubkey')) ); if((! $r) || (! count($r))) return; @@ -139,11 +140,11 @@ function remove_obsolete_hublocs() { // Do we have any invalid ones? $r = q("select hubloc_id, hubloc_hash from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", - dbesc(get_config('system', 'pubkey')), + dbesc(Config::Get('system', 'pubkey')), dbesc(z_root()) ); $p = q("select hubloc_id, hubloc_hash from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'", - dbesc(get_config('system', 'pubkey')), + dbesc(Config::Get('system', 'pubkey')), dbesc(z_root()) ); if(is_array($r) && is_array($p)) @@ -156,7 +157,7 @@ function remove_obsolete_hublocs() { logger('remove_obsolete_hublocs: removing ' . count($r) . ' hublocs.'); - $interval = get_config('queueworker', 'queue_interval', 500000); + $interval = Config::Get('queueworker', 'queue_interval', 500000); foreach($r as $rr) { q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d", diff --git a/include/import.php b/include/import.php index 7dac518f5..479c2c255 100644 --- a/include/import.php +++ b/include/import.php @@ -1,6 +1,7 @@ $unless) { $tagged = false; } @@ -3762,7 +3763,7 @@ function item_expire($uid,$days,$comment_days = 7) { $sql_extra = ((intval($expire_network_only)) ? " AND item_wall = 0 " : ""); - $expire_limit = get_config('system','expire_limit', 1000); + $expire_limit = Config::Get('system','expire_limit', 1000); $item_normal = item_normal(); diff --git a/include/language.php b/include/language.php index 1b2e7332e..22f350aac 100644 --- a/include/language.php +++ b/include/language.php @@ -10,6 +10,7 @@ use CommerceGuys\Intl\Language\LanguageRepository; use LanguageDetection\Language; +use Zotlabs\Lib\Config; /** * @brief Get the browser's submitted preferred languages. @@ -17,7 +18,7 @@ use LanguageDetection\Language; * This functions parses the HTTP_ACCEPT_LANGUAGE header sent by the browser and * extracts the preferred languages and their priority. * - * Get the language setting directly from system variables, bypassing get_config() + * Get the language setting directly from system variables, bypassing Config::Get() * as database may not yet be configured. * * If possible, we use the value from the browser. @@ -313,8 +314,8 @@ function detect_language($s) { return EMPTY_STR; } - $min_length = get_config('system', 'language_detect_min_length', LANGUAGE_DETECT_MIN_LENGTH); - $min_confidence = get_config('system', 'language_detect_min_confidence', LANGUAGE_DETECT_MIN_CONFIDENCE); + $min_length = Config::Get('system', 'language_detect_min_length', LANGUAGE_DETECT_MIN_LENGTH); + $min_confidence = Config::Get('system', 'language_detect_min_confidence', LANGUAGE_DETECT_MIN_CONFIDENCE); // embedded apps have long base64 strings which will trip up the detector. $naked_body = preg_replace('/\[app\](.*?)\[\/app\]/', '', $s); diff --git a/include/nav.php b/include/nav.php index e4df7e4e5..a68d564a0 100644 --- a/include/nav.php +++ b/include/nav.php @@ -2,6 +2,7 @@ use \Zotlabs\Lib\Apps; use \Zotlabs\Lib\Chatroom; +use \Zotlabs\Lib\Config; require_once('include/security.php'); require_once('include/menu.php'); @@ -57,10 +58,10 @@ function nav($template = 'default') { * */ - $banner = get_config('system', 'banner'); + $banner = Config::Get('system', 'banner'); if ($banner === false) - $banner = get_config('system', 'sitename'); + $banner = Config::Get('system', 'sitename'); call_hooks('get_banner', $banner); @@ -175,15 +176,15 @@ function nav($template = 'default') { ]; } - if ((get_config('system', 'register_policy') == REGISTER_OPEN || get_config('system', 'register_policy') == REGISTER_APPROVE) && empty($_SESSION['authenticated'])) { + if ((Config::Get('system', 'register_policy') == REGISTER_OPEN || Config::Get('system', 'register_policy') == REGISTER_APPROVE) && empty($_SESSION['authenticated'])) { $nav['register'] = ['register', t('Register'), "", t('Create an account'), 'register_nav_btn']; } // TODO: update help content for various modules - if (false /* !get_config('system', 'hide_help') */) { + if (false /* !Config::Get('system', 'hide_help') */) { $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); + $enable_context_help = ((intval(Config::Get('system', 'enable_context_help')) === 1 || Config::Get('system', 'enable_context_help') === false) ? true : false); if ($enable_context_help === true) { require_once('include/help.php'); $context_help = load_context_help(); @@ -350,7 +351,7 @@ function nav($template = 'default') { '$pleasewait' => t('Please wait...'), '$nav_apps' => $nav_apps, '$navbar_apps' => $navbar_apps, - '$channel_menu' => get_pconfig(App::$profile_uid, 'system', 'channel_menu', get_config('system', 'channel_menu')), + '$channel_menu' => get_pconfig(App::$profile_uid, 'system', 'channel_menu', Config::Get('system', 'channel_menu')), '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), '$channel_apps' => $channel_apps, '$addapps' => t('Apps'), diff --git a/include/network.php b/include/network.php index a5c14f9d1..a7a11ff6e 100644 --- a/include/network.php +++ b/include/network.php @@ -1,6 +1,7 @@ intval(get_config('system','force_queue_threshold',3000)) && (! $force)) { + if(intval($x[0]['total']) > intval(Config::Get('system','force_queue_threshold',3000)) && (! $force)) { logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); foreach($deliveries as $d) { Queue::update($d); @@ -1482,9 +1483,9 @@ function do_delivery($deliveries, $force = false) { */ - $interval = get_config('queueworker', 'queue_interval', 500000); + $interval = Config::Get('queueworker', 'queue_interval', 500000); - $deliveries_per_process = intval(get_config('system','delivery_batch_count')); + $deliveries_per_process = intval(Config::Get('system','delivery_batch_count')); if($deliveries_per_process <= 0) $deliveries_per_process = 1; @@ -1542,9 +1543,9 @@ function get_site_info() { $admin = false; } - $def_service_class = get_config('system','default_service_class'); + $def_service_class = Config::Get('system','default_service_class'); if($def_service_class) - $service_class = get_config('service_class',$def_service_class); + $service_class = Config::Get('service_class',$def_service_class); else $service_class = false; @@ -1555,9 +1556,9 @@ function get_site_info() { if(! isset($commit) || strlen($commit) > 16) $commit = ''; - $site_info = get_config('system','info'); - $site_name = get_config('system','sitename'); - if(! get_config('system','hidden_version_siteinfo')) { + $site_info = Config::Get('system','info'); + $site_name = Config::Get('system','sitename'); + if(! Config::Get('system','hidden_version_siteinfo')) { $version = Zotlabs\Lib\System::get_project_version(); $tag = Zotlabs\Lib\System::get_std_version(); @@ -1573,15 +1574,15 @@ function get_site_info() { } //Statistics - $channels_total_stat = intval(get_config('system','channels_total_stat')); - $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); - $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); - $local_posts_stat = intval(get_config('system','local_posts_stat')); - $local_comments_stat = intval(get_config('system','local_comments_stat')); - $hide_in_statistics = intval(get_config('system','hide_in_statistics')); - $site_expire = intval(get_config('system', 'default_expire_days')); - - load_config('feature_lock'); + $channels_total_stat = intval(Config::Get('system','channels_total_stat')); + $channels_active_halfyear_stat = intval(Config::Get('system','channels_active_halfyear_stat')); + $channels_active_monthly_stat = intval(Config::Get('system','channels_active_monthly_stat')); + $local_posts_stat = intval(Config::Get('system','local_posts_stat')); + $local_comments_stat = intval(Config::Get('system','local_comments_stat')); + $hide_in_statistics = intval(Config::Get('system','hide_in_statistics')); + $site_expire = intval(Config::Get('system', 'default_expire_days')); + + Config::Load('feature_lock'); $locked_features = array(); if(is_array(App::$config['feature_lock']) && count(App::$config['feature_lock'])) { foreach(App::$config['feature_lock'] as $k => $v) { @@ -1602,18 +1603,18 @@ function get_site_info() { 'server_role' => Zotlabs\Lib\System::get_server_role(), 'commit' => $commit, 'plugins' => $visible_plugins, - 'register_policy' => $register_policy[get_config('system','register_policy')], - 'invitation_only' => (bool) intval(get_config('system','invitation_only')), - 'directory_mode' => $directory_mode[get_config('system','directory_mode')], - 'directory_server' => get_config('system','directory_server'), - 'language' => get_config('system','language'), - 'rss_connections' => (bool) intval(get_config('system','feed_contacts')), + 'register_policy' => $register_policy[Config::Get('system','register_policy')], + 'invitation_only' => (bool) intval(Config::Get('system','invitation_only')), + 'directory_mode' => $directory_mode[Config::Get('system','directory_mode')], + 'directory_server' => Config::Get('system','directory_server'), + 'language' => Config::Get('system','language'), + 'rss_connections' => (bool) intval(Config::Get('system','feed_contacts')), 'expiration' => $site_expire, 'default_service_restrictions' => $service_class, 'locked_features' => $locked_features, 'admin' => $admin, 'dbdriver' => DBA::$dba->getdriver() . ' ' . ((ACTIVE_DBTYPE == DBTYPE_POSTGRES) ? 'postgres' : 'mysql'), - 'lastpoll' => get_config('system','lastpoll'), + 'lastpoll' => Config::Get('system','lastpoll'), 'info' => (($site_info) ? $site_info : ''), 'channels_total' => $channels_total_stat, 'hide_in_statistics' => $hide_in_statistics @@ -1651,7 +1652,7 @@ function check_siteallowed($url) { if(array_key_exists('allowed',$arr)) return $arr['allowed']; - $bl1 = get_config('system','whitelisted_sites'); + $bl1 = Config::Get('system','whitelisted_sites'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { if($bl1 === '*') @@ -1660,7 +1661,7 @@ function check_siteallowed($url) { return true; } } - $bl1 = get_config('system','blacklisted_sites'); + $bl1 = Config::Get('system','blacklisted_sites'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { if($bl1 === '*') @@ -1696,7 +1697,7 @@ function check_channelallowed($hash) { if(array_key_exists('allowed',$arr)) return $arr['allowed']; - $bl1 = get_config('system','whitelisted_channels'); + $bl1 = Config::Get('system','whitelisted_channels'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { if($bl1 === '*') @@ -1705,7 +1706,7 @@ function check_channelallowed($hash) { return true; } } - $bl1 = get_config('system','blacklisted_channels'); + $bl1 = Config::Get('system','blacklisted_channels'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { if($bl1 === '*') @@ -1810,17 +1811,17 @@ function network_to_name($s) { function z_mail($params) { if(! $params['fromEmail']) { - $params['fromEmail'] = get_config('system','from_email'); + $params['fromEmail'] = Config::Get('system','from_email'); if(! $params['fromEmail']) $params['fromEmail'] = 'Administrator' . '@' . App::get_hostname(); } if(! $params['fromName']) { - $params['fromName'] = get_config('system','from_email_name'); + $params['fromName'] = Config::Get('system','from_email_name'); if(! $params['fromName']) $params['fromName'] = Zotlabs\Lib\System::get_site_name(); } if(! $params['replyTo']) { - $params['replyTo'] = get_config('system','reply_address'); + $params['replyTo'] = Config::Get('system','reply_address'); if(! $params['replyTo']) $params['replyTo'] = 'noreply' . '@' . App::get_hostname(); } diff --git a/include/oauth.php b/include/oauth.php index 845ec4558..3426f9ca5 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -1,11 +1,13 @@ - * + * */ +use Zotlabs\Lib\Config; + define('REQUEST_TOKEN_DURATION', 300); define('ACCESS_TOKEN_DURATION', 31536000); @@ -18,7 +20,7 @@ class ZotOAuth1DataStore extends OAuth1DataStore { function gen_token(){ return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid()))); } - + function lookup_consumer($consumer_key) { logger('consumer_key: ' . $consumer_key, LOGGER_DEBUG); @@ -72,7 +74,7 @@ class ZotOAuth1DataStore extends OAuth1DataStore { $key = $this->gen_token(); $sec = $this->gen_token(); - + if ($consumer->key){ $k = $consumer->key; } else { @@ -94,19 +96,19 @@ class ZotOAuth1DataStore extends OAuth1DataStore { function new_access_token($token, $consumer, $verifier = null) { logger(__function__.":".$token.", ". $consumer.", ". $verifier, LOGGER_DEBUG); - + // return a new access token attached to this consumer // for the user associated with this token if the request token // is authorized // should also invalidate the request token - + $ret=Null; - + // get user for this verifier - $uverifier = get_config("oauth", $verifier); + $uverifier = Config::Get("oauth", $verifier); logger(__function__.":".$verifier.",".$uverifier, LOGGER_DEBUG); if (is_null($verifier) || ($uverifier!==false)) { - + $key = $this->gen_token(); $sec = $this->gen_token(); @@ -119,16 +121,16 @@ class ZotOAuth1DataStore extends OAuth1DataStore { intval($uverifier)); if ($r) - $ret = new OAuth1Token($key,$sec); + $ret = new OAuth1Token($key,$sec); } - - + + q("DELETE FROM tokens WHERE id='%s'", $token->key); - - + + if (!is_null($ret) && $uverifier!==false) { - del_config("oauth", $verifier); - + Config::Delete("oauth", $verifier); + // $apps = get_pconfig($uverifier, "oauth", "apps"); // if ($apps===false) $apps=array(); // $apps[] = $consumer->key; @@ -145,7 +147,7 @@ class ZotOAuth1 extends OAuth1Server { $this->add_signature_method(new OAuth1SignatureMethod_PLAINTEXT()); $this->add_signature_method(new OAuth1SignatureMethod_HMAC_SHA1()); } - + function loginUser($uid){ logger("ZotOAuth1::loginUser $uid"); @@ -174,7 +176,7 @@ class ZotOAuth1 extends OAuth1Server { $_SESSION['allow_api'] = true; } } - + } /* @@ -195,13 +197,13 @@ class FKOAuth2 extends OAuth2 { dbesc($client_secret), dbesc($redirect_uri) ); - + return $r; } protected function checkClientCredentials($client_id, $client_secret = NULL) { $client_secret = $this->db_secret($client_secret); - + $r = q("SELECT pw FROM clients WHERE client_id = '%s'", dbesc($client_id)); @@ -223,21 +225,21 @@ class FKOAuth2 extends OAuth2 { protected function getAccessToken($oauth_token) { $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'", dbesc($oauth_token)); - + if (count($r)) return $r[0]; return null; } - + protected function setAccessToken($oauth_token, $client_id, $expires, $scope = NULL) { $r = q("INSERT INTO tokens (id, client_id, expires, scope) VALUES ('%s', '%s', %d, '%s')", dbesc($oauth_token), dbesc($client_id), intval($expires), dbesc($scope)); - + return $r; } @@ -251,23 +253,23 @@ class FKOAuth2 extends OAuth2 { protected function getAuthCode($code) { $r = q("SELECT id, client_id, redirect_uri, expires, auth_scope FROM auth_codes WHERE id = '%s'", dbesc($code)); - + if (count($r)) return $r[0]; return null; } protected function setAuthCode($code, $client_id, $redirect_uri, $expires, $scope = NULL) { - $r = q("INSERT INTO auth_codes - (id, client_id, redirect_uri, expires, auth_scope) VALUES + $r = q("INSERT INTO auth_codes + (id, client_id, redirect_uri, expires, auth_scope) VALUES ('%s', '%s', '%s', %d, '%s')", dbesc($code), dbesc($client_id), dbesc($redirect_uri), intval($expires), dbesc($scope)); - return $r; - } - + return $r; + } + } */ diff --git a/include/oauth2.php b/include/oauth2.php index 3a71a651d..f7a279892 100644 --- a/include/oauth2.php +++ b/include/oauth2.php @@ -12,12 +12,12 @@ $oauth2_server->addGrantType(new OAuth2\GrantType\ClientCredentials($storage)); $oauth2_server->addGrantType(new OAuth2\GrantType\AuthorizationCode($storage)); - $keyStorage = new OAuth2\Storage\Memory( [ - 'keys' => [ - 'public_key' => get_config('system','pubkey'), - 'private_key' => get_config('system','prvkey') + $keyStorage = new OAuth2\Storage\Memory( [ + 'keys' => [ + 'public_key' => Config::Get('system','pubkey'), + 'private_key' => Config::Get('system','prvkey') ] ]); $oauth2_server->addStorage($keyStorage,'public_key'); -*/ \ No newline at end of file +*/ diff --git a/include/oembed.php b/include/oembed.php index a90c91641..1b6157241 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,7 +1,7 @@ '', @@ -164,7 +164,7 @@ function oembed_fetch_url($embedurl){ $txt = EMPTY_STR; if ($action !== 'block') { - $max_oembed_size = get_config('system', 'oembed_max_size', 1 * 1024 * 1024 /* 1MB */); + $max_oembed_size = Config::Get('system', 'oembed_max_size', 1 * 1024 * 1024 /* 1MB */); stream_context_set_default( [ @@ -259,7 +259,7 @@ function oembed_fetch_url($embedurl){ // save in cache - if(! get_config('system','oembed_cache_disable')) + if(! Config::Get('system','oembed_cache_disable')) Cache::set('[' . App::$videowidth . '] ' . $furl, $txt); } @@ -429,7 +429,7 @@ function oembed_iframe($src,$width,$height) { function oembed_bbcode2html($text){ - $stopoembed = get_config("system","no_oembed"); + $stopoembed = Config::Get("system","no_oembed"); if ($stopoembed == true){ return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "". t('Embedding disabled') ." : $1" ,$text); } diff --git a/include/permissions.php b/include/permissions.php index 28f242712..be6fc8594 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -1,5 +1,7 @@ $v) { - $x = get_config('default_perms', $perm, $typical[$perm]); + $x = Config::Get('default_perms', $perm, $typical[$perm]); $ret[$perm] = $x; } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 4394d3238..66a5d19f9 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -1,5 +1,6 @@ = 0) { - $limits = get_config('system', 'imagick_limits', false); + $limits = Config::Get('system', 'imagick_limits', false); if ($limits) foreach ($limits as $k => $v) IMagick::setResourceLimit($k, $v); @@ -99,7 +100,7 @@ function guess_image_type($filename, $data = '') { } if(is_null($type)){ - $ignore_imagick = get_config('system', 'ignore_imagick'); + $ignore_imagick = Config::Get('system', 'ignore_imagick'); // Guessing from extension? Isn't that... dangerous? if(class_exists('Imagick') && ! $ignore_imagick) { $v = Imagick::getVersion(); diff --git a/include/photos.php b/include/photos.php index 5e993e15f..85c97d1fd 100644 --- a/include/photos.php +++ b/include/photos.php @@ -6,6 +6,7 @@ use Zotlabs\Access\PermissionLimits; use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Config; require_once('include/permissions.php'); require_once('include/items.php'); @@ -74,11 +75,11 @@ function photo_upload($channel, $observer, $args) { $os_storage = 0; - $max_thumb = get_config('system', 'max_thumbnail', 1600); + $max_thumb = Config::Get('system', 'max_thumbnail', 1600); if ($args['os_syspath'] && $args['getimagesize']) { if ($args['getimagesize'][0] > $max_thumb || $args['getimagesize'][1] > $max_thumb) { - $imagick_path = get_config('system', 'imagick_convert_path'); + $imagick_path = Config::Get('system', 'imagick_convert_path'); if ($imagick_path && @file_exists($imagick_path)) { $tmp_name = $args['os_syspath'] . '-001'; $newsize = photo_calculate_scale(array_merge($args['getimagesize'], ['max' => $max_thumb])); @@ -146,7 +147,7 @@ function photo_upload($channel, $observer, $args) { logger('Received file: ' . $filename . ' as ' . $src . ' (' . $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG); - $maximagesize = get_config('system', 'maximagesize'); + $maximagesize = Config::Get('system', 'maximagesize'); if (($maximagesize) && ($filesize > $maximagesize)) { $ret['message'] = sprintf(t('Image exceeds website size limit of %lu bytes'), $maximagesize); @@ -219,7 +220,7 @@ function photo_upload($channel, $observer, $args) { @unlink($src); - $max_length = get_config('system', 'max_image_length'); + $max_length = Config::Get('system', 'max_image_length'); if (!$max_length) $max_length = MAX_IMAGE_LENGTH; if ($max_length > 0) diff --git a/include/plugin.php b/include/plugin.php index bbfeab988..4601cb544 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -5,6 +5,7 @@ * @brief Some functions to handle addons and themes. */ +use Zotlabs\Lib\Config; /** * @brief Handle errors in plugin calls. @@ -25,7 +26,7 @@ function handleerrors_plugin($plugin, $notice, $log, $uninstall = false){ $idx = array_search($plugin, \App::$plugins); unset(\App::$plugins[$idx]); uninstall_plugin($plugin); - set_config("system", "addon", implode(", ", \App::$plugins)); + Config::Set("system", "addon", implode(", ", \App::$plugins)); } } @@ -187,7 +188,7 @@ function plugin_is_installed($name) { * @brief Reload all updated plugins. */ function reload_plugins() { - $plugins = get_config('system', 'addon'); + $plugins = Config::Get('system', 'addon'); if(strlen($plugins)) { $r = dbq("SELECT * FROM addon WHERE installed = 1"); if($r) @@ -266,7 +267,7 @@ function plugins_sync() { $installed = plugins_installed_list(); - $plugins = get_config('system', 'addon', ''); + $plugins = Config::Get('system', 'addon', ''); $plugins_arr = explode(',', $plugins); @@ -719,7 +720,7 @@ function check_plugin_versions($info) { continue; if(strpos($test,'.')) { $conf = explode('.',$test); - if(get_config(trim($conf[0]),trim($conf[1]))) + if(Config::Get(trim($conf[0]),trim($conf[1]))) return true; else return false; diff --git a/include/security.php b/include/security.php index b3e45742e..bc44704d0 100644 --- a/include/security.php +++ b/include/security.php @@ -5,6 +5,8 @@ * @brief Some security related functions. */ +use Zotlabs\Lib\Config; + /** * @param int $user_record The account_id * @param array $channel @@ -872,7 +874,7 @@ function stream_perms_xchans($perms = NULL) { */ function zarIsDuty($wd=NULL, $hhmm=NULL, $op='isOpen') { - $isduty = get_config('system', 'register_duty_jso'); + $isduty = Config::Get('system', 'register_duty_jso'); if (!$isduty) return (bool)false; diff --git a/include/socgraph.php b/include/socgraph.php index e5e8ddf74..336c1c0c3 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1,6 +1,7 @@ $loglevel)) @@ -846,9 +847,9 @@ function dlogger($msg, $level = 0) { if(App::$module == 'setup') return; - $debugging = get_config('system','debugging'); - $loglevel = intval(get_config('system','loglevel')); - $logfile = get_config('system','dlogfile'); + $debugging = Config::Get('system','debugging'); + $loglevel = intval(Config::Get('system','loglevel')); + $logfile = Config::Get('system','dlogfile'); if((! $debugging) || (! $logfile) || ($level > $loglevel)) return; @@ -1253,7 +1254,7 @@ function sslify($s) { // The downside is that http: media files will likely be blocked by your browser // Complain to your browser maker - $allow = get_config('system','sslify_everything'); + $allow = Config::Get('system','sslify_everything'); $pattern = (($allow) ? "/\<(.*?)src=[\"|'](http\:.*?)[\"|'](.*?)\>/" : "/\/" ); $matches = null; @@ -1407,7 +1408,7 @@ function list_smilies($default_only = false) { */ function smilies($s, $sample = false) { - if(intval(get_config('system', 'no_smilies')) + if(intval(Config::Get('system', 'no_smilies')) || (local_channel() && intval(get_pconfig(local_channel(), 'system', 'no_smilies')))) return $s; @@ -2113,7 +2114,7 @@ function create_export_photo_body(&$item) { * @return string */ function feed_hublinks() { - $hub = get_config('system', 'huburl'); + $hub = Config::Get('system', 'huburl'); $hubxml = ''; if(strlen($hub)) { @@ -2496,7 +2497,7 @@ function check_webbie($arr) { // These names conflict with the CalDAV server $taken = [ 'principals', 'addressbooks', 'calendars' ]; - $reservechan = get_config('system','reserved_channels'); + $reservechan = Config::Get('system','reserved_channels'); if(strlen($reservechan)) { $taken = array_merge($taken,explode(',', $reservechan)); } diff --git a/include/zid.php b/include/zid.php index b38457d99..9f0b23edf 100644 --- a/include/zid.php +++ b/include/zid.php @@ -1,5 +1,6 @@ imageString() */ public function testImagestringReturnsABinaryString() { - // Create a stub for global function get_config() - // get_config('system', 'png_quality') - // get_config('system', 'jpeg_quality'); - $gc = $this->getFunctionMock('Zotlabs\Photo', 'get_config'); - $gc->expects($this->once())->willReturnCallback( - function() { - switch($this->photoGd->getType()){ - case 'image/png': - return 7; - case 'image/jpeg': - default: - return 70; - } - } - ); + // Init config with a known value for the test + \Zotlabs\Lib\Config::Set('system', 'png_quality', 7); $this->assertIsString($this->photoGd->imageString()); } diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php index 0a22b543a..c01e4f6a3 100644 --- a/tests/unit/Web/HttpSigTest.php +++ b/tests/unit/Web/HttpSigTest.php @@ -84,9 +84,8 @@ class HttpSigTest extends UnitTestCase { } function testDecrypt_sigheaderUseSitePrivateKey() { - // Create a stub for global function get_config() with expectation - $t = $this->getFunctionMock('Zotlabs\Web', 'get_config'); - $t->expects($this->once())->willReturn('system.prvkey'); + // Initialize config with a known value for test + \Zotlabs\Lib\Config::Set('system', 'prvkey', 'system.prvkey'); $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"'; $result = [ diff --git a/util/addons b/util/addons index 7bd70984e..f700dfcf7 100755 --- a/util/addons +++ b/util/addons @@ -19,7 +19,9 @@ require_once('include/cli_startup.php'); cli_startup(); - $plugs = get_config('system', 'addon'); +use Zotlabs\Lib\Config; + + $plugs = Config::Get('system', 'addon'); $plugins_arr = array(); if($plugs) @@ -42,7 +44,7 @@ cli_startup(); if ($idz !== false) { unset(App::$plugins[$idz]); uninstall_plugin($id); - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); } } $info['disabled'] = 1-intval($x); @@ -65,7 +67,7 @@ if($argc == 2 && $argv[1] === 'list') { echo $p[0] . "\n"; } } - } + } killme(); } @@ -89,7 +91,7 @@ if($argc == 3 && $argv[1] === 'list' && $argv[2] === 'all') { foreach($plugins as $p) { echo $p[0] . (($p[1]) ? $p[1] : (($p[2]['disabled']) ? '!' : '')) . "\n"; } - } + } killme(); } @@ -107,12 +109,12 @@ if($argc == 3 && $argv[1] === 'install') { else { App::$plugins[] = $p[0]; install_plugin($p[0]); - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); echo $p[0] . ' installed.' . "\n"; } } } - } + } killme(); } @@ -136,12 +138,12 @@ if($argc == 3 && $argv[1] === 'uninstall') { if ($idx !== false) unset(App::$plugins[$idx]); uninstall_plugin($p[0]); - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); echo $p[0] . ' uninstalled.' . "\n"; } } } - } + } // force uninstall of addon which no longer exists @@ -150,7 +152,7 @@ if($argc == 3 && $argv[1] === 'uninstall') { if ($idx !== false) unset(App::$plugins[$idx]); uninstall_plugin($argv[2]); - set_config("system","addon", implode(", ",App::$plugins)); + Config::Set("system","addon", implode(", ",App::$plugins)); echo $argv[2] . ' uninstalled.' . "\n"; } diff --git a/util/config b/util/config index cfe4500b5..c0f51b3fb 100755 --- a/util/config +++ b/util/config @@ -12,13 +12,14 @@ require_once('include/cli_startup.php'); cli_startup(); +use Zotlabs\Lib\Config; $helpArgs = getopt('h', array('help')); if (count($helpArgs) === 1) { echo <<<'EndOfOutput' Gets, sets, or lists site-wide configuration settings. -Usage: util/config +Usage: util/config util/config util/config util/config @@ -36,8 +37,8 @@ Usage: util/config Set config entry for specified family and key to value and display result Notes: - Setting config entries which are manually set in .htconfig.php may result - in conflict between database settings and the manual startup settings. + Setting config entries which are manually set in .htconfig.php may result + in conflict between database settings and the manual startup settings. For channel-specific configuration settings, use util/pconfig @@ -55,16 +56,16 @@ if($argc > 1 && strpos($argv[1],'.')) { } if($argc > 3) { - set_config($argv[1],$argv[2],$argv[3]); - echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(get_config($argv[1],$argv[2])) . "\n"; + Config::Set($argv[1],$argv[2],$argv[3]); + echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(Config::Get($argv[1],$argv[2])) . "\n"; } if($argc == 3) { - echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(get_config($argv[1],$argv[2])) . "\n"; + echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(Config::Get($argv[1],$argv[2])) . "\n"; } if($argc == 2) { - load_config($argv[1]); + Config::Load($argv[1]); foreach(App::$config[$argv[1]] as $k => $x) { echo "config[{$argv[1]}][{$k}] = " . $x . "\n"; } @@ -89,4 +90,4 @@ function printable_config($x) { } else return $x; -} \ No newline at end of file +} diff --git a/util/db_update.php b/util/db_update.php index 8fc7c7616..d74dc6ca3 100755 --- a/util/db_update.php +++ b/util/db_update.php @@ -9,7 +9,9 @@ require_once('boot.php'); require_once('include/cli_startup.php'); cli_startup(); -$build = get_config('system','db_version'); +use Zotlabs\Lib\Config; + +$build = Config::Get('system','db_version'); echo "Old DB VERSION: " . $build . "\n"; echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n"; diff --git a/util/service_class b/util/service_class index b8a1f2386..afad4c709 100755 --- a/util/service_class +++ b/util/service_class @@ -7,10 +7,12 @@ require_once('include/cli_startup.php'); cli_startup(); +use Zotlabs\Lib\Config; + if($argc > 3) { - $d = get_config('service_class', $argv[1]); + $d = Config::Get('service_class', $argv[1]); $d[$argv[2]] = $argv[3]; - set_config('service_class', $argv[1], $d); + Config::Set('service_class', $argv[1], $d); echo 'Updated service class "' . $argv[1] . '" service "' . $argv[2] . '" to ' . $argv[3] . "\n"; } @@ -24,7 +26,7 @@ if($argc == 3) { ); if(!$r) die('could not find channel'); - + $acct = intval($r[0]['channel_account_id']); } else { exit(); @@ -34,28 +36,28 @@ if($argc == 3) { ); if(!$r) die('could not find account'); - + $c = q('SELECT channel_address FROM channel WHERE channel_account_id=%d', intval($acct) ); - + echo "Account $acct: "; - + foreach($c as $chan) echo $chan['channel_address'] . ', '; - + echo "\n\033[1mProperty Old\t\tNew\033[0m\n"; - + if(empty($r[0]['account_service_class'])) { $oclass = 'None'; $old = false; } else { $oclass = $r[0]['account_service_class']; - $old = get_config('service_class', $oclass); + $old = Config::Get('service_class', $oclass); } echo "service_class $oclass\t\t\033[1m" . $argv[2] . "\033[0m\n"; - - $new = get_config('service_class', $argv[2]); + + $new = Config::Get('service_class', $argv[2]); foreach(array('photo_upload_limit','total_items','total_pages','total_identities','total_channels','total_feeds','attach_upload_limit','minimum_feedcheck_minutes','chatrooms','chatters_inroom','access_tokens') as $prop) { echo $prop . str_repeat(' ',26 - strlen($prop)) . (($old && $old[$prop]) ? $old[$prop] : 'unlimited') . "\t\t\033[1m" . (($new && $new[$prop]) ? $new[$prop] : 'unlimited') . "\033[0m\n"; } @@ -67,7 +69,7 @@ if($argc == 3) { } if($r == 'n') die('no update done'); - + $r = q("UPDATE account SET account_service_class='%s' WHERE account_id=%d", dbesc($argv[2]), intval($acct) @@ -77,11 +79,11 @@ if($argc == 3) { } else { echo "failed\n"; } -} +} if($argc == 2) { - $d = get_config('service_class', $argv[1]); + $d = Config::Get('service_class', $argv[1]); echo $argv[1] . ":\n"; foreach($d as $k => $v) { echo "$k = $v\n"; @@ -89,7 +91,7 @@ if($argc == 2) { } if($argc == 1) { - load_config('service_class'); + Config::Load('service_class'); if(is_array(App::$config['service_class']) && App::$config['service_class']) { foreach(App::$config['service_class'] as $class=>$props) { echo "$class:\n"; @@ -106,4 +108,4 @@ if($argc == 1) { } } } -} \ No newline at end of file +} diff --git a/util/storageconv b/util/storageconv index 676425038..fe12137a3 100755 --- a/util/storageconv +++ b/util/storageconv @@ -18,6 +18,7 @@ require_once('include/cli_startup.php'); cli_startup(); +use Zotlabs\Lib\Config; use Zotlabs\Lib\Hashpath; if($argc == 1) { @@ -26,8 +27,8 @@ if($argc == 1) { } if($argc == 2) { - - $storage = (intval(get_config('system','photo_storage_type', 1)) > 0 ? 1 : 0); + + $storage = (intval(Config::Get('system','photo_storage_type', 1)) > 0 ? 1 : 0); echo 'Current storage set to: ' . ($storage ? 'filesystem' : 'SQL database') . PHP_EOL; switch($argv[1]) { case 'stats': @@ -38,14 +39,14 @@ if($argc == 2) { $xx = intval($x[0]['qty']); $x = q("SELECT COUNT(resource_id) AS qty FROM photo WHERE photo_usage IN (1, 2)"); echo 'Imported profiles thumbnails: ' . $x[0]['qty'] . PHP_EOL; - $xx += intval($x[0]['qty']); + $xx += intval($x[0]['qty']); echo 'Thumbnails total: ' . $xx . PHP_EOL; $x = q("SELECT COUNT(id) AS qty FROM photo WHERE os_storage != %d AND imgscale > 0", $storage ); echo 'Thumbnails to convert: ' . $x[0]['qty'] . PHP_EOL; break; - + case 'fs': if($storage == 0) { echo 'Please set system.photo_storage_type to 1 before move thumbnails to filesystem storage' . PHP_EOL; @@ -101,7 +102,7 @@ if($argc == 2) { } echo $i . PHP_EOL . 'Total thumbnails processed: ' . $i; break; - + case 'db': if($storage == 1) { echo 'Please set system.photo_storage_type to 0 before move thumbnails to SQL database storage' . PHP_EOL; @@ -119,15 +120,15 @@ if($argc == 2) { $x = q("SELECT id, uid, resource_id, content, imgscale FROM photo WHERE id > %d AND os_storage = 1 AND imgscale > 0 ORDER BY id LIMIT 10", intval($cur_id) ); - + if($x) { foreach($x as $xx) { - + $filename = dbunescbin($xx['content']); $content = file_get_contents($filename); if($content) { - + $z = q("UPDATE photo SET content = '%s', os_storage = 0 WHERE id = %d", dbescbin($content), intval($xx['id']) @@ -136,7 +137,7 @@ if($argc == 2) { echo PHP_EOL . 'Failed to update stored file metadata ' . $filename . PHP_EOL; continue; } - + @unlink($filename); } else @@ -152,7 +153,7 @@ if($argc == 2) { } echo $i . PHP_EOL . 'Total files processed: ' . $i; break; - + default: usage(); return; diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 54e6e7be3..cffe22de6 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -1,4 +1,6 @@ Date: Sun, 24 Mar 2024 17:50:27 +0100 Subject: make sure we preserve linefeeds in the actual content of lists and tables also add tests --- include/bbcode.php | 25 ++++++++++++++++--------- tests/unit/includes/BBCodeTest.php | 12 ++++++++++++ vendor/composer/installed.php | 12 ++++++------ 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index aa1257a56..1ced24ec3 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1060,8 +1060,8 @@ function bb_fix_lf($match) { // be converted to '
' and turn your neatly crafted tables into a whole lot of // empty space. - $new_content = str_replace(["\n\r", "\n", "\r"], '', $match[1]); - return str_replace($match[1], $new_content, $match[0]); + $new_content = preg_replace("/\]\s+\[/",'][', $match[1]); + return str_replace($match[1], trim($new_content, "\r\n"), $match[0]); } function bbtopoll($s) { @@ -1554,6 +1554,20 @@ function bbcode($text, $options = []) { $text = preg_replace_callback("/\[checklist\](.*?)\[\/checklist\]/ism", 'bb_checklist', $text); } + + if (strpos($text,'[/table]') !== false) { + $text = str_replace(["[/table]\r", "[/table]\n"], '[/table]', $text); + + $text = preg_replace_callback("/\[table\](.*?)\[\/table\]/ism",'bb_fix_lf',$text); + $text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '$1
', $text); + + $text = preg_replace_callback("/\[table border=1\](.*?)\[\/table\]/ism",'bb_fix_lf',$text); + $text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '$1
', $text); + + $text = preg_replace_callback("/\[table border=0\](.*?)\[\/table\]/ism",'bb_fix_lf',$text); + $text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '$1
', $text); + } + if (strpos($text,'[th]') !== false) { $text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '$1', $text); } @@ -1566,13 +1580,6 @@ function bbcode($text, $options = []) { $text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '$1', $text); } - if (strpos($text,'[/table]') !== false) { - $text = preg_replace_callback("/\[table\](.*?)\[\/table\]/ism",'bb_fix_lf',$text); - $text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '$1
', $text); - $text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '$1
', $text); - $text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '$1
', $text); - } - $text = str_replace('[hr]', '
', $text); // This is actually executed in prepare_body() diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index fedd2df06..a6c798992 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -111,13 +111,25 @@ class BBCodeTest extends UnitTestCase { "some text\n[list]\n[*] item1\n[*] item2\n[/list]\nsome more text", 'some text
  • item1
  • item2
some more text' ], + 'list with linebreaks \n in text' => [ + "some text\n[list]\n[*] item1\nsome text[*] item2\nsome text[/list]\nsome more text", + 'some text
  • item1
    some text
  • item2
    some text
some more text' + ], 'list with linebreaks \r' => [ "some text\r[list]\r[*] item1\r[*] item2\r[/list]\rsome more text", 'some text
  • item1
  • item2
some more text' ], + 'list with linebreaks \r in text' => [ + "some text\r[list]\r[*] item1\rsome text\r[*] item2\rsome text\r[/list]\rsome more text", + 'some text
  • item1
    some text
  • item2
    some text
some more text' + ], 'list with linebreaks \r\n' => [ "some text\r\n[list]\r\n[*] item1\r\n[*] item2\r\n[/list]\r\nsome more text", 'some text
  • item1
  • item2
some more text' + ], + 'list with linebreaks \r\n in text' => [ + "some text\r\n[list]\r\n[*] item1\r\nsome text[*] item2\r\nsome text[/list]\r\nsome more text", + 'some text
  • item1
    some text
  • item2
    some text
some more text' ] ]; } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 4386e70b5..dd4bccc71 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'zotlabs/hubzilla', - 'pretty_version' => 'dev-9.0RC', - 'version' => 'dev-9.0RC', - 'reference' => 'a18e873d08e733225c70b0ace31c3cbb025ff906', + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => 'a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -338,9 +338,9 @@ 'dev_requirement' => false, ), 'zotlabs/hubzilla' => array( - 'pretty_version' => 'dev-9.0RC', - 'version' => 'dev-9.0RC', - 'reference' => 'a18e873d08e733225c70b0ace31c3cbb025ff906', + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => 'a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), -- cgit v1.2.3 From b139e5bb0054b97beff22bae65f145bc29874e08 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 25 Mar 2024 12:26:06 +0100 Subject: Fix smarty deprecation warning in category widget. --- view/tpl/categories_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index fd27dca44..a7be796d6 100644 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -5,7 +5,7 @@ -- cgit v1.2.3 From 01c6fd03b7e82d89967b4e348b75d90310375de9 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 14:15:28 +0000 Subject: fix typo after get_config -> Confi::Get conversion --- Zotlabs/Storage/Directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index b62f268d3..a68fdcf26 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -3,7 +3,7 @@ namespace Zotlabs\Storage; use Sabre\DAV; -use Zotlabz\Lib\Config; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; /** -- cgit v1.2.3 From 842df8a7991688ccb0770dcca0119acf728e1c8b Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 16:09:53 +0000 Subject: add the observer hash to the cache key in categories_widget() --- Zotlabs/Daemon/Cache_query.php | 5 ++++- include/contact_widgets.php | 7 +++++-- include/taxonomy.php | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php index 8e5c6b2ea..d5788795f 100644 --- a/Zotlabs/Daemon/Cache_query.php +++ b/Zotlabs/Daemon/Cache_query.php @@ -12,6 +12,7 @@ class Cache_query { if(! $argc == 3) return; + $r = null; $key = $argv[1]; $pid = Config::Get('procid', $key, false); @@ -29,8 +30,10 @@ class Cache_query { $arr = json_decode(base64_decode($argv[0]), true); $r = call_user_func_array('q', $arr); - if($r) + + if(is_array($r)) { Cache::set($key, serialize($r)); + } Config::Delete('procid', $key); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 43aae4b25..3589653c1 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,6 +2,7 @@ use Zotlabs\Lib\Cache; use Zotlabs\Lib\Config; +use Zotlabs\Daemon\Master; function findpeople_widget() { @@ -71,7 +72,9 @@ function categories_widget($baseurl,$selected = '') { $item_normal = item_normal(); - $key = __FUNCTION__ . "-" . App::$profile['profile_uid']; + $observer = get_observer_hash(); + + $key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer); $content = Cache::get($key, '5 MINUTE'); if (! $content) { @@ -97,7 +100,7 @@ function categories_widget($baseurl,$selected = '') { dbesc(ACTIVITY_UPDATE) ]; - \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); + Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); } if (!$content) { diff --git a/include/taxonomy.php b/include/taxonomy.php index 49b364154..45287fa63 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -7,6 +7,7 @@ use Zotlabs\Lib\Cache; use Zotlabs\Lib\Config; +use Zotlabs\Daemon\Master; function file_tag_encode($s) { @@ -358,7 +359,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { } } - $key = __FUNCTION__ . "-" . md5($site . $recent . $safemode . $limit . $type); + $key = __FUNCTION__ . '_' . md5($site . $recent . $safemode . $limit . $type); $content = Cache::get($key, '5 MINUTE'); if(! $content) { @@ -378,7 +379,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { (intval($count) ? "LIMIT $count" : '') ]; - \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); + Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); } $r = unserialize($content); -- cgit v1.2.3 From 637f39f2828a70bc053e8c0f8f2253dc04ae358c Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 17:15:05 +0000 Subject: tilt the piin --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 30b9ba64c..56194c735 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -996,6 +996,10 @@ img.mail-conv-sender-photo { margin-top: 2em; } +.wall-item-pinned i { + transform: rotate(45deg); +} + .wall-item-content-wrapper { background-color: var(--bs-tertiary-bg); } -- cgit v1.2.3 From 9ecd38911e6094e2867d490e2da5f65ecedf0370 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 17:31:53 +0000 Subject: add observer to the permissions query. this should not be necessary but it makes it clear why it should be included in the cache key (cherry picked from commit 57e32a79125072d27ebc76ca26acac64db5cb4fc) --- include/contact_widgets.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 3589653c1..84f688d36 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -68,12 +68,11 @@ function categories_widget($baseurl,$selected = '') { require_once('include/security.php'); - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + $observer = get_observer_hash(); + $sql_extra = item_permissions_sql(App::$profile['profile_uid'], $observer); $item_normal = item_normal(); - $observer = get_observer_hash(); - $key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer); $content = Cache::get($key, '5 MINUTE'); -- cgit v1.2.3 From c052b7fa9982e82fa25fe0e84ee3462da30ac157 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 19:47:17 +0000 Subject: allow to run additional site specific commands at the end of util/udall --- util/udall | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/udall b/util/udall index 44f37e86e..50ef56bfe 100755 --- a/util/udall +++ b/util/udall @@ -5,7 +5,7 @@ if [ ! -d .git ]; then fi git pull -if [ -d extend ] ; then +if [ -d extend ]; then for a in theme addon widget ; do if [ -d extend/$a ]; then for b in `ls extend/$a` ; do @@ -15,3 +15,8 @@ if [ -d extend ] ; then fi done fi + +# Allow to run additional site specific commands +if [ -f util/udall_extra ]; then + source util/udall_extra +fi -- cgit v1.2.3 From 53354a19304c932beea484e387d2c9536786e258 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 21:42:50 +0100 Subject: more remove additional linebreaks after block element plus test --- include/bbcode.php | 5 +++++ tests/unit/includes/BBCodeTest.php | 4 ++++ vendor/composer/installed.php | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 1ced24ec3..844717572 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1287,6 +1287,11 @@ function bbcode($text, $options = []) { if (strpos($text,'[pre]') !== false) { $text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$text); } + + if (strpos($text,'') !== false) { + $text = str_replace(["\r", "\n"], '', $text); + } + if (strpos($text,'[summary]') !== false) { $text = preg_replace_callback("/\[summary\](.*?)\[\/summary\]/ism", 'bb_spacefy',$text); } diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index a6c798992..a8aa8ee2b 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -107,6 +107,10 @@ class BBCodeTest extends UnitTestCase { "[code]\ntestvar = \"this is a test\"\necho \"the message is \$testvar\"\n[/code]", '
testvar = "this is a test"
echo "the message is $testvar"
', ], + 'code block with surroundin linebreaks \n' => [ + "some text\n[code]\ntestvar = \"this is a test\"\necho \"the message is \$testvar\"\n[/code]\nsome more text", + 'some text
testvar = "this is a test"
echo "the message is $testvar"
some more text', + ], 'list with linebreaks \n' => [ "some text\n[list]\n[*] item1\n[*] item2\n[/list]\nsome more text", 'some text
  • item1
  • item2
some more text' diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index dd4bccc71..1ab0e12b9 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'zotlabs/hubzilla', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3', + 'reference' => '3c0d6339bb12bd7fbf65ba7a79078e39737b4387', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -340,7 +340,7 @@ 'zotlabs/hubzilla' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3', + 'reference' => '3c0d6339bb12bd7fbf65ba7a79078e39737b4387', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), -- cgit v1.2.3 From a5d483fb5d622bf0bc35c02bb569ea8f1ef58f6a Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 20:44:22 +0000 Subject: more bootstrap override --- view/css/bootstrap-red.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index ff38da7bc..8e273dfdb 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -62,6 +62,6 @@ a { text-decoration: none !important; } -ol, ul, dl { +ol, ul, dl, pre { margin-bottom: 0; } -- cgit v1.2.3 From f72f5c7321398881243bb509211958414708e43e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 21:42:32 +0000 Subject: wrong dreport link in blog mode --- view/tpl/conv_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index fe9167a88..2d6c6fe8e 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -205,7 +205,7 @@ {{/if}} {{if $item.edpost && $item.dreport}}
- {{$item.dreport}} + {{$item.dreport}} {{/if}} {{if $item.settings}}
-- cgit v1.2.3 From 80d1e0790852c4df4768820cad8a4557dcfecd73 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 21:48:25 +0000 Subject: deprecated bootstrap namespace in list mode --- view/tpl/conv_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 2d6c6fe8e..374c3f53f 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -209,7 +209,7 @@ {{/if}} {{if $item.settings}}
- {{$item.settings}} + {{$item.settings}} {{/if}} -- cgit v1.2.3 From e0ac7b7f9ffb3e2602c23f893d75aba706a234e5 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 26 Mar 2024 09:26:18 +0000 Subject: if the updated item contains an open modal, the modal we be replaced with the new data but the backdrop will stay because it is attached to the end of the page -> remove it --- view/js/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/js/main.js b/view/js/main.js index ba863b111..c9798dede 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1046,6 +1046,8 @@ function liveUpdate(notify_id) { in_progress = false; $('#image_counter').html(''); + // remove modal backdrop in case the update was triggered from a modal + $('.modal-backdrop').remove(); }) .done( function( instance ) { //console.log('all images successfully loaded'); -- cgit v1.2.3 From 418b1eaf78418cf0bbc97577a0db8d4696920e9b Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 26 Mar 2024 09:51:09 +0000 Subject: changelog --- CHANGELOG | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index dcc4e5d08..67f6783a9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +Hubzilla 9.0.1 (2024-03-26) + - Fix an issue where after an update initiated from a modal the modal backdrop would remain + - Fix bootstrap namespace in conv list templates + - Fix link to delivery report in conv list templates + - Slightly improved handling of linefeeds in some bbcode block elements and added tests + - Fix categories_widget() cache not being observer aware + - Allow to run additional site specific commands at the end of util/udall in util/udall_extra + - Fix linefeeds in table and list content removed + - Pubcrawl: do not attrmpt to sign wall to wall messages - they will appear misattributed in mastodons + - Pubcrawl: default to Note activity type for now + + Hubzilla 9.0 (2024-03-22) - Refactor browser to browser encryption based on sodium plus library - Added developer docs for the refactored test system -- cgit v1.2.3 From 3859c010f09ecdb8ed543638d435d026e5e1efc2 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 26 Mar 2024 10:06:49 +0000 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index cdfa15855..dcdcdda01 100644 --- a/boot.php +++ b/boot.php @@ -64,7 +64,7 @@ require_once('include/selectors.php'); require_once('include/activities.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.1'); +define('STD_VERSION', '9.1.1'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3 From f85d2d3423fdb6a140e0df5f2df751ac9183a2f7 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 26 Mar 2024 14:48:16 +0000 Subject: reduce default directory result set --- Zotlabs/Module/Directory.php | 2 +- Zotlabs/Module/Dirsearch.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 88e2dd59b..05aa735c8 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -118,7 +118,7 @@ class Directory extends Controller { $safe_mode = 1; $type = 0; - $r = suggestion_query(local_channel(),get_observer_hash(),0,60); + $r = suggestion_query(local_channel(), get_observer_hash(), 0, 30); if(! $r) { notice( t('No default suggestions were found.') . EOL); diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index a90c2104a..d27b195e4 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -154,9 +154,13 @@ class Dirsearch extends Controller { } - $perpage = $_REQUEST['n'] ?? 60; - $page = ((isset($_REQUEST['p']) && $_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); - $startrec = (($page+1) * $perpage) - $perpage; + $perpage = $_REQUEST['n'] ?? 30; + if ($perpage > 30) { + $perpage = 30; + } + + $page = ((isset($_REQUEST['p']) && $_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); + $startrec = (($page+1) * $perpage) - $perpage; $limit = $_REQUEST['limit'] ?? 0; $return_total = $_REQUEST['return_total'] ?? 0; -- cgit v1.2.3 From fe43e0994f3bc3d5b629942bb4c56b65524e8e79 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 27 Mar 2024 10:00:18 +0000 Subject: add pdl for mod home --- view/pdl/mod_home.pdl | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 view/pdl/mod_home.pdl diff --git a/view/pdl/mod_home.pdl b/view/pdl/mod_home.pdl new file mode 100644 index 000000000..8b3ff52f8 --- /dev/null +++ b/view/pdl/mod_home.pdl @@ -0,0 +1,4 @@ +[region=content] +$content +[/region] + -- cgit v1.2.3 From 0b2781f42ef7fc211d048eaf7381bff42b3fd77b Mon Sep 17 00:00:00 2001 From: "mjfriaza:4GF~eYj,-iAv" Date: Sat, 30 Mar 2024 12:31:54 +0100 Subject: Update Spanish (cherry picked from commit 4e5c6f9bbaa702d9ccd5606a166c8e65224b8d8f) --- view/es-es/hmessages.po | 3148 ++++++++++++++++++++--------------------------- view/es-es/hstrings.php | 234 +--- 2 files changed, 1412 insertions(+), 1970 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 3af7a30ab..38fa42fda 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-10 08:15+0000\n" +"POT-Creation-Date: 2024-03-15 18:45+0000\n" "PO-Revision-Date: 2015-09-27 06:48+0000\n" "Last-Translator: Manuel Jiménez Friaza , 2017-2024\n" "Language-Team: Spanish (Spain) (http://app.transifex.com/Friendica/hubzilla/language/es_ES/)\n" @@ -29,22 +29,23 @@ msgstr "" msgid "Source channel not found." msgstr "No se ha encontrado el canal de origen." -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3509 +#: ../../view/theme/redbasic/php/config.php:18 ../../include/text.php:3514 #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 #: ../../addon/cart/submodules/orderoptions.php:459 -#: ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../Zotlabs/Module/Admin/Site.php:231 msgid "Default" msgstr "Predeterminado" -#: ../../view/theme/redbasic/php/config.php:16 #: ../../view/theme/redbasic/php/config.php:19 +#: ../../view/theme/redbasic/php/config.php:22 msgid "Focus (Hubzilla default)" msgstr "Focus (predefinido)" -#: ../../view/theme/redbasic/php/config.php:98 ../../include/js_strings.php:23 -#: ../../addon/irc/irc.php:45 ../../addon/smileybutton/Mod_Smileybutton.php:53 +#: ../../view/theme/redbasic/php/config.php:188 +#: ../../include/js_strings.php:23 ../../addon/irc/irc.php:45 +#: ../../addon/smileybutton/Mod_Smileybutton.php:53 #: ../../addon/socialauth/Mod_SocialAuth.php:341 #: ../../addon/hubwall/hubwall.php:95 #: ../../addon/openclipatar/openclipatar.php:54 @@ -54,14 +55,14 @@ msgstr "Focus (predefinido)" #: ../../addon/ijpost/Mod_Ijpost.php:72 ../../addon/redred/Mod_Redred.php:88 #: ../../addon/startpage/Mod_Startpage.php:71 #: ../../addon/libertree/Mod_Libertree.php:68 ../../addon/logrot/logrot.php:35 -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:61 #: ../../addon/dwpost/Mod_Dwpost.php:78 ../../addon/diaspora/diaspora.php:90 #: ../../addon/diaspora/Mod_Diaspora.php:101 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:54 #: ../../addon/mailtest/mailtest.php:100 ../../addon/nsfw/Mod_Nsfw.php:59 #: ../../addon/pumpio/Mod_Pumpio.php:113 ../../addon/wppost/Mod_Wppost.php:107 #: ../../addon/wiki/Mod_Wiki.php:218 ../../addon/wiki/Mod_Wiki.php:907 -#: ../../addon/wiki/Widget/Wiki_pages.php:69 ../../addon/xmpp/Mod_Xmpp.php:70 +#: ../../addon/wiki/Widget/Wiki_pages.php:72 ../../addon/xmpp/Mod_Xmpp.php:70 #: ../../addon/statusnet/statusnet.php:602 #: ../../addon/statusnet/Mod_Statusnet.php:191 #: ../../addon/statusnet/Mod_Statusnet.php:249 @@ -73,7 +74,7 @@ msgstr "Focus (predefinido)" #: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/submodules/orderoptions.php:312 #: ../../addon/cart/submodules/orderoptions.php:412 -#: ../../addon/cart/cart.php:1425 ../../addon/cart/Settings/Cart.php:132 +#: ../../addon/cart/cart.php:1424 ../../addon/cart/Settings/Cart.php:132 #: ../../addon/cart/Settings/Cart.php:142 #: ../../addon/twitter/Mod_Twitter.php:182 #: ../../addon/redfiles/redfiles.php:124 @@ -88,16 +89,16 @@ msgstr "Focus (predefinido)" #: ../../addon/rtof/Mod_Rtof.php:70 ../../addon/nofed/Mod_Nofed.php:51 #: ../../addon/photocache/Mod_Photocache.php:63 #: ../../addon/likebanner/likebanner.php:57 -#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../Zotlabs/Storage/Browser.php:385 +#: ../../Zotlabs/Lib/ThreadItem.php:862 ../../Zotlabs/Storage/Browser.php:385 #: ../../Zotlabs/Module/Oauth.php:109 #: ../../Zotlabs/Module/Import_items.php:125 -#: ../../Zotlabs/Module/Thing.php:328 ../../Zotlabs/Module/Thing.php:381 +#: ../../Zotlabs/Module/Thing.php:357 ../../Zotlabs/Module/Thing.php:409 #: ../../Zotlabs/Module/Tokens.php:294 ../../Zotlabs/Module/Pdledit.php:137 #: ../../Zotlabs/Module/Connect.php:107 #: ../../Zotlabs/Module/Filestorage.php:208 -#: ../../Zotlabs/Module/Contactedit.php:429 -#: ../../Zotlabs/Module/Contactedit.php:462 ../../Zotlabs/Module/Mood.php:156 -#: ../../Zotlabs/Module/Pconfig.php:117 ../../Zotlabs/Module/Appman.php:220 +#: ../../Zotlabs/Module/Contactedit.php:415 +#: ../../Zotlabs/Module/Contactedit.php:448 +#: ../../Zotlabs/Module/Pconfig.php:117 ../../Zotlabs/Module/Appman.php:230 #: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Defperms.php:262 #: ../../Zotlabs/Module/Locs.php:125 #: ../../Zotlabs/Module/Admin/Accounts.php:309 @@ -108,19 +109,18 @@ msgstr "Focus (predefinido)" #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Logs.php:84 -#: ../../Zotlabs/Module/Admin/Site.php:415 +#: ../../Zotlabs/Module/Admin/Site.php:401 #: ../../Zotlabs/Module/Admin/Security.php:129 -#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Module/Affinity.php:84 -#: ../../Zotlabs/Module/Permcats.php:257 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Module/Group.php:150 ../../Zotlabs/Module/Group.php:159 -#: ../../Zotlabs/Module/Invite.php:563 ../../Zotlabs/Module/Mitem.php:259 -#: ../../Zotlabs/Module/Photos.php:1056 ../../Zotlabs/Module/Photos.php:1095 -#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Sources.php:123 -#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Module/Profiles.php:739 -#: ../../Zotlabs/Module/Chat.php:208 ../../Zotlabs/Module/Chat.php:247 -#: ../../Zotlabs/Module/Regate.php:407 ../../Zotlabs/Module/Setup.php:316 -#: ../../Zotlabs/Module/Setup.php:356 ../../Zotlabs/Module/Editpost.php:88 -#: ../../Zotlabs/Module/Oauth2.php:114 +#: ../../Zotlabs/Module/Affinity.php:84 ../../Zotlabs/Module/Permcats.php:257 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Group.php:150 +#: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Invite.php:563 +#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Photos.php:1056 +#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1208 +#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:160 +#: ../../Zotlabs/Module/Profiles.php:735 ../../Zotlabs/Module/Chat.php:208 +#: ../../Zotlabs/Module/Chat.php:247 ../../Zotlabs/Module/Regate.php:407 +#: ../../Zotlabs/Module/Setup.php:316 ../../Zotlabs/Module/Setup.php:356 +#: ../../Zotlabs/Module/Editpost.php:88 ../../Zotlabs/Module/Oauth2.php:114 #: ../../Zotlabs/Module/Settings/Display.php:187 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Channel_home.php:91 @@ -143,36 +143,64 @@ msgstr "Focus (predefinido)" msgid "Submit" msgstr "Enviar" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:192 msgid "Theme settings" msgstr "Ajustes del tema" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:193 msgid "Dark style" msgstr "Estilo oscuro" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:194 msgid "Light style" msgstr "Estilo claro" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:195 msgid "Common settings" msgstr "Ajustes comunes" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:196 +msgid "Primary theme color" +msgstr "Color del tema principal" + +#: ../../view/theme/redbasic/php/config.php:196 +#: ../../view/theme/redbasic/php/config.php:197 +#: ../../view/theme/redbasic/php/config.php:198 +#: ../../view/theme/redbasic/php/config.php:199 +#: ../../view/theme/redbasic/php/config.php:200 +msgid "Current color, leave empty for default" +msgstr "Color actual, dejar vacío por defecto" + +#: ../../view/theme/redbasic/php/config.php:197 +msgid "Success theme color" +msgstr "Éxito en el color del tema" + +#: ../../view/theme/redbasic/php/config.php:198 +msgid "Info theme color" +msgstr "Información del color del tema" + +#: ../../view/theme/redbasic/php/config.php:199 +msgid "Warning theme color" +msgstr "Advertencia sobre el color del tema" + +#: ../../view/theme/redbasic/php/config.php:200 +msgid "Danger theme color" +msgstr "Peligro en el color del tema" + +#: ../../view/theme/redbasic/php/config.php:201 msgid "Default to dark mode" msgstr "Modo oscuro por defecto" -#: ../../view/theme/redbasic/php/config.php:106 -#: ../../view/theme/redbasic/php/config.php:107 -#: ../../view/theme/redbasic/php/config.php:108 -#: ../../view/theme/redbasic/php/config.php:124 -#: ../../include/conversation.php:1492 +#: ../../view/theme/redbasic/php/config.php:201 +#: ../../view/theme/redbasic/php/config.php:202 +#: ../../view/theme/redbasic/php/config.php:203 +#: ../../view/theme/redbasic/php/config.php:215 +#: ../../include/conversation.php:1265 #: ../../addon/smileybutton/Mod_Smileybutton.php:42 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ijpost/Mod_Ijpost.php:61 ../../addon/redred/Mod_Redred.php:61 #: ../../addon/libertree/Mod_Libertree.php:57 -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:42 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 #: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63 #: ../../addon/diaspora/Mod_Diaspora.php:70 #: ../../addon/pumpio/Mod_Pumpio.php:92 ../../addon/pumpio/Mod_Pumpio.php:96 @@ -201,26 +229,26 @@ msgstr "Modo oscuro por defecto" #: ../../addon/cart/submodules/orderoptions.php:362 #: ../../addon/cart/submodules/orderoptions.php:438 #: ../../addon/cart/submodules/orderoptions.php:462 -#: ../../addon/cart/cart.php:1419 ../../addon/cart/Settings/Cart.php:61 +#: ../../addon/cart/cart.php:1418 ../../addon/cart/Settings/Cart.php:61 #: ../../addon/cart/Settings/Cart.php:73 #: ../../addon/twitter/Mod_Twitter.php:160 #: ../../addon/twitter/Mod_Twitter.php:169 #: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 #: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/nofed/Mod_Nofed.php:40 -#: ../../boot.php:1753 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../boot.php:1751 ../../Zotlabs/Lib/Libzotdir.php:165 #: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 #: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:310 #: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:392 #: ../../Zotlabs/Storage/Browser.php:394 ../../Zotlabs/Storage/Browser.php:558 #: ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Module/Contactedit.php:284 -#: ../../Zotlabs/Module/Contactedit.php:329 +#: ../../Zotlabs/Module/Contactedit.php:270 +#: ../../Zotlabs/Module/Contactedit.php:315 #: ../../Zotlabs/Module/Register.php:512 ../../Zotlabs/Module/Connedit.php:622 #: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:99 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:305 #: ../../Zotlabs/Module/Permcats.php:247 ../../Zotlabs/Module/Group.php:137 #: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:147 #: ../../Zotlabs/Module/Group.php:249 ../../Zotlabs/Module/Group.php:301 @@ -228,8 +256,8 @@ msgstr "Modo oscuro por defecto" #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Photos.php:666 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 -#: ../../Zotlabs/Module/Profiles.php:675 ../../Zotlabs/Module/Profiles.php:685 -#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:671 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:693 #: ../../Zotlabs/Module/Settings/Display.php:86 #: ../../Zotlabs/Module/Settings/Privacy.php:132 #: ../../Zotlabs/Module/Settings/Privacy.php:133 @@ -244,16 +272,16 @@ msgstr "Modo oscuro por defecto" msgid "No" msgstr "No" -#: ../../view/theme/redbasic/php/config.php:106 -#: ../../view/theme/redbasic/php/config.php:107 -#: ../../view/theme/redbasic/php/config.php:108 -#: ../../view/theme/redbasic/php/config.php:124 -#: ../../include/conversation.php:1492 +#: ../../view/theme/redbasic/php/config.php:201 +#: ../../view/theme/redbasic/php/config.php:202 +#: ../../view/theme/redbasic/php/config.php:203 +#: ../../view/theme/redbasic/php/config.php:215 +#: ../../include/conversation.php:1265 #: ../../addon/smileybutton/Mod_Smileybutton.php:42 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ijpost/Mod_Ijpost.php:61 ../../addon/redred/Mod_Redred.php:61 #: ../../addon/libertree/Mod_Libertree.php:57 -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:42 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 #: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63 #: ../../addon/diaspora/Mod_Diaspora.php:70 #: ../../addon/pumpio/Mod_Pumpio.php:92 ../../addon/pumpio/Mod_Pumpio.php:96 @@ -282,24 +310,24 @@ msgstr "No" #: ../../addon/cart/submodules/orderoptions.php:361 #: ../../addon/cart/submodules/orderoptions.php:437 #: ../../addon/cart/submodules/orderoptions.php:461 -#: ../../addon/cart/cart.php:1419 ../../addon/cart/Settings/Cart.php:61 +#: ../../addon/cart/cart.php:1418 ../../addon/cart/Settings/Cart.php:61 #: ../../addon/cart/Settings/Cart.php:73 #: ../../addon/twitter/Mod_Twitter.php:160 #: ../../addon/twitter/Mod_Twitter.php:169 #: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 #: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/nofed/Mod_Nofed.php:40 -#: ../../boot.php:1753 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../boot.php:1751 ../../Zotlabs/Lib/Libzotdir.php:165 #: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 #: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:310 #: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:392 #: ../../Zotlabs/Storage/Browser.php:394 ../../Zotlabs/Storage/Browser.php:558 #: ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Module/Contactedit.php:284 +#: ../../Zotlabs/Module/Contactedit.php:270 #: ../../Zotlabs/Module/Register.php:512 ../../Zotlabs/Module/Defperms.php:195 #: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Menu.php:163 -#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Admin/Site.php:307 #: ../../Zotlabs/Module/Permcats.php:247 ../../Zotlabs/Module/Group.php:137 #: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:147 #: ../../Zotlabs/Module/Group.php:249 ../../Zotlabs/Module/Group.php:301 @@ -307,8 +335,8 @@ msgstr "No" #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Photos.php:666 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 -#: ../../Zotlabs/Module/Profiles.php:675 ../../Zotlabs/Module/Profiles.php:685 -#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:671 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:693 #: ../../Zotlabs/Module/Settings/Display.php:86 #: ../../Zotlabs/Module/Settings/Privacy.php:132 #: ../../Zotlabs/Module/Settings/Privacy.php:133 @@ -323,91 +351,80 @@ msgstr "No" msgid "Yes" msgstr "Sí" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:202 msgid "Always use light icons for navbar" msgstr "Utilizar siempre iconos claros para la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:202 msgid "Enable this option if you use a dark navbar color in light mode" msgstr "Active esta opción si utiliza un color oscuro para la barra de navegación en el modo claro." -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:203 msgid "Narrow navbar" msgstr "Estrechar la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:204 msgid "Navigation bar background color" msgstr "Color de fondo de la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:205 msgid "Dark navigation bar background color" msgstr "Color de fondo oscuro de la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Link color" -msgstr "Color del enlace" - -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Dark link color" -msgstr "Color oscuro del enlace" - -#: ../../view/theme/redbasic/php/config.php:113 -msgid "Link hover color" -msgstr "Color de los enlaces al pasar por encima" - -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Dark link hover color" -msgstr "Color oscuro del enlace flotante" - -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:206 msgid "Set the background color" msgstr "Ajustar el color de fondo" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:207 msgid "Set the dark background color" msgstr "Establecer el color de fondo oscuro" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:208 msgid "Set the background image" msgstr "Ajustar la imagen de fondo" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:209 msgid "Set the dark background image" msgstr "Establecer la imagen de fondo oscuro" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:210 msgid "Set font-size for the entire application" msgstr "Ajustar el tamaño de letra para toda la aplicación" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:210 msgid "Examples: 1rem, 100%, 16px" msgstr "Ejemplos: 1rem, 100%, 16px" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "Set radius of corners" -msgstr "Establecer el radio de curvatura de las esquinas" +#: ../../view/theme/redbasic/php/config.php:211 +msgid "Set radius of corners in rem" +msgstr "Fijar el radio de las esquinas en rem" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "Example: 4px" -msgstr "Ejemplo: 4px" +#: ../../view/theme/redbasic/php/config.php:211 +msgid "Leave empty for default radius" +msgstr "Dejar vacío para el radio por defecto" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:212 msgid "Set maximum width of content region in rem" msgstr "Ajustar la anchura máxima de la región de contenido, en rem" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:212 msgid "Leave empty for default width" msgstr "Dejar en blanco para la anchura predeterminada" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:213 msgid "Set size of conversation author photo" msgstr "Ajustar el tamaño de la foto del autor de la conversación" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:213 +#: ../../view/theme/redbasic/php/config.php:214 +msgid "Leave empty for default size" +msgstr "Dejar vacío para el tamaño por defecto" + +#: ../../view/theme/redbasic/php/config.php:214 msgid "Set size of followup author photos" msgstr "Ajustar el tamaño de foto de los seguidores del autor" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:215 msgid "Show advanced settings" msgstr "Mostrar ajustes avanzados" @@ -453,15 +470,15 @@ msgstr "por" msgid " on " msgstr "en" -#: ../../include/oembed.php:421 +#: ../../include/oembed.php:425 msgid "Embedded content" msgstr "Contenido incorporado" -#: ../../include/oembed.php:430 +#: ../../include/oembed.php:434 msgid "Embedding disabled" msgstr "Incrustación deshabilitada" -#: ../../include/event.php:34 ../../include/event.php:129 +#: ../../include/event.php:34 ../../include/event.php:132 msgid "l F d, Y \\@ g:i A" msgstr "l d de F, Y \\@ G:i" @@ -473,91 +490,91 @@ msgstr "Comienza:" msgid "Finishes:" msgstr "Finaliza:" -#: ../../include/event.php:64 ../../include/event.php:154 -#: ../../include/channel.php:1631 ../../Zotlabs/Module/Directory.php:354 +#: ../../include/event.php:66 ../../include/event.php:157 +#: ../../include/channel.php:1639 ../../Zotlabs/Module/Directory.php:354 msgid "Location:" msgstr "Ubicación:" -#: ../../include/event.php:129 +#: ../../include/event.php:132 msgid "l F d, Y" msgstr "l F d, Y" -#: ../../include/event.php:133 +#: ../../include/event.php:136 msgid "Start:" msgstr "Iniciar: " -#: ../../include/event.php:137 +#: ../../include/event.php:140 msgid "End:" msgstr "Finalizar: " -#: ../../include/event.php:142 ../../addon/openid/MysqlProvider.php:67 +#: ../../include/event.php:145 ../../addon/openid/MysqlProvider.php:67 msgid "Timezone" msgstr "Zona horaria" -#: ../../include/event.php:1242 +#: ../../include/event.php:1245 msgid "This event has been added to your calendar." msgstr "Este evento ha sido añadido a su calendario." -#: ../../include/event.php:1396 ../../include/conversation.php:151 +#: ../../include/event.php:1399 ../../include/conversation.php:151 #: ../../include/text.php:2355 ../../Zotlabs/Module/Tagger.php:75 -#: ../../Zotlabs/Module/Like.php:455 +#: ../../Zotlabs/Module/Like.php:450 #: ../../Zotlabs/Module/Channel_calendar.php:221 msgid "event" msgstr "el/su evento" -#: ../../include/event.php:1475 +#: ../../include/event.php:1478 msgid "Not specified" msgstr "Sin especificar" -#: ../../include/event.php:1476 +#: ../../include/event.php:1479 msgid "Needs Action" msgstr "Necesita de una intervención" -#: ../../include/event.php:1477 +#: ../../include/event.php:1480 msgid "Completed" msgstr "Completado/a" -#: ../../include/event.php:1478 +#: ../../include/event.php:1481 msgid "In Process" msgstr "En proceso" -#: ../../include/event.php:1479 +#: ../../include/event.php:1482 msgid "Cancelled" msgstr "Cancelado/a" -#: ../../include/event.php:1560 ../../include/connections.php:781 +#: ../../include/event.php:1563 ../../include/connections.php:781 #: ../../Zotlabs/Module/Connedit.php:741 ../../Zotlabs/Module/Cdav.php:1377 msgid "Mobile" msgstr "Móvil" -#: ../../include/event.php:1561 ../../include/connections.php:782 +#: ../../include/event.php:1564 ../../include/connections.php:782 #: ../../Zotlabs/Widget/Notifications.php:43 #: ../../Zotlabs/Module/Connedit.php:742 ../../Zotlabs/Module/Cdav.php:1378 msgid "Home" msgstr "Inicio" -#: ../../include/event.php:1562 ../../include/connections.php:783 +#: ../../include/event.php:1565 ../../include/connections.php:783 msgid "Home, Voice" msgstr "Llamadas particulares" -#: ../../include/event.php:1563 ../../include/connections.php:784 +#: ../../include/event.php:1566 ../../include/connections.php:784 msgid "Home, Fax" msgstr "Fax particular" -#: ../../include/event.php:1564 ../../include/connections.php:785 +#: ../../include/event.php:1567 ../../include/connections.php:785 #: ../../Zotlabs/Module/Connedit.php:743 ../../Zotlabs/Module/Cdav.php:1379 msgid "Work" msgstr "Trabajo" -#: ../../include/event.php:1565 ../../include/connections.php:786 +#: ../../include/event.php:1568 ../../include/connections.php:786 msgid "Work, Voice" msgstr "Llamadas de trabajo" -#: ../../include/event.php:1566 ../../include/connections.php:787 +#: ../../include/event.php:1569 ../../include/connections.php:787 msgid "Work, Fax" msgstr "Fax de trabajo" -#: ../../include/event.php:1567 ../../include/event.php:1574 +#: ../../include/event.php:1570 ../../include/event.php:1577 #: ../../include/selectors.php:64 ../../include/selectors.php:81 #: ../../include/selectors.php:119 ../../include/selectors.php:155 #: ../../include/connections.php:788 ../../include/connections.php:795 @@ -566,70 +583,71 @@ msgstr "Fax de trabajo" msgid "Other" msgstr "Otro" -#: ../../include/feedutils.php:871 ../../include/text.php:1581 +#: ../../include/feedutils.php:849 ../../include/text.php:1579 msgid "unknown" msgstr "desconocido" #: ../../include/items.php:448 ../../addon/hzfiles/hzfiles.php:75 #: ../../addon/redphotos/redphotos.php:119 -#: ../../addon/redfiles/redfiles.php:109 ../../Zotlabs/Module/Share.php:78 +#: ../../addon/redfiles/redfiles.php:109 #: ../../Zotlabs/Module/Import_items.php:116 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55 +#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:54 #: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Group.php:108 -#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Profperm.php:28 +#: ../../Zotlabs/Module/Like.php:344 ../../Zotlabs/Module/Profperm.php:28 #: ../../Zotlabs/Web/WebServer.php:118 msgid "Permission denied" msgstr "Permiso denegado" -#: ../../include/items.php:1235 +#: ../../include/items.php:1233 msgid "Visible to anybody on the internet." msgstr "Visible para cualquiera en internet." -#: ../../include/items.php:1237 +#: ../../include/items.php:1235 msgid "Visible to you only." msgstr "Visible sólo para usted." -#: ../../include/items.php:1239 +#: ../../include/items.php:1237 msgid "Visible to anybody in this network." msgstr "Visible para cualquiera en esta red." -#: ../../include/items.php:1241 +#: ../../include/items.php:1239 msgid "Visible to anybody authenticated." msgstr "Visible para cualquiera que esté autenticado." -#: ../../include/items.php:1243 +#: ../../include/items.php:1241 #, php-format msgid "Visible to anybody on %s." msgstr "Visible para cualquiera en %s." -#: ../../include/items.php:1245 +#: ../../include/items.php:1243 msgid "Visible to all connections." msgstr "Visible para todas las conexiones." -#: ../../include/items.php:1247 +#: ../../include/items.php:1245 msgid "Visible to approved connections." msgstr "Visible para las conexiones permitidas." -#: ../../include/items.php:1249 +#: ../../include/items.php:1247 msgid "Visible to specific connections." msgstr "Visible para conexiones específicas." -#: ../../include/items.php:3374 ../../Zotlabs/Module/Share.php:110 +#: ../../include/items.php:3340 ../../Zotlabs/Lib/Activity.php:2177 +#: ../../Zotlabs/Module/Share.php:118 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "🔁 Repetidos %2$sde %1$s" -#: ../../include/items.php:3877 ../../addon/flashcards/Mod_Flashcards.php:291 +#: ../../include/items.php:3843 ../../addon/flashcards/Mod_Flashcards.php:291 #: ../../addon/flashcards/Mod_Flashcards.php:292 -#: ../../Zotlabs/Module/Display.php:51 ../../Zotlabs/Module/Display.php:112 -#: ../../Zotlabs/Module/Display.php:390 ../../Zotlabs/Module/Thing.php:96 +#: ../../Zotlabs/Module/Display.php:58 ../../Zotlabs/Module/Display.php:119 +#: ../../Zotlabs/Module/Display.php:390 ../../Zotlabs/Module/Thing.php:113 #: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Viewsrc.php:25 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:263 ../../Zotlabs/Module/Admin.php:61 msgid "Item not found." msgstr "Elemento no encontrado." -#: ../../include/items.php:3957 ../../include/attach.php:156 +#: ../../include/items.php:3923 ../../include/attach.php:156 #: ../../include/attach.php:205 ../../include/attach.php:278 #: ../../include/attach.php:329 ../../include/attach.php:431 #: ../../include/attach.php:445 ../../include/attach.php:452 @@ -643,29 +661,29 @@ msgstr "Elemento no encontrado." #: ../../addon/wiki/Mod_Wiki.php:288 ../../addon/wiki/Mod_Wiki.php:425 #: ../../Zotlabs/Lib/Chatroom.php:135 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Display.php:386 -#: ../../Zotlabs/Module/Cover_photo.php:341 -#: ../../Zotlabs/Module/Cover_photo.php:354 +#: ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../Zotlabs/Module/Cover_photo.php:311 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 #: ../../Zotlabs/Module/Webpages.php:131 ../../Zotlabs/Module/Network.php:18 #: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302 -#: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35 +#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:331 +#: ../../Zotlabs/Module/Thing.php:372 ../../Zotlabs/Module/Pdledit.php:35 #: ../../Zotlabs/Module/Filestorage.php:20 #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:96 #: ../../Zotlabs/Module/Filestorage.php:119 -#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Mood.php:126 -#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Appman.php:153 -#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Item.php:513 -#: ../../Zotlabs/Module/Item.php:532 ../../Zotlabs/Module/Item.php:542 -#: ../../Zotlabs/Module/Item.php:1443 ../../Zotlabs/Module/Achievements.php:34 +#: ../../Zotlabs/Module/Filestorage.php:165 +#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Appman.php:163 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Item.php:512 +#: ../../Zotlabs/Module/Item.php:531 ../../Zotlabs/Module/Item.php:541 +#: ../../Zotlabs/Module/Item.php:1457 ../../Zotlabs/Module/Achievements.php:34 #: ../../Zotlabs/Module/Connedit.php:299 ../../Zotlabs/Module/Defperms.php:181 #: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Regmod.php:20 -#: ../../Zotlabs/Module/Profile_photo.php:390 -#: ../../Zotlabs/Module/Profile_photo.php:421 +#: ../../Zotlabs/Module/Profile_photo.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:420 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 @@ -673,21 +691,20 @@ msgstr "Elemento no encontrado." #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 #: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Locs.php:98 #: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141 -#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Poke.php:141 -#: ../../Zotlabs/Module/Bookmarks.php:70 +#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Attach_edit.php:90 #: ../../Zotlabs/Module/Attach_edit.php:99 #: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Group.php:14 #: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Invite.php:64 -#: ../../Zotlabs/Module/Invite.php:315 ../../Zotlabs/Module/Like.php:248 +#: ../../Zotlabs/Module/Invite.php:315 ../../Zotlabs/Module/Like.php:242 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 ../../Zotlabs/Module/Photos.php:71 -#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:379 -#: ../../Zotlabs/Module/Channel.php:418 ../../Zotlabs/Module/Profile.php:99 +#: ../../Zotlabs/Module/Channel.php:233 ../../Zotlabs/Module/Channel.php:390 +#: ../../Zotlabs/Module/Channel.php:428 ../../Zotlabs/Module/Profile.php:99 #: ../../Zotlabs/Module/Profile.php:114 ../../Zotlabs/Module/Moderate.php:15 -#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Module/Profiles.php:171 -#: ../../Zotlabs/Module/Profiles.php:614 +#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Module/Profiles.php:167 +#: ../../Zotlabs/Module/Profiles.php:610 #: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Authtest.php:13 #: ../../Zotlabs/Module/Channel_calendar.php:232 @@ -701,71 +718,29 @@ msgstr "Elemento no encontrado." msgid "Permission denied." msgstr "Acceso denegado." -#: ../../include/items.php:4459 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4425 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:206 msgid "Privacy group not found." msgstr "Grupo de canales no encontrado." -#: ../../include/items.php:4475 +#: ../../include/items.php:4441 msgid "Privacy group is empty." msgstr "El grupo de canales está vacío." -#: ../../include/items.php:4482 +#: ../../include/items.php:4448 #, php-format msgid "Privacy group: %s" msgstr "Grupo de canales: %s" -#: ../../include/items.php:4492 +#: ../../include/items.php:4458 #, php-format msgid "Connection: %s" msgstr "Conexión: %s" -#: ../../include/items.php:4494 +#: ../../include/items.php:4460 msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/items.php:4841 ../../Zotlabs/Module/Cover_photo.php:297 -msgid "female" -msgstr "mujer" - -#: ../../include/items.php:4842 ../../Zotlabs/Module/Cover_photo.php:298 -#, php-format -msgid "%1$s updated her %2$s" -msgstr "%1$s ha actualizado su %2$s" - -#: ../../include/items.php:4843 ../../Zotlabs/Module/Cover_photo.php:299 -msgid "male" -msgstr "hombre" - -#: ../../include/items.php:4844 ../../Zotlabs/Module/Cover_photo.php:300 -#, php-format -msgid "%1$s updated his %2$s" -msgstr "%1$s ha actualizado su %2$s" - -#: ../../include/items.php:4846 ../../Zotlabs/Module/Cover_photo.php:302 -#, php-format -msgid "%1$s updated their %2$s" -msgstr "%1$s ha actualizado su %2$s" - -#: ../../include/items.php:4848 -msgid "profile photo" -msgstr "foto del perfil" - -#: ../../include/items.php:5175 -#, php-format -msgid "[Edited %s]" -msgstr "[se ha editado %s]" - -#: ../../include/items.php:5175 -msgctxt "edit_activity" -msgid "Post" -msgstr "Publicar" - -#: ../../include/items.php:5175 -msgctxt "edit_activity" -msgid "Comment" -msgstr "Comentar" - #: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 #: ../../Zotlabs/Module/Settings/Features.php:38 @@ -778,8 +753,8 @@ msgstr "Desactivado" msgid "On" msgstr "Activado" -#: ../../include/features.php:82 ../../include/nav.php:476 -#: ../../include/nav.php:479 ../../Zotlabs/Lib/Apps.php:351 +#: ../../include/features.php:82 ../../include/nav.php:488 +#: ../../include/nav.php:491 ../../Zotlabs/Lib/Apps.php:351 msgid "Calendar" msgstr "Calendario" @@ -827,7 +802,7 @@ msgstr "Usar el modo blog/lista" msgid "Comments will be displayed separately" msgstr "Los comentarios se mostrarán por separado" -#: ../../include/features.php:133 ../../include/text.php:1058 +#: ../../include/features.php:133 ../../include/text.php:1077 #: ../../Zotlabs/Lib/Apps.php:338 ../../Zotlabs/Module/Connections.php:399 msgid "Connections" msgstr "Conexiones" @@ -1048,7 +1023,7 @@ msgstr "Filtro de entradas personales" 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" -#: ../../include/features.php:368 ../../include/nav.php:457 +#: ../../include/features.php:368 ../../include/nav.php:469 #: ../../Zotlabs/Lib/Apps.php:350 #: ../../Zotlabs/Widget/Channel_activities.php:93 #: ../../Zotlabs/Module/Fbrowser.php:29 @@ -1073,8 +1048,8 @@ msgid "" "view" msgstr "Proporcionar una opción de edición de fotos para ocultar las fotos inapropiadas de la vista de álbum predeterminada" -#: ../../include/features.php:390 ../../Zotlabs/Lib/Apps.php:368 -#: ../../Zotlabs/Module/Contactedit.php:444 +#: ../../include/features.php:390 ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Module/Contactedit.php:430 msgid "Profiles" msgstr "Perfiles" @@ -1169,21 +1144,21 @@ msgstr "el almacenamiento en la base de datos ha fallado." msgid "Empty path" msgstr "Ruta vacía" -#: ../../include/attach.php:2147 +#: ../../include/attach.php:1984 #, php-format msgid "%s shared an %s with you" msgstr "%s ha compartido un/una %s con usted" -#: ../../include/attach.php:2147 +#: ../../include/attach.php:1984 #, php-format msgid "%s shared a %s with you" msgstr "%s ha compartido un/una %s con usted" -#: ../../include/attach.php:2147 +#: ../../include/attach.php:1984 ../../Zotlabs/Module/Like.php:447 msgid "image" msgstr "Imagen" -#: ../../include/attach.php:2147 ../../addon/redfiles/redfilehelper.php:64 +#: ../../include/attach.php:1984 ../../addon/redfiles/redfilehelper.php:64 msgid "file" msgstr "fichero" @@ -1216,12 +1191,12 @@ msgid "Monthly" msgstr "Mensualmente" #: ../../include/selectors.php:64 ../../include/selectors.php:81 -#: ../../include/channel.php:1720 ../../addon/openid/Mod_Id.php:85 +#: ../../include/channel.php:1728 ../../addon/openid/Mod_Id.php:85 msgid "Male" msgstr "Hombre" #: ../../include/selectors.php:64 ../../include/selectors.php:81 -#: ../../include/channel.php:1718 ../../addon/openid/Mod_Id.php:87 +#: ../../include/channel.php:1726 ../../addon/openid/Mod_Id.php:87 msgid "Female" msgstr "Mujer" @@ -1257,11 +1232,11 @@ msgstr "Transexual" msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:64 ../../include/channel.php:1724 +#: ../../include/selectors.php:64 ../../include/channel.php:1732 msgid "Neuter" msgstr "Neutral" -#: ../../include/selectors.php:64 ../../include/channel.php:1726 +#: ../../include/selectors.php:64 ../../include/channel.php:1734 msgid "Non-specific" msgstr "No especificado" @@ -1357,9 +1332,9 @@ msgstr "Infiel" msgid "Sex Addict" msgstr "Con adicción al sexo" -#: ../../include/selectors.php:138 ../../include/channel.php:456 -#: ../../include/channel.php:459 ../../Zotlabs/Widget/Affinity.php:38 -#: ../../Zotlabs/Module/Contactedit.php:297 +#: ../../include/selectors.php:138 ../../include/channel.php:464 +#: ../../include/channel.php:467 ../../Zotlabs/Widget/Affinity.php:38 +#: ../../Zotlabs/Module/Contactedit.php:283 #: ../../Zotlabs/Module/Connedit.php:581 msgid "Friends" msgstr "Amigos/as" @@ -1448,28 +1423,41 @@ msgstr "No me importa" msgid "Ask me" msgstr "Pregúnteme" -#: ../../include/activities.php:42 +#: ../../include/activities.php:30 msgid " and " msgstr " y " -#: ../../include/activities.php:50 +#: ../../include/activities.php:32 +msgid ", " +msgstr ", " + +#: ../../include/activities.php:36 ../../include/activities.php:38 +#: ../../addon/openid/MysqlProvider.php:58 +#: ../../addon/openid/MysqlProvider.php:59 +#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Module/Profile_photo.php:226 +msgid "Profile Photo" +msgstr "Foto del perfil" + +#: ../../include/activities.php:36 +#: ../../store/[data]/smarty3/compiled/2cbde885645602969010e846a38817a1297aafb9_0.file.cover_photo.tpl.php:127 +#: ../../Zotlabs/Module/Cover_photo.php:229 +msgid "Cover Photo" +msgstr "Imagen de portada del perfil" + +#: ../../include/activities.php:45 msgid "public profile" msgstr "el perfil público" -#: ../../include/activities.php:59 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s ha cambiado %2$s a “%3$s”" - -#: ../../include/activities.php:60 +#: ../../include/activities.php:62 #, php-format -msgid "Visit %1$s's %2$s" -msgstr "Visitar %2$s de %1$s" +msgid "%1$s %2$s has been updated to %3$s." +msgstr "%1$s%2$sse ha actualizado a %3$s." -#: ../../include/activities.php:63 +#: ../../include/activities.php:65 #, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s ha actualizado %2$s, cambiando %3$s." +msgid "%1$s updated the %2$s. Changed %3$s." +msgstr "%1$sactualizó el %2$s. Ha cambiado %3$s." #: ../../include/contact_widgets.php:11 #, php-format @@ -1480,7 +1468,7 @@ msgstr[1] "%d invitaciones disponibles" msgstr[2] "%d invitaciones disponibles" #: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145 -#: ../../Zotlabs/Module/Admin/Site.php:419 +#: ../../Zotlabs/Module/Admin/Site.php:405 msgid "Advanced" msgstr "Avanzado" @@ -1559,10 +1547,10 @@ msgid "Summary: " msgstr "Resumen: " #: ../../include/cdav.php:158 ../../include/cdav.php:159 -#: ../../include/cdav.php:167 ../../include/conversation.php:1226 -#: ../../Zotlabs/Lib/Apps.php:1169 ../../Zotlabs/Lib/Apps.php:1253 -#: ../../Zotlabs/Lib/Activity.php:1678 ../../Zotlabs/Widget/Album.php:90 -#: ../../Zotlabs/Widget/Pinned.php:275 ../../Zotlabs/Widget/Portfolio.php:99 +#: ../../include/cdav.php:167 ../../include/conversation.php:999 +#: ../../Zotlabs/Lib/Apps.php:1167 ../../Zotlabs/Lib/Apps.php:1251 +#: ../../Zotlabs/Lib/Activity.php:1675 ../../Zotlabs/Widget/Album.php:90 +#: ../../Zotlabs/Widget/Pinned.php:255 ../../Zotlabs/Widget/Portfolio.php:99 #: ../../Zotlabs/Module/Embedphotos.php:177 #: ../../Zotlabs/Module/Photos.php:788 ../../Zotlabs/Module/Photos.php:1246 msgid "Unknown" @@ -1600,7 +1588,7 @@ msgid "edit" msgstr "editar" #: ../../include/group.php:327 ../../include/acl_selectors.php:87 -#: ../../Zotlabs/Lib/Apps.php:369 ../../Zotlabs/Widget/Activity_filter.php:95 +#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Widget/Activity_filter.php:95 #: ../../Zotlabs/Module/Group.php:143 msgid "Privacy Groups" msgstr "Grupos de canales" @@ -1650,7 +1638,7 @@ msgstr "quiero" msgid "wants" msgstr "quiere" -#: ../../include/taxonomy.php:587 ../../Zotlabs/Lib/ThreadItem.php:310 +#: ../../include/taxonomy.php:587 ../../Zotlabs/Lib/ThreadItem.php:333 msgid "like" msgstr "me gusta" @@ -1658,7 +1646,7 @@ msgstr "me gusta" msgid "likes" msgstr "gusta de" -#: ../../include/taxonomy.php:588 ../../Zotlabs/Lib/ThreadItem.php:311 +#: ../../include/taxonomy.php:588 ../../Zotlabs/Lib/ThreadItem.php:334 msgid "dislike" msgstr "no me gusta" @@ -1666,9 +1654,8 @@ msgstr "no me gusta" msgid "dislikes" msgstr "no gusta de" -#: ../../include/taxonomy.php:675 ../../include/conversation.php:1777 -#: ../../include/channel.php:1779 ../../Zotlabs/Lib/ThreadItem.php:233 -#: ../../Zotlabs/Module/Photos.php:1130 +#: ../../include/taxonomy.php:675 ../../include/conversation.php:1550 +#: ../../Zotlabs/Module/Photos.php:1129 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1676,9 +1663,9 @@ msgstr[0] "Me gusta" msgstr[1] "Me gusta" msgstr[2] "Me gusta" -#: ../../include/photo/photo_driver.php:450 +#: ../../include/photo/photo_driver.php:457 #: ../../Zotlabs/Module/Profile_photo.php:167 -#: ../../Zotlabs/Module/Profile_photo.php:337 +#: ../../Zotlabs/Module/Profile_photo.php:336 msgid "Profile Photos" msgstr "Fotos del perfil" @@ -1783,7 +1770,7 @@ msgid "Help:" msgstr "Ayuda:" #: ../../include/help.php:119 ../../include/help.php:127 -#: ../../include/nav.php:181 ../../include/nav.php:328 +#: ../../include/nav.php:193 ../../include/nav.php:340 #: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Module/Layouts.php:184 msgid "Help" msgstr "Ayuda" @@ -1795,7 +1782,7 @@ msgstr "No encontrado" #: ../../include/help.php:134 ../../addon/cards/cards.php:104 #: ../../addon/articles/articles.php:105 #: ../../addon/wiki/Lib/NativeWikiPage.php:545 -#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:147 +#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:154 #: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Web/Router.php:186 msgid "Page not found." msgstr "Página no encontrada." @@ -1808,12 +1795,12 @@ msgstr "¿Borrar este elemento?" msgid "Item deleted" msgstr "Elemento eliminado" -#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:831 +#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:861 #: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Photos.php:1207 msgid "Comment" msgstr "Comentar" -#: ../../include/js_strings.php:8 ../../Zotlabs/Lib/ThreadItem.php:540 +#: ../../include/js_strings.php:8 ../../Zotlabs/Lib/ThreadItem.php:570 #, php-format msgid "%s show all" msgstr "%s mostrar todo" @@ -1886,8 +1873,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?" #: ../../include/js_strings.php:26 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Pubsites.php:54 ../../Zotlabs/Module/Profiles.php:479 -#: ../../Zotlabs/Module/Profiles.php:750 ../../Zotlabs/Module/Cdav.php:1006 +#: ../../Zotlabs/Module/Pubsites.php:54 ../../Zotlabs/Module/Profiles.php:475 +#: ../../Zotlabs/Module/Profiles.php:746 ../../Zotlabs/Module/Cdav.php:1006 msgid "Location" msgstr "Ubicación" @@ -1941,12 +1928,12 @@ msgstr "Volver a la respuesta" msgid "Pinned" msgstr "Anclado/a" -#: ../../include/js_strings.php:39 ../../Zotlabs/Lib/ThreadItem.php:473 +#: ../../include/js_strings.php:39 ../../Zotlabs/Lib/ThreadItem.php:494 msgid "Pin to the top" msgstr "Anclar en la parte superior" -#: ../../include/js_strings.php:40 ../../Zotlabs/Lib/ThreadItem.php:473 -#: ../../Zotlabs/Widget/Pinned.php:160 +#: ../../include/js_strings.php:40 ../../Zotlabs/Lib/ThreadItem.php:494 +#: ../../Zotlabs/Widget/Pinned.php:149 msgid "Unpin from the top" msgstr "Desanclar de la parte superior" @@ -2038,19 +2025,19 @@ msgstr " " msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:75 ../../include/text.php:1504 +#: ../../include/js_strings.php:75 ../../include/text.php:1502 msgid "January" msgstr "enero" -#: ../../include/js_strings.php:76 ../../include/text.php:1504 +#: ../../include/js_strings.php:76 ../../include/text.php:1502 msgid "February" msgstr "febrero" -#: ../../include/js_strings.php:77 ../../include/text.php:1504 +#: ../../include/js_strings.php:77 ../../include/text.php:1502 msgid "March" msgstr "marzo" -#: ../../include/js_strings.php:78 ../../include/text.php:1504 +#: ../../include/js_strings.php:78 ../../include/text.php:1502 msgid "April" msgstr "abril" @@ -2059,31 +2046,31 @@ msgctxt "long" msgid "May" msgstr "mayo" -#: ../../include/js_strings.php:80 ../../include/text.php:1504 +#: ../../include/js_strings.php:80 ../../include/text.php:1502 msgid "June" msgstr "junio" -#: ../../include/js_strings.php:81 ../../include/text.php:1504 +#: ../../include/js_strings.php:81 ../../include/text.php:1502 msgid "July" msgstr "julio" -#: ../../include/js_strings.php:82 ../../include/text.php:1504 +#: ../../include/js_strings.php:82 ../../include/text.php:1502 msgid "August" msgstr "agosto" -#: ../../include/js_strings.php:83 ../../include/text.php:1504 +#: ../../include/js_strings.php:83 ../../include/text.php:1502 msgid "September" msgstr "septiembre" -#: ../../include/js_strings.php:84 ../../include/text.php:1504 +#: ../../include/js_strings.php:84 ../../include/text.php:1502 msgid "October" msgstr "octubre" -#: ../../include/js_strings.php:85 ../../include/text.php:1504 +#: ../../include/js_strings.php:85 ../../include/text.php:1502 msgid "November" msgstr "noviembre" -#: ../../include/js_strings.php:86 ../../include/text.php:1504 +#: ../../include/js_strings.php:86 ../../include/text.php:1502 msgid "December" msgstr "diciembre" @@ -2136,31 +2123,31 @@ msgstr "nov" msgid "Dec" msgstr "dic" -#: ../../include/js_strings.php:99 ../../include/text.php:1500 +#: ../../include/js_strings.php:99 ../../include/text.php:1498 msgid "Sunday" msgstr "domingo" -#: ../../include/js_strings.php:100 ../../include/text.php:1500 +#: ../../include/js_strings.php:100 ../../include/text.php:1498 msgid "Monday" msgstr "lunes" -#: ../../include/js_strings.php:101 ../../include/text.php:1500 +#: ../../include/js_strings.php:101 ../../include/text.php:1498 msgid "Tuesday" msgstr "martes" -#: ../../include/js_strings.php:102 ../../include/text.php:1500 +#: ../../include/js_strings.php:102 ../../include/text.php:1498 msgid "Wednesday" msgstr "miércoles" -#: ../../include/js_strings.php:103 ../../include/text.php:1500 +#: ../../include/js_strings.php:103 ../../include/text.php:1498 msgid "Thursday" msgstr "jueves" -#: ../../include/js_strings.php:104 ../../include/text.php:1500 +#: ../../include/js_strings.php:104 ../../include/text.php:1498 msgid "Friday" msgstr "viernes" -#: ../../include/js_strings.php:105 ../../include/text.php:1500 +#: ../../include/js_strings.php:105 ../../include/text.php:1498 msgid "Saturday" msgstr "sábado" @@ -2230,9 +2217,9 @@ msgstr "Dirección de correo electrónica no válida" #: ../../addon/cart/submodules/orderoptions.php:358 #: ../../addon/cart/submodules/orderoptions.php:434 #: ../../addon/cart/submodules/orderoptions.php:458 -#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:208 -#: ../../Zotlabs/Module/Appman.php:209 ../../Zotlabs/Module/Profiles.php:761 -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:218 +#: ../../Zotlabs/Module/Appman.php:219 ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:761 #: ../../Zotlabs/Module/Settings/Multifactor.php:84 msgid "Required" msgstr "Obligatorio" @@ -2244,133 +2231,107 @@ msgstr "OpenWebAuth: %1$s da la bienvenida a %2$s" #: ../../include/conversation.php:147 ../../include/text.php:2352 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1693 -#: ../../Zotlabs/Lib/Activity.php:3694 ../../Zotlabs/Module/Subthread.php:115 -#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Like.php:453 +#: ../../addon/diaspora/Receiver.php:1693 +#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Tagger.php:71 msgid "photo" msgstr "foto" -#: ../../include/conversation.php:154 ../../Zotlabs/Module/Like.php:184 +#: ../../include/conversation.php:155 ../../Zotlabs/Module/Like.php:183 msgid "channel" msgstr "el canal" -#: ../../include/conversation.php:177 ../../include/markdown.php:208 -#: ../../include/text.php:2358 ../../include/bbcode.php:566 -#: ../../Zotlabs/Lib/Activity.php:3694 ../../Zotlabs/Module/Tagger.php:79 +#: ../../include/conversation.php:178 ../../include/markdown.php:208 +#: ../../include/text.php:2358 ../../include/bbcode.php:571 +#: ../../Zotlabs/Module/Tagger.php:79 msgid "post" msgstr "la entrada" -#: ../../include/conversation.php:179 ../../include/text.php:2360 +#: ../../include/conversation.php:180 ../../include/text.php:2360 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "el comentario" -#: ../../include/conversation.php:193 ../../addon/pubcrawl/as.php:1993 -#: ../../addon/diaspora/Receiver.php:1628 ../../Zotlabs/Lib/Activity.php:3727 -#: ../../Zotlabs/Module/Like.php:485 +#: ../../include/conversation.php:194 ../../addon/diaspora/Receiver.php:1628 +#: ../../Zotlabs/Module/Like.php:483 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" -#: ../../include/conversation.php:196 ../../addon/pubcrawl/as.php:1995 -#: ../../Zotlabs/Lib/Activity.php:3729 ../../Zotlabs/Module/Like.php:487 -#, 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" - -#: ../../include/conversation.php:202 +#: ../../include/conversation.php:196 #, php-format msgid "likes %1$s's %2$s" msgstr "gusta de %2$s de %1$s" -#: ../../include/conversation.php:205 +#: ../../include/conversation.php:199 ../../Zotlabs/Module/Like.php:485 #, php-format -msgid "doesn't like %1$s's %2$s" -msgstr "no gusta de %2$s de %1$s" +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "A %1$s no le gusta %3$s de %2$s" -#: ../../include/conversation.php:245 ../../include/conversation.php:247 +#: ../../include/conversation.php:200 #, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s ahora está conectado/a con %2$s" +msgid "doesn't like %1$s's %2$s" +msgstr "no gusta de %2$s de %1$s" -#: ../../include/conversation.php:282 +#: ../../include/conversation.php:203 #, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s ha dado un toque a %2$s" - -#: ../../include/conversation.php:286 ../../include/text.php:1262 -msgid "poked" -msgstr "ha dado un toque a" +msgid "%1$s repeated %2$s's %3$s" +msgstr "%1$scompartió %3$sde %2$s" -#: ../../include/conversation.php:305 ../../Zotlabs/Module/Mood.php:76 +#: ../../include/conversation.php:204 #, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "%1$s está %2$s" +msgid "repeated %1$s's %2$s" +msgstr "compartió %2$s de %1$s" -#: ../../include/conversation.php:535 ../../Zotlabs/Lib/ThreadItem.php:501 +#: ../../include/conversation.php:332 ../../Zotlabs/Lib/ThreadItem.php:532 msgid "This is an unsaved preview" msgstr "Esta es una previsualización sin guardar" -#: ../../include/conversation.php:667 ../../Zotlabs/Module/Photos.php:1110 +#: ../../include/conversation.php:464 ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Likes" msgstr "Me gusta" -#: ../../include/conversation.php:668 ../../Zotlabs/Module/Photos.php:1110 +#: ../../include/conversation.php:465 ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Dislikes" msgstr "No me gusta" -#: ../../include/conversation.php:669 ../../Zotlabs/Widget/Pinned.php:82 -#: ../../Zotlabs/Module/Photos.php:1111 -msgctxt "title" -msgid "Agree" -msgstr "De acuerdo" - -#: ../../include/conversation.php:670 ../../Zotlabs/Widget/Pinned.php:83 -#: ../../Zotlabs/Module/Photos.php:1111 -msgctxt "title" -msgid "Disagree" -msgstr "En desacuerdo" - -#: ../../include/conversation.php:671 ../../Zotlabs/Widget/Pinned.php:84 +#: ../../include/conversation.php:466 ../../Zotlabs/Widget/Pinned.php:71 #: ../../Zotlabs/Module/Photos.php:1111 msgctxt "title" -msgid "Abstain" -msgstr "Abstención" - -#: ../../include/conversation.php:672 ../../Zotlabs/Widget/Pinned.php:71 -#: ../../Zotlabs/Module/Photos.php:1112 -msgctxt "title" msgid "Attending" msgstr "Participaré" -#: ../../include/conversation.php:673 ../../Zotlabs/Widget/Pinned.php:72 -#: ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:467 ../../Zotlabs/Widget/Pinned.php:72 +#: ../../Zotlabs/Module/Photos.php:1111 msgctxt "title" msgid "Not attending" msgstr "No participaré" -#: ../../include/conversation.php:674 ../../Zotlabs/Widget/Pinned.php:73 -#: ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:468 ../../Zotlabs/Widget/Pinned.php:73 +#: ../../Zotlabs/Module/Photos.php:1111 msgctxt "title" msgid "Might attend" msgstr "Quizá participe" -#: ../../include/conversation.php:744 +#: ../../include/conversation.php:470 +msgctxt "title" +msgid "Repeats" +msgstr "Se repite" + +#: ../../include/conversation.php:539 msgid "Select" msgstr "Seleccionar" -#: ../../include/conversation.php:745 ../../include/conversation.php:808 +#: ../../include/conversation.php:540 ../../include/conversation.php:601 #: ../../addon/cards/Mod_Card_edit.php:130 #: ../../addon/articles/Mod_Article_edit.php:128 -#: ../../Zotlabs/Lib/Apps.php:619 ../../Zotlabs/Lib/ThreadItem.php:179 -#: ../../Zotlabs/Lib/ThreadItem.php:509 ../../Zotlabs/Storage/Browser.php:387 +#: ../../Zotlabs/Lib/Apps.php:617 ../../Zotlabs/Lib/ThreadItem.php:184 +#: ../../Zotlabs/Lib/ThreadItem.php:540 ../../Zotlabs/Storage/Browser.php:387 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Module/Oauth.php:172 -#: ../../Zotlabs/Module/Thing.php:269 ../../Zotlabs/Module/Tokens.php:295 -#: ../../Zotlabs/Module/Contactedit.php:667 +#: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Tokens.php:295 +#: ../../Zotlabs/Module/Contactedit.php:651 #: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Connedit.php:749 #: ../../Zotlabs/Module/Admin/Accounts.php:320 #: ../../Zotlabs/Module/Admin/Profs.php:176 @@ -2383,146 +2344,141 @@ msgstr "Seleccionar" msgid "Delete" msgstr "Eliminar" -#: ../../include/conversation.php:751 ../../Zotlabs/Lib/ThreadItem.php:263 +#: ../../include/conversation.php:546 ../../Zotlabs/Lib/ThreadItem.php:286 msgid "Toggle Star Status" msgstr "Activar o desactivar el estado de entrada preferida" -#: ../../include/conversation.php:757 +#: ../../include/conversation.php:552 msgid "Private Message" msgstr "Mensaje Privado" -#: ../../include/conversation.php:766 ../../Zotlabs/Lib/ThreadItem.php:273 -#: ../../Zotlabs/Widget/Pinned.php:93 +#: ../../include/conversation.php:561 ../../Zotlabs/Lib/ThreadItem.php:296 +#: ../../Zotlabs/Widget/Pinned.php:82 msgid "Message signature validated" msgstr "Firma de mensaje validada" -#: ../../include/conversation.php:767 ../../Zotlabs/Lib/ThreadItem.php:274 -#: ../../Zotlabs/Widget/Pinned.php:94 +#: ../../include/conversation.php:562 ../../Zotlabs/Lib/ThreadItem.php:297 +#: ../../Zotlabs/Widget/Pinned.php:83 msgid "Message signature incorrect" msgstr "Firma de mensaje incorrecta" -#: ../../include/conversation.php:807 ../../Zotlabs/Lib/ThreadItem.php:508 +#: ../../include/conversation.php:600 ../../Zotlabs/Lib/ThreadItem.php:539 #: ../../Zotlabs/Module/Admin/Accounts.php:318 #: ../../Zotlabs/Module/Connections.php:358 #: ../../Zotlabs/Module/Connections.php:409 msgid "Approve" msgstr "Aprobar" -#: ../../include/conversation.php:813 +#: ../../include/conversation.php:606 #, php-format msgid "View %s's profile @ %s" msgstr "Ver el perfil @ %s de %s" -#: ../../include/conversation.php:835 +#: ../../include/conversation.php:628 msgid "Categories:" msgstr "Temas:" -#: ../../include/conversation.php:836 +#: ../../include/conversation.php:629 msgid "Filed under:" msgstr "Archivado bajo:" -#: ../../include/conversation.php:842 ../../Zotlabs/Lib/ThreadItem.php:430 -#: ../../Zotlabs/Widget/Pinned.php:137 +#: ../../include/conversation.php:635 ../../Zotlabs/Lib/ThreadItem.php:451 +#: ../../Zotlabs/Widget/Pinned.php:126 #, php-format msgid "from %s" msgstr "desde %s" -#: ../../include/conversation.php:845 ../../Zotlabs/Lib/ThreadItem.php:433 -#: ../../Zotlabs/Widget/Pinned.php:140 +#: ../../include/conversation.php:638 ../../Zotlabs/Lib/ThreadItem.php:454 +#: ../../Zotlabs/Widget/Pinned.php:129 #, php-format msgid "last edited: %s" msgstr "último cambio: %s" -#: ../../include/conversation.php:846 ../../Zotlabs/Lib/ThreadItem.php:434 -#: ../../Zotlabs/Widget/Pinned.php:141 +#: ../../include/conversation.php:639 ../../Zotlabs/Lib/ThreadItem.php:455 +#: ../../Zotlabs/Widget/Pinned.php:130 #, php-format msgid "Expires: %s" msgstr "Caduca: %s" -#: ../../include/conversation.php:861 ../../addon/cards/cards.php:82 +#: ../../include/conversation.php:654 ../../addon/cards/cards.php:82 #: ../../addon/articles/articles.php:83 msgid "View in context" msgstr "Mostrar en su contexto" -#: ../../include/conversation.php:863 ../../Zotlabs/Lib/ThreadItem.php:502 +#: ../../include/conversation.php:656 ../../Zotlabs/Lib/ThreadItem.php:533 #: ../../Zotlabs/Module/Photos.php:1077 msgid "Please wait" msgstr "Espere por favor" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:757 msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:968 +#: ../../include/conversation.php:761 msgid "Loading..." msgstr "Cargando..." -#: ../../include/conversation.php:969 ../../Zotlabs/Lib/ThreadItem.php:290 +#: ../../include/conversation.php:762 ../../Zotlabs/Lib/ThreadItem.php:313 msgid "Conversation Features" msgstr "Funciones de conversación " -#: ../../include/conversation.php:970 +#: ../../include/conversation.php:763 msgid "Delete Selected Items" msgstr "Eliminar elementos seleccionados" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:799 msgid "View Source" msgstr "Ver el código fuente de la entrada" -#: ../../include/conversation.php:1016 +#: ../../include/conversation.php:809 msgid "Follow Thread" msgstr "Seguir este hilo" -#: ../../include/conversation.php:1025 +#: ../../include/conversation.php:818 msgid "Unfollow Thread" msgstr "Dejar de seguir este hilo" -#: ../../include/conversation.php:1105 ../../include/nav.php:114 +#: ../../include/conversation.php:895 ../../include/nav.php:126 #: ../../addon/openclipatar/openclipatar.php:58 ../../Zotlabs/Lib/Apps.php:349 #: ../../Zotlabs/Module/Connedit.php:480 msgid "View Profile" msgstr "Ver el perfil" -#: ../../include/conversation.php:1117 ../../Zotlabs/Module/Connedit.php:501 +#: ../../include/conversation.php:907 ../../Zotlabs/Module/Connedit.php:501 msgid "Recent Activity" msgstr "Actividad reciente" -#: ../../include/conversation.php:1129 ../../include/connections.php:141 -#: ../../include/channel.php:1616 ../../Zotlabs/Widget/Suggestions.php:51 +#: ../../include/conversation.php:919 ../../include/connections.php:141 +#: ../../include/channel.php:1624 ../../Zotlabs/Widget/Suggestions.php:51 #: ../../Zotlabs/Widget/Follow.php:37 ../../Zotlabs/Module/Suggest.php:69 #: ../../Zotlabs/Module/Directory.php:371 #: ../../Zotlabs/Module/Connections.php:365 msgid "Connect" msgstr "Conectar" -#: ../../include/conversation.php:1141 +#: ../../include/conversation.php:931 msgid "Edit Connection" msgstr "Editar conexión" -#: ../../include/conversation.php:1153 ../../Zotlabs/Lib/Apps.php:356 -#: ../../Zotlabs/Module/Poke.php:181 ../../Zotlabs/Module/Poke.php:185 -msgid "Poke" -msgstr "Toques y otras cosas" - -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1001 msgid "Approve this item" msgstr "Aprobar este elemento" -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1001 msgid "Delete this item" msgstr "Borrar este elemento" -#: ../../include/conversation.php:1282 +#: ../../include/conversation.php:1055 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1282 +#: ../../include/conversation.php:1055 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1286 +#: ../../include/conversation.php:1059 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." @@ -2530,7 +2486,7 @@ msgstr[0] "a %2$d personas le gusta esto." msgstr[1] "A %2$d personas les gusta esto." msgstr[2] "A %2$d personas les gusta esto." -#: ../../include/conversation.php:1288 +#: ../../include/conversation.php:1061 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." @@ -2538,11 +2494,11 @@ msgstr[0] "a %2$d personas no les gusta esto." msgstr[1] "A %2$d personas no les gusta esto." msgstr[2] "A %2$d personas no les gusta esto." -#: ../../include/conversation.php:1294 +#: ../../include/conversation.php:1067 msgid "and" msgstr "y" -#: ../../include/conversation.php:1297 +#: ../../include/conversation.php:1070 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" @@ -2550,156 +2506,157 @@ msgstr[0] ", y %d persona más" msgstr[1] ", y %d personas más" msgstr[2] ", y %d personas más" -#: ../../include/conversation.php:1298 +#: ../../include/conversation.php:1071 #, php-format msgid "%s like this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1298 +#: ../../include/conversation.php:1071 #, php-format msgid "%s don't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1349 ../../addon/hsse/hsse.php:82 +#: ../../include/conversation.php:1122 ../../addon/hsse/hsse.php:82 msgid "Set your location" msgstr "Establecer su ubicación" -#: ../../include/conversation.php:1350 ../../addon/hsse/hsse.php:83 +#: ../../include/conversation.php:1123 ../../addon/hsse/hsse.php:83 msgid "Clear browser location" msgstr "Eliminar los datos de localización geográfica del navegador" -#: ../../include/conversation.php:1362 ../../addon/cards/Mod_Card_edit.php:101 +#: ../../include/conversation.php:1135 ../../addon/cards/Mod_Card_edit.php:101 #: ../../addon/articles/Mod_Article_edit.php:99 ../../addon/hsse/hsse.php:95 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:219 #: ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "Insertar enlace web" -#: ../../include/conversation.php:1366 ../../addon/hsse/hsse.php:99 +#: ../../include/conversation.php:1139 ../../addon/hsse/hsse.php:99 msgid "Embed (existing) photo from your photo albums" msgstr "Insertar una foto (existente) de sus álbumes" -#: ../../include/conversation.php:1399 ../../addon/hsse/hsse.php:134 +#: ../../include/conversation.php:1172 ../../addon/hsse/hsse.php:134 #: ../../Zotlabs/Module/Chat.php:217 msgid "Please enter a link URL:" msgstr "Por favor, introduzca la dirección del enlace:" -#: ../../include/conversation.php:1400 ../../addon/hsse/hsse.php:135 +#: ../../include/conversation.php:1173 ../../addon/hsse/hsse.php:135 msgid "Tag term:" msgstr "Término de la etiqueta:" -#: ../../include/conversation.php:1401 ../../addon/hsse/hsse.php:136 +#: ../../include/conversation.php:1174 ../../addon/hsse/hsse.php:136 msgid "Where are you right now?" msgstr "¿Donde está ahora?" -#: ../../include/conversation.php:1404 ../../addon/wiki/Mod_Wiki.php:400 -#: ../../addon/hsse/hsse.php:139 ../../Zotlabs/Module/Cover_photo.php:430 -#: ../../Zotlabs/Module/Profile_photo.php:555 +#: ../../include/conversation.php:1177 ../../addon/wiki/Mod_Wiki.php:400 +#: ../../addon/hsse/hsse.php:139 ../../Zotlabs/Module/Cover_photo.php:387 +#: ../../Zotlabs/Module/Profile_photo.php:554 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" -#: ../../include/conversation.php:1405 ../../addon/wiki/Mod_Wiki.php:401 -#: ../../addon/hsse/hsse.php:140 ../../Zotlabs/Module/Cover_photo.php:431 -#: ../../Zotlabs/Module/Profile_photo.php:556 +#: ../../include/conversation.php:1178 ../../addon/wiki/Mod_Wiki.php:401 +#: ../../addon/hsse/hsse.php:140 ../../Zotlabs/Module/Cover_photo.php:388 +#: ../../Zotlabs/Module/Profile_photo.php:555 msgid "Choose an album" msgstr "Elegir un álbum" -#: ../../include/conversation.php:1406 ../../addon/hsse/hsse.php:141 +#: ../../include/conversation.php:1179 ../../addon/hsse/hsse.php:141 msgid "Choose a different album..." msgstr "Elegir un álbum diferente..." -#: ../../include/conversation.php:1407 ../../addon/wiki/Mod_Wiki.php:403 -#: ../../addon/hsse/hsse.php:142 ../../Zotlabs/Module/Cover_photo.php:433 -#: ../../Zotlabs/Module/Profile_photo.php:558 +#: ../../include/conversation.php:1180 ../../addon/wiki/Mod_Wiki.php:403 +#: ../../addon/hsse/hsse.php:142 ../../Zotlabs/Module/Cover_photo.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:557 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" -#: ../../include/conversation.php:1408 ../../addon/wiki/Mod_Wiki.php:404 -#: ../../addon/hsse/hsse.php:143 ../../Zotlabs/Module/Cover_photo.php:434 -#: ../../Zotlabs/Module/Profile_photo.php:559 +#: ../../include/conversation.php:1181 ../../addon/wiki/Mod_Wiki.php:404 +#: ../../addon/hsse/hsse.php:143 ../../Zotlabs/Module/Cover_photo.php:391 +#: ../../Zotlabs/Module/Profile_photo.php:558 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" -#: ../../include/conversation.php:1409 ../../addon/wiki/Mod_Wiki.php:405 -#: ../../addon/hsse/hsse.php:144 ../../Zotlabs/Module/Cover_photo.php:435 -#: ../../Zotlabs/Module/Profile_photo.php:560 +#: ../../include/conversation.php:1182 ../../addon/wiki/Mod_Wiki.php:405 +#: ../../addon/hsse/hsse.php:144 ../../Zotlabs/Module/Cover_photo.php:392 +#: ../../Zotlabs/Module/Profile_photo.php:559 msgid "Error getting album" msgstr "Error al obtener el álbum" -#: ../../include/conversation.php:1410 ../../addon/hsse/hsse.php:145 +#: ../../include/conversation.php:1183 ../../addon/hsse/hsse.php:145 msgid "Comments enabled" msgstr "Comentarios habilitados" -#: ../../include/conversation.php:1411 ../../addon/hsse/hsse.php:146 +#: ../../include/conversation.php:1184 ../../addon/hsse/hsse.php:146 msgid "Comments disabled" msgstr "Comentarios deshabilitados" -#: ../../include/conversation.php:1428 ../../addon/hsse/hsse.php:153 -#: ../../Zotlabs/Lib/ThreadItem.php:842 ../../Zotlabs/Module/Webpages.php:257 +#: ../../include/conversation.php:1201 ../../addon/hsse/hsse.php:153 +#: ../../Zotlabs/Lib/ThreadItem.php:872 ../../Zotlabs/Module/Webpages.php:257 #: ../../Zotlabs/Module/Photos.php:1096 msgid "Preview" msgstr "Previsualizar" -#: ../../include/conversation.php:1461 ../../addon/wiki/Mod_Wiki.php:304 -#: ../../addon/hsse/hsse.php:186 ../../Zotlabs/Widget/Cdav.php:142 -#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Layouts.php:192 -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Photos.php:1076 +#: ../../include/conversation.php:1234 ../../addon/wiki/Mod_Wiki.php:304 +#: ../../addon/hsse/hsse.php:186 ../../Zotlabs/Lib/ThreadItem.php:341 +#: ../../Zotlabs/Widget/Cdav.php:142 ../../Zotlabs/Module/Webpages.php:251 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Blocks.php:159 +#: ../../Zotlabs/Module/Photos.php:1076 msgid "Share" msgstr "Compartir" -#: ../../include/conversation.php:1470 ../../addon/hsse/hsse.php:195 +#: ../../include/conversation.php:1243 ../../addon/hsse/hsse.php:195 msgid "Page link name" msgstr "Nombre del enlace de la página" -#: ../../include/conversation.php:1473 ../../addon/hsse/hsse.php:198 +#: ../../include/conversation.php:1246 ../../addon/hsse/hsse.php:198 msgid "Post as" msgstr "Publicar como" -#: ../../include/conversation.php:1475 ../../addon/hsse/hsse.php:200 -#: ../../Zotlabs/Lib/ThreadItem.php:833 +#: ../../include/conversation.php:1248 ../../addon/hsse/hsse.php:200 +#: ../../Zotlabs/Lib/ThreadItem.php:863 msgid "Bold" msgstr "Negrita" -#: ../../include/conversation.php:1476 ../../addon/hsse/hsse.php:201 -#: ../../Zotlabs/Lib/ThreadItem.php:834 +#: ../../include/conversation.php:1249 ../../addon/hsse/hsse.php:201 +#: ../../Zotlabs/Lib/ThreadItem.php:864 msgid "Italic" msgstr "Itálico " -#: ../../include/conversation.php:1477 ../../addon/hsse/hsse.php:202 -#: ../../Zotlabs/Lib/ThreadItem.php:835 +#: ../../include/conversation.php:1250 ../../addon/hsse/hsse.php:202 +#: ../../Zotlabs/Lib/ThreadItem.php:865 msgid "Underline" msgstr "Subrayar" -#: ../../include/conversation.php:1478 ../../addon/hsse/hsse.php:203 -#: ../../Zotlabs/Lib/ThreadItem.php:836 +#: ../../include/conversation.php:1251 ../../addon/hsse/hsse.php:203 +#: ../../Zotlabs/Lib/ThreadItem.php:866 msgid "Quote" msgstr "Citar" -#: ../../include/conversation.php:1479 ../../addon/hsse/hsse.php:204 -#: ../../Zotlabs/Lib/ThreadItem.php:837 +#: ../../include/conversation.php:1252 ../../addon/hsse/hsse.php:204 +#: ../../Zotlabs/Lib/ThreadItem.php:867 msgid "Code" msgstr "Código" -#: ../../include/conversation.php:1480 ../../addon/hsse/hsse.php:205 -#: ../../Zotlabs/Lib/ThreadItem.php:839 +#: ../../include/conversation.php:1253 ../../addon/hsse/hsse.php:205 +#: ../../Zotlabs/Lib/ThreadItem.php:869 msgid "Attach/Upload file" msgstr "Adjuntar/cargar fichero" -#: ../../include/conversation.php:1483 ../../addon/wiki/Mod_Wiki.php:397 +#: ../../include/conversation.php:1256 ../../addon/wiki/Mod_Wiki.php:397 #: ../../addon/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" -#: ../../include/conversation.php:1484 ../../include/conversation.php:1539 +#: ../../include/conversation.php:1257 ../../include/conversation.php:1312 #: ../../addon/cards/Mod_Card_edit.php:132 #: ../../addon/articles/Mod_Article_edit.php:130 #: ../../addon/wiki/Mod_Wiki.php:365 ../../addon/wiki/Mod_Wiki.php:398 #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 #: ../../Zotlabs/Storage/Browser.php:386 -#: ../../Zotlabs/Module/Cover_photo.php:428 +#: ../../Zotlabs/Module/Cover_photo.php:385 #: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Oauth.php:110 #: ../../Zotlabs/Module/Oauth.php:136 ../../Zotlabs/Module/Connedit.php:750 -#: ../../Zotlabs/Module/Profile_photo.php:553 +#: ../../Zotlabs/Module/Profile_photo.php:552 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../Zotlabs/Module/Admin/Addons.php:430 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 @@ -2711,91 +2668,98 @@ msgstr "Incluir una imagen de sus álbumes" msgid "Cancel" msgstr "Cancelar" -#: ../../include/conversation.php:1485 ../../include/conversation.php:1538 +#: ../../include/conversation.php:1258 ../../include/conversation.php:1311 #: ../../addon/wiki/Mod_Wiki.php:399 ../../addon/hsse/hsse.php:210 -#: ../../addon/hsse/hsse.php:257 ../../Zotlabs/Module/Cover_photo.php:429 -#: ../../Zotlabs/Module/Profile_photo.php:554 +#: ../../addon/hsse/hsse.php:257 ../../Zotlabs/Module/Cover_photo.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:553 msgid "OK" msgstr "OK" -#: ../../include/conversation.php:1487 ../../addon/hsse/hsse.php:212 +#: ../../include/conversation.php:1260 ../../addon/hsse/hsse.php:212 msgid "Toggle voting" msgstr "Cambiar votación" -#: ../../include/conversation.php:1488 +#: ../../include/conversation.php:1261 msgid "Toggle poll" msgstr "Activar o desactivar encuestas" -#: ../../include/conversation.php:1489 +#: ../../include/conversation.php:1262 msgid "Option" msgstr "Opción" -#: ../../include/conversation.php:1490 +#: ../../include/conversation.php:1263 msgid "Add option" msgstr "Añadir una opción" -#: ../../include/conversation.php:1491 +#: ../../include/conversation.php:1264 msgid "Minutes" msgstr "Minutos " -#: ../../include/conversation.php:1491 +#: ../../include/conversation.php:1264 msgid "Hours" msgstr "Horas " -#: ../../include/conversation.php:1491 +#: ../../include/conversation.php:1264 msgid "Days" msgstr "Días " -#: ../../include/conversation.php:1492 +#: ../../include/conversation.php:1265 msgid "Allow multiple answers" msgstr "Permitir respuestas múltiples" -#: ../../include/conversation.php:1494 ../../addon/hsse/hsse.php:215 +#: ../../include/conversation.php:1267 ../../addon/hsse/hsse.php:215 msgid "Disable comments" msgstr "Dehabilitar los comentarios" -#: ../../include/conversation.php:1495 ../../addon/hsse/hsse.php:216 +#: ../../include/conversation.php:1268 ../../addon/hsse/hsse.php:216 msgid "Toggle comments" msgstr "Activar o desactivar los comentarios" -#: ../../include/conversation.php:1501 ../../addon/cards/Mod_Card_edit.php:118 +#: ../../include/conversation.php:1274 ../../addon/cards/Mod_Card_edit.php:118 #: ../../addon/articles/Mod_Article_edit.php:116 ../../addon/hsse/hsse.php:221 #: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1042 #: ../../Zotlabs/Module/Editblock.php:129 msgid "Title (optional)" msgstr "Título (opcional)" -#: ../../include/conversation.php:1502 +#: ../../include/conversation.php:1275 msgid "Summary (optional)" msgstr "Sumario (opcional)" -#: ../../include/conversation.php:1505 ../../addon/hsse/hsse.php:224 +#: ../../include/conversation.php:1278 ../../addon/hsse/hsse.php:224 msgid "Categories (optional, comma-separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../include/conversation.php:1506 ../../addon/hsse/hsse.php:225 +#: ../../include/conversation.php:1279 ../../addon/hsse/hsse.php:225 msgid "Permission settings" msgstr "Configuración de permisos" -#: ../../include/conversation.php:1528 ../../addon/hsse/hsse.php:247 +#: ../../include/conversation.php:1301 ../../addon/hsse/hsse.php:247 msgid "Other networks and post services" msgstr "Otras redes y servicios de publicación" -#: ../../include/conversation.php:1531 ../../addon/hsse/hsse.php:250 +#: ../../include/conversation.php:1304 ../../addon/hsse/hsse.php:250 msgid "Set expiration date" msgstr "Configurar fecha de caducidad" -#: ../../include/conversation.php:1534 ../../addon/hsse/hsse.php:253 +#: ../../include/conversation.php:1307 ../../addon/hsse/hsse.php:253 msgid "Set publish date" msgstr "Establecer la fecha de publicación" -#: ../../include/conversation.php:1536 ../../addon/hsse/hsse.php:255 -#: ../../Zotlabs/Lib/ThreadItem.php:845 ../../Zotlabs/Module/Chat.php:218 +#: ../../include/conversation.php:1309 ../../addon/hsse/hsse.php:255 +#: ../../Zotlabs/Lib/ThreadItem.php:875 ../../Zotlabs/Module/Chat.php:218 msgid "Encrypt text" msgstr "Cifrar texto" -#: ../../include/conversation.php:1780 ../../Zotlabs/Lib/ThreadItem.php:239 -#: ../../Zotlabs/Module/Photos.php:1135 +#: ../../include/conversation.php:1553 +msgctxt "noun" +msgid "Repeat" +msgid_plural "Repeats" +msgstr[0] "Se repite" +msgstr[1] "Se repite" +msgstr[2] "Se repite" + +#: ../../include/conversation.php:1556 ../../Zotlabs/Module/Photos.php:1134 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -2803,7 +2767,7 @@ msgstr[0] "No me gusta" msgstr[1] "No me gusta" msgstr[2] "No me gusta" -#: ../../include/conversation.php:1783 +#: ../../include/conversation.php:1559 msgctxt "noun" msgid "Attending" msgid_plural "Attending" @@ -2811,7 +2775,7 @@ msgstr[0] "Participaré" msgstr[1] "Participaré" msgstr[2] "Participaré" -#: ../../include/conversation.php:1786 +#: ../../include/conversation.php:1562 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" @@ -2819,7 +2783,7 @@ msgstr[0] "No participaré" msgstr[1] "No participaré" msgstr[2] "No participaré" -#: ../../include/conversation.php:1789 +#: ../../include/conversation.php:1565 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" @@ -2827,50 +2791,26 @@ msgstr[0] "Indeciso/a" msgstr[1] "Indecisos/as" msgstr[2] "Indecisos/as" -#: ../../include/conversation.php:1792 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "De acuerdo" -msgstr[1] "De acuerdo" -msgstr[2] "De acuerdo" - -#: ../../include/conversation.php:1795 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "En desacuerdo" -msgstr[1] "En desacuerdo" -msgstr[2] "En desacuerdo" - -#: ../../include/conversation.php:1798 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "se abstiene" -msgstr[1] "Se abstienen" -msgstr[2] "Se abstienen" - -#: ../../include/nav.php:96 +#: ../../include/nav.php:108 msgid "Remote authentication" msgstr "Acceder desde su servidor" -#: ../../include/nav.php:96 +#: ../../include/nav.php:108 msgid "Click to authenticate to your home hub" msgstr "Pulsar para identificarse en su servidor de inicio" -#: ../../include/nav.php:102 ../../Zotlabs/Widget/Channel_activities.php:239 +#: ../../include/nav.php:114 ../../Zotlabs/Widget/Channel_activities.php:239 #: ../../Zotlabs/Widget/Admin.php:29 #: ../../Zotlabs/Module/Admin/Channels.php:146 #: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:116 msgid "Channels" msgstr "Canales" -#: ../../include/nav.php:102 +#: ../../include/nav.php:114 msgid "Manage your channels" msgstr "Gestionar sus canales" -#: ../../include/nav.php:105 ../../Zotlabs/Lib/Apps.php:344 +#: ../../include/nav.php:117 ../../Zotlabs/Lib/Apps.php:344 #: ../../Zotlabs/Widget/Newmember.php:58 #: ../../Zotlabs/Widget/Settings_menu.php:71 #: ../../Zotlabs/Module/Admin/Themes.php:140 @@ -2878,188 +2818,188 @@ msgstr "Gestionar sus canales" msgid "Settings" msgstr "Ajustes" -#: ../../include/nav.php:105 +#: ../../include/nav.php:117 msgid "Account/Channel Settings" msgstr "Ajustes de cuenta/canales" -#: ../../include/nav.php:111 ../../include/nav.php:141 -#: ../../include/nav.php:162 ../../boot.php:1747 +#: ../../include/nav.php:123 ../../include/nav.php:153 +#: ../../include/nav.php:174 ../../boot.php:1745 msgid "Logout" msgstr "Finalizar sesión" -#: ../../include/nav.php:111 ../../include/nav.php:141 +#: ../../include/nav.php:123 ../../include/nav.php:153 msgid "End this session" msgstr "Finalizar esta sesión" -#: ../../include/nav.php:114 +#: ../../include/nav.php:126 msgid "Your profile page" msgstr "Su página del perfil" -#: ../../include/nav.php:117 ../../include/channel.php:1530 -#: ../../Zotlabs/Module/Profiles.php:851 +#: ../../include/nav.php:129 ../../include/channel.php:1538 +#: ../../Zotlabs/Module/Profiles.php:847 msgid "Edit Profiles" msgstr "Editar perfiles" -#: ../../include/nav.php:117 +#: ../../include/nav.php:129 msgid "Manage/Edit profiles" msgstr "Administrar/editar perfiles" -#: ../../include/nav.php:119 ../../include/channel.php:1534 +#: ../../include/nav.php:131 ../../include/channel.php:1542 #: ../../addon/openclipatar/openclipatar.php:59 msgid "Edit Profile" msgstr "Editar el perfil" -#: ../../include/nav.php:119 ../../Zotlabs/Widget/Newmember.php:40 +#: ../../include/nav.php:131 ../../Zotlabs/Widget/Newmember.php:40 msgid "Edit your profile" msgstr "Editar su perfil" -#: ../../include/nav.php:126 ../../include/nav.php:130 ../../boot.php:1748 +#: ../../include/nav.php:138 ../../include/nav.php:142 ../../boot.php:1746 #: ../../Zotlabs/Lib/Apps.php:341 msgid "Login" msgstr "Iniciar sesión" -#: ../../include/nav.php:126 ../../include/nav.php:130 +#: ../../include/nav.php:138 ../../include/nav.php:142 msgid "Sign in" msgstr "Acceder" -#: ../../include/nav.php:160 +#: ../../include/nav.php:172 msgid "Take me home" msgstr "Volver a la página principal" -#: ../../include/nav.php:162 +#: ../../include/nav.php:174 msgid "Log me out of this site" msgstr "Salir de este sitio" -#: ../../include/nav.php:167 ../../boot.php:1725 +#: ../../include/nav.php:179 ../../boot.php:1723 #: ../../Zotlabs/Module/Register.php:542 msgid "Register" msgstr "Registrarse" -#: ../../include/nav.php:167 +#: ../../include/nav.php:179 msgid "Create an account" msgstr "Crear una cuenta" -#: ../../include/nav.php:181 +#: ../../include/nav.php:193 msgid "Help and documentation" msgstr "Ayuda y documentación" -#: ../../include/nav.php:195 ../../include/acl_selectors.php:149 -#: ../../include/text.php:1170 ../../include/text.php:1182 -#: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Widget/Sitesearch.php:37 +#: ../../include/nav.php:207 ../../include/acl_selectors.php:149 +#: ../../include/text.php:1189 ../../include/text.php:1201 +#: ../../Zotlabs/Lib/Apps.php:356 ../../Zotlabs/Widget/Sitesearch.php:37 #: ../../Zotlabs/Widget/Activity_filter.php:210 #: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:403 msgid "Search" msgstr "Buscar" -#: ../../include/nav.php:195 +#: ../../include/nav.php:207 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "Buscar en el sitio @nombre, !foro, #tag, ?docs, contenido" -#: ../../include/nav.php:201 ../../Zotlabs/Widget/Admin.php:61 +#: ../../include/nav.php:213 ../../Zotlabs/Widget/Admin.php:61 msgid "Admin" msgstr "Administrador" -#: ../../include/nav.php:201 +#: ../../include/nav.php:213 msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" -#: ../../include/nav.php:332 ../../Zotlabs/Widget/Notifications.php:175 +#: ../../include/nav.php:344 ../../Zotlabs/Widget/Notifications.php:175 #: ../../Zotlabs/Widget/Messages.php:36 ../../Zotlabs/Module/Defperms.php:254 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 msgid "Loading" msgstr "Cargando" -#: ../../include/nav.php:337 +#: ../../include/nav.php:349 msgid "@name, #tag, ?doc, content" msgstr "@nombre, #etiqueta, ?ayuda, contenido" -#: ../../include/nav.php:338 +#: ../../include/nav.php:350 msgid "Please wait..." msgstr "Espere por favor…" -#: ../../include/nav.php:344 ../../Zotlabs/Lib/Apps.php:328 +#: ../../include/nav.php:356 ../../Zotlabs/Lib/Apps.php:328 msgid "Apps" msgstr "Aplicaciones (apps)" -#: ../../include/nav.php:345 +#: ../../include/nav.php:357 msgid "Channel Apps" msgstr "Apps del canal " -#: ../../include/nav.php:346 +#: ../../include/nav.php:358 msgid "System Apps" msgstr "Apps del sistema " -#: ../../include/nav.php:347 +#: ../../include/nav.php:359 msgid "Pinned Apps" msgstr "Apps ancladas " -#: ../../include/nav.php:348 +#: ../../include/nav.php:360 msgid "Featured Apps" msgstr "Apps destacadas " -#: ../../include/nav.php:434 ../../Zotlabs/Lib/Apps.php:348 +#: ../../include/nav.php:446 ../../Zotlabs/Lib/Apps.php:348 #: ../../Zotlabs/Module/Admin/Channels.php:154 msgid "Channel" msgstr "Canal" -#: ../../include/nav.php:437 +#: ../../include/nav.php:449 msgid "Status Messages and Posts" msgstr "Mensajes de estado y publicaciones" -#: ../../include/nav.php:447 ../../Zotlabs/Module/Help.php:85 +#: ../../include/nav.php:459 ../../Zotlabs/Module/Help.php:85 msgid "About" msgstr "Mi perfil" -#: ../../include/nav.php:450 +#: ../../include/nav.php:462 msgid "Profile Details" msgstr "Detalles del perfil" -#: ../../include/nav.php:460 ../../include/photos.php:721 +#: ../../include/nav.php:472 ../../include/photos.php:721 msgid "Photo Albums" msgstr "Álbumes de fotos" -#: ../../include/nav.php:465 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/nav.php:477 ../../Zotlabs/Lib/Apps.php:345 #: ../../Zotlabs/Widget/Notifications.php:108 #: ../../Zotlabs/Widget/Channel_activities.php:125 #: ../../Zotlabs/Storage/Browser.php:350 ../../Zotlabs/Module/Fbrowser.php:85 msgid "Files" msgstr "Ficheros" -#: ../../include/nav.php:468 +#: ../../include/nav.php:480 msgid "Files and Storage" msgstr "Ficheros y repositorio" -#: ../../include/nav.php:490 ../../include/nav.php:493 +#: ../../include/nav.php:502 ../../include/nav.php:505 #: ../../Zotlabs/Lib/Apps.php:335 ../../Zotlabs/Widget/Chatroom_list.php:22 msgid "Chatrooms" msgstr "Salas de chat" -#: ../../include/nav.php:503 ../../Zotlabs/Lib/Apps.php:334 +#: ../../include/nav.php:515 ../../Zotlabs/Lib/Apps.php:334 #: ../../Zotlabs/Module/Bookmarks.php:90 msgid "Bookmarks" msgstr "Marcadores" -#: ../../include/nav.php:506 +#: ../../include/nav.php:518 msgid "Saved Bookmarks" msgstr "Marcadores guardados" -#: ../../include/nav.php:514 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/nav.php:526 ../../Zotlabs/Lib/Apps.php:346 #: ../../Zotlabs/Widget/Channel_activities.php:168 #: ../../Zotlabs/Module/Webpages.php:247 msgid "Webpages" msgstr "Páginas web" -#: ../../include/nav.php:517 +#: ../../include/nav.php:529 msgid "View Webpages" msgstr "Ver páginas web" -#: ../../include/nav.php:525 ../../addon/wiki/Mod_Wiki.php:209 -#: ../../addon/wiki/Widget/Wiki_list.php:20 ../../addon/wiki/wiki.php:70 +#: ../../include/nav.php:537 ../../addon/wiki/Mod_Wiki.php:209 +#: ../../addon/wiki/Widget/Wiki_list.php:23 ../../addon/wiki/wiki.php:72 msgid "Wikis" msgstr "Wikis" -#: ../../include/nav.php:528 ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:540 ../../Zotlabs/Lib/Apps.php:347 msgid "Wiki" msgstr "Wiki" @@ -3070,7 +3010,7 @@ msgid "" msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado" #: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:56 -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:748 msgid "Miscellaneous" msgstr "Varios" @@ -3086,7 +3026,7 @@ msgstr "Edad:" msgid "YYYY-MM-DD or MM-DD" msgstr "AAAA-MM-DD o MM-DD" -#: ../../include/datetime.php:238 ../../boot.php:2754 +#: ../../include/datetime.php:238 ../../boot.php:2752 msgid "never" msgstr "nunca" @@ -3175,8 +3115,8 @@ msgstr "La imagen excede el límite de %lu bytes del sitio" msgid "Image file is empty." msgstr "El fichero de imagen está vacío. " -#: ../../include/photos.php:197 ../../Zotlabs/Module/Cover_photo.php:241 -#: ../../Zotlabs/Module/Profile_photo.php:275 +#: ../../include/photos.php:197 ../../Zotlabs/Module/Cover_photo.php:239 +#: ../../Zotlabs/Module/Profile_photo.php:274 msgid "Unable to process image" msgstr "No ha sido posible procesar la imagen" @@ -3227,28 +3167,27 @@ msgstr "cadena_de_error: " msgid "content-type: " msgstr "tipo de contenido: " -#: ../../include/network.php:1768 ../../include/network.php:1769 +#: ../../include/network.php:1770 ../../include/network.php:1771 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1770 +#: ../../include/network.php:1772 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1771 +#: ../../include/network.php:1773 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1772 +#: ../../include/network.php:1774 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1773 ../../addon/pubcrawl/as.php:1332 -#: ../../addon/pubcrawl/as.php:2002 ../../Zotlabs/Lib/Activity.php:3736 +#: ../../include/network.php:1775 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../include/network.php:1774 ../../addon/openid/MysqlProvider.php:56 +#: ../../include/network.php:1776 ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 #: ../../addon/redred/Mod_Redred.php:69 ../../addon/rtof/Mod_Rtof.php:55 #: ../../Zotlabs/Module/Connedit.php:736 @@ -3258,36 +3197,36 @@ msgstr "ActivityPub" msgid "Email" msgstr "Correo electrónico" -#: ../../include/network.php:1775 +#: ../../include/network.php:1777 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1776 +#: ../../include/network.php:1778 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1777 +#: ../../include/network.php:1779 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1778 +#: ../../include/network.php:1780 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1779 +#: ../../include/network.php:1781 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1780 +#: ../../include/network.php:1782 msgid "MySpace" msgstr "MySpace" -#: ../../include/markdown.php:206 ../../include/bbcode.php:570 +#: ../../include/markdown.php:206 ../../include/bbcode.php:575 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s escribió la/el %2$s siguiente %3$s" -#: ../../include/markdown.php:259 ../../include/bbcode.php:655 +#: ../../include/markdown.php:259 ../../include/bbcode.php:660 msgid "spoiler" msgstr "spoiler" @@ -3299,16 +3238,16 @@ msgstr "por defecto" msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" -#: ../../include/menu.php:120 ../../include/channel.php:1530 -#: ../../include/channel.php:1534 ../../addon/cards/cards.php:74 +#: ../../include/menu.php:120 ../../include/channel.php:1538 +#: ../../include/channel.php:1542 ../../addon/cards/cards.php:74 #: ../../addon/cards/Mod_Card_edit.php:99 #: ../../addon/articles/Mod_Article_edit.php:97 #: ../../addon/articles/articles.php:75 ../../addon/wiki/Mod_Wiki.php:214 -#: ../../addon/wiki/Mod_Wiki.php:381 ../../Zotlabs/Lib/Apps.php:618 -#: ../../Zotlabs/Lib/ThreadItem.php:158 ../../Zotlabs/Widget/Cdav.php:144 +#: ../../addon/wiki/Mod_Wiki.php:381 ../../Zotlabs/Lib/Apps.php:616 +#: ../../Zotlabs/Lib/ThreadItem.php:163 ../../Zotlabs/Widget/Cdav.php:144 #: ../../Zotlabs/Widget/Cdav.php:181 ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Oauth.php:171 -#: ../../Zotlabs/Module/Thing.php:268 ../../Zotlabs/Module/Layouts.php:191 +#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Layouts.php:191 #: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Admin/Profs.php:175 #: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Blocks.php:158 #: ../../Zotlabs/Module/Editlayout.php:114 @@ -3370,15 +3309,15 @@ msgstr "No permitir" #: ../../include/acl_selectors.php:154 #: ../../addon/flashcards/Mod_Flashcards.php:261 -#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 +#: ../../Zotlabs/Module/Thing.php:350 ../../Zotlabs/Module/Thing.php:402 #: ../../Zotlabs/Module/Filestorage.php:195 #: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045 #: ../../Zotlabs/Module/Chat.php:240 msgid "Permissions" msgstr "Permisos" -#: ../../include/acl_selectors.php:156 ../../Zotlabs/Lib/ThreadItem.php:496 -#: ../../Zotlabs/Widget/Pinned.php:163 ../../Zotlabs/Storage/Browser.php:414 +#: ../../include/acl_selectors.php:156 ../../Zotlabs/Lib/ThreadItem.php:527 +#: ../../Zotlabs/Widget/Pinned.php:152 ../../Zotlabs/Storage/Browser.php:414 #: ../../Zotlabs/Module/Photos.php:1266 msgid "Close" msgstr "Cerrar" @@ -3390,66 +3329,66 @@ msgid "" " permissions set who is allowed to view the post." msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.
Estos permisos establecen quién está autorizado para ver el mensaje." -#: ../../include/text.php:546 +#: ../../include/text.php:561 msgid "prev" msgstr "anterior" -#: ../../include/text.php:548 +#: ../../include/text.php:563 msgid "first" msgstr "primera" -#: ../../include/text.php:577 +#: ../../include/text.php:592 msgid "last" msgstr "última" -#: ../../include/text.php:580 +#: ../../include/text.php:595 msgid "next" msgstr "próxima" -#: ../../include/text.php:598 +#: ../../include/text.php:613 msgid "older" msgstr "más antiguas" -#: ../../include/text.php:600 +#: ../../include/text.php:615 msgid "newer" msgstr "más recientes" -#: ../../include/text.php:1066 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../include/text.php:1085 ../../Zotlabs/Module/Viewconnections.php:80 #: ../../Zotlabs/Module/Connections.php:306 msgid "Accepts" msgstr "Se acepta" -#: ../../include/text.php:1069 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../include/text.php:1088 ../../Zotlabs/Module/Viewconnections.php:83 #: ../../Zotlabs/Module/Connections.php:309 msgid "Comments" msgstr "Comentarios" -#: ../../include/text.php:1074 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../include/text.php:1093 ../../Zotlabs/Module/Viewconnections.php:88 #: ../../Zotlabs/Module/Connections.php:314 msgid "Stream items" msgstr "Elementos del stream" -#: ../../include/text.php:1079 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../include/text.php:1098 ../../Zotlabs/Module/Viewconnections.php:93 #: ../../Zotlabs/Module/Connections.php:319 msgid "Wall posts" msgstr "Entradas del Muro" -#: ../../include/text.php:1083 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../include/text.php:1102 ../../Zotlabs/Module/Viewconnections.php:97 #: ../../Zotlabs/Module/Connections.php:323 msgid "Nothing" msgstr "Nada" -#: ../../include/text.php:1096 +#: ../../include/text.php:1115 #, php-format msgid "View all %s connections" msgstr "Ver todas las %s conexiones" -#: ../../include/text.php:1159 +#: ../../include/text.php:1178 #, php-format msgid "Network: %s" msgstr "Red %s" -#: ../../include/text.php:1171 ../../include/text.php:1183 +#: ../../include/text.php:1190 ../../include/text.php:1202 #: ../../addon/cards/Mod_Cards.php:116 #: ../../addon/articles/Mod_Articles.php:120 #: ../../Zotlabs/Module/Admin/Queueworker.php:114 @@ -3459,116 +3398,20 @@ msgstr "Red %s" msgid "Save" msgstr "Guardar" -#: ../../include/text.php:1262 -msgid "poke" -msgstr "un toque" - -#: ../../include/text.php:1263 -msgid "ping" -msgstr "un \"ping\"" - -#: ../../include/text.php:1263 -msgid "pinged" -msgstr "ha enviado un \"ping\" a" - -#: ../../include/text.php:1292 -msgid "happy" -msgstr "feliz " - -#: ../../include/text.php:1293 -msgid "sad" -msgstr "triste " - -#: ../../include/text.php:1294 -msgid "mellow" -msgstr "tranquilo/a" - -#: ../../include/text.php:1295 -msgid "tired" -msgstr "cansado/a " - -#: ../../include/text.php:1296 -msgid "perky" -msgstr "vivaz" - -#: ../../include/text.php:1297 -msgid "angry" -msgstr "enfadado/a" - -#: ../../include/text.php:1298 -msgid "stupefied" -msgstr "asombrado/a" - -#: ../../include/text.php:1299 -msgid "puzzled" -msgstr "perplejo/a" - -#: ../../include/text.php:1300 -msgid "interested" -msgstr "interesado/a" - -#: ../../include/text.php:1301 -msgid "bitter" -msgstr "amargado/a" - -#: ../../include/text.php:1302 -msgid "cheerful" -msgstr "alegre" - -#: ../../include/text.php:1303 -msgid "alive" -msgstr "animado/a" - -#: ../../include/text.php:1304 -msgid "annoyed" -msgstr "molesto/a" - -#: ../../include/text.php:1305 -msgid "anxious" -msgstr "ansioso/a" - -#: ../../include/text.php:1306 -msgid "cranky" -msgstr "de mal humor" - -#: ../../include/text.php:1307 -msgid "disturbed" -msgstr "perturbado/a" - -#: ../../include/text.php:1308 -msgid "frustrated" -msgstr "frustrado/a" - -#: ../../include/text.php:1309 -msgid "depressed" -msgstr "deprimido/a" - -#: ../../include/text.php:1310 -msgid "motivated" -msgstr "motivado/a" - -#: ../../include/text.php:1311 -msgid "relaxed" -msgstr "relajado/a" - -#: ../../include/text.php:1312 -msgid "surprised" -msgstr "sorprendido/a" - -#: ../../include/text.php:1504 +#: ../../include/text.php:1502 msgid "May" msgstr "mayo" -#: ../../include/text.php:1578 +#: ../../include/text.php:1576 msgid "Unknown attachment" msgstr "Adjunto no reconocido" -#: ../../include/text.php:1581 ../../Zotlabs/Storage/Browser.php:382 +#: ../../include/text.php:1579 ../../Zotlabs/Storage/Browser.php:382 #: ../../Zotlabs/Module/Sharedwithme.php:109 msgid "Size" msgstr "Tamaño" -#: ../../include/text.php:1623 +#: ../../include/text.php:1622 msgid "remove category" msgstr "eliminar el tema" @@ -3608,7 +3451,7 @@ msgstr "La encuesta ha terminado" msgid "Poll ends in %s" msgstr "La encuesta termina en %s" -#: ../../include/text.php:2013 ../../Zotlabs/Lib/ThreadItem.php:446 +#: ../../include/text.php:2013 ../../Zotlabs/Lib/ThreadItem.php:467 msgid "Vote" msgstr "Votar" @@ -3626,7 +3469,7 @@ msgstr "Puede crear su propia disposición gráfica con la herramienta de planti #: ../../include/text.php:2211 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 -#: ../../addon/wiki/Widget/Wiki_pages.php:65 +#: ../../addon/wiki/Widget/Wiki_pages.php:68 msgid "BBcode" msgstr "BBcode" @@ -3636,12 +3479,12 @@ msgstr "HTML" #: ../../include/text.php:2213 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 -#: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/mdpost/mdpost.php:41 +#: ../../addon/wiki/Widget/Wiki_pages.php:68 ../../addon/mdpost/mdpost.php:41 msgid "Markdown" msgstr "Markdown" #: ../../include/text.php:2214 ../../addon/wiki/Mod_Wiki.php:220 -#: ../../addon/wiki/Mod_Wiki.php:903 ../../addon/wiki/Widget/Wiki_pages.php:65 +#: ../../addon/wiki/Mod_Wiki.php:903 ../../addon/wiki/Widget/Wiki_pages.php:68 msgid "Text" msgstr "Texto" @@ -3669,140 +3512,140 @@ msgstr "encuesta" msgid "a-z, 0-9, -, and _ only" msgstr "a-z, 0-9, -, and _ only" -#: ../../include/text.php:2786 +#: ../../include/text.php:2789 msgid "Design Tools" msgstr "Herramientas de diseño web" -#: ../../include/text.php:2789 ../../Zotlabs/Module/Blocks.php:152 +#: ../../include/text.php:2792 ../../Zotlabs/Module/Blocks.php:152 msgid "Blocks" msgstr "Bloques" -#: ../../include/text.php:2790 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2793 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "Menús" -#: ../../include/text.php:2791 ../../Zotlabs/Module/Layouts.php:182 +#: ../../include/text.php:2794 ../../Zotlabs/Module/Layouts.php:182 msgid "Layouts" msgstr "Plantillas" -#: ../../include/text.php:2792 +#: ../../include/text.php:2795 msgid "Pages" msgstr "Páginas" -#: ../../include/text.php:2804 +#: ../../include/text.php:2807 msgid "Import" msgstr "Importar" -#: ../../include/text.php:2805 +#: ../../include/text.php:2808 msgid "Import website..." msgstr "Importar un sitio web..." -#: ../../include/text.php:2806 +#: ../../include/text.php:2809 msgid "Select folder to import" msgstr "Seleccionar la carpeta que se va a importar" -#: ../../include/text.php:2807 +#: ../../include/text.php:2810 msgid "Import from a zipped folder:" msgstr "Importar desde una carpeta comprimida: " -#: ../../include/text.php:2808 +#: ../../include/text.php:2811 msgid "Import from cloud files:" msgstr "Importar desde los ficheros en la nube: " -#: ../../include/text.php:2809 +#: ../../include/text.php:2812 msgid "/cloud/channel/path/to/folder" msgstr "/cloud/canal/ruta/a la/carpeta" -#: ../../include/text.php:2810 +#: ../../include/text.php:2813 msgid "Enter path to website files" msgstr "Ruta a los ficheros del sitio web" -#: ../../include/text.php:2811 +#: ../../include/text.php:2814 msgid "Select folder" msgstr "Seleccionar la carpeta" -#: ../../include/text.php:2812 +#: ../../include/text.php:2815 msgid "Export website..." msgstr "Exportar un sitio web..." -#: ../../include/text.php:2813 +#: ../../include/text.php:2816 msgid "Export to a zip file" msgstr "Exportar a un fichero comprimido .zip" -#: ../../include/text.php:2814 +#: ../../include/text.php:2817 msgid "website.zip" msgstr "sitio_web.zip" -#: ../../include/text.php:2815 +#: ../../include/text.php:2818 msgid "Enter a name for the zip file." msgstr "Escriba un nombre para el fichero zip." -#: ../../include/text.php:2816 +#: ../../include/text.php:2819 msgid "Export to cloud files" msgstr "Exportar a la nube de ficheros" -#: ../../include/text.php:2817 +#: ../../include/text.php:2820 msgid "/path/to/export/folder" msgstr "/ruta/para/exportar/carpeta" -#: ../../include/text.php:2818 +#: ../../include/text.php:2821 msgid "Enter a path to a cloud files destination." msgstr "Escriba una ruta de destino a la nube de ficheros." -#: ../../include/text.php:2819 +#: ../../include/text.php:2822 msgid "Specify folder" msgstr "Especificar una carpeta" -#: ../../include/channel.php:48 +#: ../../include/channel.php:49 msgid "Unable to obtain identity information from database" msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" -#: ../../include/channel.php:81 +#: ../../include/channel.php:82 msgid "Empty name" msgstr "Nombre vacío" -#: ../../include/channel.php:84 +#: ../../include/channel.php:85 msgid "Name too long" msgstr "Nombre demasiado largo" -#: ../../include/channel.php:201 +#: ../../include/channel.php:202 msgid "No account identifier" msgstr "Ningún identificador de la cuenta" -#: ../../include/channel.php:213 ../../Zotlabs/Module/Register.php:95 +#: ../../include/channel.php:214 ../../Zotlabs/Module/Register.php:95 msgid "Nickname is required." msgstr "Se requiere un sobrenombre (alias)." -#: ../../include/channel.php:227 ../../include/channel.php:659 +#: ../../include/channel.php:228 ../../include/channel.php:667 #: ../../Zotlabs/Module/Register.php:100 #: ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "Sobrenombre en uso. Por favor, elija otro." -#: ../../include/channel.php:232 ../../include/channel.php:664 +#: ../../include/channel.php:233 ../../include/channel.php:672 #: ../../Zotlabs/Module/Register.php:105 #: ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio." -#: ../../include/channel.php:292 +#: ../../include/channel.php:299 msgid "Unable to retrieve created identity" msgstr "No ha sido posible recuperar la identidad creada" -#: ../../include/channel.php:402 +#: ../../include/channel.php:410 msgid "Default Profile" msgstr "Perfil principal" -#: ../../include/channel.php:592 ../../include/channel.php:681 +#: ../../include/channel.php:600 ../../include/channel.php:689 msgid "Unable to retrieve modified identity" msgstr "No se puede recuperar la identidad modficada" -#: ../../include/channel.php:1373 +#: ../../include/channel.php:1381 msgid "Requested channel is not available" msgstr "El canal solicitado no está disponible" -#: ../../include/channel.php:1427 ../../addon/cards/Mod_Cards.php:42 +#: ../../include/channel.php:1435 ../../addon/cards/Mod_Cards.php:42 #: ../../addon/articles/Mod_Articles.php:46 #: ../../addon/gallery/Mod_Gallery.php:49 #: ../../Zotlabs/Module/Editwebpage.php:32 @@ -3816,255 +3659,251 @@ msgstr "El canal solicitado no está disponible" msgid "Requested profile is not available." msgstr "El perfil solicitado no está disponible." -#: ../../include/channel.php:1523 ../../Zotlabs/Module/Profiles.php:744 +#: ../../include/channel.php:1531 ../../Zotlabs/Module/Profiles.php:740 msgid "Change profile photo" msgstr "Cambiar la foto del perfil" -#: ../../include/channel.php:1531 +#: ../../include/channel.php:1539 msgid "Create New Profile" msgstr "Crear un nuevo perfil" -#: ../../include/channel.php:1549 ../../Zotlabs/Module/Profiles.php:841 +#: ../../include/channel.php:1557 ../../Zotlabs/Module/Profiles.php:837 msgid "Profile Image" msgstr "Imagen del perfil" -#: ../../include/channel.php:1552 +#: ../../include/channel.php:1560 msgid "Visible to everybody" msgstr "Visible para todos" -#: ../../include/channel.php:1553 ../../Zotlabs/Module/Profiles.php:741 -#: ../../Zotlabs/Module/Profiles.php:845 +#: ../../include/channel.php:1561 ../../Zotlabs/Module/Profiles.php:737 +#: ../../Zotlabs/Module/Profiles.php:841 msgid "Edit visibility" msgstr "Editar visibilidad" -#: ../../include/channel.php:1635 ../../include/channel.php:1763 +#: ../../include/channel.php:1643 ../../include/channel.php:1771 msgid "Gender:" msgstr "Género:" -#: ../../include/channel.php:1636 ../../include/channel.php:1807 +#: ../../include/channel.php:1644 ../../include/channel.php:1817 msgid "Status:" msgstr "Estado:" -#: ../../include/channel.php:1637 ../../include/channel.php:1831 +#: ../../include/channel.php:1645 ../../include/channel.php:1841 msgid "Homepage:" msgstr "Página personal:" -#: ../../include/channel.php:1638 ../../include/channel.php:1833 +#: ../../include/channel.php:1646 ../../include/channel.php:1843 #: ../../Zotlabs/Module/Directory.php:368 msgid "Hometown:" msgstr "Lugar de nacimiento:" -#: ../../include/channel.php:1639 +#: ../../include/channel.php:1647 msgid "Online Now" msgstr "Ahora en línea" -#: ../../include/channel.php:1688 +#: ../../include/channel.php:1696 msgid "This channel has not added a profile description yet" msgstr "Este canal aún no ha añadido una descripción de perfil" -#: ../../include/channel.php:1690 +#: ../../include/channel.php:1698 msgid "Change your profile photo" msgstr "Cambiar su foto del perfil" -#: ../../include/channel.php:1722 +#: ../../include/channel.php:1730 msgid "Trans" msgstr "Trans" -#: ../../include/channel.php:1761 +#: ../../include/channel.php:1769 msgid "Full Name:" msgstr "Nombre completo:" -#: ../../include/channel.php:1768 -msgid "Like this channel" -msgstr "Me gusta este canal" - -#: ../../include/channel.php:1792 +#: ../../include/channel.php:1802 msgid "j F, Y" msgstr "j F Y" -#: ../../include/channel.php:1793 +#: ../../include/channel.php:1803 msgid "j F" msgstr "j F" -#: ../../include/channel.php:1800 +#: ../../include/channel.php:1810 msgid "Birthday:" msgstr "Cumpleaños:" -#: ../../include/channel.php:1804 ../../Zotlabs/Module/Directory.php:349 +#: ../../include/channel.php:1814 ../../Zotlabs/Module/Directory.php:349 msgid "Age:" msgstr "Edad:" -#: ../../include/channel.php:1813 +#: ../../include/channel.php:1823 #, php-format msgid "for %1$d %2$s" msgstr "por %1$d %2$s" -#: ../../include/channel.php:1825 +#: ../../include/channel.php:1835 msgid "Tags:" msgstr "Etiquetas:" -#: ../../include/channel.php:1829 +#: ../../include/channel.php:1839 msgid "Sexual Preference:" msgstr "Orientación sexual:" -#: ../../include/channel.php:1835 +#: ../../include/channel.php:1845 msgid "Political Views:" msgstr "Posición política:" -#: ../../include/channel.php:1837 +#: ../../include/channel.php:1847 msgid "Religion:" msgstr "Religión:" -#: ../../include/channel.php:1839 ../../Zotlabs/Module/Directory.php:370 +#: ../../include/channel.php:1849 ../../Zotlabs/Module/Directory.php:370 msgid "About:" msgstr "Sobre mí:" -#: ../../include/channel.php:1841 +#: ../../include/channel.php:1851 msgid "Hobbies/Interests:" msgstr "Aficciones o intereses:" -#: ../../include/channel.php:1843 +#: ../../include/channel.php:1853 msgid "Likes:" msgstr "Me gusta:" -#: ../../include/channel.php:1845 +#: ../../include/channel.php:1855 msgid "Dislikes:" msgstr "No me gusta:" -#: ../../include/channel.php:1847 +#: ../../include/channel.php:1857 msgid "Contact information and Social Networks:" msgstr "Información de contacto y redes sociales:" -#: ../../include/channel.php:1849 +#: ../../include/channel.php:1859 msgid "My other channels:" msgstr "Mis otros canales:" -#: ../../include/channel.php:1851 +#: ../../include/channel.php:1861 msgid "Musical interests:" msgstr "Preferencias musicales:" -#: ../../include/channel.php:1853 +#: ../../include/channel.php:1863 msgid "Books, literature:" msgstr "Libros, literatura:" -#: ../../include/channel.php:1855 +#: ../../include/channel.php:1865 msgid "Television:" msgstr "Televisión:" -#: ../../include/channel.php:1857 +#: ../../include/channel.php:1867 msgid "Film/dance/culture/entertainment:" msgstr "Cine, danza, cultura, entretenimiento:" -#: ../../include/channel.php:1859 +#: ../../include/channel.php:1869 msgid "Love/Romance:" msgstr "Vida sentimental o amorosa:" -#: ../../include/channel.php:1861 +#: ../../include/channel.php:1871 msgid "Work/employment:" msgstr "Trabajo:" -#: ../../include/channel.php:1863 +#: ../../include/channel.php:1873 msgid "School/education:" msgstr "Estudios:" -#: ../../include/channel.php:1884 ../../Zotlabs/Lib/Apps.php:367 +#: ../../include/channel.php:1894 ../../Zotlabs/Lib/Apps.php:365 #: ../../Zotlabs/Module/Profperm.php:113 msgid "Profile" msgstr "Perfil" -#: ../../include/channel.php:1886 +#: ../../include/channel.php:1896 msgid "Like this thing" msgstr "Me gusta esto" -#: ../../include/channel.php:1887 +#: ../../include/channel.php:1897 msgid "Export" msgstr "Exportar" -#: ../../include/channel.php:2340 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2350 msgid "cover photo" msgstr "Imagen de portada del perfil" -#: ../../include/channel.php:2615 ../../boot.php:1749 +#: ../../include/channel.php:2631 ../../boot.php:1747 #: ../../Zotlabs/Module/Rmagic.php:96 msgid "Remote Authentication" msgstr "Acceso desde su servidor" -#: ../../include/channel.php:2616 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2632 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)" -#: ../../include/channel.php:2617 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2633 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "Acceder" -#: ../../include/channel.php:2775 ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../include/channel.php:2793 ../../Zotlabs/Module/Admin/Accounts.php:184 #, php-format msgid "Account '%s' deleted" msgstr "La cuenta '%s' ha sido eliminada" -#: ../../include/bbcode.php:233 ../../include/bbcode.php:939 -#: ../../include/bbcode.php:1560 ../../include/bbcode.php:1568 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:993 +#: ../../include/bbcode.php:1613 ../../include/bbcode.php:1621 msgid "Image/photo" msgstr "Imagen/foto" -#: ../../include/bbcode.php:280 ../../include/bbcode.php:1585 +#: ../../include/bbcode.php:285 msgid "Encrypted content" msgstr "Contenido cifrado" -#: ../../include/bbcode.php:336 +#: ../../include/bbcode.php:341 #, php-format msgid "Install %1$s element %2$s" msgstr "Instalar el elemento de%1$s%2$s" -#: ../../include/bbcode.php:340 +#: ../../include/bbcode.php:345 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio." -#: ../../include/bbcode.php:350 ../../Zotlabs/Module/Impel.php:47 +#: ../../include/bbcode.php:355 ../../Zotlabs/Module/Impel.php:47 msgid "webpage" msgstr "página web" -#: ../../include/bbcode.php:353 ../../Zotlabs/Module/Impel.php:57 +#: ../../include/bbcode.php:358 ../../Zotlabs/Module/Impel.php:57 msgid "layout" msgstr "plantilla" -#: ../../include/bbcode.php:356 ../../Zotlabs/Module/Impel.php:52 +#: ../../include/bbcode.php:361 ../../Zotlabs/Module/Impel.php:52 msgid "block" msgstr "bloque" -#: ../../include/bbcode.php:359 ../../Zotlabs/Module/Impel.php:64 +#: ../../include/bbcode.php:364 ../../Zotlabs/Module/Impel.php:64 msgid "menu" msgstr "menú" -#: ../../include/bbcode.php:562 +#: ../../include/bbcode.php:567 msgid "card" msgstr "ficha" -#: ../../include/bbcode.php:564 +#: ../../include/bbcode.php:569 msgid "article" msgstr "el artículo" -#: ../../include/bbcode.php:647 ../../include/bbcode.php:655 +#: ../../include/bbcode.php:652 ../../include/bbcode.php:660 msgid "Click to open/close" msgstr "Pulsar para abrir/cerrar" -#: ../../include/bbcode.php:668 +#: ../../include/bbcode.php:673 msgid "View article" msgstr "Ver el artículo" -#: ../../include/bbcode.php:668 +#: ../../include/bbcode.php:673 msgid "View summary" msgstr "Ver sumario" -#: ../../include/bbcode.php:1061 ../../include/bbcode.php:1246 +#: ../../include/bbcode.php:1117 ../../include/bbcode.php:1299 #: ../../addon/wiki/Lib/NativeWikiPage.php:630 msgid "Different viewers will see this text differently" msgstr "Visitantes diferentes verán este texto de forma distinta" -#: ../../include/bbcode.php:1536 +#: ../../include/bbcode.php:1589 msgid "$1 wrote:" msgstr "$1 escribió:" @@ -4081,7 +3920,7 @@ msgstr "No se ha podido crear un canal con un identificador que ya existe en est msgid "Unable to create a unique channel address. Import failed." msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación." -#: ../../include/import.php:122 +#: ../../include/import.php:128 msgid "Cloned channel not found. Import failed." msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado." @@ -4117,6 +3956,45 @@ msgstr "Ocultar el botón y mostrar los smilies directamente." msgid "Smileybutton Settings" msgstr "Ajustes de Smileybutton" +#: ../../addon/fediquest/fediquest.php:211 +msgid "ERROR: word length is not correct!" +msgstr "ERROR: ¡la longitud de la palabra no es correcta!" + +#: ../../addon/fediquest/Mod_Fediquest.php:22 +msgid "Fediquest App" +msgstr "Aplicación Fediquest" + +#: ../../addon/fediquest/Mod_Fediquest.php:23 +msgid "A distributed quest for a given word (game)." +msgstr "Una búsqueda distribuida de una palabra determinada (juego)." + +#: ../../addon/fediquest/Mod_Fediquest.php:24 +msgid "" +"To start a game, enter [fediquest]your_word[/fediquest] somewhere in a " +"toplevel post." +msgstr "Para empezar una partida, introduce [fediquest]tu_palabra[/fediquest] en algún lugar de un post de toplevel." + +#: ../../addon/fediquest/Mod_Fediquest.php:25 +msgid "Your contacts can post their guess in the comments." +msgstr "Sus contactos pueden publicar sus conjeturas en los comentarios." + +#: ../../addon/fediquest/Mod_Fediquest.php:26 +msgid "" +"Your channel will evaluate the guess and automatically post the response." +msgstr "Su canal evaluará la conjetura y publicará automáticamente la respuesta." + +#: ../../addon/fediquest/Mod_Fediquest.php:28 +msgid "Correct letters" +msgstr "Letras correctas" + +#: ../../addon/fediquest/Mod_Fediquest.php:29 +msgid "Letters contained in the word but at the wrong spot" +msgstr "Letras contenidas en la palabra pero en el lugar equivocado" + +#: ../../addon/fediquest/Mod_Fediquest.php:30 +msgid "Letters not contained in the word" +msgstr "Letras no contenidas en la palabra" + #: ../../addon/socialauth/Mod_SocialAuth.php:106 #: ../../addon/socialauth/Mod_SocialAuth.php:179 msgid "Network error" @@ -4214,45 +4092,6 @@ msgstr "PHP upload_max_filesize: " msgid "PHP post_max_size (must be larger than upload_max_filesize): " msgstr "PHP post_max_size (debe ser mayor que upload_max_filesize): " -#: ../../addon/fediwordle/fediwordle.php:211 -msgid "ERROR: word length is not correct!" -msgstr "ERROR: ¡la longitud de la palabra no es correcta!" - -#: ../../addon/fediwordle/Mod_Fediwordle.php:22 -msgid "Fediwordle App" -msgstr "App Fediwordle" - -#: ../../addon/fediwordle/Mod_Fediwordle.php:23 -msgid "A distributed word game inspired by wordle." -msgstr "Un juego de palabras distribuido inspirado en el wordle." - -#: ../../addon/fediwordle/Mod_Fediwordle.php:24 -msgid "" -"To start a game, enter [wordle]your_word[/wordle] somewhere in a toplevel " -"post." -msgstr "Para empezar una partida, introduzca [wordle]mi_palabra[/wordle] en algún lugar de un post de nivel superior." - -#: ../../addon/fediwordle/Mod_Fediwordle.php:25 -msgid "Your contacts can post their guess in the comments." -msgstr "Sus contactos pueden publicar sus conjeturas en los comentarios." - -#: ../../addon/fediwordle/Mod_Fediwordle.php:26 -msgid "" -"Your channel will evaluate the guess and automatically post the response." -msgstr "Su canal evaluará la conjetura y publicará automáticamente la respuesta." - -#: ../../addon/fediwordle/Mod_Fediwordle.php:28 -msgid "Correct letters" -msgstr "Letras correctas" - -#: ../../addon/fediwordle/Mod_Fediwordle.php:29 -msgid "Letters contained in the word but at the wrong spot" -msgstr "Letras contenidas en la palabra pero en el lugar equivocado" - -#: ../../addon/fediwordle/Mod_Fediwordle.php:30 -msgid "Letters not contained in the word" -msgstr "Letras no contenidas en la palabra" - #: ../../addon/sendzid/Mod_Sendzid.php:21 msgid "Send your identity to all websites" msgstr "Enviar su identidad a todos los sitios web" @@ -4335,7 +4174,7 @@ msgid "Last Name" msgstr "Apellido" #: ../../addon/openid/MysqlProvider.php:54 -#: ../../addon/redred/Mod_Redred.php:73 ../../boot.php:1742 +#: ../../addon/redred/Mod_Redred.php:73 ../../boot.php:1740 msgid "Nickname" msgstr "Alias" @@ -4343,12 +4182,6 @@ msgstr "Alias" msgid "Full Name" msgstr "Nombre completo" -#: ../../addon/openid/MysqlProvider.php:58 -#: ../../addon/openid/MysqlProvider.php:59 -#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:366 -msgid "Profile Photo" -msgstr "Foto del perfil" - #: ../../addon/openid/MysqlProvider.php:61 msgid "Profile Photo 16px" msgstr "Foto del perfil 16px" @@ -4374,11 +4207,11 @@ msgid "Profile Photo 128px" msgstr "Foto del perfil 128px" #: ../../addon/openid/MysqlProvider.php:68 -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Homepage URL" msgstr "Dirección de la página personal" -#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:364 +#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:362 msgid "Language" msgstr "Idioma" @@ -4399,7 +4232,7 @@ msgid "Birthdate" msgstr "Fecha de nacimiento" #: ../../addon/openid/MysqlProvider.php:74 -#: ../../Zotlabs/Module/Profiles.php:456 +#: ../../Zotlabs/Module/Profiles.php:452 msgid "Gender" msgstr "Género" @@ -4819,7 +4652,7 @@ msgstr "Publicar por defecto en InsaneJournal" msgid "Insane Journal Crosspost Connector" msgstr "Conector de publicación cruzada de InsaneJournal" -#: ../../addon/wholikesme/wholikesme.php:29 +#: ../../addon/wholikesme/wholikesme.php:30 msgid "Who likes me?" msgstr "¿Quién me ha puesto \"Me gusta\"?" @@ -4967,46 +4800,43 @@ msgstr "Su cuenta en %s caducará en unos pocos días." msgid "Your test account is about to expire." msgstr "Su cuenta de prueba está a punto de expirar." -#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1693 -#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Module/Like.php:453 -msgid "status" -msgstr "el mensaje de estado " - -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:25 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:28 msgid "ActivityPub Protocol Settings updated." msgstr "Se han actualizado los ajustes del protocolo ActivityPub." -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:41 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:44 msgid "" "The activitypub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos." -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:47 -msgid "Deliver to ActivityPub recipients in privacy groups" -msgstr "Entregar a los destinatarios de ActivityPub en grupos de canales" +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50 +msgid "Send activities of type note instead of article" +msgstr "Enviar actividades de tipo nota en lugar de artículo" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:47 -msgid "" -"May result in a large number of mentions and expose all the members of your " -"privacy group" -msgstr "Puede resultar en un gran número de menciones y exponer a todos los miembros de su grupo de canales" +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50 +msgid "Microblog services such as Mastodon do not properly support articles" +msgstr "Los servicios de microblog como Mastodon no soportan correctamente los artículos" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:51 -msgid "Send multi-media HTML articles" -msgstr "Enviar artículos multimedia en HTML" - -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:51 -msgid "Not supported by some microblog services such as Mastodon" -msgstr "No soportado por algunos servicios de microblog como Mastodon" - -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:59 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:58 msgid "Activitypub Protocol" msgstr "Protocolo Activitypub" +#: ../../addon/pubcrawl/pubcrawl.php:1073 +#: ../../addon/diaspora/diaspora.php:415 +#: ../../Zotlabs/Module/Contactedit.php:494 +msgid "Refresh failed" +msgstr "Error de actualización" + +#: ../../addon/pubcrawl/pubcrawl.php:1080 +#: ../../addon/diaspora/diaspora.php:420 +#: ../../Zotlabs/Module/Contactedit.php:491 +msgid "Refresh succeeded" +msgstr "Actualización con éxito" + #: ../../addon/bookmarker/bookmarker.php:38 -#: ../../Zotlabs/Lib/ThreadItem.php:474 +#: ../../Zotlabs/Lib/ThreadItem.php:495 msgid "Save Bookmarks" msgstr "Guardar en Marcadores" @@ -5024,7 +4854,7 @@ msgid "Post to Dreamwidth" msgstr "Publicar en Dreamwidth" #: ../../addon/dwpost/dwpost.php:134 ../../addon/dwpost/Mod_Dwpost.php:67 -#: ../../addon/wppost/wppost.php:174 ../../addon/wppost/Mod_Wppost.php:96 +#: ../../addon/wppost/wppost.php:175 ../../addon/wppost/Mod_Wppost.php:96 #: ../../addon/wiki/Mod_Wiki.php:381 ../../addon/ljpost/ljpost.php:134 msgid "Source" msgstr "Fuente" @@ -5075,7 +4905,7 @@ msgstr "La dirección de una transmisión de diaspora. Ejemplo: relay@diasporare msgid "Diaspora relay could not be imported" msgstr "El reenvío de Diaspora no ha podido ser importado" -#: ../../addon/diaspora/diaspora.php:1093 +#: ../../addon/diaspora/diaspora.php:1106 msgid "No subject" msgstr "Sin tema" @@ -5097,17 +4927,22 @@ msgstr "$projectname" msgid "%1$s dislikes %2$s's %3$s" msgstr "a %1$s no le gusta el %3$s de %2$s" -#: ../../addon/diaspora/Receiver.php:2251 ../../Zotlabs/Module/Like.php:495 +#: ../../addon/diaspora/Receiver.php:1693 +#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Like.php:456 +msgid "status" +msgstr "el mensaje de estado " + +#: ../../addon/diaspora/Receiver.php:2248 ../../Zotlabs/Module/Like.php:487 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s participa" -#: ../../addon/diaspora/Receiver.php:2253 ../../Zotlabs/Module/Like.php:497 +#: ../../addon/diaspora/Receiver.php:2250 ../../Zotlabs/Module/Like.php:489 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no participa" -#: ../../addon/diaspora/Receiver.php:2255 ../../Zotlabs/Module/Like.php:499 +#: ../../addon/diaspora/Receiver.php:2252 ../../Zotlabs/Module/Like.php:491 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s de %2$s: %1$s quizá participe" @@ -5181,7 +5016,7 @@ msgid "No channels currently blocked" msgstr "No hay canales bloqueados actualmente" #: ../../addon/superblock/Mod_Superblock.php:90 -#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Cover_photo.php:381 ../../Zotlabs/Module/Tagrm.php:137 #: ../../Zotlabs/Module/Admin/Addons.php:462 #: ../../Zotlabs/Module/Photos.php:994 msgid "Remove" @@ -5337,7 +5172,7 @@ msgstr "Nombre" #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/hzservices.php:657 #: ../../addon/cart/submodules/manualcat.php:260 -#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Rbmark.php:100 +#: ../../Zotlabs/Module/Appman.php:220 ../../Zotlabs/Module/Rbmark.php:100 #: ../../Zotlabs/Module/Cdav.php:1005 msgid "Description" msgstr "Descripción" @@ -5418,7 +5253,7 @@ msgid "You have no rendezvous. Press the button above to create a rendezvous!" msgstr "No tiene ninguna cita. ¡Presione el botón de arriba para crear una!" #: ../../addon/rendezvous/rendezvous.php:401 -#: ../../Zotlabs/Module/Setup.php:730 +#: ../../Zotlabs/Module/Setup.php:748 msgid "Errors encountered creating database tables." msgstr "Se han encontrado errores al crear las tablas de la base de datos." @@ -5541,14 +5376,14 @@ msgstr "Añadir un artículo" #: ../../addon/wiki/Mod_Wiki.php:36 #: ../../addon/flashcards/Mod_Flashcards.php:52 -#: ../../addon/faces/Mod_Faces.php:64 ../../addon/cart/cart.php:1459 +#: ../../addon/faces/Mod_Faces.php:64 ../../addon/cart/cart.php:1458 msgid "Profile Unavailable." msgstr "Perfil no disponible" #: ../../addon/wiki/Mod_Wiki.php:81 ../../addon/cart/manual_payments.php:93 #: ../../addon/cart/submodules/paypalbuttonV2.php:486 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1610 +#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1609 msgid "Invalid channel" msgstr "Canal no válido" @@ -5575,7 +5410,7 @@ msgid "View" msgstr "Ver" #: ../../addon/wiki/Mod_Wiki.php:217 ../../Zotlabs/Module/Manage.php:137 -#: ../../Zotlabs/Module/Profiles.php:852 +#: ../../Zotlabs/Module/Profiles.php:848 msgid "Create New" msgstr "Crear" @@ -5645,8 +5480,8 @@ msgstr "Nombre de la nueva página" msgid "Embed image from photo albums" msgstr "Incluir una imagen de los álbumes de fotos" -#: ../../addon/wiki/Mod_Wiki.php:402 ../../Zotlabs/Module/Cover_photo.php:432 -#: ../../Zotlabs/Module/Profile_photo.php:557 +#: ../../addon/wiki/Mod_Wiki.php:402 ../../Zotlabs/Module/Cover_photo.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:556 msgid "Choose a different album" msgstr "Elegir un álbum diferente..." @@ -5706,12 +5541,12 @@ msgstr "Revisión seleccionada" msgid "You must be authenticated." msgstr "Debe estar autenticado." -#: ../../addon/wiki/Mod_Wiki.php:899 ../../addon/wiki/Widget/Wiki_pages.php:61 +#: ../../addon/wiki/Mod_Wiki.php:899 ../../addon/wiki/Widget/Wiki_pages.php:64 msgid "Add new page" msgstr "Añadir una nueva página" -#: ../../addon/wiki/Mod_Wiki.php:906 ../../addon/wiki/Widget/Wiki_pages.php:68 -#: ../../Zotlabs/Module/Dreport.php:133 +#: ../../addon/wiki/Mod_Wiki.php:906 ../../addon/wiki/Widget/Wiki_pages.php:71 +#: ../../Zotlabs/Module/Dreport.php:132 msgid "Options" msgstr "Opciones" @@ -5792,11 +5627,11 @@ msgstr "Fecha" msgid "Compare" msgstr "Comparar" -#: ../../addon/wiki/Widget/Wiki_pages.php:55 +#: ../../addon/wiki/Widget/Wiki_pages.php:58 msgid "Wiki Pages" msgstr "Páginas del wiki" -#: ../../addon/wiki/Widget/Wiki_pages.php:66 +#: ../../addon/wiki/Widget/Wiki_pages.php:69 msgid "Page name" msgstr "Nombre de la página" @@ -5933,7 +5768,7 @@ msgid "Post to GNU social" msgstr "Publicar en GNU social" #: ../../addon/statusnet/statusnet.php:593 -#: ../../Zotlabs/Module/Admin/Site.php:423 +#: ../../Zotlabs/Module/Admin/Site.php:409 msgid "Site name" msgstr "Nombre del sitio" @@ -6122,7 +5957,7 @@ msgstr "Los pagos manuales no están habilitados." #: ../../addon/cart/manual_payments.php:68 #: ../../addon/cart/submodules/paypalbuttonV2.php:417 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/cart.php:1632 +#: ../../addon/cart/cart.php:1631 msgid "Order not found." msgstr "El pedido no se ha encontrado." @@ -6321,7 +6156,7 @@ msgstr "Instrucciones" msgid "Access Denied." msgstr "Acceso denegado" -#: ../../addon/cart/myshop.php:113 ../../addon/cart/cart.php:1495 +#: ../../addon/cart/myshop.php:113 ../../addon/cart/cart.php:1494 msgid "Order Not Found" msgstr "No se ha encontrado el pedido" @@ -6348,47 +6183,47 @@ msgstr "[cesta] Artículo añadido" msgid "Order already checked out." msgstr "El pedido ya ha sido revisado" -#: ../../addon/cart/cart.php:1417 +#: ../../addon/cart/cart.php:1416 msgid "Drop database tables when uninstalling." msgstr "Eliminar tablas de la base de datos al desinstalar." -#: ../../addon/cart/cart.php:1424 ../../addon/cart/Settings/Cart.php:129 +#: ../../addon/cart/cart.php:1423 ../../addon/cart/Settings/Cart.php:129 msgid "Cart Settings" msgstr "Configuración del carro de la compra" -#: ../../addon/cart/cart.php:1436 ../../addon/cart/cart.php:1439 +#: ../../addon/cart/cart.php:1435 ../../addon/cart/cart.php:1438 msgid "Shop" msgstr "Comprar" -#: ../../addon/cart/cart.php:1599 +#: ../../addon/cart/cart.php:1598 msgid "You must be logged into the Grid to shop." msgstr "Debe iniciar sesión en la red para comprar." -#: ../../addon/cart/cart.php:1648 +#: ../../addon/cart/cart.php:1647 msgid "Access denied." msgstr "Acceso denegado" -#: ../../addon/cart/cart.php:1700 ../../addon/cart/cart.php:1843 +#: ../../addon/cart/cart.php:1699 ../../addon/cart/cart.php:1842 msgid "No Order Found" msgstr "No se ha encontrado ningún pedido" -#: ../../addon/cart/cart.php:1709 +#: ../../addon/cart/cart.php:1708 msgid "An unknown error has occurred Please start again." msgstr "Se ha producido un error desconocido Vuelva a empezar." -#: ../../addon/cart/cart.php:1852 +#: ../../addon/cart/cart.php:1851 msgid "Requirements not met." msgstr "No se cumplen los requisitos." -#: ../../addon/cart/cart.php:1852 +#: ../../addon/cart/cart.php:1851 msgid "Review your order and complete any needed requirements." msgstr "Revise su pedido y complete los requisitos necesarios." -#: ../../addon/cart/cart.php:1878 +#: ../../addon/cart/cart.php:1877 msgid "Invalid Payment Type. Please start again." msgstr "Tipo de pago no válido. Por favor, empiece de nuevo." -#: ../../addon/cart/cart.php:1885 +#: ../../addon/cart/cart.php:1884 msgid "Order not found" msgstr "El pedido no se ha encontrado" @@ -6465,94 +6300,6 @@ msgstr "Si está activado, sus entradas públicas se publicarán en la cuenta de msgid "Twitter Crosspost Connector" msgstr "Twitter Crosspost Connector" -#: ../../addon/moremoods/moremoods.php:19 -msgid "lonely" -msgstr "Solo/a" - -#: ../../addon/moremoods/moremoods.php:20 -msgid "drunk" -msgstr "ebrio/a" - -#: ../../addon/moremoods/moremoods.php:21 -msgid "horny" -msgstr "caliente" - -#: ../../addon/moremoods/moremoods.php:22 -msgid "stoned" -msgstr "drogado/a" - -#: ../../addon/moremoods/moremoods.php:23 -msgid "fucked up" -msgstr "jodido/a" - -#: ../../addon/moremoods/moremoods.php:24 -msgid "clusterfucked" -msgstr "hecho/a polvo" - -#: ../../addon/moremoods/moremoods.php:25 -msgid "crazy" -msgstr "loco/a" - -#: ../../addon/moremoods/moremoods.php:26 -msgid "hurt" -msgstr "ofendido/a" - -#: ../../addon/moremoods/moremoods.php:27 -msgid "sleepy" -msgstr "soñoliento/a" - -#: ../../addon/moremoods/moremoods.php:28 -msgid "grumpy" -msgstr "gruñón/ona" - -#: ../../addon/moremoods/moremoods.php:29 -msgid "high" -msgstr "superior" - -#: ../../addon/moremoods/moremoods.php:30 -msgid "semi-conscious" -msgstr "semiconsciente" - -#: ../../addon/moremoods/moremoods.php:31 -msgid "in love" -msgstr "enamorado/a" - -#: ../../addon/moremoods/moremoods.php:32 -msgid "in lust" -msgstr "lujurioso/a" - -#: ../../addon/moremoods/moremoods.php:33 -msgid "naked" -msgstr "desnudo/a" - -#: ../../addon/moremoods/moremoods.php:34 -msgid "stinky" -msgstr "apestoso/a" - -#: ../../addon/moremoods/moremoods.php:35 -msgid "sweaty" -msgstr "sudoroso/a" - -#: ../../addon/moremoods/moremoods.php:36 -msgid "bleeding out" -msgstr "exánime" - -#: ../../addon/moremoods/moremoods.php:37 -msgid "victorious" -msgstr "victorioso/a" - -#: ../../addon/moremoods/moremoods.php:38 -msgid "defeated" -msgstr "derrotado/a" - -#: ../../addon/moremoods/moremoods.php:39 -msgid "envious" -msgstr "envidioso/a" - -#: ../../addon/moremoods/moremoods.php:40 -msgid "jealous" -msgstr "celoso/a" - #: ../../addon/gravatar/gravatar.php:123 msgid "generic profile image" msgstr "imagen del perfil general" @@ -6723,7 +6470,7 @@ msgstr "Título" msgid "Brief description or title" msgstr "Breve descripción o título" -#: ../../addon/workflow/workflow.php:2661 ../../Zotlabs/Lib/Apps.php:375 +#: ../../addon/workflow/workflow.php:2661 ../../Zotlabs/Lib/Apps.php:373 #: ../../Zotlabs/Widget/Notes.php:38 msgid "Notes" msgstr "Notas" @@ -6766,158 +6513,6 @@ msgstr "Un ajuste" msgid "Skeleton Settings" msgstr "Ajustes de Skeleton" -#: ../../addon/morepokes/morepokes.php:19 -msgid "bitchslap" -msgstr "una bofetada humillante" - -#: ../../addon/morepokes/morepokes.php:19 -msgid "bitchslapped" -msgstr "ha abofeteado de forma humillante a" - -#: ../../addon/morepokes/morepokes.php:20 -msgid "shag" -msgstr "un polvo" - -#: ../../addon/morepokes/morepokes.php:20 -msgid "shagged" -msgstr "ha dejado exhausto/a a" - -#: ../../addon/morepokes/morepokes.php:21 -msgid "patent" -msgstr "una patente" - -#: ../../addon/morepokes/morepokes.php:21 -msgid "patented" -msgstr "ha patentado a" - -#: ../../addon/morepokes/morepokes.php:22 -msgid "hug" -msgstr "un abrazo" - -#: ../../addon/morepokes/morepokes.php:22 -msgid "hugged" -msgstr "ha abrazado a" - -#: ../../addon/morepokes/morepokes.php:23 -msgid "murder" -msgstr "un asesinato" - -#: ../../addon/morepokes/morepokes.php:23 -msgid "murdered" -msgstr "ha asesinado a" - -#: ../../addon/morepokes/morepokes.php:24 -msgid "worship" -msgstr "una alabanza" - -#: ../../addon/morepokes/morepokes.php:24 -msgid "worshipped" -msgstr "ha elogiado a" - -#: ../../addon/morepokes/morepokes.php:25 -msgid "kiss" -msgstr "un beso" - -#: ../../addon/morepokes/morepokes.php:25 -msgid "kissed" -msgstr "ha besado a" - -#: ../../addon/morepokes/morepokes.php:26 -msgid "tempt" -msgstr "una tentación" - -#: ../../addon/morepokes/morepokes.php:26 -msgid "tempted" -msgstr "ha tentado a" - -#: ../../addon/morepokes/morepokes.php:27 -msgid "raise eyebrows at" -msgstr "un levantamiento de cejas" - -#: ../../addon/morepokes/morepokes.php:27 -msgid "raised their eyebrows at" -msgstr "ha levantado las cejas a" - -#: ../../addon/morepokes/morepokes.php:28 -msgid "insult" -msgstr "un insulto" - -#: ../../addon/morepokes/morepokes.php:28 -msgid "insulted" -msgstr "ha insultado a" - -#: ../../addon/morepokes/morepokes.php:29 -msgid "praise" -msgstr "un elogio" - -#: ../../addon/morepokes/morepokes.php:29 -msgid "praised" -msgstr "ha elogiado a" - -#: ../../addon/morepokes/morepokes.php:30 -msgid "be dubious of" -msgstr "una indecisión" - -#: ../../addon/morepokes/morepokes.php:30 -msgid "was dubious of" -msgstr "estaba dudoso de" - -#: ../../addon/morepokes/morepokes.php:31 -msgid "eat" -msgstr "una comida" - -#: ../../addon/morepokes/morepokes.php:31 -msgid "ate" -msgstr "ha comido" - -#: ../../addon/morepokes/morepokes.php:32 -msgid "giggle and fawn at" -msgstr "una sonrisa aduladora" - -#: ../../addon/morepokes/morepokes.php:32 -msgid "giggled and fawned at" -msgstr "ha sonreído y adulado a" - -#: ../../addon/morepokes/morepokes.php:33 -msgid "doubt" -msgstr "una duda" - -#: ../../addon/morepokes/morepokes.php:33 -msgid "doubted" -msgstr "ha dudado de" - -#: ../../addon/morepokes/morepokes.php:34 -msgid "glare" -msgstr "una mirada furiosa" - -#: ../../addon/morepokes/morepokes.php:34 -msgid "glared at" -msgstr "ha mirado con furia" - -#: ../../addon/morepokes/morepokes.php:35 -msgid "fuck" -msgstr "una mierda" - -#: ../../addon/morepokes/morepokes.php:35 -msgid "fucked" -msgstr "ha mandado a la mierda a" - -#: ../../addon/morepokes/morepokes.php:36 -msgid "bonk" -msgstr "un golpe" - -#: ../../addon/morepokes/morepokes.php:36 -msgid "bonked" -msgstr "ha golpeado a" - -#: ../../addon/morepokes/morepokes.php:37 -msgid "declare undying love for" -msgstr "una declaración de amor eterno" - -#: ../../addon/morepokes/morepokes.php:37 -msgid "declared undying love for" -msgstr "ha declarado amor eterno a" - #: ../../addon/authchoose/Mod_Authchoose.php:30 msgid "" "Allow magic authentication only to websites of your immediate connections" @@ -7131,45 +6726,45 @@ msgstr "¡El juego del \"gato\"!" msgid "I won!" msgstr "¡He ganado yo!" -#: ../../boot.php:1724 +#: ../../boot.php:1722 msgid "Create an account to access services and applications" msgstr "Crear una cuenta para acceder a los servicios y aplicaciones" -#: ../../boot.php:1742 +#: ../../boot.php:1740 msgid "Email or nickname" msgstr "Correo electrónico o apodo" -#: ../../boot.php:1752 +#: ../../boot.php:1750 msgid "Password" msgstr "Contraseña" -#: ../../boot.php:1753 +#: ../../boot.php:1751 msgid "Remember me" msgstr "Recordarme" -#: ../../boot.php:1756 +#: ../../boot.php:1754 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: ../../boot.php:1757 ../../Zotlabs/Module/Lostpass.php:91 +#: ../../boot.php:1755 ../../Zotlabs/Module/Lostpass.php:91 msgid "Password Reset" msgstr "Restablecer la contraseña" -#: ../../boot.php:2627 +#: ../../boot.php:2625 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Error SSL del sitio web en %s" -#: ../../boot.php:2632 +#: ../../boot.php:2630 msgid "Website SSL certificate is not valid. Please correct." msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema." -#: ../../boot.php:2748 +#: ../../boot.php:2746 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s" -#: ../../boot.php:2753 +#: ../../boot.php:2751 msgid "Cron/Scheduled tasks not running." msgstr "Las tareas del Planificador/Cron no están funcionando." @@ -7240,262 +6835,251 @@ msgstr "solicita comentar sobre " msgid "commented on" msgstr "ha comentado sobre " -#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:317 msgid "requested to like" msgstr "solicita que se permita mostrar agrado " -#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:317 msgid "liked" msgstr "ha gustado de " -#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:320 msgid "requested to dislike" msgstr "solicita que se permita mostrar desagrado " -#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:320 msgid "disliked" msgstr "no ha gustado de " -#: ../../Zotlabs/Lib/Enotify.php:169 +#: ../../Zotlabs/Lib/Enotify.php:167 +msgid "repeated" +msgstr "repetido / compartido" + +#: ../../Zotlabs/Lib/Enotify.php:172 msgid "voted on" msgstr "votado en " -#: ../../Zotlabs/Lib/Enotify.php:212 +#: ../../Zotlabs/Lib/Enotify.php:215 #, 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:220 +#: ../../Zotlabs/Lib/Enotify.php:223 #, 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:229 ../../Zotlabs/Lib/Enotify.php:321 +#: ../../Zotlabs/Lib/Enotify.php:232 ../../Zotlabs/Lib/Enotify.php:324 #, 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:241 +#: ../../Zotlabs/Lib/Enotify.php:244 #, 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:243 +#: ../../Zotlabs/Lib/Enotify.php:246 #, 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:244 +#: ../../Zotlabs/Lib/Enotify.php:247 #, 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:247 ../../Zotlabs/Lib/Enotify.php:341 -#: ../../Zotlabs/Lib/Enotify.php:357 ../../Zotlabs/Lib/Enotify.php:381 -#: ../../Zotlabs/Lib/Enotify.php:398 ../../Zotlabs/Lib/Enotify.php:411 +#: ../../Zotlabs/Lib/Enotify.php:250 ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:360 ../../Zotlabs/Lib/Enotify.php:384 +#: ../../Zotlabs/Lib/Enotify.php:401 ../../Zotlabs/Lib/Enotify.php:414 #, 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:251 ../../Zotlabs/Lib/Enotify.php:252 +#: ../../Zotlabs/Lib/Enotify.php:254 ../../Zotlabs/Lib/Enotify.php:255 #, 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:337 +#: ../../Zotlabs/Lib/Enotify.php:340 #, 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:338 +#: ../../Zotlabs/Lib/Enotify.php:341 #, 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:349 +#: ../../Zotlabs/Lib/Enotify.php:352 #, 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:351 +#: ../../Zotlabs/Lib/Enotify.php:354 #, 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:353 +#: ../../Zotlabs/Lib/Enotify.php:356 #, 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:375 +#: ../../Zotlabs/Lib/Enotify.php:378 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Aviso] %s le ha etiquetado" -#: ../../Zotlabs/Lib/Enotify.php:376 +#: ../../Zotlabs/Lib/Enotify.php:379 #, php-format msgid "%1$s tagged you at %2$s" msgstr "%1$sle ha etiquetado en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:377 +#: ../../Zotlabs/Lib/Enotify.php:380 #, 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:388 +#: ../../Zotlabs/Lib/Enotify.php:391 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Aviso] %1$s le ha dado un toque" -#: ../../Zotlabs/Lib/Enotify.php:389 +#: ../../Zotlabs/Lib/Enotify.php:392 #, php-format msgid "%1$s poked you at %2$s" msgstr "%1$sle ha dado un toque en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:390 +#: ../../Zotlabs/Lib/Enotify.php:393 #, 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:405 +#: ../../Zotlabs/Lib/Enotify.php:408 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada" -#: ../../Zotlabs/Lib/Enotify.php:406 +#: ../../Zotlabs/Lib/Enotify.php:409 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "%1$sha etiquetado su entrada en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:407 +#: ../../Zotlabs/Lib/Enotify.php:410 #, 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:418 +#: ../../Zotlabs/Lib/Enotify.php:421 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión" -#: ../../Zotlabs/Lib/Enotify.php:419 +#: ../../Zotlabs/Lib/Enotify.php:422 #, 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:420 +#: ../../Zotlabs/Lib/Enotify.php:423 #, 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:423 ../../Zotlabs/Lib/Enotify.php:441 +#: ../../Zotlabs/Lib/Enotify.php:426 ../../Zotlabs/Lib/Enotify.php:444 #, php-format msgid "You may visit their profile at %s" msgstr "Puede visitar su perfil en %s" -#: ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:428 #, 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:432 +#: ../../Zotlabs/Lib/Enotify.php:435 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión" -#: ../../Zotlabs/Lib/Enotify.php:433 +#: ../../Zotlabs/Lib/Enotify.php:436 #, 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:434 +#: ../../Zotlabs/Lib/Enotify.php:437 #, 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:439 +#: ../../Zotlabs/Lib/Enotify.php:442 msgid "Name:" msgstr "Nombre:" -#: ../../Zotlabs/Lib/Enotify.php:440 +#: ../../Zotlabs/Lib/Enotify.php:443 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:443 +#: ../../Zotlabs/Lib/Enotify.php:446 #, 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:668 +#: ../../Zotlabs/Lib/Enotify.php:676 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Aviso]" -#: ../../Zotlabs/Lib/Enotify.php:834 +#: ../../Zotlabs/Lib/Enotify.php:842 msgid "created a new poll" msgstr "se ha creado una nueva encuesta" -#: ../../Zotlabs/Lib/Enotify.php:834 +#: ../../Zotlabs/Lib/Enotify.php:842 msgid "created a new post" msgstr "ha creado una nueva entrada" -#: ../../Zotlabs/Lib/Enotify.php:835 +#: ../../Zotlabs/Lib/Enotify.php:843 #, php-format msgid "voted on %s's poll" msgstr "votado en la encuesta de %s" -#: ../../Zotlabs/Lib/Enotify.php:835 +#: ../../Zotlabs/Lib/Enotify.php:843 #, php-format msgid "commented on %s's post" msgstr "ha comentado la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:839 -#, php-format -msgid "repeated %s's post" -msgstr "repetida la entrada de %s" - -#: ../../Zotlabs/Lib/Enotify.php:843 -#, php-format -msgid "liked %s's post" -msgstr "Le ha gustado la entrada de %s" - -#: ../../Zotlabs/Lib/Enotify.php:847 -#, php-format -msgid "disliked %s's post" -msgstr "No le ha gustado la entrada de %s" - -#: ../../Zotlabs/Lib/Enotify.php:851 ../../Zotlabs/Lib/Enotify.php:954 +#: ../../Zotlabs/Lib/Enotify.php:847 ../../Zotlabs/Lib/Enotify.php:947 msgid "shared a file with you" msgstr "compartió un archivo con usted" -#: ../../Zotlabs/Lib/Enotify.php:860 +#: ../../Zotlabs/Lib/Enotify.php:856 #, php-format msgid "edited a post dated %s" msgstr "ha editado una entrada %s" -#: ../../Zotlabs/Lib/Enotify.php:863 +#: ../../Zotlabs/Lib/Enotify.php:859 #, php-format msgid "edited a comment dated %s" msgstr "ha editado un comentario %s" -#: ../../Zotlabs/Lib/Enotify.php:939 +#: ../../Zotlabs/Lib/Enotify.php:932 msgid "added your channel" msgstr "añadió este canal a sus conexiones" -#: ../../Zotlabs/Lib/Enotify.php:969 +#: ../../Zotlabs/Lib/Enotify.php:962 msgid "sent you a direct message" msgstr "enviarle un mensaje directo" -#: ../../Zotlabs/Lib/Enotify.php:976 +#: ../../Zotlabs/Lib/Enotify.php:969 msgid "g A l F d" msgstr "g A l d F" -#: ../../Zotlabs/Lib/Enotify.php:979 +#: ../../Zotlabs/Lib/Enotify.php:972 msgid "[today]" msgstr "[hoy]" -#: ../../Zotlabs/Lib/Enotify.php:989 +#: ../../Zotlabs/Lib/Enotify.php:982 msgid "created an event" msgstr "se creó un evento" -#: ../../Zotlabs/Lib/Enotify.php:1004 +#: ../../Zotlabs/Lib/Enotify.php:997 msgid "status verified" msgstr "estado verificado" @@ -7531,88 +7115,84 @@ msgstr "Stream" msgid "Mail" msgstr "Correo" -#: ../../Zotlabs/Lib/Apps.php:355 ../../Zotlabs/Module/Mood.php:152 -msgid "Mood" -msgstr "Estado de ánimo" - -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Chat" msgstr "Chat" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Probe" msgstr "Probar" -#: ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Lib/Apps.php:358 msgid "Suggest" msgstr "Sugerir" -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../Zotlabs/Lib/Apps.php:359 msgid "Random Channel" msgstr "Canal aleatorio" -#: ../../Zotlabs/Lib/Apps.php:362 +#: ../../Zotlabs/Lib/Apps.php:360 msgid "Invite" msgstr "Invitar" -#: ../../Zotlabs/Lib/Apps.php:363 ../../Zotlabs/Widget/Admin.php:31 +#: ../../Zotlabs/Lib/Apps.php:361 ../../Zotlabs/Widget/Admin.php:31 msgid "Features" msgstr "Funcionalidades" -#: ../../Zotlabs/Lib/Apps.php:365 ../../Zotlabs/Storage/Browser.php:410 +#: ../../Zotlabs/Lib/Apps.php:363 ../../Zotlabs/Storage/Browser.php:410 msgid "Post" msgstr "Publicación" -#: ../../Zotlabs/Lib/Apps.php:370 +#: ../../Zotlabs/Lib/Apps.php:368 msgid "Notifications" msgstr "Notificaciones" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:369 msgid "Order Apps" msgstr "Ordenar las apps" -#: ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "CardDAV" msgstr "CardDAV" -#: ../../Zotlabs/Lib/Apps.php:373 ../../Zotlabs/Module/Sources.php:105 +#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Module/Sources.php:105 msgid "Channel Sources" msgstr "Orígenes de los contenidos del canal" -#: ../../Zotlabs/Lib/Apps.php:374 ../../Zotlabs/Module/Tokens.php:288 +#: ../../Zotlabs/Lib/Apps.php:372 ../../Zotlabs/Module/Tokens.php:288 msgid "Guest Access" msgstr "Acceso para invitados" -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:374 msgid "OAuth Apps Manager" msgstr "Administrador de apps OAuth" -#: ../../Zotlabs/Lib/Apps.php:377 +#: ../../Zotlabs/Lib/Apps.php:375 msgid "OAuth2 Apps Manager" msgstr "Administrador de apps OAuth2" -#: ../../Zotlabs/Lib/Apps.php:378 +#: ../../Zotlabs/Lib/Apps.php:376 msgid "PDL Editor" msgstr "Editor PDL" -#: ../../Zotlabs/Lib/Apps.php:379 ../../Zotlabs/Module/Permcats.php:248 +#: ../../Zotlabs/Lib/Apps.php:377 ../../Zotlabs/Module/Permcats.php:248 msgid "Contact Roles" msgstr "Roles de contacto" -#: ../../Zotlabs/Lib/Apps.php:380 ../../Zotlabs/Widget/Notifications.php:154 -#: ../../Zotlabs/Module/Pubstream.php:100 +#: ../../Zotlabs/Lib/Apps.php:378 ../../Zotlabs/Widget/Notifications.php:154 +#: ../../Zotlabs/Module/Pubstream.php:108 msgid "Public Stream" msgstr "\"Stream\" público" -#: ../../Zotlabs/Lib/Apps.php:381 +#: ../../Zotlabs/Lib/Apps.php:379 msgid "My Chatrooms" msgstr "Mis salas de chat" -#: ../../Zotlabs/Lib/Apps.php:382 +#: ../../Zotlabs/Lib/Apps.php:380 msgid "Channel Export" msgstr "Exportar canal" -#: ../../Zotlabs/Lib/Apps.php:563 ../../Zotlabs/Module/Oauth.php:53 +#: ../../Zotlabs/Lib/Apps.php:561 ../../Zotlabs/Module/Oauth.php:53 #: ../../Zotlabs/Module/Oauth.php:135 ../../Zotlabs/Module/Connedit.php:748 #: ../../Zotlabs/Module/Admin/Addons.php:460 #: ../../Zotlabs/Module/Cdav.php:1044 ../../Zotlabs/Module/Cdav.php:1384 @@ -7620,31 +7200,31 @@ msgstr "Exportar canal" msgid "Update" msgstr "Actualizar" -#: ../../Zotlabs/Lib/Apps.php:563 ../../Zotlabs/Module/Admin/Addons.php:429 +#: ../../Zotlabs/Lib/Apps.php:561 ../../Zotlabs/Module/Admin/Addons.php:429 msgid "Install" msgstr "Instalar" -#: ../../Zotlabs/Lib/Apps.php:593 ../../Zotlabs/Lib/Apps.php:615 +#: ../../Zotlabs/Lib/Apps.php:591 ../../Zotlabs/Lib/Apps.php:613 msgid "Purchase" msgstr "Comprar" -#: ../../Zotlabs/Lib/Apps.php:620 +#: ../../Zotlabs/Lib/Apps.php:618 msgid "Undelete" msgstr "Recuperar" -#: ../../Zotlabs/Lib/Apps.php:628 +#: ../../Zotlabs/Lib/Apps.php:626 msgid "Add to app-tray" msgstr "Añadir a la bandeja de aplicaciones" -#: ../../Zotlabs/Lib/Apps.php:629 +#: ../../Zotlabs/Lib/Apps.php:627 msgid "Remove from app-tray" msgstr "Quitar de la bandeja de aplicaciones" -#: ../../Zotlabs/Lib/Apps.php:630 +#: ../../Zotlabs/Lib/Apps.php:628 msgid "Pin to navbar" msgstr "Fijar en la barra de navegación" -#: ../../Zotlabs/Lib/Apps.php:631 +#: ../../Zotlabs/Lib/Apps.php:629 msgid "Unpin from navbar" msgstr "Quitar de la barra de navegación" @@ -7749,216 +7329,204 @@ msgstr "No puede conectarse consigo mismo." msgid "error saving data" msgstr "error guardando los datos" -#: ../../Zotlabs/Lib/ThreadItem.php:108 +#: ../../Zotlabs/Lib/ThreadItem.php:111 msgid "Restricted message" msgstr "Mensaje restringido" -#: ../../Zotlabs/Lib/ThreadItem.php:115 +#: ../../Zotlabs/Lib/ThreadItem.php:118 msgid "Direct message" msgstr "Mensaje directo" -#: ../../Zotlabs/Lib/ThreadItem.php:120 +#: ../../Zotlabs/Lib/ThreadItem.php:123 msgid "Public Policy" msgstr "Política pública" -#: ../../Zotlabs/Lib/ThreadItem.php:152 +#: ../../Zotlabs/Lib/ThreadItem.php:157 msgid "Privacy conflict. Discretion advised." msgstr "Conflicto de privacidad. Se aconseja discreción." -#: ../../Zotlabs/Lib/ThreadItem.php:183 ../../Zotlabs/Storage/Browser.php:372 +#: ../../Zotlabs/Lib/ThreadItem.php:188 ../../Zotlabs/Storage/Browser.php:372 msgid "Admin Delete" msgstr "Eliminar admin" -#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Module/Filer.php:55 msgid "Save to Folder" msgstr "Guardar en carpeta" -#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:75 +#: ../../Zotlabs/Lib/ThreadItem.php:216 ../../Zotlabs/Widget/Pinned.php:75 msgid "I will attend" msgstr "Participaré" -#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:75 +#: ../../Zotlabs/Lib/ThreadItem.php:216 ../../Zotlabs/Widget/Pinned.php:75 msgid "I will not attend" msgstr "No participaré" -#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:75 +#: ../../Zotlabs/Lib/ThreadItem.php:216 ../../Zotlabs/Widget/Pinned.php:75 msgid "I might attend" msgstr "Quizá participe" -#: ../../Zotlabs/Lib/ThreadItem.php:229 ../../Zotlabs/Lib/ThreadItem.php:242 -#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138 -msgid "View all" -msgstr "Ver todo" - -#: ../../Zotlabs/Lib/ThreadItem.php:310 ../../Zotlabs/Module/Photos.php:1074 +#: ../../Zotlabs/Lib/ThreadItem.php:333 ../../Zotlabs/Module/Photos.php:1074 msgid "I like this (toggle)" msgstr "Me gusta (cambiar)" -#: ../../Zotlabs/Lib/ThreadItem.php:311 ../../Zotlabs/Module/Photos.php:1075 +#: ../../Zotlabs/Lib/ThreadItem.php:334 ../../Zotlabs/Module/Photos.php:1075 msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" -#: ../../Zotlabs/Lib/ThreadItem.php:312 +#: ../../Zotlabs/Lib/ThreadItem.php:335 msgid "Reply on this comment" msgstr "Responder a este comentario" -#: ../../Zotlabs/Lib/ThreadItem.php:312 +#: ../../Zotlabs/Lib/ThreadItem.php:335 msgid "reply" msgstr "responder" -#: ../../Zotlabs/Lib/ThreadItem.php:312 +#: ../../Zotlabs/Lib/ThreadItem.php:335 msgid "Reply to" msgstr "Responder a " -#: ../../Zotlabs/Lib/ThreadItem.php:324 ../../Zotlabs/Widget/Pinned.php:104 -msgid "Share This" -msgstr "Compartir esto" - -#: ../../Zotlabs/Lib/ThreadItem.php:324 ../../Zotlabs/Widget/Pinned.php:104 +#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../Zotlabs/Widget/Pinned.php:93 msgid "share" msgstr "compartir" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:345 +msgid "Repeat" +msgstr "Se repite" + +#: ../../Zotlabs/Lib/ThreadItem.php:345 +msgid "repeat" +msgstr "Se repite" + +#: ../../Zotlabs/Lib/ThreadItem.php:356 msgid "Delivery Report" msgstr "Informe de transmisión" -#: ../../Zotlabs/Lib/ThreadItem.php:355 +#: ../../Zotlabs/Lib/ThreadItem.php:376 #, php-format -msgid "%d Comment" -msgid_plural "%d Comments" +msgid "%d comment" +msgid_plural "%d comments" msgstr[0] "%d comentario" msgstr[1] "%d comentarios" msgstr[2] "%d comentarios" -#: ../../Zotlabs/Lib/ThreadItem.php:356 +#: ../../Zotlabs/Lib/ThreadItem.php:377 #, php-format msgid "%d unseen" msgstr "%dno visto/a vistos/as" -#: ../../Zotlabs/Lib/ThreadItem.php:406 +#: ../../Zotlabs/Lib/ThreadItem.php:427 msgid "Forum" msgstr "Foro" -#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Lib/ThreadItem.php:434 msgid "to" msgstr "a" -#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Messages.php:148 -#: ../../Zotlabs/Widget/Pinned.php:132 +#: ../../Zotlabs/Lib/ThreadItem.php:435 ../../Zotlabs/Widget/Messages.php:146 +#: ../../Zotlabs/Widget/Messages.php:149 ../../Zotlabs/Widget/Pinned.php:121 msgid "via" msgstr "mediante" -#: ../../Zotlabs/Lib/ThreadItem.php:415 +#: ../../Zotlabs/Lib/ThreadItem.php:436 msgid "Wall-to-Wall" msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../Zotlabs/Lib/ThreadItem.php:437 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:444 +#: ../../Zotlabs/Lib/ThreadItem.php:465 msgid "Attend" msgstr "Participar o asistir" -#: ../../Zotlabs/Lib/ThreadItem.php:445 ../../Zotlabs/Widget/Pinned.php:146 +#: ../../Zotlabs/Lib/ThreadItem.php:466 ../../Zotlabs/Widget/Pinned.php:135 msgid "Attendance Options" msgstr "Opciones de participación o asistencia" -#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../Zotlabs/Widget/Pinned.php:147 +#: ../../Zotlabs/Lib/ThreadItem.php:468 ../../Zotlabs/Widget/Pinned.php:136 msgid "Voting Options" msgstr "Opciones de votación" -#: ../../Zotlabs/Lib/ThreadItem.php:462 +#: ../../Zotlabs/Lib/ThreadItem.php:483 msgid "Go to previous comment" msgstr "Ir al comentario anterior" -#: ../../Zotlabs/Lib/ThreadItem.php:471 ../../Zotlabs/Widget/Pinned.php:159 +#: ../../Zotlabs/Lib/ThreadItem.php:492 ../../Zotlabs/Widget/Pinned.php:148 msgid "Pinned post" msgstr "Entradas ancladas" -#: ../../Zotlabs/Lib/ThreadItem.php:475 +#: ../../Zotlabs/Lib/ThreadItem.php:496 msgid "Add to Calendar" msgstr "Añadir al calendario" -#: ../../Zotlabs/Lib/ThreadItem.php:483 -#: ../../Zotlabs/Module/Notifications.php:111 -msgid "Mark all seen" -msgstr "Marcar todo como visto" - -#: ../../Zotlabs/Lib/ThreadItem.php:490 ../../Zotlabs/Module/Photos.php:1260 -msgctxt "noun" -msgid "Likes" -msgstr "Me gusta" +#: ../../Zotlabs/Lib/ThreadItem.php:504 +msgid "Mark all comments seen" +msgstr "Marcar como leídos todos los comentarios" -#: ../../Zotlabs/Lib/ThreadItem.php:491 ../../Zotlabs/Module/Photos.php:1261 -msgctxt "noun" -msgid "Dislikes" -msgstr "No me gusta" - -#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../Zotlabs/Module/Photos.php:1092 +#: ../../Zotlabs/Lib/ThreadItem.php:859 ../../Zotlabs/Module/Photos.php:1092 #: ../../Zotlabs/Module/Photos.php:1205 msgid "This is you" msgstr "Este es usted" -#: ../../Zotlabs/Lib/ThreadItem.php:838 +#: ../../Zotlabs/Lib/ThreadItem.php:868 msgid "Image" msgstr "Imagen" -#: ../../Zotlabs/Lib/ThreadItem.php:840 +#: ../../Zotlabs/Lib/ThreadItem.php:870 msgid "Insert Link" msgstr "Insertar enlace" -#: ../../Zotlabs/Lib/ThreadItem.php:841 +#: ../../Zotlabs/Lib/ThreadItem.php:871 msgid "Video" msgstr "Vídeo" -#: ../../Zotlabs/Lib/ThreadItem.php:850 +#: ../../Zotlabs/Lib/ThreadItem.php:880 msgid "Your full name (required)" msgstr "Su nombre completo (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:851 +#: ../../Zotlabs/Lib/ThreadItem.php:881 msgid "Your email address (required)" msgstr "Su dirección de correo electrónico (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:852 +#: ../../Zotlabs/Lib/ThreadItem.php:882 msgid "Your website URL (optional)" msgstr "La URL de su sitio web (opcional)" -#: ../../Zotlabs/Lib/Libzot.php:686 +#: ../../Zotlabs/Lib/Libzot.php:687 msgid "Unable to verify channel signature" msgstr "No ha sido posible de verificar la firma del canal" -#: ../../Zotlabs/Lib/Activity.php:2395 +#: ../../Zotlabs/Lib/Activity.php:2154 #, php-format msgid "Likes %1$s's %2$s" msgstr "Gusta de %2$sde %1$s" -#: ../../Zotlabs/Lib/Activity.php:2398 +#: ../../Zotlabs/Lib/Activity.php:2157 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "No le gusta %2$sde %1$s" -#: ../../Zotlabs/Lib/Activity.php:2404 +#: ../../Zotlabs/Lib/Activity.php:2163 #, php-format msgid "Will attend %s's event" msgstr "Asistirá al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:2407 +#: ../../Zotlabs/Lib/Activity.php:2166 #, php-format msgid "Will not attend %s's event" msgstr "No asistirá al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:2410 +#: ../../Zotlabs/Lib/Activity.php:2169 #, php-format msgid "May attend %s's event" msgstr "Puede asistir al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:2413 +#: ../../Zotlabs/Lib/Activity.php:2172 #, php-format msgid "May not attend %s's event" msgstr "Puede no asistir al evento de %s" -#: ../../Zotlabs/Lib/Libsync.php:819 +#: ../../Zotlabs/Lib/Libsync.php:823 #, php-format msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" @@ -8473,31 +8041,23 @@ msgstr "Editar álbum" #: ../../Zotlabs/Widget/Album.php:103 ../../Zotlabs/Widget/Portfolio.php:114 #: ../../Zotlabs/Widget/Cdav.php:152 ../../Zotlabs/Widget/Cdav.php:188 #: ../../Zotlabs/Storage/Browser.php:546 -#: ../../Zotlabs/Module/Cover_photo.php:423 +#: ../../Zotlabs/Module/Cover_photo.php:380 #: ../../Zotlabs/Module/Embedphotos.php:189 -#: ../../Zotlabs/Module/Profile_photo.php:547 +#: ../../Zotlabs/Module/Profile_photo.php:546 #: ../../Zotlabs/Module/Photos.php:681 msgid "Upload" msgstr "Subir" -#: ../../Zotlabs/Widget/Pinned.php:86 -msgid "I agree" -msgstr "Estoy de acuerdo" - -#: ../../Zotlabs/Widget/Pinned.php:86 -msgid "I disagree" -msgstr "No estoy de acuerdo" - -#: ../../Zotlabs/Widget/Pinned.php:86 -msgid "I abstain" -msgstr "Me abstengo" +#: ../../Zotlabs/Widget/Pinned.php:93 +msgid "Share This" +msgstr "Compartir esto" -#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Widget/Pinned.php:128 +#: ../../Zotlabs/Widget/Pinned.php:116 ../../Zotlabs/Widget/Pinned.php:117 #, php-format msgid "View %s's profile - %s" msgstr "Ver el perfil de %s - %s" -#: ../../Zotlabs/Widget/Pinned.php:161 +#: ../../Zotlabs/Widget/Pinned.php:150 msgid "Don't show" msgstr "No mostrar" @@ -8666,25 +8226,25 @@ msgstr[1] "avisos" msgstr[2] "avisos" #: ../../Zotlabs/Widget/Affinity.php:36 -#: ../../Zotlabs/Module/Contactedit.php:295 +#: ../../Zotlabs/Module/Contactedit.php:281 #: ../../Zotlabs/Module/Connedit.php:579 msgid "Me" msgstr "Yo" #: ../../Zotlabs/Widget/Affinity.php:37 -#: ../../Zotlabs/Module/Contactedit.php:296 +#: ../../Zotlabs/Module/Contactedit.php:282 #: ../../Zotlabs/Module/Connedit.php:580 msgid "Family" msgstr "Familia" #: ../../Zotlabs/Widget/Affinity.php:39 -#: ../../Zotlabs/Module/Contactedit.php:298 +#: ../../Zotlabs/Module/Contactedit.php:284 #: ../../Zotlabs/Module/Connedit.php:582 msgid "Acquaintances" msgstr "Conocidos/as" #: ../../Zotlabs/Widget/Affinity.php:40 -#: ../../Zotlabs/Module/Contactedit.php:299 +#: ../../Zotlabs/Module/Contactedit.php:285 #: ../../Zotlabs/Module/Connedit.php:583 #: ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 @@ -8692,10 +8252,11 @@ msgid "All" msgstr "Todos/as" #: ../../Zotlabs/Widget/Affinity.php:60 +#: ../../Zotlabs/Module/Contactedit.php:618 msgid "Refresh" msgstr "Recargar" -#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Site.php:414 +#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Site.php:400 msgid "Site" msgstr "Sitio" @@ -8755,7 +8316,7 @@ msgid "Add new role" msgstr "Añadir nuevo rol" #: ../../Zotlabs/Widget/Permcats.php:92 -#: ../../Zotlabs/Module/Contactedit.php:409 +#: ../../Zotlabs/Module/Contactedit.php:395 msgid "Contact roles" msgstr "Roles del contacto" @@ -8912,7 +8473,7 @@ msgid "Add new group" msgstr "Añadir nuevo grupo" #: ../../Zotlabs/Widget/Privacygroups.php:54 -#: ../../Zotlabs/Module/Contactedit.php:443 +#: ../../Zotlabs/Module/Contactedit.php:429 msgid "Privacy groups" msgstr "Grupos de canales" @@ -9105,19 +8666,18 @@ msgstr "Sólo se reanuda si la sincronización se estanca." msgid "Public access denied." msgstr "Acceso público denegado." -#: ../../Zotlabs/Module/Display.php:45 ../../Zotlabs/Module/Hq.php:41 -#: ../../Zotlabs/Module/Oep.php:82 ../../Zotlabs/Module/Pubstream.php:46 -#: ../../Zotlabs/Module/Channel.php:161 ../../Zotlabs/Module/Channel.php:183 +#: ../../Zotlabs/Module/Display.php:52 ../../Zotlabs/Module/Oep.php:82 +#: ../../Zotlabs/Module/Pubstream.php:54 ../../Zotlabs/Module/Channel.php:194 msgid "Malformed message id." msgstr "ID de mensaje malformado." -#: ../../Zotlabs/Module/Display.php:87 ../../Zotlabs/Module/Network.php:213 -#: ../../Zotlabs/Module/Hq.php:104 ../../Zotlabs/Module/Pubstream.php:89 -#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Rpost.php:210 +#: ../../Zotlabs/Module/Display.php:94 ../../Zotlabs/Module/Network.php:213 +#: ../../Zotlabs/Module/Hq.php:108 ../../Zotlabs/Module/Pubstream.php:97 +#: ../../Zotlabs/Module/Channel.php:278 ../../Zotlabs/Module/Rpost.php:210 msgid "Reset form" msgstr "Reiniciar el formulario" -#: ../../Zotlabs/Module/Display.php:319 ../../Zotlabs/Module/Channel.php:494 +#: ../../Zotlabs/Module/Display.php:319 ../../Zotlabs/Module/Channel.php:500 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." @@ -9135,71 +8695,71 @@ msgstr "Se ha eliminado el elemento." msgid "Image uploaded but image cropping failed." msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. " -#: ../../Zotlabs/Module/Cover_photo.php:196 -#: ../../Zotlabs/Module/Cover_photo.php:254 +#: ../../Zotlabs/Module/Cover_photo.php:194 +#: ../../Zotlabs/Module/Cover_photo.php:251 msgid "Cover Photos" msgstr "Imágenes de portada del perfil" -#: ../../Zotlabs/Module/Cover_photo.php:212 +#: ../../Zotlabs/Module/Cover_photo.php:210 #: ../../Zotlabs/Module/Profile_photo.php:184 msgid "Image resize failed." msgstr "El ajuste del tamaño de la imagen ha fallado." -#: ../../Zotlabs/Module/Cover_photo.php:265 -#: ../../Zotlabs/Module/Profile_photo.php:350 +#: ../../Zotlabs/Module/Cover_photo.php:262 +#: ../../Zotlabs/Module/Profile_photo.php:349 msgid "Image upload failed." msgstr "La carga de la imagen ha fallado." -#: ../../Zotlabs/Module/Cover_photo.php:282 -#: ../../Zotlabs/Module/Profile_photo.php:370 +#: ../../Zotlabs/Module/Cover_photo.php:279 +#: ../../Zotlabs/Module/Profile_photo.php:369 msgid "Unable to process image." msgstr "No ha sido posible procesar la imagen." -#: ../../Zotlabs/Module/Cover_photo.php:367 -#: ../../Zotlabs/Module/Cover_photo.php:382 -#: ../../Zotlabs/Module/Profile_photo.php:432 -#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Cover_photo.php:324 +#: ../../Zotlabs/Module/Cover_photo.php:339 +#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Profile_photo.php:496 msgid "Photo not available." msgstr "Foto no disponible." -#: ../../Zotlabs/Module/Cover_photo.php:418 +#: ../../Zotlabs/Module/Cover_photo.php:375 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/Cover_photo.php:420 +#: ../../Zotlabs/Module/Cover_photo.php:377 msgid "Upload File:" msgstr "Subir fichero:" -#: ../../Zotlabs/Module/Cover_photo.php:421 +#: ../../Zotlabs/Module/Cover_photo.php:378 msgid "Select a profile:" msgstr "Seleccionar un perfil:" -#: ../../Zotlabs/Module/Cover_photo.php:422 +#: ../../Zotlabs/Module/Cover_photo.php:379 msgid "Change Cover Photo" msgstr "Cambiar la foto de portada del perfil" -#: ../../Zotlabs/Module/Cover_photo.php:426 -#: ../../Zotlabs/Module/Cover_photo.php:427 +#: ../../Zotlabs/Module/Cover_photo.php:383 +#: ../../Zotlabs/Module/Cover_photo.php:384 +#: ../../Zotlabs/Module/Profile_photo.php:550 #: ../../Zotlabs/Module/Profile_photo.php:551 -#: ../../Zotlabs/Module/Profile_photo.php:552 msgid "Use a photo from your albums" msgstr "Usar una foto de sus álbumes" -#: ../../Zotlabs/Module/Cover_photo.php:438 +#: ../../Zotlabs/Module/Cover_photo.php:395 msgid "Select existing photo" msgstr "Seleccionar una foto" -#: ../../Zotlabs/Module/Cover_photo.php:455 -#: ../../Zotlabs/Module/Profile_photo.php:581 +#: ../../Zotlabs/Module/Cover_photo.php:412 +#: ../../Zotlabs/Module/Profile_photo.php:580 msgid "Crop Image" msgstr "Recortar imagen" -#: ../../Zotlabs/Module/Cover_photo.php:456 -#: ../../Zotlabs/Module/Profile_photo.php:582 +#: ../../Zotlabs/Module/Cover_photo.php:413 +#: ../../Zotlabs/Module/Profile_photo.php:581 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/Cover_photo.php:458 +#: ../../Zotlabs/Module/Cover_photo.php:415 msgid "Done Editing" msgstr "Edición completada" @@ -9211,11 +8771,11 @@ msgstr "Enlace de la página" msgid "Edit Webpage" msgstr "Editar la página web" -#: ../../Zotlabs/Module/Sse_bs.php:623 +#: ../../Zotlabs/Module/Sse_bs.php:626 msgid "Private forum" msgstr "Foro privado" -#: ../../Zotlabs/Module/Sse_bs.php:623 +#: ../../Zotlabs/Module/Sse_bs.php:626 msgid "Public forum" msgstr "Foro público" @@ -9360,7 +8920,7 @@ msgstr "No se encuentra el grupo" msgid "No such channel" msgstr "No se encuentra el canal" -#: ../../Zotlabs/Module/Network.php:172 ../../Zotlabs/Module/Channel.php:234 +#: ../../Zotlabs/Module/Network.php:172 ../../Zotlabs/Module/Channel.php:245 msgid "Search Results For:" msgstr "Buscar resultados para:" @@ -9384,10 +8944,6 @@ msgstr "Administrar apps" msgid "Create Custom App" msgstr "Crear una app personalizada" -#: ../../Zotlabs/Module/Share.php:126 -msgid "Post repeated" -msgstr "Entrada repetida" - #: ../../Zotlabs/Module/Service_limits.php:23 msgid "No service class restrictions found." msgstr "No se han encontrado restricciones sobre esta clase de servicio." @@ -9564,6 +9120,10 @@ msgstr "No hay más notificaciones del sistema" msgid "System Notifications" msgstr "Notificaciones del sistema" +#: ../../Zotlabs/Module/Notifications.php:111 +msgid "Mark all seen" +msgstr "Marcar todo como visto" + #: ../../Zotlabs/Module/Z6trans.php:19 msgid "Update to Hubzilla 5.0 step 2" msgstr "Actualizar a Hubzilla 5.0. Paso 2" @@ -9580,60 +9140,56 @@ msgstr "php util/z6convert.php" msgid "from the terminal." msgstr "desde la terminal." -#: ../../Zotlabs/Module/Thing.php:122 +#: ../../Zotlabs/Module/Thing.php:139 msgid "Thing updated" msgstr "Elemento actualizado." -#: ../../Zotlabs/Module/Thing.php:174 +#: ../../Zotlabs/Module/Thing.php:191 msgid "Object store: failed" msgstr "Guardar objeto: ha fallado" -#: ../../Zotlabs/Module/Thing.php:178 +#: ../../Zotlabs/Module/Thing.php:195 msgid "Thing added" msgstr "Elemento añadido" -#: ../../Zotlabs/Module/Thing.php:204 +#: ../../Zotlabs/Module/Thing.php:210 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "OBJ: %1$s %2$s %3$s" -#: ../../Zotlabs/Module/Thing.php:267 -msgid "Show Thing" -msgstr "Mostrar elemento" - -#: ../../Zotlabs/Module/Thing.php:274 +#: ../../Zotlabs/Module/Thing.php:277 ../../Zotlabs/Module/Thing.php:301 msgid "item not found." msgstr "elemento no encontrado." -#: ../../Zotlabs/Module/Thing.php:307 +#: ../../Zotlabs/Module/Thing.php:336 msgid "Edit Thing" msgstr "Editar elemento" -#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366 +#: ../../Zotlabs/Module/Thing.php:338 ../../Zotlabs/Module/Thing.php:394 msgid "Select a profile" msgstr "Seleccionar un perfil" -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 +#: ../../Zotlabs/Module/Thing.php:342 ../../Zotlabs/Module/Thing.php:397 msgid "Post an activity" msgstr "Publicar una actividad" -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 +#: ../../Zotlabs/Module/Thing.php:342 ../../Zotlabs/Module/Thing.php:397 msgid "Only sends to viewers of the applicable profile" msgstr "Sólo enviar a espectadores del perfil pertinente." -#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371 +#: ../../Zotlabs/Module/Thing.php:344 ../../Zotlabs/Module/Thing.php:399 msgid "Name of thing e.g. something" msgstr "Nombre del elemento, p. ej.:. \"algo\"" -#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372 +#: ../../Zotlabs/Module/Thing.php:346 ../../Zotlabs/Module/Thing.php:400 msgid "URL of thing (optional)" msgstr "Dirección del elemento (opcional)" -#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373 +#: ../../Zotlabs/Module/Thing.php:348 ../../Zotlabs/Module/Thing.php:401 msgid "URL for photo of thing (optional)" msgstr "Dirección para la foto o elemento (opcional)" -#: ../../Zotlabs/Module/Thing.php:364 +#: ../../Zotlabs/Module/Thing.php:392 msgid "Add Thing to your Profile" msgstr "Añadir alguna cosa a su perfil" @@ -9842,303 +9398,274 @@ msgstr "No se ha podido acceder al registro de contacto." msgid "Could not locate selected profile." msgstr "No se ha podido localizar el perfil seleccionado." -#: ../../Zotlabs/Module/Contactedit.php:192 +#: ../../Zotlabs/Module/Contactedit.php:180 #: ../../Zotlabs/Module/Connedit.php:215 msgid "is now connected to" msgstr "ahora está conectado/a" -#: ../../Zotlabs/Module/Contactedit.php:252 -#: ../../Zotlabs/Module/Contactedit.php:401 +#: ../../Zotlabs/Module/Contactedit.php:238 +#: ../../Zotlabs/Module/Contactedit.php:387 #: ../../Zotlabs/Module/Connedit.php:701 msgid "Contact Tools" msgstr "Gestión de contactos" -#: ../../Zotlabs/Module/Contactedit.php:329 +#: ../../Zotlabs/Module/Contactedit.php:315 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Approve this contact" msgstr "Aprobar este contacto" -#: ../../Zotlabs/Module/Contactedit.php:329 +#: ../../Zotlabs/Module/Contactedit.php:315 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Accept contact to allow communication" msgstr "Aceptar el contacto para permitir la comunicación" -#: ../../Zotlabs/Module/Contactedit.php:362 +#: ../../Zotlabs/Module/Contactedit.php:348 #: ../../Zotlabs/Module/Connedit.php:658 msgid "Please select a role for this contact!" msgstr "¡Por favor, seleccione un rol para este contacto!" -#: ../../Zotlabs/Module/Contactedit.php:382 +#: ../../Zotlabs/Module/Contactedit.php:368 #: ../../Zotlabs/Module/Connedit.php:678 msgid "This contact is unreachable from this location." msgstr "Este contacto es inaccesible desde esta ubicación." -#: ../../Zotlabs/Module/Contactedit.php:383 +#: ../../Zotlabs/Module/Contactedit.php:369 #: ../../Zotlabs/Module/Connedit.php:679 msgid "This contact may be unreachable from other channel locations." msgstr "Este contacto puede ser inaccesible desde otras ubicaciones del canal." -#: ../../Zotlabs/Module/Contactedit.php:385 +#: ../../Zotlabs/Module/Contactedit.php:371 #: ../../Zotlabs/Module/Connedit.php:681 msgid "Location independence is not supported by their network." msgstr "La independencia de ubicación no es compatible con su red." -#: ../../Zotlabs/Module/Contactedit.php:395 +#: ../../Zotlabs/Module/Contactedit.php:381 msgid "View profile" msgstr "Ver el perfil" -#: ../../Zotlabs/Module/Contactedit.php:397 +#: ../../Zotlabs/Module/Contactedit.php:383 #: ../../Zotlabs/Module/Connections.php:413 msgid "This is a group/forum channel" msgstr "Este es un canal de grupo/foro" -#: ../../Zotlabs/Module/Contactedit.php:408 +#: ../../Zotlabs/Module/Contactedit.php:394 msgid "Select a role for this contact" msgstr "Selecciones un rol para este contacto" -#: ../../Zotlabs/Module/Contactedit.php:420 +#: ../../Zotlabs/Module/Contactedit.php:406 #: ../../Zotlabs/Module/Connedit.php:703 msgid "Slide to adjust your degree of friendship" msgstr "Deslizar para ajustar el grado de amistad" -#: ../../Zotlabs/Module/Contactedit.php:422 +#: ../../Zotlabs/Module/Contactedit.php:408 #: ../../Zotlabs/Module/Connedit.php:705 msgid "Custom Filter" msgstr "Filtro personalizado" -#: ../../Zotlabs/Module/Contactedit.php:423 +#: ../../Zotlabs/Module/Contactedit.php:409 #: ../../Zotlabs/Module/Connedit.php:706 #: ../../Zotlabs/Module/Settings/Channel.php:286 msgid "Only import posts with this text" msgstr "Importar solo entradas que contengan este texto" -#: ../../Zotlabs/Module/Contactedit.php:423 -#: ../../Zotlabs/Module/Contactedit.php:424 +#: ../../Zotlabs/Module/Contactedit.php:409 +#: ../../Zotlabs/Module/Contactedit.php:410 #: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707 -#: ../../Zotlabs/Module/Admin/Site.php:515 -#: ../../Zotlabs/Module/Admin/Site.php:516 +#: ../../Zotlabs/Module/Admin/Site.php:500 +#: ../../Zotlabs/Module/Admin/Site.php:501 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo" -#: ../../Zotlabs/Module/Contactedit.php:424 +#: ../../Zotlabs/Module/Contactedit.php:410 #: ../../Zotlabs/Module/Connedit.php:707 #: ../../Zotlabs/Module/Settings/Channel.php:285 msgid "Do not import posts with this text" msgstr "No importar entradas que contengan este texto" -#: ../../Zotlabs/Module/Contactedit.php:429 +#: ../../Zotlabs/Module/Contactedit.php:415 #: ../../Zotlabs/Module/Connedit.php:714 msgid "Approve contact" msgstr "Aprobar contacto" -#: ../../Zotlabs/Module/Contactedit.php:431 +#: ../../Zotlabs/Module/Contactedit.php:417 #: ../../Zotlabs/Module/Connedit.php:717 msgid "Their" msgstr "Su" -#: ../../Zotlabs/Module/Contactedit.php:432 +#: ../../Zotlabs/Module/Contactedit.php:418 #: ../../Zotlabs/Module/Connedit.php:718 msgid "My" msgstr "Mi" -#: ../../Zotlabs/Module/Contactedit.php:440 +#: ../../Zotlabs/Module/Contactedit.php:426 msgid "Roles" msgstr "Roles" -#: ../../Zotlabs/Module/Contactedit.php:441 +#: ../../Zotlabs/Module/Contactedit.php:427 msgid "Compare permissions" msgstr "Comparar permisos" -#: ../../Zotlabs/Module/Contactedit.php:442 +#: ../../Zotlabs/Module/Contactedit.php:428 msgid "Permission" msgstr "Permiso " -#: ../../Zotlabs/Module/Contactedit.php:445 +#: ../../Zotlabs/Module/Contactedit.php:431 #: ../../Zotlabs/Module/Connedit.php:572 msgid "Affinity" msgstr "Afinidad" -#: ../../Zotlabs/Module/Contactedit.php:446 +#: ../../Zotlabs/Module/Contactedit.php:432 msgid "Content filter" msgstr "Filtro de contenidos" -#: ../../Zotlabs/Module/Contactedit.php:456 +#: ../../Zotlabs/Module/Contactedit.php:442 msgid "Contact updated" msgstr "Contacto actualizado" -#: ../../Zotlabs/Module/Contactedit.php:456 +#: ../../Zotlabs/Module/Contactedit.php:442 msgid "Contact update failed" msgstr "Fallo en la actualización del contacto" -#: ../../Zotlabs/Module/Contactedit.php:462 +#: ../../Zotlabs/Module/Contactedit.php:448 #: ../../Zotlabs/Module/Connections.php:357 msgid "Approve connection" msgstr "Aprobar esta conexión" -#: ../../Zotlabs/Module/Contactedit.php:508 -#: ../../Zotlabs/Module/Contactedit.php:518 -msgid "Refresh succeeded" -msgstr "Actualización con éxito" - -#: ../../Zotlabs/Module/Contactedit.php:511 -msgid "Refresh failed - channel is currently unavailable" -msgstr "Error de actualización: el canal no está disponible en este momento" - -#: ../../Zotlabs/Module/Contactedit.php:530 +#: ../../Zotlabs/Module/Contactedit.php:520 msgid "Block status updated" msgstr "Estado del bloqueo actualizado" -#: ../../Zotlabs/Module/Contactedit.php:534 +#: ../../Zotlabs/Module/Contactedit.php:524 msgid "Block failed" msgstr "Bloqueo fallido" -#: ../../Zotlabs/Module/Contactedit.php:545 +#: ../../Zotlabs/Module/Contactedit.php:535 msgid "Ignore status updated" msgstr "Estado de ignorar actualizado" -#: ../../Zotlabs/Module/Contactedit.php:549 +#: ../../Zotlabs/Module/Contactedit.php:539 msgid "Ignore failed" msgstr "Ignorar falló" -#: ../../Zotlabs/Module/Contactedit.php:560 +#: ../../Zotlabs/Module/Contactedit.php:550 msgid "Archive status updated" msgstr "Estado de archivar actualizado" -#: ../../Zotlabs/Module/Contactedit.php:564 +#: ../../Zotlabs/Module/Contactedit.php:554 msgid "Archive failed" msgstr "Archivar falló" -#: ../../Zotlabs/Module/Contactedit.php:575 +#: ../../Zotlabs/Module/Contactedit.php:565 msgid "Hide status updated" msgstr "Estado de ocultación actualizado" -#: ../../Zotlabs/Module/Contactedit.php:579 +#: ../../Zotlabs/Module/Contactedit.php:569 msgid "Hide failed" msgstr "Ocultar falló" -#: ../../Zotlabs/Module/Contactedit.php:614 +#: ../../Zotlabs/Module/Contactedit.php:604 msgid "Contact removed" msgstr "Contacto eliminado" -#: ../../Zotlabs/Module/Contactedit.php:618 +#: ../../Zotlabs/Module/Contactedit.php:608 msgid "Delete failed" msgstr "Eliminar falló" -#: ../../Zotlabs/Module/Contactedit.php:628 -#: ../../Zotlabs/Module/Connedit.php:487 -msgid "Refresh Permissions" -msgstr "Recargar los permisos" - -#: ../../Zotlabs/Module/Contactedit.php:629 -#: ../../Zotlabs/Module/Connedit.php:490 -msgid "Fetch updated permissions" -msgstr "Obtener los permisos actualizados" - -#: ../../Zotlabs/Module/Contactedit.php:633 -#: ../../Zotlabs/Module/Connedit.php:494 -msgid "Refresh Photo" -msgstr "Actualizar la foto" +#: ../../Zotlabs/Module/Contactedit.php:619 +msgid "Refetch contact info" +msgstr "Recuperar información de contacto" -#: ../../Zotlabs/Module/Contactedit.php:634 -#: ../../Zotlabs/Module/Connedit.php:497 -msgid "Fetch updated photo" -msgstr "Obtener una foto actualizada" - -#: ../../Zotlabs/Module/Contactedit.php:639 +#: ../../Zotlabs/Module/Contactedit.php:623 #: ../../Zotlabs/Module/Connedit.php:508 #: ../../Zotlabs/Module/Admin/Accounts.php:322 msgid "Unblock" msgstr "Desbloquear" -#: ../../Zotlabs/Module/Contactedit.php:639 +#: ../../Zotlabs/Module/Contactedit.php:623 #: ../../Zotlabs/Module/Connedit.php:508 #: ../../Zotlabs/Module/Admin/Accounts.php:321 msgid "Block" msgstr "Bloquear" -#: ../../Zotlabs/Module/Contactedit.php:641 +#: ../../Zotlabs/Module/Contactedit.php:625 #: ../../Zotlabs/Module/Connedit.php:511 msgid "Block (or Unblock) all communications with this connection" msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión" -#: ../../Zotlabs/Module/Contactedit.php:642 +#: ../../Zotlabs/Module/Contactedit.php:626 #: ../../Zotlabs/Module/Connedit.php:512 msgid "This connection is blocked!" msgstr "¡Esta conexión está bloqueada!" -#: ../../Zotlabs/Module/Contactedit.php:646 +#: ../../Zotlabs/Module/Contactedit.php:630 #: ../../Zotlabs/Module/Connedit.php:516 msgid "Unignore" msgstr "Dejar de ignorar" -#: ../../Zotlabs/Module/Contactedit.php:646 +#: ../../Zotlabs/Module/Contactedit.php:630 #: ../../Zotlabs/Module/Connedit.php:516 #: ../../Zotlabs/Module/Connections.php:360 msgid "Ignore" msgstr "Ignorar" -#: ../../Zotlabs/Module/Contactedit.php:648 +#: ../../Zotlabs/Module/Contactedit.php:632 #: ../../Zotlabs/Module/Connedit.php:519 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/Contactedit.php:649 +#: ../../Zotlabs/Module/Contactedit.php:633 #: ../../Zotlabs/Module/Connedit.php:520 msgid "This connection is ignored!" msgstr "¡Esta conexión es ignorada!" -#: ../../Zotlabs/Module/Contactedit.php:653 +#: ../../Zotlabs/Module/Contactedit.php:637 #: ../../Zotlabs/Module/Connedit.php:524 msgid "Unarchive" msgstr "Desarchivar" -#: ../../Zotlabs/Module/Contactedit.php:653 +#: ../../Zotlabs/Module/Contactedit.php:637 #: ../../Zotlabs/Module/Connedit.php:524 msgid "Archive" msgstr "Archivar" -#: ../../Zotlabs/Module/Contactedit.php:655 +#: ../../Zotlabs/Module/Contactedit.php:639 #: ../../Zotlabs/Module/Connedit.php:527 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/Contactedit.php:656 +#: ../../Zotlabs/Module/Contactedit.php:640 #: ../../Zotlabs/Module/Connedit.php:528 msgid "This connection is archived!" msgstr "¡Esta conexión esta archivada!" -#: ../../Zotlabs/Module/Contactedit.php:660 +#: ../../Zotlabs/Module/Contactedit.php:644 #: ../../Zotlabs/Module/Connedit.php:532 msgid "Unhide" msgstr "Mostrar" -#: ../../Zotlabs/Module/Contactedit.php:660 +#: ../../Zotlabs/Module/Contactedit.php:644 #: ../../Zotlabs/Module/Connedit.php:532 msgid "Hide" msgstr "Ocultar" -#: ../../Zotlabs/Module/Contactedit.php:662 +#: ../../Zotlabs/Module/Contactedit.php:646 #: ../../Zotlabs/Module/Connedit.php:535 msgid "Hide or Unhide this connection from your other connections" msgstr "Ocultar o mostrar esta conexión a sus otras conexiones" -#: ../../Zotlabs/Module/Contactedit.php:663 +#: ../../Zotlabs/Module/Contactedit.php:647 #: ../../Zotlabs/Module/Connedit.php:536 msgid "This connection is hidden!" msgstr "¡Esta conexión está oculta!" -#: ../../Zotlabs/Module/Contactedit.php:669 +#: ../../Zotlabs/Module/Contactedit.php:653 #: ../../Zotlabs/Module/Connedit.php:543 msgid "Delete this connection" msgstr "Eliminar esta conexión" -#: ../../Zotlabs/Module/Mood.php:153 -msgid "Set your current mood and tell your friends" -msgstr "Describir su estado de ánimo para comunicárselo a sus amigos" - #: ../../Zotlabs/Module/Search.php:250 #, php-format msgid "Items tagged with: %s" @@ -10270,7 +9797,7 @@ msgid "This will help to review your registration" msgstr "Esto ayudará a revisar su registro" #: ../../Zotlabs/Module/Register.php:520 -#: ../../Zotlabs/Module/Admin/Site.php:416 +#: ../../Zotlabs/Module/Admin/Site.php:402 msgid "Registration" msgstr "Registro" @@ -10306,47 +9833,47 @@ msgstr "Aplicación instalada." msgid "Malformed app." msgstr "Aplicación con errores" -#: ../../Zotlabs/Module/Appman.php:198 +#: ../../Zotlabs/Module/Appman.php:208 msgid "Embed code" msgstr "Código incorporado" -#: ../../Zotlabs/Module/Appman.php:203 +#: ../../Zotlabs/Module/Appman.php:213 msgid "Edit App" msgstr "Modificar la aplicación" -#: ../../Zotlabs/Module/Appman.php:203 +#: ../../Zotlabs/Module/Appman.php:213 msgid "Create App" msgstr "Crear una aplicación" -#: ../../Zotlabs/Module/Appman.php:208 +#: ../../Zotlabs/Module/Appman.php:218 msgid "Name of app" msgstr "Nombre de la aplicación" -#: ../../Zotlabs/Module/Appman.php:209 +#: ../../Zotlabs/Module/Appman.php:219 msgid "Location (URL) of app" msgstr "Dirección (URL) de la aplicación" -#: ../../Zotlabs/Module/Appman.php:211 +#: ../../Zotlabs/Module/Appman.php:221 msgid "Photo icon URL" msgstr "Dirección del icono" -#: ../../Zotlabs/Module/Appman.php:211 +#: ../../Zotlabs/Module/Appman.php:221 msgid "80 x 80 pixels - optional" msgstr "80 x 80 pixels - opcional" -#: ../../Zotlabs/Module/Appman.php:212 +#: ../../Zotlabs/Module/Appman.php:222 msgid "Categories (optional, comma separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../Zotlabs/Module/Appman.php:213 +#: ../../Zotlabs/Module/Appman.php:223 msgid "Version ID" msgstr "Versión" -#: ../../Zotlabs/Module/Appman.php:214 +#: ../../Zotlabs/Module/Appman.php:224 msgid "Price of app" msgstr "Precio de la aplicación" -#: ../../Zotlabs/Module/Appman.php:215 +#: ../../Zotlabs/Module/Appman.php:225 msgid "Location (URL) to purchase app" msgstr "Dirección (URL) donde adquirir la aplicación" @@ -10354,36 +9881,36 @@ msgstr "Dirección (URL) donde adquirir la aplicación" msgid "item" msgstr "elemento" -#: ../../Zotlabs/Module/Item.php:478 ../../Zotlabs/Module/Pin.php:36 +#: ../../Zotlabs/Module/Item.php:477 ../../Zotlabs/Module/Pin.php:36 msgid "Unable to locate original post." msgstr "No ha sido posible encontrar la entrada original." -#: ../../Zotlabs/Module/Item.php:764 +#: ../../Zotlabs/Module/Item.php:763 msgid "Empty post discarded." msgstr "La entrada vacía ha sido desechada." -#: ../../Zotlabs/Module/Item.php:1179 +#: ../../Zotlabs/Module/Item.php:1205 msgid "Duplicate post suppressed." msgstr "Se ha suprimido la entrada duplicada." -#: ../../Zotlabs/Module/Item.php:1329 +#: ../../Zotlabs/Module/Item.php:1343 msgid "System error. Post not saved." msgstr "Error del sistema. La entrada no se ha podido salvar." -#: ../../Zotlabs/Module/Item.php:1363 +#: ../../Zotlabs/Module/Item.php:1377 msgid "Your comment is awaiting approval." msgstr "Su comentario está pendiente de aprobación." -#: ../../Zotlabs/Module/Item.php:1500 +#: ../../Zotlabs/Module/Item.php:1514 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:1507 +#: ../../Zotlabs/Module/Item.php:1521 #, 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:1514 +#: ../../Zotlabs/Module/Item.php:1528 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Ha alcanzado su límite de %1$.0f páginas web." @@ -10431,6 +9958,22 @@ msgstr "La conexión ha sido eliminada." msgid "View %s's profile" msgstr "Ver el perfil de %s" +#: ../../Zotlabs/Module/Connedit.php:487 +msgid "Refresh Permissions" +msgstr "Recargar los permisos" + +#: ../../Zotlabs/Module/Connedit.php:490 +msgid "Fetch updated permissions" +msgstr "Obtener los permisos actualizados" + +#: ../../Zotlabs/Module/Connedit.php:494 +msgid "Refresh Photo" +msgstr "Actualizar la foto" + +#: ../../Zotlabs/Module/Connedit.php:497 +msgid "Fetch updated photo" +msgstr "Obtener una foto actualizada" + #: ../../Zotlabs/Module/Connedit.php:504 msgid "View recent posts and comments" msgstr "Ver publicaciones y comentarios recientes" @@ -10557,7 +10100,7 @@ msgstr "Sitio web" #: ../../Zotlabs/Module/Connedit.php:739 ../../Zotlabs/Module/Locs.php:122 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:472 ../../Zotlabs/Module/Cdav.php:1375 +#: ../../Zotlabs/Module/Profiles.php:468 ../../Zotlabs/Module/Cdav.php:1375 msgid "Address" msgstr "Dirección" @@ -10597,7 +10140,7 @@ msgstr "Provincia, región o estado" msgid "ZIP Code" msgstr "Código postal" -#: ../../Zotlabs/Module/Connedit.php:757 ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Connedit.php:757 ../../Zotlabs/Module/Profiles.php:769 #: ../../Zotlabs/Module/Cdav.php:1393 msgid "Country" msgstr "País" @@ -10643,7 +10186,7 @@ msgid "" "hours." msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo." -#: ../../Zotlabs/Module/Follow.php:92 +#: ../../Zotlabs/Module/Follow.php:75 msgid "Connection added." msgstr "Se ha incorporado una conexión." @@ -10739,35 +10282,35 @@ msgstr "De más antiguo a más nuevo" msgid "No entries (some entries may be hidden)." msgstr "Sin entradas (algunas entradas pueden estar ocultas)." -#: ../../Zotlabs/Module/Profile_photo.php:544 +#: ../../Zotlabs/Module/Profile_photo.php:543 msgid "" "This profile photo will be visible to anybody on the internet and may be " "distributed to other websites." msgstr "Esta foto de perfil será visible para cualquier persona en Internet y podrá ser distribuida a otros sitios web." -#: ../../Zotlabs/Module/Profile_photo.php:544 +#: ../../Zotlabs/Module/Profile_photo.php:543 msgid "" "This profile photo will be visible only to channels with permission to view " "this profile." msgstr "Esta foto de perfil sólo será visible para los canales con permiso para ver este perfil." -#: ../../Zotlabs/Module/Profile_photo.php:546 +#: ../../Zotlabs/Module/Profile_photo.php:545 msgid "Use Photo for Profile" msgstr "Usar la fotografía para el perfil" -#: ../../Zotlabs/Module/Profile_photo.php:546 +#: ../../Zotlabs/Module/Profile_photo.php:545 msgid "Change Profile Photo" msgstr "Cambiar la foto del perfil" -#: ../../Zotlabs/Module/Profile_photo.php:548 +#: ../../Zotlabs/Module/Profile_photo.php:547 msgid "Reset to default" msgstr "Restablecer los valores por defecto" -#: ../../Zotlabs/Module/Profile_photo.php:562 +#: ../../Zotlabs/Module/Profile_photo.php:561 msgid "Select existing" msgstr "Seleccione lo que hay" -#: ../../Zotlabs/Module/Profile_photo.php:584 +#: ../../Zotlabs/Module/Profile_photo.php:583 msgid "Done editing" msgstr "Edición completada" @@ -11136,7 +10679,7 @@ msgstr "Caducado/a" #: ../../Zotlabs/Module/Admin/Addons.php:443 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Site.php:411 +#: ../../Zotlabs/Module/Admin/Site.php:397 #: ../../Zotlabs/Module/Admin/Security.php:105 #: ../../Zotlabs/Module/Admin.php:140 msgid "Administration" @@ -11710,512 +11253,512 @@ msgstr "Errores" msgid "Site settings updated." msgstr "Ajustes del sitio actualizados." -#: ../../Zotlabs/Module/Admin/Site.php:256 +#: ../../Zotlabs/Module/Admin/Site.php:242 #: ../../Zotlabs/Module/Settings/Display.php:116 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Incompatible)" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:249 msgid "mobile" msgstr "móvil" -#: ../../Zotlabs/Module/Admin/Site.php:265 +#: ../../Zotlabs/Module/Admin/Site.php:251 msgid "experimental" msgstr "experimental" -#: ../../Zotlabs/Module/Admin/Site.php:267 +#: ../../Zotlabs/Module/Admin/Site.php:253 msgid "unsupported" msgstr "no soportado" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Yes - with approval" msgstr "Sí - con aprobación" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "My site is not a public server" msgstr "Mi sitio no es un servidor público" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "My site has paid access only" msgstr "Mi sitio es un servicio de pago" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "My site has free access only" msgstr "Mi sitio es un servicio gratuito" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Default permission role for new accounts" msgstr "Permisos de rol por defecto para las nuevas cuentas" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:335 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:356 ../../Zotlabs/Module/Invite.php:410 +#: ../../Zotlabs/Module/Admin/Site.php:342 ../../Zotlabs/Module/Invite.php:410 msgid "Minute(s)" msgstr "Minuto(s)" -#: ../../Zotlabs/Module/Admin/Site.php:357 ../../Zotlabs/Module/Invite.php:411 +#: ../../Zotlabs/Module/Admin/Site.php:343 ../../Zotlabs/Module/Invite.php:411 msgid "Hour(s)" msgstr "Hora(s)" -#: ../../Zotlabs/Module/Admin/Site.php:358 ../../Zotlabs/Module/Invite.php:412 +#: ../../Zotlabs/Module/Admin/Site.php:344 ../../Zotlabs/Module/Invite.php:412 msgid "Day(s)" msgstr "Día(s)" -#: ../../Zotlabs/Module/Admin/Site.php:359 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Week(s)" msgstr "Semana(s)" -#: ../../Zotlabs/Module/Admin/Site.php:360 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Month(s)" msgstr "Mes(Meses)" -#: ../../Zotlabs/Module/Admin/Site.php:361 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Year(s)" msgstr "Año(s)" -#: ../../Zotlabs/Module/Admin/Site.php:369 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Register verification delay" msgstr "Retraso en la verificación del registro" -#: ../../Zotlabs/Module/Admin/Site.php:372 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Time to wait before a registration can be verified" msgstr "Tiempo de espera para verificar un registro " -#: ../../Zotlabs/Module/Admin/Site.php:375 -#: ../../Zotlabs/Module/Admin/Site.php:397 ../../Zotlabs/Module/Invite.php:421 +#: ../../Zotlabs/Module/Admin/Site.php:361 +#: ../../Zotlabs/Module/Admin/Site.php:383 ../../Zotlabs/Module/Invite.php:421 msgid "duration up from now" msgstr "duración a partir de ahora " -#: ../../Zotlabs/Module/Admin/Site.php:391 +#: ../../Zotlabs/Module/Admin/Site.php:377 msgid "Register verification expiration time" msgstr "Tiempo de caducidad de la verificación del registro " -#: ../../Zotlabs/Module/Admin/Site.php:394 +#: ../../Zotlabs/Module/Admin/Site.php:380 msgid "Time before an unverified registration will expire" msgstr "Tiempo antes de que caduque un registro no verificado " -#: ../../Zotlabs/Module/Admin/Site.php:417 +#: ../../Zotlabs/Module/Admin/Site.php:403 msgid "File upload" msgstr "Subir fichero" -#: ../../Zotlabs/Module/Admin/Site.php:418 +#: ../../Zotlabs/Module/Admin/Site.php:404 msgid "Policies" msgstr "Políticas" -#: ../../Zotlabs/Module/Admin/Site.php:425 +#: ../../Zotlabs/Module/Admin/Site.php:411 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../Zotlabs/Module/Admin/Site.php:425 +#: ../../Zotlabs/Module/Admin/Site.php:411 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "Se permite HTML/CSS/JS sin filtrar" -#: ../../Zotlabs/Module/Admin/Site.php:426 +#: ../../Zotlabs/Module/Admin/Site.php:412 msgid "Administrator Information" msgstr "Información del Administrador" -#: ../../Zotlabs/Module/Admin/Site.php:426 +#: ../../Zotlabs/Module/Admin/Site.php:412 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:427 +#: ../../Zotlabs/Module/Admin/Site.php:413 #: ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "Información sobre el sitio" -#: ../../Zotlabs/Module/Admin/Site.php:427 +#: ../../Zotlabs/Module/Admin/Site.php:413 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Descripción pública de este sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:429 +#: ../../Zotlabs/Module/Admin/Site.php:414 msgid "System theme" msgstr "Tema gráfico del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:429 +#: ../../Zotlabs/Module/Admin/Site.php:414 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - modificar los ajustes del tema" -#: ../../Zotlabs/Module/Admin/Site.php:432 +#: ../../Zotlabs/Module/Admin/Site.php:417 msgid "Allow Feeds as Connections" msgstr "Permitir contenidos RSS como conexiones" -#: ../../Zotlabs/Module/Admin/Site.php:432 +#: ../../Zotlabs/Module/Admin/Site.php:417 msgid "(Heavy system resource usage)" msgstr "(Uso intenso de los recursos del sistema)" -#: ../../Zotlabs/Module/Admin/Site.php:433 +#: ../../Zotlabs/Module/Admin/Site.php:418 msgid "Maximum image size" msgstr "Tamaño máximo de la imagen" -#: ../../Zotlabs/Module/Admin/Site.php:433 +#: ../../Zotlabs/Module/Admin/Site.php:418 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." 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:434 +#: ../../Zotlabs/Module/Admin/Site.php:419 msgid "Minimum age" msgstr "Edad mínima" -#: ../../Zotlabs/Module/Admin/Site.php:434 +#: ../../Zotlabs/Module/Admin/Site.php:419 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:435 +#: ../../Zotlabs/Module/Admin/Site.php:420 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:435 +#: ../../Zotlabs/Module/Admin/Site.php:420 msgid "This is displayed on the public server site list." msgstr "Esto se muestra en la lista de sitios de servidores públicos." -#: ../../Zotlabs/Module/Admin/Site.php:441 +#: ../../Zotlabs/Module/Admin/Site.php:426 msgid "Register text" msgstr "Texto del registro" -#: ../../Zotlabs/Module/Admin/Site.php:443 +#: ../../Zotlabs/Module/Admin/Site.php:428 msgid "This text will be displayed prominently at the registration page" msgstr "Este texto se mostrará de forma destacada en la página de registro " -#: ../../Zotlabs/Module/Admin/Site.php:447 +#: ../../Zotlabs/Module/Admin/Site.php:432 msgid "Does this site allow new member registration?" msgstr "¿Debe este sitio permitir el registro de nuevos miembros?" -#: ../../Zotlabs/Module/Admin/Site.php:454 +#: ../../Zotlabs/Module/Admin/Site.php:439 msgid "Configure the registration open days/hours" msgstr "Configurar los días/horas de apertura del registro" -#: ../../Zotlabs/Module/Admin/Site.php:456 +#: ../../Zotlabs/Module/Admin/Site.php:441 msgid "Empty or '-:-' value will keep registration open 24/7 (default)" msgstr "El valor vacío o \"-:-\" mantendrá el registro abierto 24/7 (por defecto)" -#: ../../Zotlabs/Module/Admin/Site.php:457 +#: ../../Zotlabs/Module/Admin/Site.php:442 msgid "" "Weekdays and hours must be separated by colon ':', From-To ranges with a " "dash `-` example: 1:800-1200" msgstr "Los días de la semana y las horas deben separarse con dos puntos ':', los rangos Desde-Hasta con un guión `-` ejemplo: 1:800-1200" -#: ../../Zotlabs/Module/Admin/Site.php:458 +#: ../../Zotlabs/Module/Admin/Site.php:443 msgid "" "Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 " "2:900-1700" msgstr "Los pares día de la semana:hora deben estar separados por un espacio ' ' ejemplo: 1:900-1700 2:900-1700" -#: ../../Zotlabs/Module/Admin/Site.php:459 +#: ../../Zotlabs/Module/Admin/Site.php:444 msgid "" "From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 " "or 1-2,4-5:900-1700" msgstr "Los rangos desde-hasta deben estar separados por comas ',' ejemplo: 1:800-1200,1300-1700 o 1-2,4-5:900-1700" -#: ../../Zotlabs/Module/Admin/Site.php:460 +#: ../../Zotlabs/Module/Admin/Site.php:445 msgid "Advanced examples:" msgstr "Ejemplos avanzados: " -#: ../../Zotlabs/Module/Admin/Site.php:460 +#: ../../Zotlabs/Module/Admin/Site.php:445 #: ../../Zotlabs/Module/Settings/Channel.php:183 msgid "or" msgstr "o" -#: ../../Zotlabs/Module/Admin/Site.php:461 +#: ../../Zotlabs/Module/Admin/Site.php:446 msgid "Check your configuration" msgstr "Compruebe su configuración" -#: ../../Zotlabs/Module/Admin/Site.php:465 +#: ../../Zotlabs/Module/Admin/Site.php:450 msgid "Max account registrations per day" msgstr "Máximo de registros de cuentas por día " -#: ../../Zotlabs/Module/Admin/Site.php:467 +#: ../../Zotlabs/Module/Admin/Site.php:452 msgid "Unlimited if zero or no value - default 50" msgstr "Ilimitado si es cero o sin valor - por defecto 50" -#: ../../Zotlabs/Module/Admin/Site.php:471 +#: ../../Zotlabs/Module/Admin/Site.php:456 msgid "Max account registrations from same IP" msgstr "Máximo de registros de cuentas desde la misma IP" -#: ../../Zotlabs/Module/Admin/Site.php:473 +#: ../../Zotlabs/Module/Admin/Site.php:458 msgid "Unlimited if zero or no value - default 3" msgstr "Ilimitado si es cero o sin valor - por defecto 3" -#: ../../Zotlabs/Module/Admin/Site.php:479 +#: ../../Zotlabs/Module/Admin/Site.php:464 msgid "Auto channel create" msgstr "Creación automática de canales" -#: ../../Zotlabs/Module/Admin/Site.php:481 +#: ../../Zotlabs/Module/Admin/Site.php:466 msgid "" "If disabled the channel will be created in a separate step during the " "registration process" msgstr "Si se desactiva, el canal se creará en un paso separado durante el proceso de registro" -#: ../../Zotlabs/Module/Admin/Site.php:485 +#: ../../Zotlabs/Module/Admin/Site.php:470 msgid "Require invite code" msgstr "Solicitar código de invitación" -#: ../../Zotlabs/Module/Admin/Site.php:490 +#: ../../Zotlabs/Module/Admin/Site.php:475 msgid "Allow invite code" msgstr "Permitir código de invitación" -#: ../../Zotlabs/Module/Admin/Site.php:495 +#: ../../Zotlabs/Module/Admin/Site.php:480 msgid "Require email address" msgstr "Solicitar dirección de correo electrónico" -#: ../../Zotlabs/Module/Admin/Site.php:497 +#: ../../Zotlabs/Module/Admin/Site.php:482 msgid "The provided email address will be verified (recommended)" msgstr "La dirección de correo electrónico proporcionada será verificada (recomendado)" -#: ../../Zotlabs/Module/Admin/Site.php:501 +#: ../../Zotlabs/Module/Admin/Site.php:486 msgid "Abandon account after x days" msgstr "Abandonar la cuenta después de x días" -#: ../../Zotlabs/Module/Admin/Site.php:503 +#: ../../Zotlabs/Module/Admin/Site.php:488 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." 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:508 +#: ../../Zotlabs/Module/Admin/Site.php:493 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:508 +#: ../../Zotlabs/Module/Admin/Site.php:493 msgid "" "example: 'pubstream' to show public stream, 'page/sys/home' to show a system" " webpage called 'home' or 'include:home.html' to include a file." msgstr "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo." -#: ../../Zotlabs/Module/Admin/Site.php:509 +#: ../../Zotlabs/Module/Admin/Site.php:494 msgid "Preserve site homepage URL" msgstr "Preservar la dirección de la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:509 +#: ../../Zotlabs/Module/Admin/Site.php:494 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" 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:510 +#: ../../Zotlabs/Module/Admin/Site.php:495 msgid "Allowed friend domains" msgstr "Dominios amigos permitidos" -#: ../../Zotlabs/Module/Admin/Site.php:510 +#: ../../Zotlabs/Module/Admin/Site.php:495 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio." -#: ../../Zotlabs/Module/Admin/Site.php:511 +#: ../../Zotlabs/Module/Admin/Site.php:496 msgid "Force publish" msgstr "Forzar la publicación" -#: ../../Zotlabs/Module/Admin/Site.php:511 +#: ../../Zotlabs/Module/Admin/Site.php:496 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:512 +#: ../../Zotlabs/Module/Admin/Site.php:497 msgid "Enable public stream" msgstr "Habilitar el \"stream\" público" -#: ../../Zotlabs/Module/Admin/Site.php:512 +#: ../../Zotlabs/Module/Admin/Site.php:497 msgid "Enable the public stream. Warning: this content is unmoderated" msgstr "Habilitar el \"stream\" público. Advertencia: este contenido no está moderado" -#: ../../Zotlabs/Module/Admin/Site.php:513 +#: ../../Zotlabs/Module/Admin/Site.php:498 msgid "Site only public stream" msgstr "Solo contenido público en este sitio" -#: ../../Zotlabs/Module/Admin/Site.php:513 +#: ../../Zotlabs/Module/Admin/Site.php:498 msgid "Restrict the public stream to content originating at this site" msgstr "Restringir el \"stream\" público a los contenidos originados en este sitio" -#: ../../Zotlabs/Module/Admin/Site.php:514 +#: ../../Zotlabs/Module/Admin/Site.php:499 msgid "Allow anybody on the internet to access the public streams" msgstr "Permitir que cualquiera en Internet pueda acceder a los \"streams\" públicos" -#: ../../Zotlabs/Module/Admin/Site.php:514 +#: ../../Zotlabs/Module/Admin/Site.php:499 msgid "Disable to require authentication before viewing" msgstr "Desactivar para requerir autenticación antes de ver" -#: ../../Zotlabs/Module/Admin/Site.php:515 +#: ../../Zotlabs/Module/Admin/Site.php:500 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:516 +#: ../../Zotlabs/Module/Admin/Site.php:501 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:519 +#: ../../Zotlabs/Module/Admin/Site.php:504 msgid "Login on Homepage" msgstr "Iniciar sesión en la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:519 +#: ../../Zotlabs/Module/Admin/Site.php:504 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." 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:520 +#: ../../Zotlabs/Module/Admin/Site.php:505 msgid "Enable context help" msgstr "Habilitar la ayuda contextual" -#: ../../Zotlabs/Module/Admin/Site.php:520 +#: ../../Zotlabs/Module/Admin/Site.php:505 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda." -#: ../../Zotlabs/Module/Admin/Site.php:522 +#: ../../Zotlabs/Module/Admin/Site.php:507 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:523 +#: ../../Zotlabs/Module/Admin/Site.php:508 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:524 +#: ../../Zotlabs/Module/Admin/Site.php:509 msgid "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:526 +#: ../../Zotlabs/Module/Admin/Site.php:511 msgid "Directory Server URL" msgstr "URL del servidor de directorio" -#: ../../Zotlabs/Module/Admin/Site.php:526 +#: ../../Zotlabs/Module/Admin/Site.php:511 msgid "Default directory server" msgstr "Servidor de directorio predeterminado" -#: ../../Zotlabs/Module/Admin/Site.php:528 +#: ../../Zotlabs/Module/Admin/Site.php:513 msgid "Enable SSE Notifications" msgstr "Habilitar notificaciones SSE" -#: ../../Zotlabs/Module/Admin/Site.php:528 +#: ../../Zotlabs/Module/Admin/Site.php:513 msgid "" "If disabled, traditional polling will be used. Warning: this setting might " "not be suited for shared hosting" msgstr "Si está desactivado, se usará el sistema de votación tradicional. Advertencia: esta configuración podría no ser adecuada para el alojamiento compartido" -#: ../../Zotlabs/Module/Admin/Site.php:530 +#: ../../Zotlabs/Module/Admin/Site.php:515 msgid "Proxy user" msgstr "Usuario del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:531 +#: ../../Zotlabs/Module/Admin/Site.php:516 msgid "Proxy URL" msgstr "Dirección del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:532 +#: ../../Zotlabs/Module/Admin/Site.php:517 msgid "Network timeout" msgstr "Tiempo de espera de la red" -#: ../../Zotlabs/Module/Admin/Site.php:532 +#: ../../Zotlabs/Module/Admin/Site.php:517 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:533 +#: ../../Zotlabs/Module/Admin/Site.php:518 msgid "Delivery interval" msgstr "Intervalo de entrega" -#: ../../Zotlabs/Module/Admin/Site.php:533 +#: ../../Zotlabs/Module/Admin/Site.php:518 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 "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados." -#: ../../Zotlabs/Module/Admin/Site.php:534 +#: ../../Zotlabs/Module/Admin/Site.php:519 msgid "Deliveries per process" msgstr "Intentos de envío por proceso" -#: ../../Zotlabs/Module/Admin/Site.php:534 +#: ../../Zotlabs/Module/Admin/Site.php:519 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." 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:536 +#: ../../Zotlabs/Module/Admin/Site.php:521 msgid "Poll interval" msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos" -#: ../../Zotlabs/Module/Admin/Site.php:536 +#: ../../Zotlabs/Module/Admin/Site.php:521 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega." -#: ../../Zotlabs/Module/Admin/Site.php:537 +#: ../../Zotlabs/Module/Admin/Site.php:522 msgid "Path to ImageMagick convert program" msgstr "Ruta al programa de conversión de ImageMagick" -#: ../../Zotlabs/Module/Admin/Site.php:537 +#: ../../Zotlabs/Module/Admin/Site.php:522 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 está configurado, utilice este programa para generar miniaturas de fotos para imágenes de gran tamaño ( > 4000 píxeles en cualquiera de las dos dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:538 +#: ../../Zotlabs/Module/Admin/Site.php:523 msgid "Maximum Load Average" msgstr "Carga media máxima" -#: ../../Zotlabs/Module/Admin/Site.php:538 +#: ../../Zotlabs/Module/Admin/Site.php:523 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." 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:539 +#: ../../Zotlabs/Module/Admin/Site.php:524 msgid "Expiration period in days for imported (grid/network) content" msgstr "Caducidad del contenido importado de otros sitios (en días)" -#: ../../Zotlabs/Module/Admin/Site.php:539 +#: ../../Zotlabs/Module/Admin/Site.php:524 msgid "0 for no expiration of imported content" msgstr "0 para que no caduque el contenido importado" -#: ../../Zotlabs/Module/Admin/Site.php:540 +#: ../../Zotlabs/Module/Admin/Site.php:525 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:541 +#: ../../Zotlabs/Module/Admin/Site.php:526 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:541 +#: ../../Zotlabs/Module/Admin/Site.php:526 #, 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:542 +#: ../../Zotlabs/Module/Admin/Site.php:527 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:542 +#: ../../Zotlabs/Module/Admin/Site.php:527 msgid "Default: profiles" msgstr "Perfiles predeterminados" -#: ../../Zotlabs/Module/Admin/Site.php:543 +#: ../../Zotlabs/Module/Admin/Site.php:528 msgid "Optional: site location" msgstr "Opcional: ubicación del sitio" -#: ../../Zotlabs/Module/Admin/Site.php:543 +#: ../../Zotlabs/Module/Admin/Site.php:528 msgid "Region or country" msgstr "Región o país" -#: ../../Zotlabs/Module/Admin/Site.php:628 -#: ../../Zotlabs/Module/Admin/Site.php:629 +#: ../../Zotlabs/Module/Admin/Site.php:613 +#: ../../Zotlabs/Module/Admin/Site.php:614 msgid "Invalid 24h time value (hhmm/hmm)" msgstr "Valor de tiempo de 24h no válido (hhmm/hmm)" @@ -12410,75 +11953,55 @@ msgstr "Reenvío del email de verificación" msgid "Unable to resend email verification message." msgstr "No se puede reenviar el mensaje de verificación por correo electrónico." -#: ../../Zotlabs/Module/Dreport.php:38 +#: ../../Zotlabs/Module/Dreport.php:37 msgid "Invalid message" msgstr "Mensaje no válido" -#: ../../Zotlabs/Module/Dreport.php:68 +#: ../../Zotlabs/Module/Dreport.php:67 msgid "no results" msgstr "sin resultados" -#: ../../Zotlabs/Module/Dreport.php:82 +#: ../../Zotlabs/Module/Dreport.php:81 msgid "channel sync processed" msgstr "se ha realizado la sincronización del canal" -#: ../../Zotlabs/Module/Dreport.php:86 +#: ../../Zotlabs/Module/Dreport.php:85 msgid "queued" msgstr "encolado" -#: ../../Zotlabs/Module/Dreport.php:90 +#: ../../Zotlabs/Module/Dreport.php:89 msgid "posted" msgstr "enviado" -#: ../../Zotlabs/Module/Dreport.php:94 +#: ../../Zotlabs/Module/Dreport.php:93 msgid "accepted for delivery" msgstr "aceptado para el envío" -#: ../../Zotlabs/Module/Dreport.php:98 +#: ../../Zotlabs/Module/Dreport.php:97 msgid "updated" msgstr "actualizado" -#: ../../Zotlabs/Module/Dreport.php:102 +#: ../../Zotlabs/Module/Dreport.php:101 msgid "update ignored" msgstr "actualización ignorada" -#: ../../Zotlabs/Module/Dreport.php:105 +#: ../../Zotlabs/Module/Dreport.php:104 msgid "permission denied" msgstr "permiso denegado" -#: ../../Zotlabs/Module/Dreport.php:109 +#: ../../Zotlabs/Module/Dreport.php:108 msgid "recipient not found" msgstr "destinatario no encontrado" -#: ../../Zotlabs/Module/Dreport.php:129 +#: ../../Zotlabs/Module/Dreport.php:128 #, php-format msgid "Delivery report for %1$s" msgstr "Informe de entrega para %1$s" -#: ../../Zotlabs/Module/Dreport.php:134 +#: ../../Zotlabs/Module/Dreport.php:133 msgid "Redeliver" msgstr "Volver a enviar" -#: ../../Zotlabs/Module/Poke.php:182 -msgid "Poke somebody" -msgstr "Dar un toque a alguien" - -#: ../../Zotlabs/Module/Poke.php:186 -msgid "Poke or ping somebody" -msgstr "Dar un toque o hacer ping a alguien" - -#: ../../Zotlabs/Module/Poke.php:193 -msgid "Recipient" -msgstr "Destinatario" - -#: ../../Zotlabs/Module/Poke.php:194 -msgid "Choose action" -msgstr "Elegir una acción" - -#: ../../Zotlabs/Module/Poke.php:197 ../../Zotlabs/Module/Poke.php:198 -msgid "Make this post private" -msgstr "Convertir en privado este envío" - #: ../../Zotlabs/Module/Chatsvc.php:131 msgid "Away" msgstr "Ausente" @@ -12487,12 +12010,12 @@ msgstr "Ausente" msgid "Online" msgstr "Conectado/a" -#: ../../Zotlabs/Module/Subthread.php:128 +#: ../../Zotlabs/Module/Subthread.php:125 #, 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:130 +#: ../../Zotlabs/Module/Subthread.php:127 #, php-format msgid "%1$s stopped following %2$s's %3$s" msgstr "%1$s ha dejado de seguir %3$s de %2$s" @@ -12605,7 +12128,7 @@ msgstr "Registros pendientes" msgid "Registered channels" msgstr "Canales registrados" -#: ../../Zotlabs/Module/Admin.php:147 +#: ../../Zotlabs/Module/Admin.php:147 ../../Zotlabs/Module/Siteinfo.php:41 msgid "Active addons" msgstr "Addons acivos" @@ -12947,6 +12470,10 @@ msgstr "Página principal del proyecto" msgid "Developer homepage" msgstr "Página principal del desarrollador" +#: ../../Zotlabs/Module/Siteinfo.php:42 +msgid "Blocked sites" +msgstr "Sitios bloqueados" + #: ../../Zotlabs/Module/Attach.php:68 msgid "Item not available." msgstr "Elemento no disponible" @@ -13020,57 +12547,46 @@ msgid "" "href=\"%1$s\">%2$s on any site containing your channel." msgstr "Esta exportación puede ser importada o restaurada visitando %2$s cualquier sitio que contenga su canal." -#: ../../Zotlabs/Module/Like.php:112 +#: ../../Zotlabs/Module/Like.php:111 msgid "Like/Dislike" msgstr "Me gusta/No me gusta" -#: ../../Zotlabs/Module/Like.php:118 +#: ../../Zotlabs/Module/Like.php:117 msgid "This action is restricted to members." msgstr "Esta acción está restringida solo para miembros." -#: ../../Zotlabs/Module/Like.php:119 +#: ../../Zotlabs/Module/Like.php:118 msgid "" "Please login with your $Projectname ID or register as a new $Projectname member to continue." msgstr "Por favor, identifíquese con su $Projectname ID o rregístrese como un nuevo $Projectname member para continuar." -#: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198 -#: ../../Zotlabs/Module/Like.php:236 +#: ../../Zotlabs/Module/Like.php:171 ../../Zotlabs/Module/Like.php:197 +#: ../../Zotlabs/Module/Like.php:230 msgid "Invalid request." msgstr "Solicitud incorrecta." -#: ../../Zotlabs/Module/Like.php:213 +#: ../../Zotlabs/Module/Like.php:212 msgid "thing" msgstr "elemento" -#: ../../Zotlabs/Module/Like.php:259 +#: ../../Zotlabs/Module/Like.php:253 msgid "Channel unavailable." msgstr "Canal no disponible." -#: ../../Zotlabs/Module/Like.php:295 +#: ../../Zotlabs/Module/Like.php:289 msgid "Previous action reversed." msgstr "Acción anterior revocada." -#: ../../Zotlabs/Module/Like.php:489 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" -msgstr "%3$s de %2$s: %1$s está de acuerdo" - -#: ../../Zotlabs/Module/Like.php:491 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" -msgstr "%3$s de %2$s: %1$s no está de acuerdo" - -#: ../../Zotlabs/Module/Like.php:493 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" -msgstr "%3$s de %2$s: %1$s se abstiene" +#: ../../Zotlabs/Module/Like.php:453 +msgid "profile" +msgstr "perfil" -#: ../../Zotlabs/Module/Like.php:617 +#: ../../Zotlabs/Module/Like.php:610 msgid "Action completed." msgstr "Acción completada." -#: ../../Zotlabs/Module/Like.php:618 +#: ../../Zotlabs/Module/Like.php:611 msgid "Thank you." msgstr "Gracias." @@ -13394,6 +12910,10 @@ msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com" msgid "Flag as adult in album view" msgstr "Marcar como \"solo para adultos\" en el álbum" +#: ../../Zotlabs/Module/Photos.php:1125 ../../Zotlabs/Module/Photos.php:1137 +msgid "View all" +msgstr "Ver todo" + #: ../../Zotlabs/Module/Photos.php:1238 msgid "Photo Tools" msgstr "Gestión de las fotos" @@ -13406,21 +12926,31 @@ msgstr "En esta foto:" msgid "Map" msgstr "Mapa" +#: ../../Zotlabs/Module/Photos.php:1260 +msgctxt "noun" +msgid "Likes" +msgstr "Me gusta" + +#: ../../Zotlabs/Module/Photos.php:1261 +msgctxt "noun" +msgid "Dislikes" +msgstr "No me gusta" + #: ../../Zotlabs/Module/Ochannel.php:32 ../../Zotlabs/Module/Chat.php:29 msgid "You must be logged in to see this page." msgstr "Debe haber iniciado sesión para poder ver esta página." -#: ../../Zotlabs/Module/Hcard.php:37 ../../Zotlabs/Module/Channel.php:141 +#: ../../Zotlabs/Module/Hcard.php:37 ../../Zotlabs/Module/Channel.php:149 #: ../../Zotlabs/Module/Profile.php:62 msgid "Posts and comments" msgstr "Publicaciones y comentarios" -#: ../../Zotlabs/Module/Hcard.php:44 ../../Zotlabs/Module/Channel.php:148 +#: ../../Zotlabs/Module/Hcard.php:44 ../../Zotlabs/Module/Channel.php:156 #: ../../Zotlabs/Module/Profile.php:69 msgid "Only posts" msgstr "Solo publicaciones" -#: ../../Zotlabs/Module/Channel.php:219 +#: ../../Zotlabs/Module/Channel.php:230 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permisos insuficientes. Petición redirigida a la página del perfil." @@ -13508,260 +13038,260 @@ msgstr "Fuente eliminada" msgid "Unable to remove source." msgstr "No se puede eliminar la fuente." -#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:214 -#: ../../Zotlabs/Module/Profiles.php:642 +#: ../../Zotlabs/Module/Profiles.php:22 ../../Zotlabs/Module/Profiles.php:210 +#: ../../Zotlabs/Module/Profiles.php:638 msgid "Profile not found." msgstr "Perfil no encontrado." -#: ../../Zotlabs/Module/Profiles.php:46 +#: ../../Zotlabs/Module/Profiles.php:42 msgid "Profile deleted." msgstr "Perfil eliminado." -#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107 +#: ../../Zotlabs/Module/Profiles.php:66 ../../Zotlabs/Module/Profiles.php:103 msgid "Profile-" msgstr "Perfil-" -#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129 +#: ../../Zotlabs/Module/Profiles.php:88 ../../Zotlabs/Module/Profiles.php:125 msgid "New profile created." msgstr "El nuevo perfil ha sido creado." -#: ../../Zotlabs/Module/Profiles.php:113 +#: ../../Zotlabs/Module/Profiles.php:109 msgid "Profile unavailable to clone." msgstr "Perfil no disponible para clonar." -#: ../../Zotlabs/Module/Profiles.php:148 +#: ../../Zotlabs/Module/Profiles.php:144 msgid "Profile unavailable to export." msgstr "Perfil no disponible para exportar." -#: ../../Zotlabs/Module/Profiles.php:224 +#: ../../Zotlabs/Module/Profiles.php:220 msgid "Profile Name is required." msgstr "Se necesita el nombre del perfil." -#: ../../Zotlabs/Module/Profiles.php:429 +#: ../../Zotlabs/Module/Profiles.php:425 msgid "Marital Status" msgstr "Estado civil" -#: ../../Zotlabs/Module/Profiles.php:433 +#: ../../Zotlabs/Module/Profiles.php:429 msgid "Romantic Partner" msgstr "Pareja sentimental" -#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:784 msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Profiles.php:441 ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:785 msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Profiles.php:445 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Profiles.php:441 ../../Zotlabs/Module/Profiles.php:792 msgid "Work/Employment" msgstr "Trabajo:" -#: ../../Zotlabs/Module/Profiles.php:448 +#: ../../Zotlabs/Module/Profiles.php:444 msgid "Religion" msgstr "Religión" -#: ../../Zotlabs/Module/Profiles.php:452 +#: ../../Zotlabs/Module/Profiles.php:448 msgid "Political Views" msgstr "Ideas políticas" -#: ../../Zotlabs/Module/Profiles.php:460 +#: ../../Zotlabs/Module/Profiles.php:456 msgid "Sexual Preference" msgstr "Preferencia sexual" -#: ../../Zotlabs/Module/Profiles.php:464 +#: ../../Zotlabs/Module/Profiles.php:460 msgid "Homepage" msgstr "Página personal" -#: ../../Zotlabs/Module/Profiles.php:468 +#: ../../Zotlabs/Module/Profiles.php:464 msgid "Interests" msgstr "Intereses" -#: ../../Zotlabs/Module/Profiles.php:576 +#: ../../Zotlabs/Module/Profiles.php:572 msgid "Profile updated." msgstr "Perfil actualizado." -#: ../../Zotlabs/Module/Profiles.php:672 +#: ../../Zotlabs/Module/Profiles.php:668 msgid "Hide my connections from viewers of this profile" msgstr "Ocultar mis conexiones a los espectadores de este perfil" -#: ../../Zotlabs/Module/Profiles.php:685 +#: ../../Zotlabs/Module/Profiles.php:681 msgid "Publish my default profile in the network directory" msgstr "Publicar mi perfil por defecto en el directorio de la red" -#: ../../Zotlabs/Module/Profiles.php:693 +#: ../../Zotlabs/Module/Profiles.php:689 msgid "Suggest me as a potential contact to new members" msgstr "Sugerirme como contacto potencial a los nuevos miembros" -#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:693 msgid "Reveal my online status" msgstr "Revelar mi estado en línea" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Edit Profile Details" msgstr "Modificar los detalles de este perfil" -#: ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:736 msgid "View this profile" msgstr "Ver este perfil" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Profile Tools" msgstr "Gestión del perfil" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Change cover photo" msgstr "Cambiar la imagen de portada del perfil" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Create a new profile using these settings" msgstr "Crear un nuevo perfil usando estos ajustes" -#: ../../Zotlabs/Module/Profiles.php:746 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Clone this profile" msgstr "Clonar este perfil" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Delete this profile" msgstr "Eliminar este perfil" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Add profile things" msgstr "Añadir cosas al perfil" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Basic" msgstr "Básico" -#: ../../Zotlabs/Module/Profiles.php:751 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Relationship" msgstr "Relación" -#: ../../Zotlabs/Module/Profiles.php:754 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Import profile from file" msgstr "Importar perfil desde un fichero" -#: ../../Zotlabs/Module/Profiles.php:755 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Export profile to file" msgstr "Exportar perfil a un fichero" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Your gender" msgstr "Género" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Marital status" msgstr "Estado civil" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Sexual preference" msgstr "Preferencia sexual" -#: ../../Zotlabs/Module/Profiles.php:761 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Profile name" msgstr "Nombre del perfil" -#: ../../Zotlabs/Module/Profiles.php:763 +#: ../../Zotlabs/Module/Profiles.php:759 msgid "This is your default profile." msgstr "Este es su perfil principal." -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:761 msgid "Your full name" msgstr "Nombre completo" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Short title/description" msgstr "Breve título y descripción" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Maximal 190 characters" msgstr "Máximo de 190 caracteres" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Street address" msgstr "Dirección" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Locality/City" msgstr "Ciudad" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:767 msgid "Region/State" msgstr "Región o Estado" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Postal/Zip code" msgstr "Código postal" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Who (if applicable)" msgstr "Quién (si es pertinente)" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Since (date)" msgstr "Desde (fecha)" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Tell us about yourself" msgstr "Háblenos de usted" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:780 msgid "Hometown" msgstr "Lugar de nacimiento" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "Political views" msgstr "Ideas políticas" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Religious views" msgstr "Creencias religiosas" -#: ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "Keywords used in directory listings" msgstr "Palabras clave utilizadas en los listados de directorios" -#: ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "Example: fishing photography software" msgstr "Por ejemplo: software de fotografía submarina" -#: ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Musical interests" msgstr "Preferencias musicales" -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Books, literature" msgstr "Libros, literatura" -#: ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Profiles.php:788 msgid "Television" msgstr "Televisión" -#: ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Profiles.php:789 msgid "Film/Dance/Culture/Entertainment" msgstr "Cine, danza, cultura, entretenimiento" -#: ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Hobbies/Interests" msgstr "Aficiones o intereses" -#: ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Love/Romance" msgstr "Vida sentimental o amorosa" -#: ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Profiles.php:793 msgid "School/Education" msgstr "Estudios" -#: ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Profiles.php:794 msgid "Contact information and social networks" msgstr "Información de contacto y redes sociales" -#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Profiles.php:795 msgid "My other channels" msgstr "Mis otros canales" @@ -14139,7 +13669,7 @@ msgid "" msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos." #: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:271 -#: ../../Zotlabs/Module/Setup.php:778 +#: ../../Zotlabs/Module/Setup.php:796 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"." @@ -14320,199 +13850,223 @@ msgstr "Si está en un servidor Windows, por favor, lea \"http://www.php.net/man msgid "Generate encryption keys" msgstr "Generar claves de cifrado" -#: ../../Zotlabs/Module/Setup.php:510 +#: ../../Zotlabs/Module/Setup.php:497 +msgid "Error: the sodium encryption library is not installed." +msgstr "Error: la biblioteca de encriptación sodium no está instalada." + +#: ../../Zotlabs/Module/Setup.php:499 +msgid "Generate ed25519 encryption keys" +msgstr "Generar claves de cifrado ed25519" + +#: ../../Zotlabs/Module/Setup.php:504 +msgid "Error: one of \"bcmath\" or \"gmp\" (bigmath library) extensions are required." +msgstr "Error: se requiere una de las extensiones \"bcmath\" o \"gmp\" (bigmath library)." + +#: ../../Zotlabs/Module/Setup.php:506 +msgid "Bigmath library (either bcmath or gmp)" +msgstr "Biblioteca Bigmath (bcmath o gmp)" + +#: ../../Zotlabs/Module/Setup.php:523 msgid "libCurl PHP module" msgstr "módulo libCurl PHP" -#: ../../Zotlabs/Module/Setup.php:511 +#: ../../Zotlabs/Module/Setup.php:524 msgid "GD graphics PHP module" msgstr "módulo PHP GD graphics" -#: ../../Zotlabs/Module/Setup.php:512 +#: ../../Zotlabs/Module/Setup.php:525 msgid "OpenSSL PHP module" msgstr "módulo PHP OpenSSL" -#: ../../Zotlabs/Module/Setup.php:513 +#: ../../Zotlabs/Module/Setup.php:526 msgid "PDO database PHP module" msgstr "Módulo PHP de la base de datos PDO " -#: ../../Zotlabs/Module/Setup.php:514 +#: ../../Zotlabs/Module/Setup.php:527 msgid "mb_string PHP module" msgstr "módulo PHP mb_string" -#: ../../Zotlabs/Module/Setup.php:515 +#: ../../Zotlabs/Module/Setup.php:528 msgid "xml PHP module" msgstr "módulo PHP xml" -#: ../../Zotlabs/Module/Setup.php:516 +#: ../../Zotlabs/Module/Setup.php:529 msgid "zip PHP module" msgstr "Módulo zip PHP" -#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:522 +#: ../../Zotlabs/Module/Setup.php:530 +msgid "intl PHP module" +msgstr "módulo intl PHP" + +#: ../../Zotlabs/Module/Setup.php:534 ../../Zotlabs/Module/Setup.php:536 msgid "Apache mod_rewrite module" msgstr "módulo Apache mod_rewrite " -#: ../../Zotlabs/Module/Setup.php:520 +#: ../../Zotlabs/Module/Setup.php:534 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:526 ../../Zotlabs/Module/Setup.php:529 +#: ../../Zotlabs/Module/Setup.php:540 ../../Zotlabs/Module/Setup.php:543 msgid "exec" msgstr "ejecutable" -#: ../../Zotlabs/Module/Setup.php:526 +#: ../../Zotlabs/Module/Setup.php:540 msgid "" "Error: exec is required but is either not installed or has been disabled in " "php.ini" msgstr "Error: se necesita un ejecutable pero o no se instaló o está deshabilitado en php.ini" -#: ../../Zotlabs/Module/Setup.php:532 ../../Zotlabs/Module/Setup.php:535 +#: ../../Zotlabs/Module/Setup.php:546 ../../Zotlabs/Module/Setup.php:549 msgid "shell_exec" msgstr "shell_exec" -#: ../../Zotlabs/Module/Setup.php:532 +#: ../../Zotlabs/Module/Setup.php:546 msgid "" "Error: shell_exec is required but is either not installed or has been " "disabled in php.ini" msgstr "Error: se necesita shell_exec pero o no se instaló o está deshabilitado en php.ini" -#: ../../Zotlabs/Module/Setup.php:540 +#: ../../Zotlabs/Module/Setup.php:554 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:544 +#: ../../Zotlabs/Module/Setup.php:558 msgid "" "Error: GD PHP module with JPEG support or ImageMagick graphics library " "required but not installed." 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:548 +#: ../../Zotlabs/Module/Setup.php:562 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:554 +#: ../../Zotlabs/Module/Setup.php:568 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:559 +#: ../../Zotlabs/Module/Setup.php:573 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:563 +#: ../../Zotlabs/Module/Setup.php:577 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:567 +#: ../../Zotlabs/Module/Setup.php:581 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:571 +#: ../../Zotlabs/Module/Setup.php:585 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:590 ../../Zotlabs/Module/Setup.php:599 +#: ../../Zotlabs/Module/Setup.php:589 +msgid "Error: intl PHP module required but not installed." +msgstr "Error: el módulo intl PHP es necesario pero no está instalado." + +#: ../../Zotlabs/Module/Setup.php:608 ../../Zotlabs/Module/Setup.php:617 msgid ".htconfig.php is writable" msgstr ".htconfig.php tiene permisos de escritura" -#: ../../Zotlabs/Module/Setup.php:595 +#: ../../Zotlabs/Module/Setup.php:613 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 "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor." -#: ../../Zotlabs/Module/Setup.php:596 +#: ../../Zotlabs/Module/Setup.php:614 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 "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos." -#: ../../Zotlabs/Module/Setup.php:597 +#: ../../Zotlabs/Module/Setup.php:615 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:613 +#: ../../Zotlabs/Module/Setup.php:631 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "Este software hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 compila las plantillas a PHP para acelerar la renderización." -#: ../../Zotlabs/Module/Setup.php:614 +#: ../../Zotlabs/Module/Setup.php:632 #, 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 "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:615 ../../Zotlabs/Module/Setup.php:636 +#: ../../Zotlabs/Module/Setup.php:633 ../../Zotlabs/Module/Setup.php:654 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has" " write access to this folder." msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)." -#: ../../Zotlabs/Module/Setup.php:616 +#: ../../Zotlabs/Module/Setup.php:634 #, 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: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene." -#: ../../Zotlabs/Module/Setup.php:619 +#: ../../Zotlabs/Module/Setup.php:637 #, php-format msgid "%s is writable" msgstr "%s tiene permisos de escritura" -#: ../../Zotlabs/Module/Setup.php:635 +#: ../../Zotlabs/Module/Setup.php:653 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 "Este software utiliza el directorio de almacenamiento para guardar los ficheros subidos. El servidor web debe tener acceso de escritura a este directorio en la carpeta de nivel superior" -#: ../../Zotlabs/Module/Setup.php:639 +#: ../../Zotlabs/Module/Setup.php:657 msgid "store is writable" msgstr "\"store\" tiene permisos de escritura" -#: ../../Zotlabs/Module/Setup.php:671 +#: ../../Zotlabs/Module/Setup.php:689 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access" " to this site." msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio." -#: ../../Zotlabs/Module/Setup.php:672 +#: ../../Zotlabs/Module/Setup.php:690 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 su servidor soporta conexiones cifradas SSL o si permite conexiones al 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:673 +#: ../../Zotlabs/Module/Setup.php:691 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." 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:674 +#: ../../Zotlabs/Module/Setup.php:692 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 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:675 +#: ../../Zotlabs/Module/Setup.php:693 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." 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:676 +#: ../../Zotlabs/Module/Setup.php:694 msgid "" "Providers are available that issue free certificates which are browser-" "valid." msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos." -#: ../../Zotlabs/Module/Setup.php:677 +#: ../../Zotlabs/Module/Setup.php:695 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. " @@ -14520,32 +14074,32 @@ msgid "" "server communications." msgstr "Si se tiene la certeza de que el certificado es válido y está firmado por una autoridad de confianza, comprobar para ver si hubo un error al instalar un certificado intermedio. Estos no son normalmente requeridos por los navegadores, pero son necesarios para las comunicaciones de servidor a servidor." -#: ../../Zotlabs/Module/Setup.php:679 +#: ../../Zotlabs/Module/Setup.php:697 msgid "SSL certificate validation" msgstr "validación del certificado SSL" -#: ../../Zotlabs/Module/Setup.php:685 +#: ../../Zotlabs/Module/Setup.php:703 msgid "" "Url rewrite in .htaccess is not working. Check your server " "configuration.Test: " msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:" -#: ../../Zotlabs/Module/Setup.php:688 +#: ../../Zotlabs/Module/Setup.php:706 msgid "Url rewrite is working" msgstr "La reescritura de las direcciones funciona correctamente" -#: ../../Zotlabs/Module/Setup.php:701 +#: ../../Zotlabs/Module/Setup.php:719 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 "El fichero de configuración de la base de datos .htconfig.php no se ha 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:776 +#: ../../Zotlabs/Module/Setup.php:794 msgid "

What next?

" msgstr "

¿Qué sigue?

" -#: ../../Zotlabs/Module/Setup.php:777 +#: ../../Zotlabs/Module/Setup.php:795 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the " "poller." diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 5f449df83..6957ee3b7 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -2,7 +2,7 @@ if(! function_exists("string_plural_select_es_es")) { function string_plural_select_es_es($n){ - return ($n != 1 ? 1 : 0); + return ($n != 1 ? 1 : 0); }} App::$rtl = 0; App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)"; @@ -14,6 +14,12 @@ App::$strings["Theme settings"] = "Ajustes del tema"; App::$strings["Dark style"] = "Estilo oscuro"; App::$strings["Light style"] = "Estilo claro"; App::$strings["Common settings"] = "Ajustes comunes"; +App::$strings["Primary theme color"] = "Color del tema principal"; +App::$strings["Current color, leave empty for default"] = "Color actual, dejar vacío por defecto"; +App::$strings["Success theme color"] = "Éxito en el color del tema"; +App::$strings["Info theme color"] = "Información del color del tema"; +App::$strings["Warning theme color"] = "Advertencia sobre el color del tema"; +App::$strings["Danger theme color"] = "Peligro en el color del tema"; App::$strings["Default to dark mode"] = "Modo oscuro por defecto"; App::$strings["No"] = "No"; App::$strings["Yes"] = "Sí"; @@ -22,21 +28,18 @@ App::$strings["Enable this option if you use a dark navbar color in light mode"] App::$strings["Narrow navbar"] = "Estrechar la barra de navegación"; App::$strings["Navigation bar background color"] = "Color de fondo de la barra de navegación"; App::$strings["Dark navigation bar background color"] = "Color de fondo oscuro de la barra de navegación"; -App::$strings["Link color"] = "Color del enlace"; -App::$strings["Dark link color"] = "Color oscuro del enlace"; -App::$strings["Link hover color"] = "Color de los enlaces al pasar por encima"; -App::$strings["Dark link hover color"] = "Color oscuro del enlace flotante"; App::$strings["Set the background color"] = "Ajustar el color de fondo"; App::$strings["Set the dark background color"] = "Establecer el color de fondo oscuro"; App::$strings["Set the background image"] = "Ajustar la imagen de fondo"; App::$strings["Set the dark background image"] = "Establecer la imagen de fondo oscuro"; App::$strings["Set font-size for the entire application"] = "Ajustar el tamaño de letra para toda la aplicación"; App::$strings["Examples: 1rem, 100%, 16px"] = "Ejemplos: 1rem, 100%, 16px"; -App::$strings["Set radius of corners"] = "Establecer el radio de curvatura de las esquinas"; -App::$strings["Example: 4px"] = "Ejemplo: 4px"; +App::$strings["Set radius of corners in rem"] = "Fijar el radio de las esquinas en rem"; +App::$strings["Leave empty for default radius"] = "Dejar vacío para el radio por defecto"; App::$strings["Set maximum width of content region in rem"] = "Ajustar la anchura máxima de la región de contenido, en rem"; App::$strings["Leave empty for default width"] = "Dejar en blanco para la anchura predeterminada"; App::$strings["Set size of conversation author photo"] = "Ajustar el tamaño de la foto del autor de la conversación"; +App::$strings["Leave empty for default size"] = "Dejar vacío para el tamaño por defecto"; App::$strings["Set size of followup author photos"] = "Ajustar el tamaño de foto de los seguidores del autor"; App::$strings["Show advanced settings"] = "Mostrar ajustes avanzados"; App::$strings["%1\$s's bookmarks"] = "Marcadores de %1\$s"; @@ -92,15 +95,6 @@ App::$strings["Privacy group is empty."] = "El grupo de canales está vacío."; App::$strings["Privacy group: %s"] = "Grupo de canales: %s"; App::$strings["Connection: %s"] = "Conexión: %s"; App::$strings["Connection not found."] = "Conexión no encontrada"; -App::$strings["female"] = "mujer"; -App::$strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s"; -App::$strings["male"] = "hombre"; -App::$strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s"; -App::$strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s"; -App::$strings["profile photo"] = "foto del perfil"; -App::$strings["[Edited %s]"] = "[se ha editado %s]"; -App::$strings["__ctx:edit_activity__ Post"] = "Publicar"; -App::$strings["__ctx:edit_activity__ Comment"] = "Comentar"; App::$strings["Off"] = "Desactivado"; App::$strings["On"] = "Activado"; App::$strings["Calendar"] = "Calendario"; @@ -264,10 +258,12 @@ App::$strings["It's complicated"] = "Es complicado"; App::$strings["Don't care"] = "No me importa"; App::$strings["Ask me"] = "Pregúnteme"; App::$strings[" and "] = " y "; +App::$strings[", "] = ", "; +App::$strings["Profile Photo"] = "Foto del perfil"; +App::$strings["Cover Photo"] = "Imagen de portada del perfil"; App::$strings["public profile"] = "el perfil público"; -App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s ha cambiado %2\$s a “%3\$s”"; -App::$strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s"; -App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s, cambiando %3\$s."; +App::$strings["%1\$s %2\$s has been updated to %3\$s."] = "%1\$s%2\$sse ha actualizado a %3\$s."; +App::$strings["%1\$s updated the %2\$s. Changed %3\$s."] = "%1\$sactualizó el %2\$s. Ha cambiado %3\$s."; App::$strings["%d invitation available"] = array( 0 => "%d invitación pendiente", 1 => "%d invitaciones disponibles", @@ -469,22 +465,18 @@ App::$strings["channel"] = "el canal"; App::$strings["post"] = "la entrada"; App::$strings["comment"] = "el comentario"; App::$strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s"; -App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; App::$strings["likes %1\$s's %2\$s"] = "gusta de %2\$s de %1\$s"; +App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; App::$strings["doesn't like %1\$s's %2\$s"] = "no gusta de %2\$s de %1\$s"; -App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s"; -App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s"; -App::$strings["poked"] = "ha dado un toque a"; -App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s"; +App::$strings["%1\$s repeated %2\$s's %3\$s"] = "%1\$scompartió %3\$sde %2\$s"; +App::$strings["repeated %1\$s's %2\$s"] = "compartió %2\$s de %1\$s"; App::$strings["This is an unsaved preview"] = "Esta es una previsualización sin guardar"; App::$strings["__ctx:title__ Likes"] = "Me gusta"; App::$strings["__ctx:title__ Dislikes"] = "No me gusta"; -App::$strings["__ctx:title__ Agree"] = "De acuerdo"; -App::$strings["__ctx:title__ Disagree"] = "En desacuerdo"; -App::$strings["__ctx:title__ Abstain"] = "Abstención"; App::$strings["__ctx:title__ Attending"] = "Participaré"; App::$strings["__ctx:title__ Not attending"] = "No participaré"; App::$strings["__ctx:title__ Might attend"] = "Quizá participe"; +App::$strings["__ctx:title__ Repeats"] = "Se repite"; App::$strings["Select"] = "Seleccionar"; App::$strings["Delete"] = "Eliminar"; App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada preferida"; @@ -511,7 +503,6 @@ App::$strings["View Profile"] = "Ver el perfil"; App::$strings["Recent Activity"] = "Actividad reciente"; App::$strings["Connect"] = "Conectar"; App::$strings["Edit Connection"] = "Editar conexión"; -App::$strings["Poke"] = "Toques y otras cosas"; App::$strings["Approve this item"] = "Aprobar este elemento"; App::$strings["Delete this item"] = "Borrar este elemento"; App::$strings["%s likes this."] = "A %s le gusta esto."; @@ -580,6 +571,11 @@ App::$strings["Other networks and post services"] = "Otras redes y servicios de App::$strings["Set expiration date"] = "Configurar fecha de caducidad"; App::$strings["Set publish date"] = "Establecer la fecha de publicación"; App::$strings["Encrypt text"] = "Cifrar texto"; +App::$strings["__ctx:noun__ Repeat"] = array( + 0 => "Se repite", + 1 => "Se repite", + 2 => "Se repite", +); App::$strings["__ctx:noun__ Dislike"] = array( 0 => "No me gusta", 1 => "No me gusta", @@ -600,21 +596,6 @@ App::$strings["__ctx:noun__ Undecided"] = array( 1 => "Indecisos/as", 2 => "Indecisos/as", ); -App::$strings["__ctx:noun__ Agree"] = array( - 0 => "De acuerdo", - 1 => "De acuerdo", - 2 => "De acuerdo", -); -App::$strings["__ctx:noun__ Disagree"] = array( - 0 => "En desacuerdo", - 1 => "En desacuerdo", - 2 => "En desacuerdo", -); -App::$strings["__ctx:noun__ Abstain"] = array( - 0 => "se abstiene", - 1 => "Se abstienen", - 2 => "Se abstienen", -); App::$strings["Remote authentication"] = "Acceder desde su servidor"; App::$strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio"; App::$strings["Channels"] = "Canales"; @@ -764,30 +745,6 @@ App::$strings["Nothing"] = "Nada"; App::$strings["View all %s connections"] = "Ver todas las %s conexiones"; App::$strings["Network: %s"] = "Red %s"; App::$strings["Save"] = "Guardar"; -App::$strings["poke"] = "un toque"; -App::$strings["ping"] = "un \"ping\""; -App::$strings["pinged"] = "ha enviado un \"ping\" a"; -App::$strings["happy"] = "feliz "; -App::$strings["sad"] = "triste "; -App::$strings["mellow"] = "tranquilo/a"; -App::$strings["tired"] = "cansado/a "; -App::$strings["perky"] = "vivaz"; -App::$strings["angry"] = "enfadado/a"; -App::$strings["stupefied"] = "asombrado/a"; -App::$strings["puzzled"] = "perplejo/a"; -App::$strings["interested"] = "interesado/a"; -App::$strings["bitter"] = "amargado/a"; -App::$strings["cheerful"] = "alegre"; -App::$strings["alive"] = "animado/a"; -App::$strings["annoyed"] = "molesto/a"; -App::$strings["anxious"] = "ansioso/a"; -App::$strings["cranky"] = "de mal humor"; -App::$strings["disturbed"] = "perturbado/a"; -App::$strings["frustrated"] = "frustrado/a"; -App::$strings["depressed"] = "deprimido/a"; -App::$strings["motivated"] = "motivado/a"; -App::$strings["relaxed"] = "relajado/a"; -App::$strings["surprised"] = "sorprendido/a"; App::$strings["May"] = "mayo"; App::$strings["Unknown attachment"] = "Adjunto no reconocido"; App::$strings["Size"] = "Tamaño"; @@ -867,7 +824,6 @@ App::$strings["This channel has not added a profile description yet"] = "Este ca App::$strings["Change your profile photo"] = "Cambiar su foto del perfil"; App::$strings["Trans"] = "Trans"; App::$strings["Full Name:"] = "Nombre completo:"; -App::$strings["Like this channel"] = "Me gusta este canal"; App::$strings["j F, Y"] = "j F Y"; App::$strings["j F"] = "j F"; App::$strings["Birthday:"] = "Cumpleaños:"; @@ -925,6 +881,15 @@ App::$strings["IRC settings saved."] = "Se han guardado los ajustes de IRC."; App::$strings["IRC Chatroom"] = "Sala de chat IRC"; App::$strings["Hide the button and show the smilies directly."] = "Ocultar el botón y mostrar los smilies directamente."; App::$strings["Smileybutton Settings"] = "Ajustes de Smileybutton"; +App::$strings["ERROR: word length is not correct!"] = "ERROR: ¡la longitud de la palabra no es correcta!"; +App::$strings["Fediquest App"] = "Aplicación Fediquest"; +App::$strings["A distributed quest for a given word (game)."] = "Una búsqueda distribuida de una palabra determinada (juego)."; +App::$strings["To start a game, enter [fediquest]your_word[/fediquest] somewhere in a toplevel post."] = "Para empezar una partida, introduce [fediquest]tu_palabra[/fediquest] en algún lugar de un post de toplevel."; +App::$strings["Your contacts can post their guess in the comments."] = "Sus contactos pueden publicar sus conjeturas en los comentarios."; +App::$strings["Your channel will evaluate the guess and automatically post the response."] = "Su canal evaluará la conjetura y publicará automáticamente la respuesta."; +App::$strings["Correct letters"] = "Letras correctas"; +App::$strings["Letters contained in the word but at the wrong spot"] = "Letras contenidas en la palabra pero en el lugar equivocado"; +App::$strings["Letters not contained in the word"] = "Letras no contenidas en la palabra"; App::$strings["Network error"] = "Error de red"; App::$strings["API error"] = "Error de API"; App::$strings["Unknown issue"] = "Problema desconocido"; @@ -947,15 +912,6 @@ App::$strings["Show Upload Limits"] = "Mostrar los límites de subida"; App::$strings["Hubzilla configured maximum size: "] = "Tamaño máximo configurado por Hubzilla: "; App::$strings["PHP upload_max_filesize: "] = "PHP upload_max_filesize: "; App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (debe ser mayor que upload_max_filesize): "; -App::$strings["ERROR: word length is not correct!"] = "ERROR: ¡la longitud de la palabra no es correcta!"; -App::$strings["Fediwordle App"] = "App Fediwordle"; -App::$strings["A distributed word game inspired by wordle."] = "Un juego de palabras distribuido inspirado en el wordle."; -App::$strings["To start a game, enter [wordle]your_word[/wordle] somewhere in a toplevel post."] = "Para empezar una partida, introduzca [wordle]mi_palabra[/wordle] en algún lugar de un post de nivel superior."; -App::$strings["Your contacts can post their guess in the comments."] = "Sus contactos pueden publicar sus conjeturas en los comentarios."; -App::$strings["Your channel will evaluate the guess and automatically post the response."] = "Su canal evaluará la conjetura y publicará automáticamente la respuesta."; -App::$strings["Correct letters"] = "Letras correctas"; -App::$strings["Letters contained in the word but at the wrong spot"] = "Letras contenidas en la palabra pero en el lugar equivocado"; -App::$strings["Letters not contained in the word"] = "Letras no contenidas en la palabra"; App::$strings["Send your identity to all websites"] = "Enviar su identidad a todos los sitios web"; App::$strings["Send ZID"] = "Enviar ZID"; App::$strings["Send email to all members"] = "Enviar un correo electrónico a todos los miembros"; @@ -977,7 +933,6 @@ App::$strings["First Name"] = "Nombre"; App::$strings["Last Name"] = "Apellido"; App::$strings["Nickname"] = "Alias"; App::$strings["Full Name"] = "Nombre completo"; -App::$strings["Profile Photo"] = "Foto del perfil"; App::$strings["Profile Photo 16px"] = "Foto del perfil 16px"; App::$strings["Profile Photo 32px"] = "Foto del perfil 32px"; App::$strings["Profile Photo 48px"] = "Foto del perfil 48px"; @@ -1119,14 +1074,13 @@ App::$strings["Logfile size in bytes before rotating"] = "Tamaño del fichero de App::$strings["Number of logfiles to retain"] = "Número de ficheros de informe que se deben retener"; App::$strings["Your account on %s will expire in a few days."] = "Su cuenta en %s caducará en unos pocos días."; App::$strings["Your test account is about to expire."] = "Su cuenta de prueba está a punto de expirar."; -App::$strings["status"] = "el mensaje de estado "; App::$strings["ActivityPub Protocol Settings updated."] = "Se han actualizado los ajustes del protocolo ActivityPub."; App::$strings["The activitypub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos."; -App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "Entregar a los destinatarios de ActivityPub en grupos de canales"; -App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Puede resultar en un gran número de menciones y exponer a todos los miembros de su grupo de canales"; -App::$strings["Send multi-media HTML articles"] = "Enviar artículos multimedia en HTML"; -App::$strings["Not supported by some microblog services such as Mastodon"] = "No soportado por algunos servicios de microblog como Mastodon"; +App::$strings["Send activities of type note instead of article"] = "Enviar actividades de tipo nota en lugar de artículo"; +App::$strings["Microblog services such as Mastodon do not properly support articles"] = "Los servicios de microblog como Mastodon no soportan correctamente los artículos"; App::$strings["Activitypub Protocol"] = "Protocolo Activitypub"; +App::$strings["Refresh failed"] = "Error de actualización"; +App::$strings["Refresh succeeded"] = "Actualización con éxito"; App::$strings["Save Bookmarks"] = "Guardar en Marcadores"; App::$strings["Random Planet App"] = "App Random Planet"; App::$strings["Set a random planet from the Star Wars Empire as your location when posting"] = "Establecer un planeta aleatorio del Imperio de la Guerra de las Galaxias como su ubicación cuando publique."; @@ -1148,6 +1102,7 @@ App::$strings["No username found in import file."] = "No se ha encontrado el nom App::$strings["Import completed."] = "Importación completada."; App::$strings["\$projectname"] = "\$projectname"; App::$strings["%1\$s dislikes %2\$s's %3\$s"] = "a %1\$s no le gusta el %3\$s de %2\$s"; +App::$strings["status"] = "el mensaje de estado "; App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s participa"; App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s no participa"; App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe"; @@ -1447,28 +1402,6 @@ App::$strings["Maximum tweet length"] = "Longitud máxima del tweet"; App::$strings["Send public postings to Twitter by default"] = "Enviar mensajes públicos a Twitter de forma predeterminada"; App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Si está activado, sus entradas públicas se publicarán en la cuenta de Twitter asociada de forma predeterminada."; App::$strings["Twitter Crosspost Connector"] = "Twitter Crosspost Connector"; -App::$strings["lonely"] = "Solo/a"; -App::$strings["drunk"] = "ebrio/a"; -App::$strings["horny"] = "caliente"; -App::$strings["stoned"] = "drogado/a"; -App::$strings["fucked up"] = "jodido/a"; -App::$strings["clusterfucked"] = "hecho/a polvo"; -App::$strings["crazy"] = "loco/a"; -App::$strings["hurt"] = "ofendido/a"; -App::$strings["sleepy"] = "soñoliento/a"; -App::$strings["grumpy"] = "gruñón/ona"; -App::$strings["high"] = "superior"; -App::$strings["semi-conscious"] = "semiconsciente"; -App::$strings["in love"] = "enamorado/a"; -App::$strings["in lust"] = "lujurioso/a"; -App::$strings["naked"] = "desnudo/a"; -App::$strings["stinky"] = "apestoso/a"; -App::$strings["sweaty"] = "sudoroso/a"; -App::$strings["bleeding out"] = "exánime"; -App::$strings["victorious"] = "victorioso/a"; -App::$strings["defeated"] = "derrotado/a"; -App::$strings["envious"] = "envidioso/a"; -App::$strings["jealous"] = "celoso/a"; App::$strings["generic profile image"] = "imagen del perfil general"; App::$strings["random geometric pattern"] = "patrón geométrico aleatorio"; App::$strings["monster face"] = "cara de monstruo"; @@ -1518,44 +1451,6 @@ App::$strings["Workflow settings"] = "Ajustes del flujo de trabajo"; App::$strings["Some setting"] = "Algunos ajustes"; App::$strings["A setting"] = "Un ajuste"; App::$strings["Skeleton Settings"] = "Ajustes de Skeleton"; -App::$strings["bitchslap"] = "una bofetada humillante"; -App::$strings["bitchslapped"] = "ha abofeteado de forma humillante a"; -App::$strings["shag"] = "un polvo"; -App::$strings["shagged"] = "ha dejado exhausto/a a"; -App::$strings["patent"] = "una patente"; -App::$strings["patented"] = "ha patentado a"; -App::$strings["hug"] = "un abrazo"; -App::$strings["hugged"] = "ha abrazado a"; -App::$strings["murder"] = "un asesinato"; -App::$strings["murdered"] = "ha asesinado a"; -App::$strings["worship"] = "una alabanza"; -App::$strings["worshipped"] = "ha elogiado a"; -App::$strings["kiss"] = "un beso"; -App::$strings["kissed"] = "ha besado a"; -App::$strings["tempt"] = "una tentación"; -App::$strings["tempted"] = "ha tentado a"; -App::$strings["raise eyebrows at"] = "un levantamiento de cejas"; -App::$strings["raised their eyebrows at"] = "ha levantado las cejas a"; -App::$strings["insult"] = "un insulto"; -App::$strings["insulted"] = "ha insultado a"; -App::$strings["praise"] = "un elogio"; -App::$strings["praised"] = "ha elogiado a"; -App::$strings["be dubious of"] = "una indecisión"; -App::$strings["was dubious of"] = "estaba dudoso de"; -App::$strings["eat"] = "una comida"; -App::$strings["ate"] = "ha comido"; -App::$strings["giggle and fawn at"] = "una sonrisa aduladora"; -App::$strings["giggled and fawned at"] = "ha sonreído y adulado a"; -App::$strings["doubt"] = "una duda"; -App::$strings["doubted"] = "ha dudado de"; -App::$strings["glare"] = "una mirada furiosa"; -App::$strings["glared at"] = "ha mirado con furia"; -App::$strings["fuck"] = "una mierda"; -App::$strings["fucked"] = "ha mandado a la mierda a"; -App::$strings["bonk"] = "un golpe"; -App::$strings["bonked"] = "ha golpeado a"; -App::$strings["declare undying love for"] = "una declaración de amor eterno"; -App::$strings["declared undying love for"] = "ha declarado amor eterno a"; App::$strings["Allow magic authentication only to websites of your immediate connections"] = "Permitir la autenticación mágica sólo a los sitios web de sus conexiones próximas"; App::$strings["Authchoose"] = "Autoseleccionar"; App::$strings["No server specified"] = "No se ha especificado ningún servidor"; @@ -1634,6 +1529,7 @@ App::$strings["requested to like"] = "solicita que se permita mostrar agrado "; App::$strings["liked"] = "ha gustado de "; App::$strings["requested to dislike"] = "solicita que se permita mostrar desagrado "; App::$strings["disliked"] = "no ha gustado de "; +App::$strings["repeated"] = "repetido / compartido"; App::$strings["voted on"] = "votado en "; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s ]un %4\$s[/zrl]"; App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s[zrl=%3\$s]%5\$s de %4\$s[/zrl]"; @@ -1673,9 +1569,6 @@ App::$strings["created a new poll"] = "se ha creado una nueva encuesta"; App::$strings["created a new post"] = "ha creado una nueva entrada"; App::$strings["voted on %s's poll"] = "votado en la encuesta de %s"; App::$strings["commented on %s's post"] = "ha comentado la entrada de %s"; -App::$strings["repeated %s's post"] = "repetida la entrada de %s"; -App::$strings["liked %s's post"] = "Le ha gustado la entrada de %s"; -App::$strings["disliked %s's post"] = "No le ha gustado la entrada de %s"; App::$strings["shared a file with you"] = "compartió un archivo con usted"; App::$strings["edited a post dated %s"] = "ha editado una entrada %s"; App::$strings["edited a comment dated %s"] = "ha editado un comentario %s"; @@ -1693,7 +1586,6 @@ App::$strings["Suggest Channels"] = "Sugerir canales"; App::$strings["Channel Manager"] = "Administración de canales"; App::$strings["Stream"] = "Stream"; App::$strings["Mail"] = "Correo"; -App::$strings["Mood"] = "Estado de ánimo"; App::$strings["Chat"] = "Chat"; App::$strings["Probe"] = "Probar"; App::$strings["Suggest"] = "Sugerir"; @@ -1753,16 +1645,16 @@ App::$strings["Save to Folder"] = "Guardar en carpeta"; App::$strings["I will attend"] = "Participaré"; App::$strings["I will not attend"] = "No participaré"; App::$strings["I might attend"] = "Quizá participe"; -App::$strings["View all"] = "Ver todo"; App::$strings["I like this (toggle)"] = "Me gusta (cambiar)"; App::$strings["I don't like this (toggle)"] = "No me gusta esto (cambiar)"; App::$strings["Reply on this comment"] = "Responder a este comentario"; App::$strings["reply"] = "responder"; App::$strings["Reply to"] = "Responder a "; -App::$strings["Share This"] = "Compartir esto"; App::$strings["share"] = "compartir"; +App::$strings["Repeat"] = "Se repite"; +App::$strings["repeat"] = "Se repite"; App::$strings["Delivery Report"] = "Informe de transmisión"; -App::$strings["%d Comment"] = array( +App::$strings["%d comment"] = array( 0 => "%d comentario", 1 => "%d comentarios", 2 => "%d comentarios", @@ -1779,9 +1671,7 @@ App::$strings["Voting Options"] = "Opciones de votación"; App::$strings["Go to previous comment"] = "Ir al comentario anterior"; App::$strings["Pinned post"] = "Entradas ancladas"; App::$strings["Add to Calendar"] = "Añadir al calendario"; -App::$strings["Mark all seen"] = "Marcar todo como visto"; -App::$strings["__ctx:noun__ Likes"] = "Me gusta"; -App::$strings["__ctx:noun__ Dislikes"] = "No me gusta"; +App::$strings["Mark all comments seen"] = "Marcar como leídos todos los comentarios"; App::$strings["This is you"] = "Este es usted"; App::$strings["Image"] = "Imagen"; App::$strings["Insert Link"] = "Insertar enlace"; @@ -1919,9 +1809,7 @@ App::$strings["Channel activities"] = "Actividades del canal"; App::$strings["View Photo"] = "Ver foto"; App::$strings["Edit Album"] = "Editar álbum"; App::$strings["Upload"] = "Subir"; -App::$strings["I agree"] = "Estoy de acuerdo"; -App::$strings["I disagree"] = "No estoy de acuerdo"; -App::$strings["I abstain"] = "Me abstengo"; +App::$strings["Share This"] = "Compartir esto"; App::$strings["View %s's profile - %s"] = "Ver el perfil de %s - %s"; App::$strings["Don't show"] = "No mostrar"; App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f de %2$.0f conexiones permitidas."; @@ -2131,7 +2019,6 @@ App::$strings["Privacy group: "] = "Grupo de canales: "; App::$strings["Installed Apps"] = "Apps instaladas"; App::$strings["Manage Apps"] = "Administrar apps"; App::$strings["Create Custom App"] = "Crear una app personalizada"; -App::$strings["Post repeated"] = "Entrada repetida"; App::$strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio."; App::$strings["No valid account found."] = "No se ha encontrado una cuenta válida."; App::$strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."; @@ -2170,6 +2057,7 @@ App::$strings["This site is not a directory server"] = "Este sitio no es un serv App::$strings["New"] = "Nuevas"; App::$strings["No more system notifications."] = "No hay más notificaciones del sistema"; App::$strings["System Notifications"] = "Notificaciones del sistema"; +App::$strings["Mark all seen"] = "Marcar todo como visto"; App::$strings["Update to Hubzilla 5.0 step 2"] = "Actualizar a Hubzilla 5.0. Paso 2"; App::$strings["To complete the update please run"] = "Para completar la actualización, ejecutar "; App::$strings["php util/z6convert.php"] = "php util/z6convert.php"; @@ -2178,7 +2066,6 @@ App::$strings["Thing updated"] = "Elemento actualizado."; App::$strings["Object store: failed"] = "Guardar objeto: ha fallado"; App::$strings["Thing added"] = "Elemento añadido"; App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; -App::$strings["Show Thing"] = "Mostrar elemento"; App::$strings["item not found."] = "elemento no encontrado."; App::$strings["Edit Thing"] = "Editar elemento"; App::$strings["Select a profile"] = "Seleccionar un perfil"; @@ -2261,8 +2148,6 @@ App::$strings["Content filter"] = "Filtro de contenidos"; App::$strings["Contact updated"] = "Contacto actualizado"; App::$strings["Contact update failed"] = "Fallo en la actualización del contacto"; App::$strings["Approve connection"] = "Aprobar esta conexión"; -App::$strings["Refresh succeeded"] = "Actualización con éxito"; -App::$strings["Refresh failed - channel is currently unavailable"] = "Error de actualización: el canal no está disponible en este momento"; App::$strings["Block status updated"] = "Estado del bloqueo actualizado"; App::$strings["Block failed"] = "Bloqueo fallido"; App::$strings["Ignore status updated"] = "Estado de ignorar actualizado"; @@ -2273,10 +2158,7 @@ App::$strings["Hide status updated"] = "Estado de ocultación actualizado"; App::$strings["Hide failed"] = "Ocultar falló"; App::$strings["Contact removed"] = "Contacto eliminado"; App::$strings["Delete failed"] = "Eliminar falló"; -App::$strings["Refresh Permissions"] = "Recargar los permisos"; -App::$strings["Fetch updated permissions"] = "Obtener los permisos actualizados"; -App::$strings["Refresh Photo"] = "Actualizar la foto"; -App::$strings["Fetch updated photo"] = "Obtener una foto actualizada"; +App::$strings["Refetch contact info"] = "Recuperar información de contacto"; App::$strings["Unblock"] = "Desbloquear"; App::$strings["Block"] = "Bloquear"; App::$strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"; @@ -2294,7 +2176,6 @@ App::$strings["Hide"] = "Ocultar"; App::$strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones"; App::$strings["This connection is hidden!"] = "¡Esta conexión está oculta!"; App::$strings["Delete this connection"] = "Eliminar esta conexión"; -App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos"; App::$strings["Items tagged with: %s"] = "elementos etiquetados con: %s"; App::$strings["Search results for: %s"] = "Resultados de la búsqueda para: %s"; App::$strings["Email address required"] = "Dirección de correo electrónico requerida"; @@ -2364,6 +2245,10 @@ App::$strings["Refresh failed - channel is currently unavailable."] = "Recarga f App::$strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones."; App::$strings["Connection has been removed."] = "La conexión ha sido eliminada."; App::$strings["View %s's profile"] = "Ver el perfil de %s"; +App::$strings["Refresh Permissions"] = "Recargar los permisos"; +App::$strings["Fetch updated permissions"] = "Obtener los permisos actualizados"; +App::$strings["Refresh Photo"] = "Actualizar la foto"; +App::$strings["Fetch updated photo"] = "Obtener una foto actualizada"; App::$strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes"; App::$strings["Fetch Vcard"] = "Obtener una vcard"; App::$strings["Fetch electronic calling card for this connection"] = "Obtener una tarjeta de llamada electrónica para esta conexión"; @@ -2840,11 +2725,6 @@ App::$strings["permission denied"] = "permiso denegado"; App::$strings["recipient not found"] = "destinatario no encontrado"; App::$strings["Delivery report for %1\$s"] = "Informe de entrega para %1\$s"; App::$strings["Redeliver"] = "Volver a enviar"; -App::$strings["Poke somebody"] = "Dar un toque a alguien"; -App::$strings["Poke or ping somebody"] = "Dar un toque o hacer ping a alguien"; -App::$strings["Recipient"] = "Destinatario"; -App::$strings["Choose action"] = "Elegir una acción"; -App::$strings["Make this post private"] = "Convertir en privado este envío"; App::$strings["Away"] = "Ausente"; App::$strings["Online"] = "Conectado/a"; App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %3\$s de %2\$s"; @@ -2956,6 +2836,7 @@ App::$strings["Additional federated transport protocols:"] = "Protocolos adicion App::$strings["Version %s"] = "Versión %s"; App::$strings["Project homepage"] = "Página principal del proyecto"; App::$strings["Developer homepage"] = "Página principal del desarrollador"; +App::$strings["Blocked sites"] = "Sitios bloqueados"; App::$strings["Item not available."] = "Elemento no disponible"; App::$strings["No content available for year"] = "No hay contenido disponible para el año"; App::$strings["Export Channel"] = "Exportar el canal"; @@ -2979,9 +2860,7 @@ App::$strings["Invalid request."] = "Solicitud incorrecta."; App::$strings["thing"] = "elemento"; App::$strings["Channel unavailable."] = "Canal no disponible."; App::$strings["Previous action reversed."] = "Acción anterior revocada."; -App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s está de acuerdo"; -App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s no está de acuerdo"; -App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s se abstiene"; +App::$strings["profile"] = "perfil"; App::$strings["Action completed."] = "Acción completada."; App::$strings["Thank you."] = "Gracias."; App::$strings["Block Name"] = "Nombre del bloque"; @@ -3061,9 +2940,12 @@ App::$strings["or select an existing one (doubleclick)"] = "o seleccionar un ál App::$strings["Add a Tag"] = "Añadir una etiqueta"; App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"; App::$strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum"; +App::$strings["View all"] = "Ver todo"; App::$strings["Photo Tools"] = "Gestión de las fotos"; App::$strings["In This Photo:"] = "En esta foto:"; App::$strings["Map"] = "Mapa"; +App::$strings["__ctx:noun__ Likes"] = "Me gusta"; +App::$strings["__ctx:noun__ Dislikes"] = "No me gusta"; App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página."; App::$strings["Posts and comments"] = "Publicaciones y comentarios"; App::$strings["Only posts"] = "Solo publicaciones"; @@ -3280,6 +3162,10 @@ App::$strings["PHP upload limits"] = "Límites PHP de subida"; App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."; App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."; App::$strings["Generate encryption keys"] = "Generar claves de cifrado"; +App::$strings["Error: the sodium encryption library is not installed."] = "Error: la biblioteca de encriptación sodium no está instalada."; +App::$strings["Generate ed25519 encryption keys"] = "Generar claves de cifrado ed25519"; +App::$strings["Error: one of \"bcmath\" or \"gmp\" (bigmath library) extensions are required."] = "Error: se requiere una de las extensiones \"bcmath\" o \"gmp\" (bigmath library)."; +App::$strings["Bigmath library (either bcmath or gmp)"] = "Biblioteca Bigmath (bcmath o gmp)"; App::$strings["libCurl PHP module"] = "módulo libCurl PHP"; App::$strings["GD graphics PHP module"] = "módulo PHP GD graphics"; App::$strings["OpenSSL PHP module"] = "módulo PHP OpenSSL"; @@ -3287,6 +3173,7 @@ App::$strings["PDO database PHP module"] = "Módulo PHP de la base de datos PDO App::$strings["mb_string PHP module"] = "módulo PHP mb_string"; App::$strings["xml PHP module"] = "módulo PHP xml"; App::$strings["zip PHP module"] = "Módulo zip PHP"; +App::$strings["intl PHP module"] = "módulo intl PHP"; App::$strings["Apache mod_rewrite module"] = "módulo Apache mod_rewrite "; App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."; App::$strings["exec"] = "ejecutable"; @@ -3301,6 +3188,7 @@ App::$strings["Error: PDO database PHP module required but not installed."] = "E App::$strings["Error: mb_string PHP module required but not installed."] = "Error: el módulo PHP mb_string es necesario, pero no está instalado."; App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."; App::$strings["Error: zip PHP module required but not installed."] = "Error: se requiere el módulo zip PHP pero no está instalado."; +App::$strings["Error: intl PHP module required but not installed."] = "Error: el módulo intl PHP es necesario pero no está instalado."; App::$strings[".htconfig.php is writable"] = ".htconfig.php tiene permisos de escritura"; App::$strings["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."] = "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."; App::$strings["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."] = "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."; -- cgit v1.2.3 From a56d727c2665a80965a1f331bc6423f314d79f6e Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 5 Apr 2024 10:40:16 +0000 Subject: allow to kick off sync process in case it did not start at all. requires import host to be set manually in pconfig for now. --- Zotlabs/Module/Import_progress.php | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Zotlabs/Module/Import_progress.php b/Zotlabs/Module/Import_progress.php index 5c68f9ff1..d9b13e8a8 100644 --- a/Zotlabs/Module/Import_progress.php +++ b/Zotlabs/Module/Import_progress.php @@ -1,6 +1,7 @@ Date: Fri, 5 Apr 2024 11:09:15 +0000 Subject: minor refactor and store import host for possible later use --- Zotlabs/Module/Import.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index e8968c6bd..24b7498dd 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -525,14 +525,21 @@ class Import extends Controller { // This will indirectly perform a refresh_all *and* update the directory Master::Summon(['Directory', $channel['channel_id']]); - $cf_api_compat = true; + if ($api_path) { + $parsed = parse_url($api_path); + unset($parsed['path']); - if ($api_path && $import_posts) { // we are importing from a server and not a file - if (version_compare($data['compatibility']['version'], '6.3.4', '>=')) { + // store the import host so we can manually kick off item/file sync later in case anything did not work out + set_pconfig($channel['channel_id'], 'import', 'host', $parsed['host']); + + $hz_server = unparse_url($parsed); + } - $m = parse_url($api_path); + $cf_api_compat = false; - $hz_server = $m['scheme'] . '://' . $m['host']; + if ($api_path && $hz_server && $import_posts) { // we are importing from a server and not a file + if (version_compare($data['compatibility']['version'], '6.3.4', '>=')) { + $cf_api_compat = true; $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'); @@ -543,9 +550,6 @@ class Import extends Controller { Master::Summon(['Content_importer', sprintf('%d', $page), $since, $until, $channel['channel_address'], urlencode($hz_server)]); Master::Summon(['File_importer', sprintf('%d', $page), $channel['channel_address'], urlencode($hz_server)]); } - else { - $cf_api_compat = false; - } } change_channel($channel['channel_id']); -- cgit v1.2.3 From 7de629a8c325a02a62e43b3ad357feaac844564a Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 5 Apr 2024 12:56:51 +0000 Subject: update siteinfo --- Zotlabs/Module/Siteinfo.php | 4 ++-- view/tpl/siteinfo.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index df6a334d8..3cad64a13 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -29,8 +29,8 @@ class Siteinfo extends \Zotlabs\Web\Controller { '$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 Zot'), - '$transport_link' => 'https://zotlabs.org', + '$prj_transport' => t('Federated and decentralised networking and identity services provided by'), + '$transport_link' => 'https://hubzilla.org', '$additional_text' => t('Additional federated transport protocols:'), '$additional_fed' => implode(', ', $federated), diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 6cf7da756..08e4790f2 100644 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -55,7 +55,7 @@
{{$prj_src}}


-
{{$prj_transport}} ({{$transport_link}})
+
{{$prj_transport}} {{$transport_link}}
{{if $additional_fed}}
{{$additional_text}} {{$additional_fed}}
-- cgit v1.2.3 From 1ca91c49aaa8565f9d97e2e354fa6851179ca4d8 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Apr 2024 07:36:49 +0000 Subject: add some docu --- include/connections.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/connections.php b/include/connections.php index e5cc90411..efc531171 100644 --- a/include/connections.php +++ b/include/connections.php @@ -68,6 +68,14 @@ function rconnect_url($channel_id,$xchan) { } +/** + * @brief returns deliverable xchans for a channel. + * + * @param intval $channel_id + * @param array $filter (optional) + * @param boolean $flatten (optional) + */ + function deliverable_abook_xchans($channel_id, $filter = [], $flatten = true) { $filter_sql = ''; -- cgit v1.2.3 From 716013633ecb09b1c8fd950275f0cbf272b1fe43 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Apr 2024 07:39:22 +0000 Subject: passing an empty filter to deliverable_abook_xchans() will return all deliverable abook xchans - we do not want this in this place. also add some docu --- include/items.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index efc45db38..2300f70ef 100644 --- a/include/items.php +++ b/include/items.php @@ -36,10 +36,10 @@ require_once('include/permissions.php'); * @param boolean $include_groups * @return array containing the recipients */ -function collect_recipients($item, &$private_envelope,$include_groups = true) { +function collect_recipients($item, &$private_envelope, $include_groups = true) { $private_envelope = ((intval($item['item_private'])) ? true : false); - $recipients = array(); + $recipients = []; if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) { @@ -54,8 +54,15 @@ function collect_recipients($item, &$private_envelope,$include_groups = true) { $allow_groups = []; } - $raw_recipients = array_unique(array_merge($allow_people, $allow_groups)); - $recipients = deliverable_abook_xchans($item['uid'], $raw_recipients); + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + + if ($recipients) { + // deliverable_abook_xchans() will return all deliverable xchans + // if passed an empty array as 2nd argument (no filtering). + // Hence only call it if we do actually have any recipients. + $recipients = deliverable_abook_xchans($item['uid'], $recipients); + } + // if you specifically deny somebody but haven't allowed anybody, we'll allow everybody in your // address book minus the denied connections. The post is still private and can't be seen publicly @@ -201,6 +208,8 @@ function collect_recipients($item, &$private_envelope,$include_groups = true) { $recipients[] = $item['owner_xchan']; } +hz_syslog(print_r($recipients, true)); + return $recipients; } -- cgit v1.2.3 From 2e15207d0bdbe147f9d1f21030f4c36b02c3dedf Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Apr 2024 07:45:20 +0000 Subject: fix spacing issues in mod wall_attach and make save_chunk() deal with userfile and file array keys --- Zotlabs/Module/Wall_attach.php | 14 +++++++------- include/api_zot.php | 3 ++- include/attach.php | 14 ++++++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 0d5c9e983..3c57d4b94 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -104,32 +104,32 @@ class Wall_attach extends \Zotlabs\Web\Controller { } if(intval($r['data']['is_photo'])) { - $s = "\n\n" . $r['body'] . "\n\n"; + $s = $r['body']; } else { - if(strpos($r['data']['filetype'],'video') === 0) { + if(strpos($r['data']['filetype'], 'video') === 0) { // give a wee bit of time for the background thumbnail processor to do its thing // or else we'll never see a video poster sleep(3); $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; $thumb = Linkinfo::get_video_poster($url); if($thumb) { - $s = "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n"; + $s = '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]'; } else { - $s = "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n"; + $s = '[zvideo]' . $url . '[/zvideo]'; } } if(strpos($r['data']['filetype'],'audio') === 0) { $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; - $s = "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; + $s = '[zaudio]' . $url . '[/zaudio]'; } 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; + $s .= $bb; } else { logger('empty return from svgbb'); @@ -140,7 +140,7 @@ class Wall_attach extends \Zotlabs\Web\Controller { } } - $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; + $s .= '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]'; } $sync = attach_export_data($channel,$r['data']['hash']); diff --git a/include/api_zot.php b/include/api_zot.php index 22692b962..56cec005d 100644 --- a/include/api_zot.php +++ b/include/api_zot.php @@ -546,6 +546,7 @@ return false; } + logger('api_red_item_store: REQUEST ' . print_r($_REQUEST,true)); logger('api_red_item_store: FILES ' . print_r($_FILES,true)); @@ -561,7 +562,7 @@ $mod = new Zotlabs\Module\Wall_attach(); $media = $mod->post(); if($media) - $_REQUEST['body'] = $media . "\n\n" . $_REQUEST['body']; + $_REQUEST['body'] = $media . "\n" . $_REQUEST['body']; } $mod = new Zotlabs\Module\Item(); diff --git a/include/attach.php b/include/attach.php index efefc73a4..2283da1c6 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2982,11 +2982,17 @@ function save_chunk($channel,$start,$end,$len) { $result = []; - $tmp_path = $_FILES['files']['tmp_name']; + $file = $_FILES['files'] ?? $_FILES['userfile'] ?? []; + + if (!$file) { + return $result; + } + + $tmp_path = $file['tmp_name']; $new_base = 'store/[data]/' . $channel['channel_address'] . '/tmp'; os_mkdir($new_base,STORAGE_DEFAULT_PERMISSIONS,true); - $new_path = $new_base . '/' . $_FILES['files']['name']; + $new_path = $new_base . '/' . $file['name']; if(file_exists($new_path) && intval($start) === 0) { $result['partial'] = true; @@ -3008,8 +3014,8 @@ function save_chunk($channel,$start,$end,$len) { } if(($len - 1) == $end) { unlink($tmp_path); - $result['name'] = $_FILES['files']['name']; - $result['type'] = $_FILES['files']['type']; + $result['name'] = $file['name']; + $result['type'] = $file['type']; $result['tmp_name'] = $new_path; $result['error'] = 0; $result['size'] = $len; -- cgit v1.2.3 From 3b812f25703a496c91fb92409db173b38d4cc115 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Apr 2024 10:00:40 +0000 Subject: comment out deprecated way to find forum items and do not count announce activities --- Zotlabs/Module/Sse_bs.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index a18301a1a..09c4ed614 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -590,6 +590,7 @@ class Sse_bs extends Controller { if($forums) { $item_normal = item_normal(); + $p_sql = ''; $sql_extra = ''; if(! (self::$vnotify & VNOTIFY_LIKE)) @@ -599,6 +600,7 @@ class Sse_bs extends Controller { $i = 0; for($x = 0; $x < $fcount; $x ++) { + /* $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", intval(self::$uid), intval(TERM_FORUM), @@ -607,14 +609,16 @@ class Sse_bs extends Controller { $p_str = ids_to_querystr($p, 'parent'); $p_sql = (($p_str) ? "OR parent IN ( $p_str )" : ''); + */ $r = q("select count(*) as total from item - where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $sql_extra $item_normal", + where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and verb != 'Announce' and item_unseen = 1 $sql_extra $item_normal", intval(self::$uid), dbesc($forums[$x]['xchan_hash']), dbesc($forums[$x]['xchan_hash']) ); + if($r[0]['total']) { $forums[$x]['notify_link'] = z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']; -- cgit v1.2.3 From 26c1fa07c912547f7d55c19f34aad0912e5f3f29 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 18 Apr 2024 09:55:42 +0000 Subject: Reduce some global state and add some docs --- Zotlabs/Module/Setup.php | 6 ++--- Zotlabs/Web/Controller.php | 56 +++++++++++++++++++++++++++++++++++++++++----- Zotlabs/Web/Router.php | 33 ++++++++++++++------------- Zotlabs/Web/WebServer.php | 12 +++++----- boot.php | 18 ++++++++++++--- 5 files changed, 92 insertions(+), 33 deletions(-) diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 74b10de25..65d4ec471 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -1,5 +1,4 @@ controller = new $modname; - App::$module_loaded = true; + $this->module_loaded = true; } } } @@ -70,15 +71,15 @@ class Router { // legacy plugins - this can be removed when they have all been converted - if(! (App::$module_loaded)) { + if(! ($this->module_loaded)) { if(is_array(App::$plugins) && in_array($module, App::$plugins) && file_exists("addon/{$module}/{$module}.php")) { include_once("addon/{$module}/{$module}.php"); if(class_exists($modname)) { $this->controller = new $modname; - App::$module_loaded = true; + $this->module_loaded = true; } elseif(function_exists($module . '_module')) { - App::$module_loaded = true; + $this->module_loaded = true; } } } @@ -88,40 +89,40 @@ class Router { * Otherwise, look for the standard program module */ - if(! (App::$module_loaded)) { + if(! ($this->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; + $this->module_loaded = true; } else { $filename = 'Zotlabs/Module/'. ucfirst($module). '.php'; if(file_exists($filename)) { $this->controller = new $modname; - App::$module_loaded = true; + $this->module_loaded = true; } } - if(! App::$module_loaded) + if(! $this->module_loaded) throw new Exception('Module not found'); } catch(Exception $e) { if(file_exists("mod/site/{$module}.php")) { include_once("mod/site/{$module}.php"); - App::$module_loaded = true; + $this->module_loaded = true; } elseif(file_exists("mod/{$module}.php")) { include_once("mod/{$module}.php"); - App::$module_loaded = true; + $this->module_loaded = true; } } } $x = [ 'module' => $module, - 'installed' => App::$module_loaded, + 'installed' => $this->module_loaded, 'controller' => $this->controller ]; /** @@ -138,7 +139,7 @@ class Router { */ call_hooks('module_loaded', $x); if($x['installed']) { - App::$module_loaded = true; + $this->module_loaded = true; $this->controller = $x['controller']; } @@ -146,7 +147,7 @@ class Router { * The URL provided does not resolve to a valid module. */ - if(! (App::$module_loaded)) { + if(! ($this->module_loaded)) { // undo the setting of a letsencrypt acme-challenge rewrite rule // which blocks access to our .well-known routes. @@ -162,7 +163,7 @@ class Router { $x = [ 'module' => $module, - 'installed' => App::$module_loaded, + 'installed' => $this->module_loaded, 'controller' => $this->controller ]; call_hooks('page_not_found',$x); @@ -189,7 +190,7 @@ class Router { // pretend this is a module so it will initialise the theme App::$module = '404'; - App::$module_loaded = true; + $this->module_loaded = true; App::$error = true; } } @@ -205,7 +206,7 @@ class Router { * Call module functions */ - if(App::$module_loaded) { + if($this->module_loaded) { App::$page['page_title'] = App::$module; $placeholder = ''; diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index f43ae10a4..6f8a4b956 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -13,11 +13,11 @@ class WebServer { require_once('boot.php'); - sys_boot(); + $installed = sys_boot(); \App::$language = get_best_language(); - load_translation_table(\App::$language,\App::$install); + load_translation_table(\App::$language, !$installed); /** @@ -56,7 +56,7 @@ class WebServer { load_translation_table(\App::$language); } - if((x($_GET,'zid')) && (! \App::$install)) { + if (x($_GET,'zid') && $installed) { \App::$query_string = strip_zids(\App::$query_string); if(! local_channel()) { if (!isset($_SESSION['my_address']) || $_SESSION['my_address'] != $_GET['zid']) { @@ -69,14 +69,14 @@ class WebServer { } } - if((x($_GET,'zat')) && (! \App::$install)) { + if (x($_GET,'zat') && $installed) { \App::$query_string = strip_zats(\App::$query_string); if(! local_channel()) { zat_init(); } } - if((x($_REQUEST,'owt')) && (! \App::$install)) { + if (x($_REQUEST,'owt') && $installed) { $token = $_REQUEST['owt']; \App::$query_string = strip_query_param(\App::$query_string,'owt'); owt_init($token); @@ -85,7 +85,7 @@ class WebServer { if((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (\App::$module === 'login')) require('include/auth.php'); - if(\App::$install) { + if (!$installed) { /* Allow an exception for the view module so that pcss will be interpreted during installation */ if(\App::$module != 'view') \App::$module = 'setup'; diff --git a/boot.php b/boot.php index dcdcdda01..862079276 100644 --- a/boot.php +++ b/boot.php @@ -602,8 +602,19 @@ define('DBTYPE_MYSQL', 0); define('DBTYPE_POSTGRES', 1); -function sys_boot() { - +/** + * Boot the app. + * + * Detects if the system is installed, and if it is, reads the basic configuration + * in `.htconfig`, conects to the database, and loads the system configuration stored + * in the db. + * + * As a side effect it also sets the App::$install flag to true if the system is _not_ + * installed yet. + * + * @return True if the system is installed, false otherwise. + */ +function sys_boot(): bool { // our central App object @@ -686,6 +697,8 @@ function sys_boot() { */ call_hooks('init_1'); } + + return !App::$install; } @@ -766,7 +779,6 @@ class App { public static $langsave; public static $rtl = false; public static $plugins_admin; - public static $module_loaded = false; public static $query_string; public static $page; public static $profile; -- cgit v1.2.3 From 80e124f53e00088dc6f9a3d77623740d039b0c87 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 20 Apr 2024 18:57:37 +0000 Subject: remove logging --- include/items.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/items.php b/include/items.php index 2300f70ef..dc9e9a7d9 100644 --- a/include/items.php +++ b/include/items.php @@ -208,8 +208,6 @@ function collect_recipients($item, &$private_envelope, $include_groups = true) { $recipients[] = $item['owner_xchan']; } -hz_syslog(print_r($recipients, true)); - return $recipients; } -- cgit v1.2.3 From 1c92c7476ba0952afd3d88a22ee7756ea3f6e25b Mon Sep 17 00:00:00 2001 From: "mjfriaza:4GF~eYj,-iAv" Date: Sun, 28 Apr 2024 16:18:29 +0200 Subject: Fix some errors in Spanish strings (cherry picked from commit 60cd7cc8d09240e1a3f7f7b3bde75115a61ce4de) --- view/es-es/hmessages.po | 16 ++++++++-------- view/es-es/hstrings.php | 19 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 38fa42fda..20afa3ffc 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -635,7 +635,7 @@ msgstr "Visible para conexiones específicas." #: ../../Zotlabs/Module/Share.php:118 #, php-format msgid "🔁 Repeated %1$s's %2$s" -msgstr "🔁 Repetidos %2$sde %1$s" +msgstr "🔁 Repitió %2$sde %1$s" #: ../../include/items.php:3843 ../../addon/flashcards/Mod_Flashcards.php:291 #: ../../addon/flashcards/Mod_Flashcards.php:292 @@ -2275,12 +2275,12 @@ msgstr "no gusta de %2$s de %1$s" #: ../../include/conversation.php:203 #, php-format msgid "%1$s repeated %2$s's %3$s" -msgstr "%1$scompartió %3$sde %2$s" +msgstr "%1$s repitió %3$sde %2$s" #: ../../include/conversation.php:204 #, php-format msgid "repeated %1$s's %2$s" -msgstr "compartió %2$s de %1$s" +msgstr "repitió %2$s de %1$s" #: ../../include/conversation.php:332 ../../Zotlabs/Lib/ThreadItem.php:532 msgid "This is an unsaved preview" @@ -2317,7 +2317,7 @@ msgstr "Quizá participe" #: ../../include/conversation.php:470 msgctxt "title" msgid "Repeats" -msgstr "Se repite" +msgstr "Repite" #: ../../include/conversation.php:539 msgid "Select" @@ -2757,7 +2757,7 @@ msgid "Repeat" msgid_plural "Repeats" msgstr[0] "Se repite" msgstr[1] "Se repite" -msgstr[2] "Se repite" +msgstr[2] "Repite" #: ../../include/conversation.php:1556 ../../Zotlabs/Module/Photos.php:1134 msgctxt "noun" @@ -6853,7 +6853,7 @@ msgstr "no ha gustado de " #: ../../Zotlabs/Lib/Enotify.php:167 msgid "repeated" -msgstr "repetido / compartido" +msgstr "repitió" #: ../../Zotlabs/Lib/Enotify.php:172 msgid "voted on" @@ -7391,11 +7391,11 @@ msgstr "compartir" #: ../../Zotlabs/Lib/ThreadItem.php:345 msgid "Repeat" -msgstr "Se repite" +msgstr "Repetir" #: ../../Zotlabs/Lib/ThreadItem.php:345 msgid "repeat" -msgstr "Se repite" +msgstr "repetir" #: ../../Zotlabs/Lib/ThreadItem.php:356 msgid "Delivery Report" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 6957ee3b7..31f5de315 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -2,8 +2,7 @@ if(! function_exists("string_plural_select_es_es")) { function string_plural_select_es_es($n){ - return ($n != 1 ? 1 : 0); -}} + return ($n != 1 ? 1 : 0)}} App::$rtl = 0; App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)"; App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen."; @@ -87,7 +86,7 @@ App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s."; App::$strings["Visible to all connections."] = "Visible para todas las conexiones."; App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas."; App::$strings["Visible to specific connections."] = "Visible para conexiones específicas."; -App::$strings["🔁 Repeated %1\$s's %2\$s"] = "🔁 Repetidos %2\$sde %1\$s"; +App::$strings["🔁 Repeated %1\$s's %2\$s"] = "🔁 Repitió %2\$sde %1\$s"; App::$strings["Item not found."] = "Elemento no encontrado."; App::$strings["Permission denied."] = "Acceso denegado."; App::$strings["Privacy group not found."] = "Grupo de canales no encontrado."; @@ -468,15 +467,15 @@ App::$strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s"; App::$strings["likes %1\$s's %2\$s"] = "gusta de %2\$s de %1\$s"; App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; App::$strings["doesn't like %1\$s's %2\$s"] = "no gusta de %2\$s de %1\$s"; -App::$strings["%1\$s repeated %2\$s's %3\$s"] = "%1\$scompartió %3\$sde %2\$s"; -App::$strings["repeated %1\$s's %2\$s"] = "compartió %2\$s de %1\$s"; +App::$strings["%1\$s repeated %2\$s's %3\$s"] = "%1\$s repitió %3\$sde %2\$s"; +App::$strings["repeated %1\$s's %2\$s"] = "repitió %2\$s de %1\$s"; App::$strings["This is an unsaved preview"] = "Esta es una previsualización sin guardar"; App::$strings["__ctx:title__ Likes"] = "Me gusta"; App::$strings["__ctx:title__ Dislikes"] = "No me gusta"; App::$strings["__ctx:title__ Attending"] = "Participaré"; App::$strings["__ctx:title__ Not attending"] = "No participaré"; App::$strings["__ctx:title__ Might attend"] = "Quizá participe"; -App::$strings["__ctx:title__ Repeats"] = "Se repite"; +App::$strings["__ctx:title__ Repeats"] = "Repite"; App::$strings["Select"] = "Seleccionar"; App::$strings["Delete"] = "Eliminar"; App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada preferida"; @@ -574,7 +573,7 @@ App::$strings["Encrypt text"] = "Cifrar texto"; App::$strings["__ctx:noun__ Repeat"] = array( 0 => "Se repite", 1 => "Se repite", - 2 => "Se repite", + 2 => "Repite", ); App::$strings["__ctx:noun__ Dislike"] = array( 0 => "No me gusta", @@ -1529,7 +1528,7 @@ App::$strings["requested to like"] = "solicita que se permita mostrar agrado "; App::$strings["liked"] = "ha gustado de "; App::$strings["requested to dislike"] = "solicita que se permita mostrar desagrado "; App::$strings["disliked"] = "no ha gustado de "; -App::$strings["repeated"] = "repetido / compartido"; +App::$strings["repeated"] = "repitió"; App::$strings["voted on"] = "votado en "; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s ]un %4\$s[/zrl]"; App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s[zrl=%3\$s]%5\$s de %4\$s[/zrl]"; @@ -1651,8 +1650,8 @@ App::$strings["Reply on this comment"] = "Responder a este comentario"; App::$strings["reply"] = "responder"; App::$strings["Reply to"] = "Responder a "; App::$strings["share"] = "compartir"; -App::$strings["Repeat"] = "Se repite"; -App::$strings["repeat"] = "Se repite"; +App::$strings["Repeat"] = "Repetir"; +App::$strings["repeat"] = "repetir"; App::$strings["Delivery Report"] = "Informe de transmisión"; App::$strings["%d comment"] = array( 0 => "%d comentario", -- cgit v1.2.3 From 7c34a3676d294c9a1acc69f71ab3061074509160 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 30 Apr 2024 06:59:19 +0000 Subject: Rework Help module + begin tests for Setup module --- Zotlabs/Lib/Traits/HelpHelper.php | 68 ++ Zotlabs/Module/Help.php | 191 +++- Zotlabs/Widget/Helpindex.php | 63 +- doc/AdvancedSearch.md | 53 - doc/Comparison-of-activity-stream-networks.md | 23 - doc/Creating-Templates.md | 93 -- doc/DerivedTheme1.md | 101 -- doc/Developers.md | 54 - doc/Features.md | 108 -- doc/Hubzilla_on_OpenShift.bb | 105 -- doc/Plugins.md | 263 ----- doc/Primary-Directory.md | 47 - doc/Remove-Account.md | 26 - doc/Schema-development.md | 81 -- doc/TermsOfService.md | 11 - doc/Translations.md | 93 -- doc/Widgets.md | 174 ---- doc/Zot---A-High-Level-Overview.md | 109 -- doc/about/about.bb | 204 ---- doc/about/about_hub.bb | 7 - doc/about/project.bb | 186 ---- doc/accounts_profiles_channels_basics.bb | 19 - doc/acl_dialog_post.html | 16 - doc/addons.bb | 117 --- doc/addons_gnusocial.bb | 65 -- doc/admin/administrator_guide.md | 464 --------- doc/admin/hub_snapshots.md | 127 --- doc/admin/zarlog_msgs.md | 112 -- doc/admins.bb | 15 - doc/api/api_albums.md | 66 -- doc/api/api_filedata.md | 66 -- doc/api/api_files.md | 103 -- doc/api/api_functions.bb | 133 --- doc/api/api_group_members.md | 133 --- doc/api/api_item_update.md | 225 ----- doc/api/api_posting.bb | 24 - doc/api/api_xchan.md | 44 - doc/api/group.md | 41 - doc/api/statuses_update.bb | 23 - doc/bugs.bb | 32 - doc/campaign.bb | 237 ----- doc/checking_account_quota_usage.bb | 20 - doc/comanche.bb | 261 ----- doc/context/de/admin/logs/help.html | 8 - doc/context/de/admin/queue/help.html | 4 - doc/context/de/admin/security/help.html | 4 - doc/context/de/appman/help.html | 4 - doc/context/de/apps/edit/help.html | 4 - doc/context/de/apps/help.html | 6 - doc/context/de/channel/help.html | 8 - doc/context/de/chat/help.html | 8 - doc/context/de/cloud/help.html | 6 - doc/context/de/connections/help.html | 8 - doc/context/de/connections/ifpending/help.html | 8 - doc/context/de/events/help.html | 8 - doc/context/de/mail/help.html | 12 - doc/context/de/network/help.html | 10 - doc/context/de/photos/help.html | 6 - doc/context/de/profile/help.html | 6 - doc/context/de/register/help.html | 12 - doc/context/de/settings/account/help.html | 19 - doc/context/de/settings/channel/help.html | 19 - doc/context/de/settings/features/help.html | 12 - doc/context/de/settings/tokens/help.html | 20 - doc/context/de/wiki/help.html | 10 - .../en/admin/addons/assets/addon_repo_gui_1.png | Bin 16983 -> 0 bytes doc/context/en/admin/addons/help.html | 14 - doc/context/en/admin/logs/help.html | 8 - doc/context/en/admin/queue/help.html | 4 - doc/context/en/admin/security/help.html | 4 - doc/context/en/appman/help.html | 4 - doc/context/en/apps/edit/help.html | 4 - doc/context/en/apps/help.html | 6 - doc/context/en/cards/help.html | 20 - doc/context/en/channel/help.html | 6 - doc/context/en/chat/help.html | 8 - doc/context/en/cloud/help.html | 6 - doc/context/en/connections/help.html | 8 - doc/context/en/connections/ifpending/help.html | 8 - doc/context/en/connedit/help.html | 12 - doc/context/en/events/help.html | 8 - doc/context/en/mail/help.html | 10 - doc/context/en/network/help.html | 10 - doc/context/en/photos/help.html | 6 - doc/context/en/profile/help.html | 6 - doc/context/en/profiles/help.html | 35 - doc/context/en/register/help.html | 12 - doc/context/en/settings/account/help.html | 35 - doc/context/en/settings/channel/help.html | 35 - doc/context/en/settings/features/help.html | 12 - doc/context/en/settings/tokens/help.html | 23 - doc/context/en/webpages/help.html | 8 - doc/context/en/wiki/help.html | 10 - doc/context/es | 1 - .../es-es/admin/addons/assets/addon_repo_gui_1.png | Bin 16983 -> 0 bytes doc/context/es-es/admin/addons/help.html | 14 - doc/context/es-es/admin/logs/help.html | 9 - doc/context/es-es/admin/queue/help.html | 4 - doc/context/es-es/admin/security/help.html | 4 - doc/context/es-es/appman/help.html | 4 - doc/context/es-es/apps/edit/help.html | 4 - doc/context/es-es/apps/help.html | 6 - doc/context/es-es/articles/help.html | 20 - doc/context/es-es/cards/help.html | 19 - doc/context/es-es/channel/help.html | 8 - doc/context/es-es/chat/help.html | 8 - doc/context/es-es/cloud/help.html | 6 - doc/context/es-es/connections/help.html | 15 - doc/context/es-es/connections/ifpending/help.html | 15 - doc/context/es-es/connedit/help.html | 12 - doc/context/es-es/events/help.html | 8 - doc/context/es-es/mail/help.html | 10 - doc/context/es-es/network/help.html | 12 - doc/context/es-es/photos/help.html | 6 - doc/context/es-es/profile/help.html | 6 - doc/context/es-es/profiles/help.html | 35 - doc/context/es-es/settings/account/help.html | 35 - doc/context/es-es/settings/channel/help.html | 35 - doc/context/es-es/settings/features/help.html | 12 - doc/context/es-es/settings/tokens/help.html | 23 - doc/context/es-es/webpages/help.html | 8 - doc/context/es-es/wiki/help.html | 10 - doc/context/fr/admin/logs/help.html | 8 - doc/context/fr/admin/queue/help.html | 4 - doc/context/fr/appman/help.html | 5 - doc/context/fr/apps/edit/index.html | 4 - doc/context/fr/apps/help.html | 7 - doc/context/fr/cards/help.html | 20 - doc/context/fr/channel/help.html | 6 - doc/context/fr/chat/help.html | 8 - doc/context/fr/cloud/help.html | 7 - doc/context/fr/connections/help.html | 8 - doc/context/fr/connections/ifpending/help.html | 8 - doc/context/fr/connedit/help.html | 13 - doc/context/fr/events/help.html | 8 - doc/context/fr/mail/help.html | 10 - doc/context/fr/photos/help.html | 6 - doc/context/fr/profile/help.html | 6 - doc/context/fr/settings/account/help.html | 18 - doc/context/fr/settings/channel/help.html | 18 - doc/context/fr/settings/features/help.html | 12 - doc/context/fr/settings/tokens | 20 - doc/context/fr/webpages/help.html | 8 - doc/context/fr/wiki/help.html | 13 - doc/context/it/wiki/help.html | 10 - .../pl/admin/addons/assets/addon_repo_gui_1.png | Bin 16983 -> 0 bytes doc/context/pl/admin/addons/help.html | 14 - doc/context/pl/admin/logs/help.html | 20 - doc/context/pl/admin/queue/help.html | 7 - doc/context/pl/admin/security/help.html | 8 - doc/context/pl/appman/help.html | 10 - doc/context/pl/apps/edit/help.html | 7 - doc/context/pl/apps/help.html | 15 - doc/context/pl/cards/help.html | 31 - doc/context/pl/channel/help.html | 13 - doc/context/pl/chat/help.html | 19 - doc/context/pl/cloud/help.html | 17 - doc/context/pl/connections/help.html | 24 - doc/context/pl/connections/ifpending/help.html | 24 - doc/context/pl/connedit/help.html | 44 - doc/context/pl/events/help.html | 18 - doc/context/pl/mail/help.html | 25 - doc/context/pl/network/help.html | 36 - doc/context/pl/photos/help.html | 15 - doc/context/pl/profile/help.html | 17 - doc/context/pl/profiles/help.html | 49 - doc/context/pl/register/help.html | 54 - doc/context/pl/settings/account/help.html | 49 - doc/context/pl/settings/channel/help.html | 49 - doc/context/pl/settings/features/help.html | 50 - doc/context/pl/settings/tokens/help.html | 43 - doc/context/pl/webpages/help.html | 24 - doc/context/pl/wiki/help.html | 29 - doc/context/ru/cards/help.html | 16 - doc/context/ru/connections/help.html | 7 - doc/context/ru/network/help.html | 9 - doc/database.bb | 71 -- doc/database/db_abook.bb | 55 - doc/database/db_account.bb | 66 -- doc/database/db_addon.bb | 24 - doc/database/db_app.bb | 48 - doc/database/db_attach.bb | 54 - doc/database/db_auth_codes.bb | 19 - doc/database/db_cache.bb | 15 - doc/database/db_channel.bb | 104 -- doc/database/db_chat.bb | 16 - doc/database/db_chatpresence.bb | 18 - doc/database/db_chatroom.bb | 28 - doc/database/db_clients.bb | 18 - doc/database/db_config.bb | 14 - doc/database/db_conv.bb | 25 - doc/database/db_event.bb | 64 -- doc/database/db_fcontact.bb | 38 - doc/database/db_ffinder.bb | 14 - doc/database/db_fserver.bb | 14 - doc/database/db_fsuggest.bb | 24 - doc/database/db_hook.bb | 18 - doc/database/db_hubloc.bb | 38 - doc/database/db_issue.bb | 20 - doc/database/db_item.bb | 151 --- doc/database/db_item_id.bb | 16 - doc/database/db_likes.bb | 24 - doc/database/db_mail.bb | 34 - doc/database/db_menu.bb | 16 - doc/database/db_menu_item.bb | 28 - doc/database/db_notify.bb | 36 - doc/database/db_obj.bb | 26 - doc/database/db_outq.bb | 28 - doc/database/db_pconfig.bb | 16 - doc/database/db_pgrp.bb | 18 - doc/database/db_pgrp_member.bb | 14 - doc/database/db_photo.bb | 52 - doc/database/db_poll.bb | 16 - doc/database/db_poll_elm.bb | 16 - doc/database/db_profdef.bb | 18 - doc/database/db_profext.bb | 16 - doc/database/db_profile.bb | 94 -- doc/database/db_profile_check.bb | 18 - doc/database/db_register.bb | 18 - doc/database/db_session.bb | 14 - doc/database/db_shares.bb | 14 - doc/database/db_sign.bb | 18 - doc/database/db_site.bb | 28 - doc/database/db_source.bb | 16 - doc/database/db_spam.bb | 18 - doc/database/db_sys_perms.bb | 16 - doc/database/db_term.bb | 28 - doc/database/db_tokens.bb | 18 - doc/database/db_updates.bb | 20 - doc/database/db_verify.bb | 18 - doc/database/db_vote.bb | 16 - doc/database/db_xchan.bb | 59 -- doc/database/db_xchat.bb | 16 - doc/database/db_xconfig.bb | 16 - doc/database/db_xign.bb | 13 - doc/database/db_xlink.bb | 22 - doc/database/db_xprof.bb | 37 - doc/database/db_xtag.bb | 14 - doc/dev-function-overview.md | 51 - doc/dev_beginner.bb | 419 -------- doc/develop.bb | 31 - doc/developer/api_zot.bb | 766 -------------- doc/developer/covenant.bb | 47 - doc/developer/developer_guide.bb | 176 ---- doc/developer/testing.md | 130 --- doc/developer/unorganized.md | 73 -- doc/developer/zot_protocol.bb | 478 --------- doc/developer_function_primer.bb | 47 - doc/developers.bb | 71 -- doc/diaspora_compat.bb | 68 -- doc/directories.bb | 95 -- doc/dnt-policy.txt | 218 ---- doc/doco.bb | 33 - doc/en/AdvancedSearch.md | 53 + doc/en/Comparison-of-activity-stream-networks.md | 23 + doc/en/Creating-Templates.md | 93 ++ doc/en/DerivedTheme1.md | 101 ++ doc/en/Developers.md | 54 + doc/en/Features.md | 108 ++ doc/en/Hubzilla_on_OpenShift.bb | 105 ++ doc/en/Plugins.md | 263 +++++ doc/en/Primary-Directory.md | 47 + doc/en/Remove-Account.md | 26 + doc/en/Schema-development.md | 81 ++ doc/en/TermsOfService.md | 11 + doc/en/Translations.md | 93 ++ doc/en/Widgets.md | 174 ++++ doc/en/Zot---A-High-Level-Overview.md | 109 ++ doc/en/about/about.bb | 204 ++++ doc/en/about/about_hub.bb | 7 + doc/en/about/project.bb | 186 ++++ doc/en/accounts_profiles_channels_basics.bb | 19 + doc/en/acl_dialog_post.html | 16 + doc/en/addons.bb | 117 +++ doc/en/addons_gnusocial.bb | 65 ++ doc/en/admin/administrator_guide.md | 464 +++++++++ doc/en/admin/hub_snapshots.md | 127 +++ doc/en/admin/zarlog_msgs.md | 112 ++ doc/en/admins.bb | 15 + doc/en/api/api_albums.md | 66 ++ doc/en/api/api_filedata.md | 66 ++ doc/en/api/api_files.md | 103 ++ doc/en/api/api_functions.bb | 133 +++ doc/en/api/api_group_members.md | 133 +++ doc/en/api/api_item_update.md | 225 +++++ doc/en/api/api_posting.bb | 24 + doc/en/api/api_xchan.md | 44 + doc/en/api/group.md | 41 + doc/en/api/statuses_update.bb | 23 + doc/en/bugs.bb | 32 + doc/en/campaign.bb | 237 +++++ doc/en/checking_account_quota_usage.bb | 20 + doc/en/comanche.bb | 261 +++++ doc/en/context/de/admin/logs/help.html | 8 + doc/en/context/de/admin/queue/help.html | 4 + doc/en/context/de/admin/security/help.html | 4 + doc/en/context/de/appman/help.html | 4 + doc/en/context/de/channel/help.html | 8 + doc/en/context/de/chat/help.html | 8 + doc/en/context/de/cloud/help.html | 6 + doc/en/context/de/connections/help.html | 8 + doc/en/context/de/connections/ifpending/help.html | 8 + doc/en/context/de/events/help.html | 8 + doc/en/context/de/mail/help.html | 12 + doc/en/context/de/network/help.html | 10 + doc/en/context/de/photos/help.html | 6 + doc/en/context/de/profile/help.html | 6 + doc/en/context/de/register/help.html | 12 + doc/en/context/de/settings/account/help.html | 19 + doc/en/context/de/settings/channel/help.html | 19 + doc/en/context/de/settings/features/help.html | 12 + doc/en/context/de/settings/tokens/help.html | 20 + doc/en/context/de/wiki/help.html | 10 + .../en/admin/addons/assets/addon_repo_gui_1.png | Bin 0 -> 16983 bytes doc/en/context/en/admin/addons/help.html | 14 + doc/en/context/en/admin/logs/help.html | 8 + doc/en/context/en/admin/queue/help.html | 4 + doc/en/context/en/admin/security/help.html | 4 + doc/en/context/en/appman/help.html | 4 + doc/en/context/en/cards/help.html | 20 + doc/en/context/en/channel/help.html | 6 + doc/en/context/en/chat/help.html | 8 + doc/en/context/en/cloud/help.html | 6 + doc/en/context/en/connections/help.html | 8 + doc/en/context/en/connections/ifpending/help.html | 8 + doc/en/context/en/connedit/help.html | 12 + doc/en/context/en/events/help.html | 8 + doc/en/context/en/mail/help.html | 10 + doc/en/context/en/network/help.html | 10 + doc/en/context/en/photos/help.html | 6 + doc/en/context/en/profile/help.html | 6 + doc/en/context/en/profiles/help.html | 35 + doc/en/context/en/register/help.html | 12 + doc/en/context/en/settings/account/help.html | 35 + doc/en/context/en/settings/channel/help.html | 35 + doc/en/context/en/settings/features/help.html | 12 + doc/en/context/en/settings/tokens/help.html | 23 + doc/en/context/en/webpages/help.html | 8 + doc/en/context/en/wiki/help.html | 10 + doc/en/context/es | 1 + .../es-es/admin/addons/assets/addon_repo_gui_1.png | Bin 0 -> 16983 bytes doc/en/context/es-es/admin/addons/help.html | 14 + doc/en/context/es-es/admin/logs/help.html | 9 + doc/en/context/es-es/admin/queue/help.html | 4 + doc/en/context/es-es/admin/security/help.html | 4 + doc/en/context/es-es/appman/help.html | 4 + doc/en/context/es-es/articles/help.html | 20 + doc/en/context/es-es/cards/help.html | 19 + doc/en/context/es-es/channel/help.html | 8 + doc/en/context/es-es/chat/help.html | 8 + doc/en/context/es-es/cloud/help.html | 6 + doc/en/context/es-es/connections/help.html | 15 + .../context/es-es/connections/ifpending/help.html | 15 + doc/en/context/es-es/connedit/help.html | 12 + doc/en/context/es-es/events/help.html | 8 + doc/en/context/es-es/mail/help.html | 10 + doc/en/context/es-es/network/help.html | 12 + doc/en/context/es-es/photos/help.html | 6 + doc/en/context/es-es/profile/help.html | 6 + doc/en/context/es-es/profiles/help.html | 35 + doc/en/context/es-es/settings/account/help.html | 35 + doc/en/context/es-es/settings/channel/help.html | 35 + doc/en/context/es-es/settings/features/help.html | 12 + doc/en/context/es-es/settings/tokens/help.html | 23 + doc/en/context/es-es/webpages/help.html | 8 + doc/en/context/es-es/wiki/help.html | 10 + doc/en/context/fr/admin/logs/help.html | 8 + doc/en/context/fr/admin/queue/help.html | 4 + doc/en/context/fr/appman/help.html | 5 + doc/en/context/fr/cards/help.html | 20 + doc/en/context/fr/channel/help.html | 6 + doc/en/context/fr/chat/help.html | 8 + doc/en/context/fr/cloud/help.html | 7 + doc/en/context/fr/connections/help.html | 8 + doc/en/context/fr/connections/ifpending/help.html | 8 + doc/en/context/fr/connedit/help.html | 13 + doc/en/context/fr/events/help.html | 8 + doc/en/context/fr/mail/help.html | 10 + doc/en/context/fr/photos/help.html | 6 + doc/en/context/fr/profile/help.html | 6 + doc/en/context/fr/settings/account/help.html | 18 + doc/en/context/fr/settings/channel/help.html | 18 + doc/en/context/fr/settings/features/help.html | 12 + doc/en/context/fr/settings/tokens | 20 + doc/en/context/fr/webpages/help.html | 8 + doc/en/context/fr/wiki/help.html | 13 + doc/en/context/it/wiki/help.html | 10 + .../pl/admin/addons/assets/addon_repo_gui_1.png | Bin 0 -> 16983 bytes doc/en/context/pl/admin/addons/help.html | 14 + doc/en/context/pl/admin/logs/help.html | 20 + doc/en/context/pl/admin/queue/help.html | 7 + doc/en/context/pl/admin/security/help.html | 8 + doc/en/context/pl/appman/help.html | 10 + doc/en/context/pl/cards/help.html | 31 + doc/en/context/pl/channel/help.html | 13 + doc/en/context/pl/chat/help.html | 19 + doc/en/context/pl/cloud/help.html | 17 + doc/en/context/pl/connections/help.html | 24 + doc/en/context/pl/connections/ifpending/help.html | 24 + doc/en/context/pl/connedit/help.html | 44 + doc/en/context/pl/events/help.html | 18 + doc/en/context/pl/mail/help.html | 25 + doc/en/context/pl/network/help.html | 36 + doc/en/context/pl/photos/help.html | 15 + doc/en/context/pl/profile/help.html | 17 + doc/en/context/pl/profiles/help.html | 49 + doc/en/context/pl/register/help.html | 54 + doc/en/context/pl/settings/account/help.html | 49 + doc/en/context/pl/settings/channel/help.html | 49 + doc/en/context/pl/settings/features/help.html | 50 + doc/en/context/pl/settings/tokens/help.html | 43 + doc/en/context/pl/webpages/help.html | 24 + doc/en/context/pl/wiki/help.html | 29 + doc/en/context/ru/cards/help.html | 16 + doc/en/context/ru/connections/help.html | 7 + doc/en/context/ru/network/help.html | 9 + doc/en/database.bb | 71 ++ doc/en/database/db_abook.bb | 55 + doc/en/database/db_account.bb | 66 ++ doc/en/database/db_addon.bb | 24 + doc/en/database/db_app.bb | 48 + doc/en/database/db_attach.bb | 54 + doc/en/database/db_auth_codes.bb | 19 + doc/en/database/db_cache.bb | 15 + doc/en/database/db_channel.bb | 104 ++ doc/en/database/db_chat.bb | 16 + doc/en/database/db_chatpresence.bb | 18 + doc/en/database/db_chatroom.bb | 28 + doc/en/database/db_clients.bb | 18 + doc/en/database/db_config.bb | 14 + doc/en/database/db_conv.bb | 25 + doc/en/database/db_event.bb | 64 ++ doc/en/database/db_fcontact.bb | 38 + doc/en/database/db_ffinder.bb | 14 + doc/en/database/db_fserver.bb | 14 + doc/en/database/db_fsuggest.bb | 24 + doc/en/database/db_hook.bb | 18 + doc/en/database/db_hubloc.bb | 38 + doc/en/database/db_issue.bb | 20 + doc/en/database/db_item.bb | 151 +++ doc/en/database/db_item_id.bb | 16 + doc/en/database/db_likes.bb | 24 + doc/en/database/db_mail.bb | 34 + doc/en/database/db_menu.bb | 16 + doc/en/database/db_menu_item.bb | 28 + doc/en/database/db_notify.bb | 36 + doc/en/database/db_obj.bb | 26 + doc/en/database/db_outq.bb | 28 + doc/en/database/db_pconfig.bb | 16 + doc/en/database/db_pgrp.bb | 18 + doc/en/database/db_pgrp_member.bb | 14 + doc/en/database/db_photo.bb | 52 + doc/en/database/db_poll.bb | 16 + doc/en/database/db_poll_elm.bb | 16 + doc/en/database/db_profdef.bb | 18 + doc/en/database/db_profext.bb | 16 + doc/en/database/db_profile.bb | 94 ++ doc/en/database/db_profile_check.bb | 18 + doc/en/database/db_register.bb | 18 + doc/en/database/db_session.bb | 14 + doc/en/database/db_shares.bb | 14 + doc/en/database/db_sign.bb | 18 + doc/en/database/db_site.bb | 28 + doc/en/database/db_source.bb | 16 + doc/en/database/db_spam.bb | 18 + doc/en/database/db_sys_perms.bb | 16 + doc/en/database/db_term.bb | 28 + doc/en/database/db_tokens.bb | 18 + doc/en/database/db_updates.bb | 20 + doc/en/database/db_verify.bb | 18 + doc/en/database/db_vote.bb | 16 + doc/en/database/db_xchan.bb | 59 ++ doc/en/database/db_xchat.bb | 16 + doc/en/database/db_xconfig.bb | 16 + doc/en/database/db_xign.bb | 13 + doc/en/database/db_xlink.bb | 22 + doc/en/database/db_xprof.bb | 37 + doc/en/database/db_xtag.bb | 14 + doc/en/dev-function-overview.md | 51 + doc/en/dev_beginner.bb | 419 ++++++++ doc/en/develop.bb | 31 + doc/en/developer/api_zot.bb | 766 ++++++++++++++ doc/en/developer/covenant.bb | 47 + doc/en/developer/developer_guide.bb | 176 ++++ doc/en/developer/testing.md | 130 +++ doc/en/developer/unorganized.md | 73 ++ doc/en/developer/zot_protocol.bb | 478 +++++++++ doc/en/developer_function_primer.bb | 47 + doc/en/developers.bb | 71 ++ doc/en/diaspora_compat.bb | 68 ++ doc/en/directories.bb | 95 ++ doc/en/dnt-policy.txt | 218 ++++ doc/en/doco.bb | 33 + doc/en/encryption.bb | 18 + doc/en/external-resource-links.bb | 21 + doc/en/extra_features.bb | 98 ++ doc/en/faq_admins.bb | 78 ++ doc/en/feature/access_tokens.bb | 47 + doc/en/feature/additional/access.md | 41 + doc/en/feature/additional/composition.md | 67 ++ doc/en/feature/additional/filtering.md | 57 ++ doc/en/feature/additional/general.md | 130 +++ doc/en/feature/additional/overview.md | 33 + doc/en/feature/additional/posts.md | 57 ++ doc/en/federate.bb | 71 ++ doc/en/filesync.md | 61 ++ doc/en/first-post.bb | 3 + doc/en/gdpr1.md | 114 +++ doc/en/general.bb | 18 + doc/en/git_for_non_developers.bb | 71 ++ doc/en/hidden_configs.bb | 127 +++ doc/en/hook/about_hook.bb | 1 + doc/en/hook/accept_follow.bb | 1 + doc/en/hook/account_downgrade.bb | 1 + doc/en/hook/account_settings.bb | 1 + doc/en/hook/account_settings_post.bb | 1 + doc/en/hook/activity_decode_mapper.bb | 1 + doc/en/hook/activity_filter.bb | 1 + doc/en/hook/activity_mapper.bb | 1 + doc/en/hook/activity_obj_decode_mapper.bb | 1 + doc/en/hook/activity_obj_mapper.bb | 1 + doc/en/hook/activity_order.bb | 1 + doc/en/hook/activity_received.bb | 1 + doc/en/hook/addon_app_installed_filter.bb | 18 + doc/en/hook/affinity_labels.bb | 1 + doc/en/hook/api_perm_is_allowed.bb | 1 + doc/en/hook/app_destroy.bb | 4 + doc/en/hook/app_installed_filter.bb | 17 + doc/en/hook/atom_author.bb | 1 + doc/en/hook/atom_entry.bb | 1 + doc/en/hook/atom_feed.bb | 1 + doc/en/hook/atom_feed_end.bb | 1 + doc/en/hook/attach_delete.bb | 11 + doc/en/hook/attach_upload_file.bb | 1 + doc/en/hook/authenticate.bb | 29 + doc/en/hook/author_is_pmable.bb | 14 + doc/en/hook/bb2diaspora.bb | 1 + doc/en/hook/bbcode.bb | 6 + doc/en/hook/bbcode_filter.bb | 7 + doc/en/hook/build_pagehead.bb | 2 + doc/en/hook/can_comment_on_post.bb | 13 + doc/en/hook/change_channel.bb | 11 + doc/en/hook/channel_links.bb | 12 + doc/en/hook/channel_remove.bb | 1 + doc/en/hook/chat_message.bb | 1 + doc/en/hook/chat_post.bb | 1 + doc/en/hook/check_account_email.bb | 1 + doc/en/hook/check_account_invite.bb | 1 + doc/en/hook/check_account_password.bb | 17 + doc/en/hook/check_channelallowed.bb | 11 + doc/en/hook/check_siteallowed.bb | 10 + doc/en/hook/collect_public_recipients.bb | 42 + doc/en/hook/comments_are_now_closed.bb | 11 + doc/en/hook/connect_premium.bb | 1 + doc/en/hook/connection_remove.bb | 9 + doc/en/hook/connector_settings.bb | 1 + doc/en/hook/construct_page.bb | 1 + doc/en/hook/contact_block_end.bb | 1 + doc/en/hook/contact_edit.bb | 1 + doc/en/hook/contact_edit_post.bb | 1 + doc/en/hook/contact_select_options.bb | 1 + doc/en/hook/content_security_policy.bb | 39 + doc/en/hook/conversation_start.bb | 1 + doc/en/hook/create_identity.bb | 1 + doc/en/hook/cron.bb | 5 + doc/en/hook/cron_daily.bb | 3 + doc/en/hook/cron_weekly.bb | 3 + doc/en/hook/crypto_methods.bb | 5 + doc/en/hook/daemon_addon.bb | 15 + doc/en/hook/daemon_master_release.bb | 5 + doc/en/hook/directory_item.bb | 1 + doc/en/hook/discover_channel_webfinger.bb | 14 + doc/en/hook/display_item.bb | 1 + doc/en/hook/display_settings.bb | 1 + doc/en/hook/display_settings_post.bb | 1 + doc/en/hook/donate_contributors.bb | 1 + doc/en/hook/donate_plugin.bb | 1 + doc/en/hook/donate_sponsors.bb | 1 + doc/en/hook/dreport_is_storable.bb | 1 + doc/en/hook/dreport_process.bb | 7 + doc/en/hook/drop_item.bb | 1 + doc/en/hook/dropdown_extras.bb | 17 + doc/en/hook/encode_object.bb | 1 + doc/en/hook/enotify.bb | 1 + doc/en/hook/enotify_mail.bb | 1 + doc/en/hook/enotify_store.bb | 1 + doc/en/hook/event_created.bb | 1 + doc/en/hook/event_store_event.bb | 11 + doc/en/hook/event_updated.bb | 1 + doc/en/hook/externals_url_select.bb | 1 + doc/en/hook/feature_enabled.bb | 1 + doc/en/hook/feature_settings.bb | 1 + doc/en/hook/feature_settings_post.bb | 1 + doc/en/hook/fetch_and_store.bb | 1 + doc/en/hook/follow.bb | 1 + doc/en/hook/follow_allow.bb | 1 + doc/en/hook/gender_selector.bb | 1 + doc/en/hook/gender_selector_min.bb | 1 + doc/en/hook/generate_map.bb | 1 + doc/en/hook/generate_named_map.bb | 1 + doc/en/hook/get_all_api_perms.bb | 1 + doc/en/hook/get_all_perms.bb | 1 + doc/en/hook/get_default_export_sections | 10 + doc/en/hook/get_features.bb | 1 + doc/en/hook/get_photo.bb | 14 + doc/en/hook/get_profile_photo.bb | 18 + doc/en/hook/get_role_perms.bb | 1 + doc/en/hook/global_permissions.bb | 1 + doc/en/hook/home_content.bb | 1 + doc/en/hook/home_init.bb | 1 + doc/en/hook/hostxrd.bb | 1 + doc/en/hook/html2bbcode.bb | 1 + doc/en/hook/identity_basic_export.bb | 10 + doc/en/hook/import_author_xchan.bb | 1 + doc/en/hook/import_channel.bb | 1 + doc/en/hook/import_directory_profile.bb | 1 + doc/en/hook/import_xchan.bb | 1 + doc/en/hook/item_custom.bb | 24 + doc/en/hook/item_photo_menu.bb | 1 + doc/en/hook/item_store.bb | 1 + doc/en/hook/item_store_update.bb | 1 + doc/en/hook/item_stored.bb | 18 + doc/en/hook/item_stored_update.bb | 15 + doc/en/hook/item_translate.bb | 1 + doc/en/hook/jot_header_tpl_filter.bb | 5 + doc/en/hook/jot_networks.bb | 1 + doc/en/hook/jot_tool.bb | 1 + doc/en/hook/jot_tpl_filter.bb | 5 + doc/en/hook/legal_webbie.bb | 10 + doc/en/hook/legal_webbie_text.bb | 7 + doc/en/hook/load_pdl.bb | 1 + doc/en/hook/local_dir_update.bb | 1 + doc/en/hook/logged_in.bb | 1 + doc/en/hook/logger.bb | 16 + doc/en/hook/logging_out.bb | 1 + doc/en/hook/login_hook.bb | 1 + doc/en/hook/magic_auth.bb | 1 + doc/en/hook/magic_auth_openid_success.bb | 1 + doc/en/hook/magic_auth_success.bb | 1 + doc/en/hook/main_slider.bb | 1 + doc/en/hook/marital_selector.bb | 1 + doc/en/hook/marital_selector_min.bb | 1 + doc/en/hook/markdown_to_bb.bb | 5 + doc/en/hook/module_loaded.bb | 1 + doc/en/hook/module_mod_aftercontent.bb | 12 + doc/en/hook/module_mod_content.bb | 10 + doc/en/hook/module_mod_init.bb | 1 + doc/en/hook/module_mod_post.bb | 1 + doc/en/hook/mood_verbs.bb | 1 + doc/en/hook/nav.bb | 28 + doc/en/hook/network_content_init.bb | 1 + doc/en/hook/network_ping.bb | 1 + doc/en/hook/network_to_name.bb | 1 + doc/en/hook/notifier_end.bb | 1 + doc/en/hook/notifier_hub.bb | 1 + doc/en/hook/notifier_normal.bb | 1 + doc/en/hook/obj_verbs.bb | 1 + doc/en/hook/oembed_probe.bb | 1 + doc/en/hook/other_encapsulate.bb | 7 + doc/en/hook/other_unencapsulate.bb | 5 + doc/en/hook/page_content_top.bb | 1 + doc/en/hook/page_end.bb | 1 + doc/en/hook/page_header.bb | 1 + doc/en/hook/page_meta.bb | 13 + doc/en/hook/parse_atom.bb | 1 + doc/en/hook/parse_link.bb | 1 + doc/en/hook/pdl_selector.bb | 1 + doc/en/hook/perm_is_allowed.bb | 1 + doc/en/hook/permissions_create.bb | 1 + doc/en/hook/permissions_update.bb | 1 + doc/en/hook/permit_hook.bb | 0 doc/en/hook/personal_xrd.bb | 1 + doc/en/hook/photo_post_end.bb | 1 + doc/en/hook/photo_upload_begin.bb | 1 + doc/en/hook/photo_upload_end.bb | 1 + doc/en/hook/photo_upload_file.bb | 1 + doc/en/hook/photo_upload_form.bb | 1 + doc/en/hook/photo_view_filter.bb | 1 + doc/en/hook/poke_verbs.bb | 1 + doc/en/hook/post_local.bb | 1 + doc/en/hook/post_local_end.bb | 1 + doc/en/hook/post_local_start.bb | 1 + doc/en/hook/post_mail.bb | 1 + doc/en/hook/post_mail_end.bb | 1 + doc/en/hook/post_remote.bb | 1 + doc/en/hook/post_remote_end.bb | 1 + doc/en/hook/post_remote_update.bb | 1 + doc/en/hook/post_remote_update_end.bb | 1 + doc/en/hook/prepare_body.bb | 1 + doc/en/hook/prepare_body_final.bb | 1 + doc/en/hook/prepare_body_init.bb | 1 + doc/en/hook/privacygroup_extras.bb | 12 + doc/en/hook/privacygroup_extras_drop.bb | 11 + doc/en/hook/privacygroup_extras_post.bb | 11 + doc/en/hook/proc_run.bb | 1 + doc/en/hook/process_channel_sync_delivery.bb | 1 + doc/en/hook/profile_advanced.bb | 1 + doc/en/hook/profile_edit.bb | 1 + doc/en/hook/profile_photo_content_end.bb | 1 + doc/en/hook/profile_post.bb | 1 + doc/en/hook/profile_sidebar.bb | 1 + doc/en/hook/profile_sidebar_enter.bb | 1 + doc/en/hook/register_account.bb | 1 + doc/en/hook/render_location.bb | 1 + doc/en/hook/replace_macros.bb | 1 + doc/en/hook/reverse_magic_auth.bb | 1 + doc/en/hook/settings_form.bb | 1 + doc/en/hook/settings_post.bb | 1 + doc/en/hook/sexpref_selector.bb | 1 + doc/en/hook/sexpref_selector_min.bb | 1 + doc/en/hook/smilie.bb | 19 + doc/en/hook/status_editor.bb | 31 + doc/en/hook/stream_item.bb | 13 + doc/en/hook/system_app_installed_filter.bb | 18 + doc/en/hook/tagged.bb | 16 + doc/en/hook/update_unseen.bb | 9 + doc/en/hook/validate_channelname.bb | 23 + doc/en/hook/webfinger.bb | 1 + doc/en/hook/well_known.bb | 1 + doc/en/hook/wiki_preprocess.bb | 11 + doc/en/hook/zid.bb | 1 + doc/en/hook/zid_init.bb | 1 + doc/en/hook/zot_best_algorithm.bb | 3 + doc/en/hook/zot_finger.bb | 1 + doc/en/hooklist.bb | 698 +++++++++++++ doc/en/hooks.html | 1 + doc/en/intro_for_developers.bb | 113 +++ doc/en/macros/addons_footer.bb | 2 + doc/en/macros/cloud_footer.bb | 2 + doc/en/macros/de/addons_footer.bb | 2 + doc/en/macros/de/cloud_footer.bb | 2 + doc/en/macros/de/main_footer.bb | 1 + doc/en/macros/de/troubleshooting_footer.bb | 2 + doc/en/macros/main_footer.bb | 1 + doc/en/macros/pl/addons_footer.bb | 2 + doc/en/macros/pl/cloud_footer.bb | 2 + doc/en/macros/pl/main_footer.bb | 1 + doc/en/macros/pl/troubleshooting_footer.bb | 2 + doc/en/macros/troubleshooting_footer.bb | 2 + doc/en/member/assets/qr_text_to_post.png | Bin 0 -> 273 bytes doc/en/member/assets/zat_dialog.png | Bin 0 -> 81837 bytes doc/en/member/bbcode.html | 337 ++++++ doc/en/member/member_faq.bb | 10 + doc/en/member/member_guide.bb | 1068 ++++++++++++++++++++ doc/en/plugins.bb | 312 ++++++ doc/en/problems-following-an-update.bb | 38 + doc/en/red2pi.bb | 342 +++++++ doc/en/roadmap.bb | 28 + doc/en/schema_development.bb | 78 ++ doc/en/schemaspy_hubzilla/zot.meta.xml | 283 ++++++ doc/en/sql_conventions.bb | 91 ++ doc/en/toc.html | 75 ++ ...38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png | Bin 0 -> 249151 bytes ...035c441631745d16acdb7a44e50d148256c8ad26a67.png | Bin 0 -> 293314 bytes ...7cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png | Bin 0 -> 178913 bytes ...1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png | Bin 0 -> 43797 bytes ...dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png | Bin 0 -> 46752 bytes ...0329db6c3814e2975979aff12f873f43d81724c5e61.png | Bin 0 -> 257211 bytes ...4fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png | Bin 0 -> 91478 bytes ...515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png | Bin 0 -> 293611 bytes ...7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png | Bin 0 -> 318766 bytes ...999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png | Bin 0 -> 298857 bytes ...f5630e921756f825ee00f8ee464d3ef9fed971d2852.png | Bin 0 -> 532838 bytes ...d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png | Bin 0 -> 137827 bytes ...3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png | Bin 0 -> 466641 bytes ...2d2a849412044cc6a0f8aebeac289d28786f2649d24.png | Bin 0 -> 240495 bytes ...e665961d35affbd053368056f562c58200fb41027b0.png | Bin 0 -> 665755 bytes ...7bb6092c3240b291eca8afa73133b3ac03b86f3302d.png | Bin 0 -> 324092 bytes ...915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png | Bin 0 -> 466584 bytes ...24af42055f0f24ed5e81ba622aca8cac576ccf5930e.png | Bin 0 -> 155763 bytes ...37f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png | Bin 0 -> 134643 bytes ...27df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png | Bin 0 -> 306069 bytes ...2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png | Bin 0 -> 57185 bytes ...3fa39b2084c16a8410de1f7a6559633435817444aef.png | Bin 0 -> 255688 bytes ...4bde52432fdc7b39692a094559aa504de99352940b1.png | Bin 0 -> 83265 bytes ...ce90a60fc416415271d9c51b81ad2a950fb0157222a.png | Bin 0 -> 264916 bytes ...6f353514c907b3fdfe019918fc5553bb3f31388a36f.png | Bin 0 -> 68194 bytes ...de9048cd14b417c0d76de17af476be5f296b78d70e9.png | Bin 0 -> 99210 bytes doc/en/tutorials/personal_channel.html | 162 +++ doc/encryption.bb | 18 - doc/external-resource-links.bb | 21 - doc/extra_features.bb | 98 -- doc/faq_admins.bb | 78 -- doc/feature/access_tokens.bb | 47 - doc/feature/additional/access.md | 41 - doc/feature/additional/composition.md | 67 -- doc/feature/additional/filtering.md | 57 -- doc/feature/additional/general.md | 130 --- doc/feature/additional/overview.md | 33 - doc/feature/additional/posts.md | 57 -- doc/federate.bb | 71 -- doc/filesync.md | 61 -- doc/first-post.bb | 3 - doc/gdpr1.md | 114 --- doc/general.bb | 18 - doc/git_for_non_developers.bb | 71 -- doc/hidden_configs.bb | 127 --- doc/hook/about_hook.bb | 1 - doc/hook/accept_follow.bb | 1 - doc/hook/account_downgrade.bb | 1 - doc/hook/account_settings.bb | 1 - doc/hook/account_settings_post.bb | 1 - doc/hook/activity_decode_mapper.bb | 1 - doc/hook/activity_filter.bb | 1 - doc/hook/activity_mapper.bb | 1 - doc/hook/activity_obj_decode_mapper.bb | 1 - doc/hook/activity_obj_mapper.bb | 1 - doc/hook/activity_order.bb | 1 - doc/hook/activity_received.bb | 1 - doc/hook/addon_app_installed_filter.bb | 18 - doc/hook/affinity_labels.bb | 1 - doc/hook/api_perm_is_allowed.bb | 1 - doc/hook/app_destroy.bb | 4 - doc/hook/app_installed_filter.bb | 17 - doc/hook/atom_author.bb | 1 - doc/hook/atom_entry.bb | 1 - doc/hook/atom_feed.bb | 1 - doc/hook/atom_feed_end.bb | 1 - doc/hook/attach_delete.bb | 11 - doc/hook/attach_upload_file.bb | 1 - doc/hook/authenticate.bb | 29 - doc/hook/author_is_pmable.bb | 14 - doc/hook/bb2diaspora.bb | 1 - doc/hook/bbcode.bb | 6 - doc/hook/bbcode_filter.bb | 7 - doc/hook/build_pagehead.bb | 2 - doc/hook/can_comment_on_post.bb | 13 - doc/hook/change_channel.bb | 11 - doc/hook/channel_links.bb | 12 - doc/hook/channel_remove.bb | 1 - doc/hook/chat_message.bb | 1 - doc/hook/chat_post.bb | 1 - doc/hook/check_account_email.bb | 1 - doc/hook/check_account_invite.bb | 1 - doc/hook/check_account_password.bb | 17 - doc/hook/check_channelallowed.bb | 11 - doc/hook/check_siteallowed.bb | 10 - doc/hook/collect_public_recipients.bb | 42 - doc/hook/comments_are_now_closed.bb | 11 - doc/hook/connect_premium.bb | 1 - doc/hook/connection_remove.bb | 9 - doc/hook/connector_settings.bb | 1 - doc/hook/construct_page.bb | 1 - doc/hook/contact_block_end.bb | 1 - doc/hook/contact_edit.bb | 1 - doc/hook/contact_edit_post.bb | 1 - doc/hook/contact_select_options.bb | 1 - doc/hook/content_security_policy.bb | 39 - doc/hook/conversation_start.bb | 1 - doc/hook/create_identity.bb | 1 - doc/hook/cron.bb | 5 - doc/hook/cron_daily.bb | 3 - doc/hook/cron_weekly.bb | 3 - doc/hook/crypto_methods.bb | 5 - doc/hook/daemon_addon.bb | 15 - doc/hook/daemon_master_release.bb | 5 - doc/hook/directory_item.bb | 1 - doc/hook/discover_channel_webfinger.bb | 14 - doc/hook/display_item.bb | 1 - doc/hook/display_settings.bb | 1 - doc/hook/display_settings_post.bb | 1 - doc/hook/donate_contributors.bb | 1 - doc/hook/donate_plugin.bb | 1 - doc/hook/donate_sponsors.bb | 1 - doc/hook/dreport_is_storable.bb | 1 - doc/hook/dreport_process.bb | 7 - doc/hook/drop_item.bb | 1 - doc/hook/dropdown_extras.bb | 17 - doc/hook/encode_object.bb | 1 - doc/hook/enotify.bb | 1 - doc/hook/enotify_mail.bb | 1 - doc/hook/enotify_store.bb | 1 - doc/hook/event_created.bb | 1 - doc/hook/event_store_event.bb | 11 - doc/hook/event_updated.bb | 1 - doc/hook/externals_url_select.bb | 1 - doc/hook/feature_enabled.bb | 1 - doc/hook/feature_settings.bb | 1 - doc/hook/feature_settings_post.bb | 1 - doc/hook/fetch_and_store.bb | 1 - doc/hook/follow.bb | 1 - doc/hook/follow_allow.bb | 1 - doc/hook/gender_selector.bb | 1 - doc/hook/gender_selector_min.bb | 1 - doc/hook/generate_map.bb | 1 - doc/hook/generate_named_map.bb | 1 - doc/hook/get_all_api_perms.bb | 1 - doc/hook/get_all_perms.bb | 1 - doc/hook/get_default_export_sections | 10 - doc/hook/get_features.bb | 1 - doc/hook/get_photo.bb | 14 - doc/hook/get_profile_photo.bb | 18 - doc/hook/get_role_perms.bb | 1 - doc/hook/global_permissions.bb | 1 - doc/hook/home_content.bb | 1 - doc/hook/home_init.bb | 1 - doc/hook/hostxrd.bb | 1 - doc/hook/html2bbcode.bb | 1 - doc/hook/identity_basic_export.bb | 10 - doc/hook/import_author_xchan.bb | 1 - doc/hook/import_channel.bb | 1 - doc/hook/import_directory_profile.bb | 1 - doc/hook/import_xchan.bb | 1 - doc/hook/item_custom.bb | 24 - doc/hook/item_photo_menu.bb | 1 - doc/hook/item_store.bb | 1 - doc/hook/item_store_update.bb | 1 - doc/hook/item_stored.bb | 18 - doc/hook/item_stored_update.bb | 15 - doc/hook/item_translate.bb | 1 - doc/hook/jot_header_tpl_filter.bb | 5 - doc/hook/jot_networks.bb | 1 - doc/hook/jot_tool.bb | 1 - doc/hook/jot_tpl_filter.bb | 5 - doc/hook/legal_webbie.bb | 10 - doc/hook/legal_webbie_text.bb | 7 - doc/hook/load_pdl.bb | 1 - doc/hook/local_dir_update.bb | 1 - doc/hook/logged_in.bb | 1 - doc/hook/logger.bb | 16 - doc/hook/logging_out.bb | 1 - doc/hook/login_hook.bb | 1 - doc/hook/magic_auth.bb | 1 - doc/hook/magic_auth_openid_success.bb | 1 - doc/hook/magic_auth_success.bb | 1 - doc/hook/main_slider.bb | 1 - doc/hook/marital_selector.bb | 1 - doc/hook/marital_selector_min.bb | 1 - doc/hook/markdown_to_bb.bb | 5 - doc/hook/module_loaded.bb | 1 - doc/hook/module_mod_aftercontent.bb | 12 - doc/hook/module_mod_content.bb | 10 - doc/hook/module_mod_init.bb | 1 - doc/hook/module_mod_post.bb | 1 - doc/hook/mood_verbs.bb | 1 - doc/hook/nav.bb | 28 - doc/hook/network_content_init.bb | 1 - doc/hook/network_ping.bb | 1 - doc/hook/network_to_name.bb | 1 - doc/hook/notifier_end.bb | 1 - doc/hook/notifier_hub.bb | 1 - doc/hook/notifier_normal.bb | 1 - doc/hook/obj_verbs.bb | 1 - doc/hook/oembed_probe.bb | 1 - doc/hook/other_encapsulate.bb | 7 - doc/hook/other_unencapsulate.bb | 5 - doc/hook/page_content_top.bb | 1 - doc/hook/page_end.bb | 1 - doc/hook/page_header.bb | 1 - doc/hook/page_meta.bb | 13 - doc/hook/parse_atom.bb | 1 - doc/hook/parse_link.bb | 1 - doc/hook/pdl_selector.bb | 1 - doc/hook/perm_is_allowed.bb | 1 - doc/hook/permissions_create.bb | 1 - doc/hook/permissions_update.bb | 1 - doc/hook/permit_hook.bb | 0 doc/hook/personal_xrd.bb | 1 - doc/hook/photo_post_end.bb | 1 - doc/hook/photo_upload_begin.bb | 1 - doc/hook/photo_upload_end.bb | 1 - doc/hook/photo_upload_file.bb | 1 - doc/hook/photo_upload_form.bb | 1 - doc/hook/photo_view_filter.bb | 1 - doc/hook/poke_verbs.bb | 1 - doc/hook/post_local.bb | 1 - doc/hook/post_local_end.bb | 1 - doc/hook/post_local_start.bb | 1 - doc/hook/post_mail.bb | 1 - doc/hook/post_mail_end.bb | 1 - doc/hook/post_remote.bb | 1 - doc/hook/post_remote_end.bb | 1 - doc/hook/post_remote_update.bb | 1 - doc/hook/post_remote_update_end.bb | 1 - doc/hook/prepare_body.bb | 1 - doc/hook/prepare_body_final.bb | 1 - doc/hook/prepare_body_init.bb | 1 - doc/hook/privacygroup_extras.bb | 12 - doc/hook/privacygroup_extras_drop.bb | 11 - doc/hook/privacygroup_extras_post.bb | 11 - doc/hook/proc_run.bb | 1 - doc/hook/process_channel_sync_delivery.bb | 1 - doc/hook/profile_advanced.bb | 1 - doc/hook/profile_edit.bb | 1 - doc/hook/profile_photo_content_end.bb | 1 - doc/hook/profile_post.bb | 1 - doc/hook/profile_sidebar.bb | 1 - doc/hook/profile_sidebar_enter.bb | 1 - doc/hook/register_account.bb | 1 - doc/hook/render_location.bb | 1 - doc/hook/replace_macros.bb | 1 - doc/hook/reverse_magic_auth.bb | 1 - doc/hook/settings_form.bb | 1 - doc/hook/settings_post.bb | 1 - doc/hook/sexpref_selector.bb | 1 - doc/hook/sexpref_selector_min.bb | 1 - doc/hook/smilie.bb | 19 - doc/hook/status_editor.bb | 31 - doc/hook/stream_item.bb | 13 - doc/hook/system_app_installed_filter.bb | 18 - doc/hook/tagged.bb | 16 - doc/hook/update_unseen.bb | 9 - doc/hook/validate_channelname.bb | 23 - doc/hook/webfinger.bb | 1 - doc/hook/well_known.bb | 1 - doc/hook/wiki_preprocess.bb | 11 - doc/hook/zid.bb | 1 - doc/hook/zid_init.bb | 1 - doc/hook/zot_best_algorithm.bb | 3 - doc/hook/zot_finger.bb | 1 - doc/hooklist.bb | 698 ------------- doc/hooks.html | 1 - doc/intro_for_developers.bb | 113 --- doc/macros/addons_footer.bb | 2 - doc/macros/cloud_footer.bb | 2 - doc/macros/de/addons_footer.bb | 2 - doc/macros/de/cloud_footer.bb | 2 - doc/macros/de/main_footer.bb | 1 - doc/macros/de/troubleshooting_footer.bb | 2 - doc/macros/main_footer.bb | 1 - doc/macros/pl/addons_footer.bb | 2 - doc/macros/pl/cloud_footer.bb | 2 - doc/macros/pl/main_footer.bb | 1 - doc/macros/pl/troubleshooting_footer.bb | 2 - doc/macros/troubleshooting_footer.bb | 2 - doc/member/assets/qr_text_to_post.png | Bin 273 -> 0 bytes doc/member/assets/zat_dialog.png | Bin 81837 -> 0 bytes doc/member/bbcode.html | 337 ------ doc/member/member_faq.bb | 10 - doc/member/member_guide.bb | 1068 -------------------- doc/plugins.bb | 312 ------ doc/problems-following-an-update.bb | 38 - doc/red2pi.bb | 342 ------- doc/roadmap.bb | 28 - doc/schema_development.bb | 78 -- doc/schemaspy_hubzilla/zot.meta.xml | 283 ------ doc/sql_conventions.bb | 91 -- doc/toc.html | 75 -- ...38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png | Bin 249151 -> 0 bytes ...035c441631745d16acdb7a44e50d148256c8ad26a67.png | Bin 293314 -> 0 bytes ...7cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png | Bin 178913 -> 0 bytes ...1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png | Bin 43797 -> 0 bytes ...dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png | Bin 46752 -> 0 bytes ...0329db6c3814e2975979aff12f873f43d81724c5e61.png | Bin 257211 -> 0 bytes ...4fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png | Bin 91478 -> 0 bytes ...515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png | Bin 293611 -> 0 bytes ...7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png | Bin 318766 -> 0 bytes ...999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png | Bin 298857 -> 0 bytes ...f5630e921756f825ee00f8ee464d3ef9fed971d2852.png | Bin 532838 -> 0 bytes ...d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png | Bin 137827 -> 0 bytes ...3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png | Bin 466641 -> 0 bytes ...2d2a849412044cc6a0f8aebeac289d28786f2649d24.png | Bin 240495 -> 0 bytes ...e665961d35affbd053368056f562c58200fb41027b0.png | Bin 665755 -> 0 bytes ...7bb6092c3240b291eca8afa73133b3ac03b86f3302d.png | Bin 324092 -> 0 bytes ...915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png | Bin 466584 -> 0 bytes ...24af42055f0f24ed5e81ba622aca8cac576ccf5930e.png | Bin 155763 -> 0 bytes ...37f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png | Bin 134643 -> 0 bytes ...27df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png | Bin 306069 -> 0 bytes ...2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png | Bin 57185 -> 0 bytes ...3fa39b2084c16a8410de1f7a6559633435817444aef.png | Bin 255688 -> 0 bytes ...4bde52432fdc7b39692a094559aa504de99352940b1.png | Bin 83265 -> 0 bytes ...ce90a60fc416415271d9c51b81ad2a950fb0157222a.png | Bin 264916 -> 0 bytes ...6f353514c907b3fdfe019918fc5553bb3f31388a36f.png | Bin 68194 -> 0 bytes ...de9048cd14b417c0d76de17af476be5f296b78d70e9.png | Bin 99210 -> 0 bytes doc/tutorials/personal_channel.html | 162 --- include/help.php | 197 ---- tests/unit/Module/HelpTest.php | 188 ++++ tests/unit/Module/SetupTest.php | 74 ++ tests/unit/Module/TestCase.php | 74 ++ tests/unit/Widget/HelpindexTest.php | 80 ++ tests/unit/includes/LanguageTest.php | 48 - view/tpl/help.tpl | 8 +- view/tpl/widget.tpl | 10 + 1073 files changed, 16815 insertions(+), 16495 deletions(-) create mode 100644 Zotlabs/Lib/Traits/HelpHelper.php delete mode 100644 doc/AdvancedSearch.md delete mode 100644 doc/Comparison-of-activity-stream-networks.md delete mode 100644 doc/Creating-Templates.md delete mode 100644 doc/DerivedTheme1.md delete mode 100644 doc/Developers.md delete mode 100644 doc/Features.md delete mode 100644 doc/Hubzilla_on_OpenShift.bb delete mode 100644 doc/Plugins.md delete mode 100644 doc/Primary-Directory.md delete mode 100644 doc/Remove-Account.md delete mode 100644 doc/Schema-development.md delete mode 100644 doc/TermsOfService.md delete mode 100644 doc/Translations.md delete mode 100644 doc/Widgets.md delete mode 100644 doc/Zot---A-High-Level-Overview.md delete mode 100644 doc/about/about.bb delete mode 100644 doc/about/about_hub.bb delete mode 100644 doc/about/project.bb delete mode 100644 doc/accounts_profiles_channels_basics.bb delete mode 100644 doc/acl_dialog_post.html delete mode 100644 doc/addons.bb delete mode 100644 doc/addons_gnusocial.bb delete mode 100644 doc/admin/administrator_guide.md delete mode 100644 doc/admin/hub_snapshots.md delete mode 100644 doc/admin/zarlog_msgs.md delete mode 100644 doc/admins.bb delete mode 100644 doc/api/api_albums.md delete mode 100644 doc/api/api_filedata.md delete mode 100644 doc/api/api_files.md delete mode 100644 doc/api/api_functions.bb delete mode 100644 doc/api/api_group_members.md delete mode 100644 doc/api/api_item_update.md delete mode 100644 doc/api/api_posting.bb delete mode 100644 doc/api/api_xchan.md delete mode 100644 doc/api/group.md delete mode 100644 doc/api/statuses_update.bb delete mode 100644 doc/bugs.bb delete mode 100644 doc/campaign.bb delete mode 100644 doc/checking_account_quota_usage.bb delete mode 100644 doc/comanche.bb delete mode 100644 doc/context/de/admin/logs/help.html delete mode 100644 doc/context/de/admin/queue/help.html delete mode 100644 doc/context/de/admin/security/help.html delete mode 100644 doc/context/de/appman/help.html delete mode 100644 doc/context/de/apps/edit/help.html delete mode 100644 doc/context/de/apps/help.html delete mode 100644 doc/context/de/channel/help.html delete mode 100644 doc/context/de/chat/help.html delete mode 100644 doc/context/de/cloud/help.html delete mode 100644 doc/context/de/connections/help.html delete mode 100644 doc/context/de/connections/ifpending/help.html delete mode 100644 doc/context/de/events/help.html delete mode 100644 doc/context/de/mail/help.html delete mode 100644 doc/context/de/network/help.html delete mode 100644 doc/context/de/photos/help.html delete mode 100644 doc/context/de/profile/help.html delete mode 100644 doc/context/de/register/help.html delete mode 100644 doc/context/de/settings/account/help.html delete mode 100644 doc/context/de/settings/channel/help.html delete mode 100644 doc/context/de/settings/features/help.html delete mode 100644 doc/context/de/settings/tokens/help.html delete mode 100644 doc/context/de/wiki/help.html delete mode 100644 doc/context/en/admin/addons/assets/addon_repo_gui_1.png delete mode 100644 doc/context/en/admin/addons/help.html delete mode 100644 doc/context/en/admin/logs/help.html delete mode 100644 doc/context/en/admin/queue/help.html delete mode 100644 doc/context/en/admin/security/help.html delete mode 100644 doc/context/en/appman/help.html delete mode 100644 doc/context/en/apps/edit/help.html delete mode 100644 doc/context/en/apps/help.html delete mode 100644 doc/context/en/cards/help.html delete mode 100644 doc/context/en/channel/help.html delete mode 100644 doc/context/en/chat/help.html delete mode 100644 doc/context/en/cloud/help.html delete mode 100644 doc/context/en/connections/help.html delete mode 100644 doc/context/en/connections/ifpending/help.html delete mode 100644 doc/context/en/connedit/help.html delete mode 100644 doc/context/en/events/help.html delete mode 100644 doc/context/en/mail/help.html delete mode 100644 doc/context/en/network/help.html delete mode 100644 doc/context/en/photos/help.html delete mode 100644 doc/context/en/profile/help.html delete mode 100644 doc/context/en/profiles/help.html delete mode 100644 doc/context/en/register/help.html delete mode 100644 doc/context/en/settings/account/help.html delete mode 100644 doc/context/en/settings/channel/help.html delete mode 100644 doc/context/en/settings/features/help.html delete mode 100644 doc/context/en/settings/tokens/help.html delete mode 100644 doc/context/en/webpages/help.html delete mode 100644 doc/context/en/wiki/help.html delete mode 120000 doc/context/es delete mode 100644 doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png delete mode 100644 doc/context/es-es/admin/addons/help.html delete mode 100644 doc/context/es-es/admin/logs/help.html delete mode 100644 doc/context/es-es/admin/queue/help.html delete mode 100644 doc/context/es-es/admin/security/help.html delete mode 100644 doc/context/es-es/appman/help.html delete mode 100644 doc/context/es-es/apps/edit/help.html delete mode 100644 doc/context/es-es/apps/help.html delete mode 100644 doc/context/es-es/articles/help.html delete mode 100644 doc/context/es-es/cards/help.html delete mode 100644 doc/context/es-es/channel/help.html delete mode 100644 doc/context/es-es/chat/help.html delete mode 100644 doc/context/es-es/cloud/help.html delete mode 100644 doc/context/es-es/connections/help.html delete mode 100644 doc/context/es-es/connections/ifpending/help.html delete mode 100644 doc/context/es-es/connedit/help.html delete mode 100644 doc/context/es-es/events/help.html delete mode 100644 doc/context/es-es/mail/help.html delete mode 100644 doc/context/es-es/network/help.html delete mode 100644 doc/context/es-es/photos/help.html delete mode 100644 doc/context/es-es/profile/help.html delete mode 100644 doc/context/es-es/profiles/help.html delete mode 100644 doc/context/es-es/settings/account/help.html delete mode 100644 doc/context/es-es/settings/channel/help.html delete mode 100644 doc/context/es-es/settings/features/help.html delete mode 100644 doc/context/es-es/settings/tokens/help.html delete mode 100644 doc/context/es-es/webpages/help.html delete mode 100644 doc/context/es-es/wiki/help.html delete mode 100644 doc/context/fr/admin/logs/help.html delete mode 100644 doc/context/fr/admin/queue/help.html delete mode 100644 doc/context/fr/appman/help.html delete mode 100644 doc/context/fr/apps/edit/index.html delete mode 100644 doc/context/fr/apps/help.html delete mode 100644 doc/context/fr/cards/help.html delete mode 100644 doc/context/fr/channel/help.html delete mode 100644 doc/context/fr/chat/help.html delete mode 100644 doc/context/fr/cloud/help.html delete mode 100644 doc/context/fr/connections/help.html delete mode 100644 doc/context/fr/connections/ifpending/help.html delete mode 100644 doc/context/fr/connedit/help.html delete mode 100644 doc/context/fr/events/help.html delete mode 100644 doc/context/fr/mail/help.html delete mode 100644 doc/context/fr/photos/help.html delete mode 100644 doc/context/fr/profile/help.html delete mode 100644 doc/context/fr/settings/account/help.html delete mode 100644 doc/context/fr/settings/channel/help.html delete mode 100644 doc/context/fr/settings/features/help.html delete mode 100644 doc/context/fr/settings/tokens delete mode 100644 doc/context/fr/webpages/help.html delete mode 100644 doc/context/fr/wiki/help.html delete mode 100644 doc/context/it/wiki/help.html delete mode 100644 doc/context/pl/admin/addons/assets/addon_repo_gui_1.png delete mode 100644 doc/context/pl/admin/addons/help.html delete mode 100644 doc/context/pl/admin/logs/help.html delete mode 100644 doc/context/pl/admin/queue/help.html delete mode 100644 doc/context/pl/admin/security/help.html delete mode 100644 doc/context/pl/appman/help.html delete mode 100644 doc/context/pl/apps/edit/help.html delete mode 100644 doc/context/pl/apps/help.html delete mode 100644 doc/context/pl/cards/help.html delete mode 100644 doc/context/pl/channel/help.html delete mode 100644 doc/context/pl/chat/help.html delete mode 100644 doc/context/pl/cloud/help.html delete mode 100644 doc/context/pl/connections/help.html delete mode 100644 doc/context/pl/connections/ifpending/help.html delete mode 100644 doc/context/pl/connedit/help.html delete mode 100644 doc/context/pl/events/help.html delete mode 100644 doc/context/pl/mail/help.html delete mode 100644 doc/context/pl/network/help.html delete mode 100644 doc/context/pl/photos/help.html delete mode 100644 doc/context/pl/profile/help.html delete mode 100644 doc/context/pl/profiles/help.html delete mode 100644 doc/context/pl/register/help.html delete mode 100644 doc/context/pl/settings/account/help.html delete mode 100644 doc/context/pl/settings/channel/help.html delete mode 100644 doc/context/pl/settings/features/help.html delete mode 100644 doc/context/pl/settings/tokens/help.html delete mode 100644 doc/context/pl/webpages/help.html delete mode 100644 doc/context/pl/wiki/help.html delete mode 100644 doc/context/ru/cards/help.html delete mode 100644 doc/context/ru/connections/help.html delete mode 100644 doc/context/ru/network/help.html delete mode 100644 doc/database.bb delete mode 100644 doc/database/db_abook.bb delete mode 100644 doc/database/db_account.bb delete mode 100644 doc/database/db_addon.bb delete mode 100644 doc/database/db_app.bb delete mode 100644 doc/database/db_attach.bb delete mode 100644 doc/database/db_auth_codes.bb delete mode 100644 doc/database/db_cache.bb delete mode 100644 doc/database/db_channel.bb delete mode 100644 doc/database/db_chat.bb delete mode 100644 doc/database/db_chatpresence.bb delete mode 100644 doc/database/db_chatroom.bb delete mode 100644 doc/database/db_clients.bb delete mode 100644 doc/database/db_config.bb delete mode 100644 doc/database/db_conv.bb delete mode 100644 doc/database/db_event.bb delete mode 100644 doc/database/db_fcontact.bb delete mode 100644 doc/database/db_ffinder.bb delete mode 100644 doc/database/db_fserver.bb delete mode 100644 doc/database/db_fsuggest.bb delete mode 100644 doc/database/db_hook.bb delete mode 100644 doc/database/db_hubloc.bb delete mode 100644 doc/database/db_issue.bb delete mode 100644 doc/database/db_item.bb delete mode 100644 doc/database/db_item_id.bb delete mode 100644 doc/database/db_likes.bb delete mode 100644 doc/database/db_mail.bb delete mode 100644 doc/database/db_menu.bb delete mode 100644 doc/database/db_menu_item.bb delete mode 100644 doc/database/db_notify.bb delete mode 100644 doc/database/db_obj.bb delete mode 100644 doc/database/db_outq.bb delete mode 100644 doc/database/db_pconfig.bb delete mode 100644 doc/database/db_pgrp.bb delete mode 100644 doc/database/db_pgrp_member.bb delete mode 100644 doc/database/db_photo.bb delete mode 100644 doc/database/db_poll.bb delete mode 100644 doc/database/db_poll_elm.bb delete mode 100644 doc/database/db_profdef.bb delete mode 100644 doc/database/db_profext.bb delete mode 100644 doc/database/db_profile.bb delete mode 100644 doc/database/db_profile_check.bb delete mode 100644 doc/database/db_register.bb delete mode 100644 doc/database/db_session.bb delete mode 100644 doc/database/db_shares.bb delete mode 100644 doc/database/db_sign.bb delete mode 100644 doc/database/db_site.bb delete mode 100644 doc/database/db_source.bb delete mode 100644 doc/database/db_spam.bb delete mode 100644 doc/database/db_sys_perms.bb delete mode 100644 doc/database/db_term.bb delete mode 100644 doc/database/db_tokens.bb delete mode 100644 doc/database/db_updates.bb delete mode 100644 doc/database/db_verify.bb delete mode 100644 doc/database/db_vote.bb delete mode 100644 doc/database/db_xchan.bb delete mode 100644 doc/database/db_xchat.bb delete mode 100644 doc/database/db_xconfig.bb delete mode 100644 doc/database/db_xign.bb delete mode 100644 doc/database/db_xlink.bb delete mode 100644 doc/database/db_xprof.bb delete mode 100644 doc/database/db_xtag.bb delete mode 100644 doc/dev-function-overview.md delete mode 100644 doc/dev_beginner.bb delete mode 100644 doc/develop.bb delete mode 100644 doc/developer/api_zot.bb delete mode 100644 doc/developer/covenant.bb delete mode 100644 doc/developer/developer_guide.bb delete mode 100644 doc/developer/testing.md delete mode 100644 doc/developer/unorganized.md delete mode 100644 doc/developer/zot_protocol.bb delete mode 100644 doc/developer_function_primer.bb delete mode 100644 doc/developers.bb delete mode 100644 doc/diaspora_compat.bb delete mode 100644 doc/directories.bb delete mode 100644 doc/dnt-policy.txt delete mode 100644 doc/doco.bb create mode 100644 doc/en/AdvancedSearch.md create mode 100644 doc/en/Comparison-of-activity-stream-networks.md create mode 100644 doc/en/Creating-Templates.md create mode 100644 doc/en/DerivedTheme1.md create mode 100644 doc/en/Developers.md create mode 100644 doc/en/Features.md create mode 100644 doc/en/Hubzilla_on_OpenShift.bb create mode 100644 doc/en/Plugins.md create mode 100644 doc/en/Primary-Directory.md create mode 100644 doc/en/Remove-Account.md create mode 100644 doc/en/Schema-development.md create mode 100644 doc/en/TermsOfService.md create mode 100644 doc/en/Translations.md create mode 100644 doc/en/Widgets.md create mode 100644 doc/en/Zot---A-High-Level-Overview.md create mode 100644 doc/en/about/about.bb create mode 100644 doc/en/about/about_hub.bb create mode 100644 doc/en/about/project.bb create mode 100644 doc/en/accounts_profiles_channels_basics.bb create mode 100644 doc/en/acl_dialog_post.html create mode 100644 doc/en/addons.bb create mode 100644 doc/en/addons_gnusocial.bb create mode 100644 doc/en/admin/administrator_guide.md create mode 100644 doc/en/admin/hub_snapshots.md create mode 100644 doc/en/admin/zarlog_msgs.md create mode 100644 doc/en/admins.bb create mode 100644 doc/en/api/api_albums.md create mode 100644 doc/en/api/api_filedata.md create mode 100644 doc/en/api/api_files.md create mode 100644 doc/en/api/api_functions.bb create mode 100644 doc/en/api/api_group_members.md create mode 100644 doc/en/api/api_item_update.md create mode 100644 doc/en/api/api_posting.bb create mode 100644 doc/en/api/api_xchan.md create mode 100644 doc/en/api/group.md create mode 100644 doc/en/api/statuses_update.bb create mode 100644 doc/en/bugs.bb create mode 100644 doc/en/campaign.bb create mode 100644 doc/en/checking_account_quota_usage.bb create mode 100644 doc/en/comanche.bb create mode 100644 doc/en/context/de/admin/logs/help.html create mode 100644 doc/en/context/de/admin/queue/help.html create mode 100644 doc/en/context/de/admin/security/help.html create mode 100644 doc/en/context/de/appman/help.html create mode 100644 doc/en/context/de/channel/help.html create mode 100644 doc/en/context/de/chat/help.html create mode 100644 doc/en/context/de/cloud/help.html create mode 100644 doc/en/context/de/connections/help.html create mode 100644 doc/en/context/de/connections/ifpending/help.html create mode 100644 doc/en/context/de/events/help.html create mode 100644 doc/en/context/de/mail/help.html create mode 100644 doc/en/context/de/network/help.html create mode 100644 doc/en/context/de/photos/help.html create mode 100644 doc/en/context/de/profile/help.html create mode 100644 doc/en/context/de/register/help.html create mode 100644 doc/en/context/de/settings/account/help.html create mode 100644 doc/en/context/de/settings/channel/help.html create mode 100644 doc/en/context/de/settings/features/help.html create mode 100644 doc/en/context/de/settings/tokens/help.html create mode 100644 doc/en/context/de/wiki/help.html create mode 100644 doc/en/context/en/admin/addons/assets/addon_repo_gui_1.png create mode 100644 doc/en/context/en/admin/addons/help.html create mode 100644 doc/en/context/en/admin/logs/help.html create mode 100644 doc/en/context/en/admin/queue/help.html create mode 100644 doc/en/context/en/admin/security/help.html create mode 100644 doc/en/context/en/appman/help.html create mode 100644 doc/en/context/en/cards/help.html create mode 100644 doc/en/context/en/channel/help.html create mode 100644 doc/en/context/en/chat/help.html create mode 100644 doc/en/context/en/cloud/help.html create mode 100644 doc/en/context/en/connections/help.html create mode 100644 doc/en/context/en/connections/ifpending/help.html create mode 100644 doc/en/context/en/connedit/help.html create mode 100644 doc/en/context/en/events/help.html create mode 100644 doc/en/context/en/mail/help.html create mode 100644 doc/en/context/en/network/help.html create mode 100644 doc/en/context/en/photos/help.html create mode 100644 doc/en/context/en/profile/help.html create mode 100644 doc/en/context/en/profiles/help.html create mode 100644 doc/en/context/en/register/help.html create mode 100644 doc/en/context/en/settings/account/help.html create mode 100644 doc/en/context/en/settings/channel/help.html create mode 100644 doc/en/context/en/settings/features/help.html create mode 100644 doc/en/context/en/settings/tokens/help.html create mode 100644 doc/en/context/en/webpages/help.html create mode 100644 doc/en/context/en/wiki/help.html create mode 120000 doc/en/context/es create mode 100644 doc/en/context/es-es/admin/addons/assets/addon_repo_gui_1.png create mode 100644 doc/en/context/es-es/admin/addons/help.html create mode 100644 doc/en/context/es-es/admin/logs/help.html create mode 100644 doc/en/context/es-es/admin/queue/help.html create mode 100644 doc/en/context/es-es/admin/security/help.html create mode 100644 doc/en/context/es-es/appman/help.html create mode 100644 doc/en/context/es-es/articles/help.html create mode 100644 doc/en/context/es-es/cards/help.html create mode 100644 doc/en/context/es-es/channel/help.html create mode 100644 doc/en/context/es-es/chat/help.html create mode 100644 doc/en/context/es-es/cloud/help.html create mode 100644 doc/en/context/es-es/connections/help.html create mode 100644 doc/en/context/es-es/connections/ifpending/help.html create mode 100644 doc/en/context/es-es/connedit/help.html create mode 100644 doc/en/context/es-es/events/help.html create mode 100644 doc/en/context/es-es/mail/help.html create mode 100644 doc/en/context/es-es/network/help.html create mode 100644 doc/en/context/es-es/photos/help.html create mode 100644 doc/en/context/es-es/profile/help.html create mode 100644 doc/en/context/es-es/profiles/help.html create mode 100644 doc/en/context/es-es/settings/account/help.html create mode 100644 doc/en/context/es-es/settings/channel/help.html create mode 100644 doc/en/context/es-es/settings/features/help.html create mode 100644 doc/en/context/es-es/settings/tokens/help.html create mode 100644 doc/en/context/es-es/webpages/help.html create mode 100644 doc/en/context/es-es/wiki/help.html create mode 100644 doc/en/context/fr/admin/logs/help.html create mode 100644 doc/en/context/fr/admin/queue/help.html create mode 100644 doc/en/context/fr/appman/help.html create mode 100644 doc/en/context/fr/cards/help.html create mode 100644 doc/en/context/fr/channel/help.html create mode 100644 doc/en/context/fr/chat/help.html create mode 100644 doc/en/context/fr/cloud/help.html create mode 100644 doc/en/context/fr/connections/help.html create mode 100644 doc/en/context/fr/connections/ifpending/help.html create mode 100644 doc/en/context/fr/connedit/help.html create mode 100644 doc/en/context/fr/events/help.html create mode 100644 doc/en/context/fr/mail/help.html create mode 100644 doc/en/context/fr/photos/help.html create mode 100644 doc/en/context/fr/profile/help.html create mode 100644 doc/en/context/fr/settings/account/help.html create mode 100644 doc/en/context/fr/settings/channel/help.html create mode 100644 doc/en/context/fr/settings/features/help.html create mode 100644 doc/en/context/fr/settings/tokens create mode 100644 doc/en/context/fr/webpages/help.html create mode 100644 doc/en/context/fr/wiki/help.html create mode 100644 doc/en/context/it/wiki/help.html create mode 100644 doc/en/context/pl/admin/addons/assets/addon_repo_gui_1.png create mode 100644 doc/en/context/pl/admin/addons/help.html create mode 100644 doc/en/context/pl/admin/logs/help.html create mode 100644 doc/en/context/pl/admin/queue/help.html create mode 100644 doc/en/context/pl/admin/security/help.html create mode 100644 doc/en/context/pl/appman/help.html create mode 100644 doc/en/context/pl/cards/help.html create mode 100644 doc/en/context/pl/channel/help.html create mode 100644 doc/en/context/pl/chat/help.html create mode 100644 doc/en/context/pl/cloud/help.html create mode 100644 doc/en/context/pl/connections/help.html create mode 100644 doc/en/context/pl/connections/ifpending/help.html create mode 100644 doc/en/context/pl/connedit/help.html create mode 100644 doc/en/context/pl/events/help.html create mode 100644 doc/en/context/pl/mail/help.html create mode 100644 doc/en/context/pl/network/help.html create mode 100644 doc/en/context/pl/photos/help.html create mode 100644 doc/en/context/pl/profile/help.html create mode 100644 doc/en/context/pl/profiles/help.html create mode 100644 doc/en/context/pl/register/help.html create mode 100644 doc/en/context/pl/settings/account/help.html create mode 100644 doc/en/context/pl/settings/channel/help.html create mode 100644 doc/en/context/pl/settings/features/help.html create mode 100644 doc/en/context/pl/settings/tokens/help.html create mode 100644 doc/en/context/pl/webpages/help.html create mode 100644 doc/en/context/pl/wiki/help.html create mode 100644 doc/en/context/ru/cards/help.html create mode 100644 doc/en/context/ru/connections/help.html create mode 100644 doc/en/context/ru/network/help.html create mode 100644 doc/en/database.bb create mode 100644 doc/en/database/db_abook.bb create mode 100644 doc/en/database/db_account.bb create mode 100644 doc/en/database/db_addon.bb create mode 100644 doc/en/database/db_app.bb create mode 100644 doc/en/database/db_attach.bb create mode 100644 doc/en/database/db_auth_codes.bb create mode 100644 doc/en/database/db_cache.bb create mode 100644 doc/en/database/db_channel.bb create mode 100644 doc/en/database/db_chat.bb create mode 100644 doc/en/database/db_chatpresence.bb create mode 100644 doc/en/database/db_chatroom.bb create mode 100644 doc/en/database/db_clients.bb create mode 100644 doc/en/database/db_config.bb create mode 100644 doc/en/database/db_conv.bb create mode 100644 doc/en/database/db_event.bb create mode 100644 doc/en/database/db_fcontact.bb create mode 100644 doc/en/database/db_ffinder.bb create mode 100644 doc/en/database/db_fserver.bb create mode 100644 doc/en/database/db_fsuggest.bb create mode 100644 doc/en/database/db_hook.bb create mode 100644 doc/en/database/db_hubloc.bb create mode 100644 doc/en/database/db_issue.bb create mode 100644 doc/en/database/db_item.bb create mode 100644 doc/en/database/db_item_id.bb create mode 100644 doc/en/database/db_likes.bb create mode 100644 doc/en/database/db_mail.bb create mode 100644 doc/en/database/db_menu.bb create mode 100644 doc/en/database/db_menu_item.bb create mode 100644 doc/en/database/db_notify.bb create mode 100644 doc/en/database/db_obj.bb create mode 100644 doc/en/database/db_outq.bb create mode 100644 doc/en/database/db_pconfig.bb create mode 100644 doc/en/database/db_pgrp.bb create mode 100644 doc/en/database/db_pgrp_member.bb create mode 100644 doc/en/database/db_photo.bb create mode 100644 doc/en/database/db_poll.bb create mode 100644 doc/en/database/db_poll_elm.bb create mode 100644 doc/en/database/db_profdef.bb create mode 100644 doc/en/database/db_profext.bb create mode 100644 doc/en/database/db_profile.bb create mode 100644 doc/en/database/db_profile_check.bb create mode 100644 doc/en/database/db_register.bb create mode 100644 doc/en/database/db_session.bb create mode 100644 doc/en/database/db_shares.bb create mode 100644 doc/en/database/db_sign.bb create mode 100644 doc/en/database/db_site.bb create mode 100644 doc/en/database/db_source.bb create mode 100644 doc/en/database/db_spam.bb create mode 100644 doc/en/database/db_sys_perms.bb create mode 100644 doc/en/database/db_term.bb create mode 100644 doc/en/database/db_tokens.bb create mode 100644 doc/en/database/db_updates.bb create mode 100644 doc/en/database/db_verify.bb create mode 100644 doc/en/database/db_vote.bb create mode 100644 doc/en/database/db_xchan.bb create mode 100644 doc/en/database/db_xchat.bb create mode 100644 doc/en/database/db_xconfig.bb create mode 100644 doc/en/database/db_xign.bb create mode 100644 doc/en/database/db_xlink.bb create mode 100644 doc/en/database/db_xprof.bb create mode 100644 doc/en/database/db_xtag.bb create mode 100644 doc/en/dev-function-overview.md create mode 100644 doc/en/dev_beginner.bb create mode 100644 doc/en/develop.bb create mode 100644 doc/en/developer/api_zot.bb create mode 100644 doc/en/developer/covenant.bb create mode 100644 doc/en/developer/developer_guide.bb create mode 100644 doc/en/developer/testing.md create mode 100644 doc/en/developer/unorganized.md create mode 100644 doc/en/developer/zot_protocol.bb create mode 100644 doc/en/developer_function_primer.bb create mode 100644 doc/en/developers.bb create mode 100644 doc/en/diaspora_compat.bb create mode 100644 doc/en/directories.bb create mode 100644 doc/en/dnt-policy.txt create mode 100644 doc/en/doco.bb create mode 100644 doc/en/encryption.bb create mode 100644 doc/en/external-resource-links.bb create mode 100644 doc/en/extra_features.bb create mode 100644 doc/en/faq_admins.bb create mode 100644 doc/en/feature/access_tokens.bb create mode 100644 doc/en/feature/additional/access.md create mode 100644 doc/en/feature/additional/composition.md create mode 100644 doc/en/feature/additional/filtering.md create mode 100644 doc/en/feature/additional/general.md create mode 100644 doc/en/feature/additional/overview.md create mode 100644 doc/en/feature/additional/posts.md create mode 100644 doc/en/federate.bb create mode 100644 doc/en/filesync.md create mode 100644 doc/en/first-post.bb create mode 100644 doc/en/gdpr1.md create mode 100644 doc/en/general.bb create mode 100644 doc/en/git_for_non_developers.bb create mode 100644 doc/en/hidden_configs.bb create mode 100644 doc/en/hook/about_hook.bb create mode 100644 doc/en/hook/accept_follow.bb create mode 100644 doc/en/hook/account_downgrade.bb create mode 100644 doc/en/hook/account_settings.bb create mode 100644 doc/en/hook/account_settings_post.bb create mode 100644 doc/en/hook/activity_decode_mapper.bb create mode 100644 doc/en/hook/activity_filter.bb create mode 100644 doc/en/hook/activity_mapper.bb create mode 100644 doc/en/hook/activity_obj_decode_mapper.bb create mode 100644 doc/en/hook/activity_obj_mapper.bb create mode 100644 doc/en/hook/activity_order.bb create mode 100644 doc/en/hook/activity_received.bb create mode 100644 doc/en/hook/addon_app_installed_filter.bb create mode 100644 doc/en/hook/affinity_labels.bb create mode 100644 doc/en/hook/api_perm_is_allowed.bb create mode 100644 doc/en/hook/app_destroy.bb create mode 100644 doc/en/hook/app_installed_filter.bb create mode 100644 doc/en/hook/atom_author.bb create mode 100644 doc/en/hook/atom_entry.bb create mode 100644 doc/en/hook/atom_feed.bb create mode 100644 doc/en/hook/atom_feed_end.bb create mode 100644 doc/en/hook/attach_delete.bb create mode 100644 doc/en/hook/attach_upload_file.bb create mode 100644 doc/en/hook/authenticate.bb create mode 100644 doc/en/hook/author_is_pmable.bb create mode 100644 doc/en/hook/bb2diaspora.bb create mode 100644 doc/en/hook/bbcode.bb create mode 100644 doc/en/hook/bbcode_filter.bb create mode 100644 doc/en/hook/build_pagehead.bb create mode 100644 doc/en/hook/can_comment_on_post.bb create mode 100644 doc/en/hook/change_channel.bb create mode 100644 doc/en/hook/channel_links.bb create mode 100644 doc/en/hook/channel_remove.bb create mode 100644 doc/en/hook/chat_message.bb create mode 100644 doc/en/hook/chat_post.bb create mode 100644 doc/en/hook/check_account_email.bb create mode 100644 doc/en/hook/check_account_invite.bb create mode 100644 doc/en/hook/check_account_password.bb create mode 100644 doc/en/hook/check_channelallowed.bb create mode 100644 doc/en/hook/check_siteallowed.bb create mode 100644 doc/en/hook/collect_public_recipients.bb create mode 100644 doc/en/hook/comments_are_now_closed.bb create mode 100644 doc/en/hook/connect_premium.bb create mode 100644 doc/en/hook/connection_remove.bb create mode 100644 doc/en/hook/connector_settings.bb create mode 100644 doc/en/hook/construct_page.bb create mode 100644 doc/en/hook/contact_block_end.bb create mode 100644 doc/en/hook/contact_edit.bb create mode 100644 doc/en/hook/contact_edit_post.bb create mode 100644 doc/en/hook/contact_select_options.bb create mode 100644 doc/en/hook/content_security_policy.bb create mode 100644 doc/en/hook/conversation_start.bb create mode 100644 doc/en/hook/create_identity.bb create mode 100644 doc/en/hook/cron.bb create mode 100644 doc/en/hook/cron_daily.bb create mode 100644 doc/en/hook/cron_weekly.bb create mode 100644 doc/en/hook/crypto_methods.bb create mode 100644 doc/en/hook/daemon_addon.bb create mode 100644 doc/en/hook/daemon_master_release.bb create mode 100644 doc/en/hook/directory_item.bb create mode 100644 doc/en/hook/discover_channel_webfinger.bb create mode 100644 doc/en/hook/display_item.bb create mode 100644 doc/en/hook/display_settings.bb create mode 100644 doc/en/hook/display_settings_post.bb create mode 100644 doc/en/hook/donate_contributors.bb create mode 100644 doc/en/hook/donate_plugin.bb create mode 100644 doc/en/hook/donate_sponsors.bb create mode 100644 doc/en/hook/dreport_is_storable.bb create mode 100644 doc/en/hook/dreport_process.bb create mode 100644 doc/en/hook/drop_item.bb create mode 100644 doc/en/hook/dropdown_extras.bb create mode 100644 doc/en/hook/encode_object.bb create mode 100644 doc/en/hook/enotify.bb create mode 100644 doc/en/hook/enotify_mail.bb create mode 100644 doc/en/hook/enotify_store.bb create mode 100644 doc/en/hook/event_created.bb create mode 100644 doc/en/hook/event_store_event.bb create mode 100644 doc/en/hook/event_updated.bb create mode 100644 doc/en/hook/externals_url_select.bb create mode 100644 doc/en/hook/feature_enabled.bb create mode 100644 doc/en/hook/feature_settings.bb create mode 100644 doc/en/hook/feature_settings_post.bb create mode 100644 doc/en/hook/fetch_and_store.bb create mode 100644 doc/en/hook/follow.bb create mode 100644 doc/en/hook/follow_allow.bb create mode 100644 doc/en/hook/gender_selector.bb create mode 100644 doc/en/hook/gender_selector_min.bb create mode 100644 doc/en/hook/generate_map.bb create mode 100644 doc/en/hook/generate_named_map.bb create mode 100644 doc/en/hook/get_all_api_perms.bb create mode 100644 doc/en/hook/get_all_perms.bb create mode 100644 doc/en/hook/get_default_export_sections create mode 100644 doc/en/hook/get_features.bb create mode 100644 doc/en/hook/get_photo.bb create mode 100644 doc/en/hook/get_profile_photo.bb create mode 100644 doc/en/hook/get_role_perms.bb create mode 100644 doc/en/hook/global_permissions.bb create mode 100644 doc/en/hook/home_content.bb create mode 100644 doc/en/hook/home_init.bb create mode 100644 doc/en/hook/hostxrd.bb create mode 100644 doc/en/hook/html2bbcode.bb create mode 100644 doc/en/hook/identity_basic_export.bb create mode 100644 doc/en/hook/import_author_xchan.bb create mode 100644 doc/en/hook/import_channel.bb create mode 100644 doc/en/hook/import_directory_profile.bb create mode 100644 doc/en/hook/import_xchan.bb create mode 100644 doc/en/hook/item_custom.bb create mode 100644 doc/en/hook/item_photo_menu.bb create mode 100644 doc/en/hook/item_store.bb create mode 100644 doc/en/hook/item_store_update.bb create mode 100644 doc/en/hook/item_stored.bb create mode 100644 doc/en/hook/item_stored_update.bb create mode 100644 doc/en/hook/item_translate.bb create mode 100644 doc/en/hook/jot_header_tpl_filter.bb create mode 100644 doc/en/hook/jot_networks.bb create mode 100644 doc/en/hook/jot_tool.bb create mode 100644 doc/en/hook/jot_tpl_filter.bb create mode 100644 doc/en/hook/legal_webbie.bb create mode 100644 doc/en/hook/legal_webbie_text.bb create mode 100644 doc/en/hook/load_pdl.bb create mode 100644 doc/en/hook/local_dir_update.bb create mode 100644 doc/en/hook/logged_in.bb create mode 100644 doc/en/hook/logger.bb create mode 100644 doc/en/hook/logging_out.bb create mode 100644 doc/en/hook/login_hook.bb create mode 100644 doc/en/hook/magic_auth.bb create mode 100644 doc/en/hook/magic_auth_openid_success.bb create mode 100644 doc/en/hook/magic_auth_success.bb create mode 100644 doc/en/hook/main_slider.bb create mode 100644 doc/en/hook/marital_selector.bb create mode 100644 doc/en/hook/marital_selector_min.bb create mode 100644 doc/en/hook/markdown_to_bb.bb create mode 100644 doc/en/hook/module_loaded.bb create mode 100644 doc/en/hook/module_mod_aftercontent.bb create mode 100644 doc/en/hook/module_mod_content.bb create mode 100644 doc/en/hook/module_mod_init.bb create mode 100644 doc/en/hook/module_mod_post.bb create mode 100644 doc/en/hook/mood_verbs.bb create mode 100644 doc/en/hook/nav.bb create mode 100644 doc/en/hook/network_content_init.bb create mode 100644 doc/en/hook/network_ping.bb create mode 100644 doc/en/hook/network_to_name.bb create mode 100644 doc/en/hook/notifier_end.bb create mode 100644 doc/en/hook/notifier_hub.bb create mode 100644 doc/en/hook/notifier_normal.bb create mode 100644 doc/en/hook/obj_verbs.bb create mode 100644 doc/en/hook/oembed_probe.bb create mode 100644 doc/en/hook/other_encapsulate.bb create mode 100644 doc/en/hook/other_unencapsulate.bb create mode 100644 doc/en/hook/page_content_top.bb create mode 100644 doc/en/hook/page_end.bb create mode 100644 doc/en/hook/page_header.bb create mode 100644 doc/en/hook/page_meta.bb create mode 100644 doc/en/hook/parse_atom.bb create mode 100644 doc/en/hook/parse_link.bb create mode 100644 doc/en/hook/pdl_selector.bb create mode 100644 doc/en/hook/perm_is_allowed.bb create mode 100644 doc/en/hook/permissions_create.bb create mode 100644 doc/en/hook/permissions_update.bb create mode 100644 doc/en/hook/permit_hook.bb create mode 100644 doc/en/hook/personal_xrd.bb create mode 100644 doc/en/hook/photo_post_end.bb create mode 100644 doc/en/hook/photo_upload_begin.bb create mode 100644 doc/en/hook/photo_upload_end.bb create mode 100644 doc/en/hook/photo_upload_file.bb create mode 100644 doc/en/hook/photo_upload_form.bb create mode 100644 doc/en/hook/photo_view_filter.bb create mode 100644 doc/en/hook/poke_verbs.bb create mode 100644 doc/en/hook/post_local.bb create mode 100644 doc/en/hook/post_local_end.bb create mode 100644 doc/en/hook/post_local_start.bb create mode 100644 doc/en/hook/post_mail.bb create mode 100644 doc/en/hook/post_mail_end.bb create mode 100644 doc/en/hook/post_remote.bb create mode 100644 doc/en/hook/post_remote_end.bb create mode 100644 doc/en/hook/post_remote_update.bb create mode 100644 doc/en/hook/post_remote_update_end.bb create mode 100644 doc/en/hook/prepare_body.bb create mode 100644 doc/en/hook/prepare_body_final.bb create mode 100644 doc/en/hook/prepare_body_init.bb create mode 100644 doc/en/hook/privacygroup_extras.bb create mode 100644 doc/en/hook/privacygroup_extras_drop.bb create mode 100644 doc/en/hook/privacygroup_extras_post.bb create mode 100644 doc/en/hook/proc_run.bb create mode 100644 doc/en/hook/process_channel_sync_delivery.bb create mode 100644 doc/en/hook/profile_advanced.bb create mode 100644 doc/en/hook/profile_edit.bb create mode 100644 doc/en/hook/profile_photo_content_end.bb create mode 100644 doc/en/hook/profile_post.bb create mode 100644 doc/en/hook/profile_sidebar.bb create mode 100644 doc/en/hook/profile_sidebar_enter.bb create mode 100644 doc/en/hook/register_account.bb create mode 100644 doc/en/hook/render_location.bb create mode 100644 doc/en/hook/replace_macros.bb create mode 100644 doc/en/hook/reverse_magic_auth.bb create mode 100644 doc/en/hook/settings_form.bb create mode 100644 doc/en/hook/settings_post.bb create mode 100644 doc/en/hook/sexpref_selector.bb create mode 100644 doc/en/hook/sexpref_selector_min.bb create mode 100644 doc/en/hook/smilie.bb create mode 100644 doc/en/hook/status_editor.bb create mode 100644 doc/en/hook/stream_item.bb create mode 100644 doc/en/hook/system_app_installed_filter.bb create mode 100644 doc/en/hook/tagged.bb create mode 100644 doc/en/hook/update_unseen.bb create mode 100644 doc/en/hook/validate_channelname.bb create mode 100644 doc/en/hook/webfinger.bb create mode 100644 doc/en/hook/well_known.bb create mode 100644 doc/en/hook/wiki_preprocess.bb create mode 100644 doc/en/hook/zid.bb create mode 100644 doc/en/hook/zid_init.bb create mode 100644 doc/en/hook/zot_best_algorithm.bb create mode 100644 doc/en/hook/zot_finger.bb create mode 100644 doc/en/hooklist.bb create mode 100644 doc/en/hooks.html create mode 100644 doc/en/intro_for_developers.bb create mode 100644 doc/en/macros/addons_footer.bb create mode 100644 doc/en/macros/cloud_footer.bb create mode 100644 doc/en/macros/de/addons_footer.bb create mode 100644 doc/en/macros/de/cloud_footer.bb create mode 100644 doc/en/macros/de/main_footer.bb create mode 100644 doc/en/macros/de/troubleshooting_footer.bb create mode 100644 doc/en/macros/main_footer.bb create mode 100644 doc/en/macros/pl/addons_footer.bb create mode 100644 doc/en/macros/pl/cloud_footer.bb create mode 100644 doc/en/macros/pl/main_footer.bb create mode 100644 doc/en/macros/pl/troubleshooting_footer.bb create mode 100644 doc/en/macros/troubleshooting_footer.bb create mode 100644 doc/en/member/assets/qr_text_to_post.png create mode 100644 doc/en/member/assets/zat_dialog.png create mode 100644 doc/en/member/bbcode.html create mode 100644 doc/en/member/member_faq.bb create mode 100644 doc/en/member/member_guide.bb create mode 100644 doc/en/plugins.bb create mode 100644 doc/en/problems-following-an-update.bb create mode 100644 doc/en/red2pi.bb create mode 100644 doc/en/roadmap.bb create mode 100644 doc/en/schema_development.bb create mode 100644 doc/en/schemaspy_hubzilla/zot.meta.xml create mode 100644 doc/en/sql_conventions.bb create mode 100644 doc/en/toc.html create mode 100644 doc/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png create mode 100644 doc/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png create mode 100644 doc/en/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png create mode 100644 doc/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png create mode 100644 doc/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png create mode 100644 doc/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png create mode 100644 doc/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png create mode 100644 doc/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png create mode 100644 doc/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png create mode 100644 doc/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png create mode 100644 doc/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png create mode 100644 doc/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png create mode 100644 doc/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png create mode 100644 doc/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png create mode 100644 doc/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png create mode 100644 doc/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png create mode 100644 doc/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png create mode 100644 doc/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png create mode 100644 doc/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png create mode 100644 doc/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png create mode 100644 doc/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png create mode 100644 doc/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png create mode 100644 doc/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png create mode 100644 doc/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png create mode 100644 doc/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png create mode 100644 doc/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png create mode 100644 doc/en/tutorials/personal_channel.html delete mode 100644 doc/encryption.bb delete mode 100644 doc/external-resource-links.bb delete mode 100644 doc/extra_features.bb delete mode 100644 doc/faq_admins.bb delete mode 100644 doc/feature/access_tokens.bb delete mode 100644 doc/feature/additional/access.md delete mode 100644 doc/feature/additional/composition.md delete mode 100644 doc/feature/additional/filtering.md delete mode 100644 doc/feature/additional/general.md delete mode 100644 doc/feature/additional/overview.md delete mode 100644 doc/feature/additional/posts.md delete mode 100644 doc/federate.bb delete mode 100644 doc/filesync.md delete mode 100644 doc/first-post.bb delete mode 100644 doc/gdpr1.md delete mode 100644 doc/general.bb delete mode 100644 doc/git_for_non_developers.bb delete mode 100644 doc/hidden_configs.bb delete mode 100644 doc/hook/about_hook.bb delete mode 100644 doc/hook/accept_follow.bb delete mode 100644 doc/hook/account_downgrade.bb delete mode 100644 doc/hook/account_settings.bb delete mode 100644 doc/hook/account_settings_post.bb delete mode 100644 doc/hook/activity_decode_mapper.bb delete mode 100644 doc/hook/activity_filter.bb delete mode 100644 doc/hook/activity_mapper.bb delete mode 100644 doc/hook/activity_obj_decode_mapper.bb delete mode 100644 doc/hook/activity_obj_mapper.bb delete mode 100644 doc/hook/activity_order.bb delete mode 100644 doc/hook/activity_received.bb delete mode 100644 doc/hook/addon_app_installed_filter.bb delete mode 100644 doc/hook/affinity_labels.bb delete mode 100644 doc/hook/api_perm_is_allowed.bb delete mode 100644 doc/hook/app_destroy.bb delete mode 100644 doc/hook/app_installed_filter.bb delete mode 100644 doc/hook/atom_author.bb delete mode 100644 doc/hook/atom_entry.bb delete mode 100644 doc/hook/atom_feed.bb delete mode 100644 doc/hook/atom_feed_end.bb delete mode 100644 doc/hook/attach_delete.bb delete mode 100644 doc/hook/attach_upload_file.bb delete mode 100644 doc/hook/authenticate.bb delete mode 100644 doc/hook/author_is_pmable.bb delete mode 100644 doc/hook/bb2diaspora.bb delete mode 100644 doc/hook/bbcode.bb delete mode 100644 doc/hook/bbcode_filter.bb delete mode 100644 doc/hook/build_pagehead.bb delete mode 100644 doc/hook/can_comment_on_post.bb delete mode 100644 doc/hook/change_channel.bb delete mode 100644 doc/hook/channel_links.bb delete mode 100644 doc/hook/channel_remove.bb delete mode 100644 doc/hook/chat_message.bb delete mode 100644 doc/hook/chat_post.bb delete mode 100644 doc/hook/check_account_email.bb delete mode 100644 doc/hook/check_account_invite.bb delete mode 100644 doc/hook/check_account_password.bb delete mode 100644 doc/hook/check_channelallowed.bb delete mode 100644 doc/hook/check_siteallowed.bb delete mode 100644 doc/hook/collect_public_recipients.bb delete mode 100644 doc/hook/comments_are_now_closed.bb delete mode 100644 doc/hook/connect_premium.bb delete mode 100644 doc/hook/connection_remove.bb delete mode 100644 doc/hook/connector_settings.bb delete mode 100644 doc/hook/construct_page.bb delete mode 100644 doc/hook/contact_block_end.bb delete mode 100644 doc/hook/contact_edit.bb delete mode 100644 doc/hook/contact_edit_post.bb delete mode 100644 doc/hook/contact_select_options.bb delete mode 100644 doc/hook/content_security_policy.bb delete mode 100644 doc/hook/conversation_start.bb delete mode 100644 doc/hook/create_identity.bb delete mode 100644 doc/hook/cron.bb delete mode 100644 doc/hook/cron_daily.bb delete mode 100644 doc/hook/cron_weekly.bb delete mode 100644 doc/hook/crypto_methods.bb delete mode 100644 doc/hook/daemon_addon.bb delete mode 100644 doc/hook/daemon_master_release.bb delete mode 100644 doc/hook/directory_item.bb delete mode 100644 doc/hook/discover_channel_webfinger.bb delete mode 100644 doc/hook/display_item.bb delete mode 100644 doc/hook/display_settings.bb delete mode 100644 doc/hook/display_settings_post.bb delete mode 100644 doc/hook/donate_contributors.bb delete mode 100644 doc/hook/donate_plugin.bb delete mode 100644 doc/hook/donate_sponsors.bb delete mode 100644 doc/hook/dreport_is_storable.bb delete mode 100644 doc/hook/dreport_process.bb delete mode 100644 doc/hook/drop_item.bb delete mode 100644 doc/hook/dropdown_extras.bb delete mode 100644 doc/hook/encode_object.bb delete mode 100644 doc/hook/enotify.bb delete mode 100644 doc/hook/enotify_mail.bb delete mode 100644 doc/hook/enotify_store.bb delete mode 100644 doc/hook/event_created.bb delete mode 100644 doc/hook/event_store_event.bb delete mode 100644 doc/hook/event_updated.bb delete mode 100644 doc/hook/externals_url_select.bb delete mode 100644 doc/hook/feature_enabled.bb delete mode 100644 doc/hook/feature_settings.bb delete mode 100644 doc/hook/feature_settings_post.bb delete mode 100644 doc/hook/fetch_and_store.bb delete mode 100644 doc/hook/follow.bb delete mode 100644 doc/hook/follow_allow.bb delete mode 100644 doc/hook/gender_selector.bb delete mode 100644 doc/hook/gender_selector_min.bb delete mode 100644 doc/hook/generate_map.bb delete mode 100644 doc/hook/generate_named_map.bb delete mode 100644 doc/hook/get_all_api_perms.bb delete mode 100644 doc/hook/get_all_perms.bb delete mode 100644 doc/hook/get_default_export_sections delete mode 100644 doc/hook/get_features.bb delete mode 100644 doc/hook/get_photo.bb delete mode 100644 doc/hook/get_profile_photo.bb delete mode 100644 doc/hook/get_role_perms.bb delete mode 100644 doc/hook/global_permissions.bb delete mode 100644 doc/hook/home_content.bb delete mode 100644 doc/hook/home_init.bb delete mode 100644 doc/hook/hostxrd.bb delete mode 100644 doc/hook/html2bbcode.bb delete mode 100644 doc/hook/identity_basic_export.bb delete mode 100644 doc/hook/import_author_xchan.bb delete mode 100644 doc/hook/import_channel.bb delete mode 100644 doc/hook/import_directory_profile.bb delete mode 100644 doc/hook/import_xchan.bb delete mode 100644 doc/hook/item_custom.bb delete mode 100644 doc/hook/item_photo_menu.bb delete mode 100644 doc/hook/item_store.bb delete mode 100644 doc/hook/item_store_update.bb delete mode 100644 doc/hook/item_stored.bb delete mode 100644 doc/hook/item_stored_update.bb delete mode 100644 doc/hook/item_translate.bb delete mode 100644 doc/hook/jot_header_tpl_filter.bb delete mode 100644 doc/hook/jot_networks.bb delete mode 100644 doc/hook/jot_tool.bb delete mode 100644 doc/hook/jot_tpl_filter.bb delete mode 100644 doc/hook/legal_webbie.bb delete mode 100644 doc/hook/legal_webbie_text.bb delete mode 100644 doc/hook/load_pdl.bb delete mode 100644 doc/hook/local_dir_update.bb delete mode 100644 doc/hook/logged_in.bb delete mode 100644 doc/hook/logger.bb delete mode 100644 doc/hook/logging_out.bb delete mode 100644 doc/hook/login_hook.bb delete mode 100644 doc/hook/magic_auth.bb delete mode 100644 doc/hook/magic_auth_openid_success.bb delete mode 100644 doc/hook/magic_auth_success.bb delete mode 100644 doc/hook/main_slider.bb delete mode 100644 doc/hook/marital_selector.bb delete mode 100644 doc/hook/marital_selector_min.bb delete mode 100644 doc/hook/markdown_to_bb.bb delete mode 100644 doc/hook/module_loaded.bb delete mode 100644 doc/hook/module_mod_aftercontent.bb delete mode 100644 doc/hook/module_mod_content.bb delete mode 100644 doc/hook/module_mod_init.bb delete mode 100644 doc/hook/module_mod_post.bb delete mode 100644 doc/hook/mood_verbs.bb delete mode 100644 doc/hook/nav.bb delete mode 100644 doc/hook/network_content_init.bb delete mode 100644 doc/hook/network_ping.bb delete mode 100644 doc/hook/network_to_name.bb delete mode 100644 doc/hook/notifier_end.bb delete mode 100644 doc/hook/notifier_hub.bb delete mode 100644 doc/hook/notifier_normal.bb delete mode 100644 doc/hook/obj_verbs.bb delete mode 100644 doc/hook/oembed_probe.bb delete mode 100644 doc/hook/other_encapsulate.bb delete mode 100644 doc/hook/other_unencapsulate.bb delete mode 100644 doc/hook/page_content_top.bb delete mode 100644 doc/hook/page_end.bb delete mode 100644 doc/hook/page_header.bb delete mode 100644 doc/hook/page_meta.bb delete mode 100644 doc/hook/parse_atom.bb delete mode 100644 doc/hook/parse_link.bb delete mode 100644 doc/hook/pdl_selector.bb delete mode 100644 doc/hook/perm_is_allowed.bb delete mode 100644 doc/hook/permissions_create.bb delete mode 100644 doc/hook/permissions_update.bb delete mode 100644 doc/hook/permit_hook.bb delete mode 100644 doc/hook/personal_xrd.bb delete mode 100644 doc/hook/photo_post_end.bb delete mode 100644 doc/hook/photo_upload_begin.bb delete mode 100644 doc/hook/photo_upload_end.bb delete mode 100644 doc/hook/photo_upload_file.bb delete mode 100644 doc/hook/photo_upload_form.bb delete mode 100644 doc/hook/photo_view_filter.bb delete mode 100644 doc/hook/poke_verbs.bb delete mode 100644 doc/hook/post_local.bb delete mode 100644 doc/hook/post_local_end.bb delete mode 100644 doc/hook/post_local_start.bb delete mode 100644 doc/hook/post_mail.bb delete mode 100644 doc/hook/post_mail_end.bb delete mode 100644 doc/hook/post_remote.bb delete mode 100644 doc/hook/post_remote_end.bb delete mode 100644 doc/hook/post_remote_update.bb delete mode 100644 doc/hook/post_remote_update_end.bb delete mode 100644 doc/hook/prepare_body.bb delete mode 100644 doc/hook/prepare_body_final.bb delete mode 100644 doc/hook/prepare_body_init.bb delete mode 100644 doc/hook/privacygroup_extras.bb delete mode 100644 doc/hook/privacygroup_extras_drop.bb delete mode 100644 doc/hook/privacygroup_extras_post.bb delete mode 100644 doc/hook/proc_run.bb delete mode 100644 doc/hook/process_channel_sync_delivery.bb delete mode 100644 doc/hook/profile_advanced.bb delete mode 100644 doc/hook/profile_edit.bb delete mode 100644 doc/hook/profile_photo_content_end.bb delete mode 100644 doc/hook/profile_post.bb delete mode 100644 doc/hook/profile_sidebar.bb delete mode 100644 doc/hook/profile_sidebar_enter.bb delete mode 100644 doc/hook/register_account.bb delete mode 100644 doc/hook/render_location.bb delete mode 100644 doc/hook/replace_macros.bb delete mode 100644 doc/hook/reverse_magic_auth.bb delete mode 100644 doc/hook/settings_form.bb delete mode 100644 doc/hook/settings_post.bb delete mode 100644 doc/hook/sexpref_selector.bb delete mode 100644 doc/hook/sexpref_selector_min.bb delete mode 100644 doc/hook/smilie.bb delete mode 100644 doc/hook/status_editor.bb delete mode 100644 doc/hook/stream_item.bb delete mode 100644 doc/hook/system_app_installed_filter.bb delete mode 100644 doc/hook/tagged.bb delete mode 100644 doc/hook/update_unseen.bb delete mode 100644 doc/hook/validate_channelname.bb delete mode 100644 doc/hook/webfinger.bb delete mode 100644 doc/hook/well_known.bb delete mode 100644 doc/hook/wiki_preprocess.bb delete mode 100644 doc/hook/zid.bb delete mode 100644 doc/hook/zid_init.bb delete mode 100644 doc/hook/zot_best_algorithm.bb delete mode 100644 doc/hook/zot_finger.bb delete mode 100644 doc/hooklist.bb delete mode 100644 doc/hooks.html delete mode 100644 doc/intro_for_developers.bb delete mode 100644 doc/macros/addons_footer.bb delete mode 100644 doc/macros/cloud_footer.bb delete mode 100644 doc/macros/de/addons_footer.bb delete mode 100644 doc/macros/de/cloud_footer.bb delete mode 100644 doc/macros/de/main_footer.bb delete mode 100644 doc/macros/de/troubleshooting_footer.bb delete mode 100644 doc/macros/main_footer.bb delete mode 100644 doc/macros/pl/addons_footer.bb delete mode 100644 doc/macros/pl/cloud_footer.bb delete mode 100644 doc/macros/pl/main_footer.bb delete mode 100644 doc/macros/pl/troubleshooting_footer.bb delete mode 100644 doc/macros/troubleshooting_footer.bb delete mode 100644 doc/member/assets/qr_text_to_post.png delete mode 100644 doc/member/assets/zat_dialog.png delete mode 100644 doc/member/bbcode.html delete mode 100644 doc/member/member_faq.bb delete mode 100644 doc/member/member_guide.bb delete mode 100644 doc/plugins.bb delete mode 100644 doc/problems-following-an-update.bb delete mode 100644 doc/red2pi.bb delete mode 100644 doc/roadmap.bb delete mode 100644 doc/schema_development.bb delete mode 100644 doc/schemaspy_hubzilla/zot.meta.xml delete mode 100644 doc/sql_conventions.bb delete mode 100644 doc/toc.html delete mode 100644 doc/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png delete mode 100644 doc/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png delete mode 100644 doc/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png delete mode 100644 doc/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png delete mode 100644 doc/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png delete mode 100644 doc/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png delete mode 100644 doc/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png delete mode 100644 doc/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png delete mode 100644 doc/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png delete mode 100644 doc/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png delete mode 100644 doc/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png delete mode 100644 doc/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png delete mode 100644 doc/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png delete mode 100644 doc/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png delete mode 100644 doc/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png delete mode 100644 doc/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png delete mode 100644 doc/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png delete mode 100644 doc/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png delete mode 100644 doc/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png delete mode 100644 doc/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png delete mode 100644 doc/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png delete mode 100644 doc/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png delete mode 100644 doc/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png delete mode 100644 doc/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png delete mode 100644 doc/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png delete mode 100644 doc/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png delete mode 100644 doc/tutorials/personal_channel.html create mode 100644 tests/unit/Module/HelpTest.php create mode 100644 tests/unit/Module/SetupTest.php create mode 100644 tests/unit/Module/TestCase.php create mode 100644 tests/unit/Widget/HelpindexTest.php create mode 100644 view/tpl/widget.tpl diff --git a/Zotlabs/Lib/Traits/HelpHelper.php b/Zotlabs/Lib/Traits/HelpHelper.php new file mode 100644 index 000000000..f0dca35d0 --- /dev/null +++ b/Zotlabs/Lib/Traits/HelpHelper.php @@ -0,0 +1,68 @@ +getList(); + + if(array_key_exists(argv(1), $languages)) { + $lang = argv(1); + $from_url = true; + } else { + $lang = \App::$language; + if(! isset($lang)) + $lang = 'en'; + + $from_url = false; + } + + $this->lang = array('language' => $lang, 'from_url' => $from_url); + } + + /** + * Find the full path name of the file, given it's base path and + * the language of the request. + * + * @param string $base_path The path of the file to find, relative to the + * doc root path, and without the extension. + */ + private function find_help_file(string $base_path, string $lang): void { + + // Use local variable until we can use trait constants. + $valid_file_ext = ['md', 'bb', 'html']; + + $base_path = "doc/{$lang}/${base_path}"; + + foreach ($valid_file_ext as $ext) { + $path = "{$base_path}.{$ext}"; + if (file_exists($path)) { + $this->file_name = $path; + $this->file_type = $ext; + + break; + } + } + } +} diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index 55ac80842..00946368f 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -1,7 +1,7 @@ 'en', //! Detected language, 2-letter ISO 639-1 code ("en") + 'from_url' => false, //! true if language from URL overrides browser default + ]; + + /** + * Pre-check before processing request. + * + * Determine language requested, and ensure that a topic was requested. + * If no topic was requested, redirect to the about page, and abort + * processing. + */ + public function init() { + $this->determine_help_language(); + + if (argc() === 1) { + goaway("/help/{$this->lang['language']}/about/about"); + killme(); + } + } + + /** + * Process get request for the help module. + * + * Loads the correct help file from the `doc/` directory, and passes it to + * the help template in `view/tpl/help.tpl`. + * + * If the requested help topic does not exist for the currently selected + * language, a 404 status is returned instead. + * + * This function currently also handles search and serving static assets + * that may be used by the help files. + * + * @return string The rendered help page or a 404 page if help topic was + * not found. + */ + public function get() { nav_set_selected('Help'); $o = ''; @@ -81,6 +124,119 @@ class Help extends \Zotlabs\Web\Controller { killme(); } + // + // The args to the module will be along this pattern: + // + // help/// + // + // Where `` is the language which we want to fetch the topic. This + // element is optional, but will be used to override the browser language + // preference if it exists. + // + // There may be zero or more `` elements. If there are any + // present, the first subdir will be used as the slug to find the + // heading of the help page. + // + // The `` should be the name of a file within the given language + // and subdirectory tree under the `doc/` directory of the site file + // system. The topic is given _without_ the file extension, which will be + // determined by the module. + // + // The valid file extensions for help topic are: + // + // - `.md` for markdown formatted source files. + // - `.bb` for bbcode formatted source files. + // - `.html` for help topics in html format. + // + + // Strip away the module name from the args + $args = array_slice(\App::$argv, 1); + + // Remove language if necessary + // + // The language was determined during pre-request processing in the + // `init` function. + if ($this->lang['from_url']) { + array_shift($args); + } + + // Keep the first remaining arg as the heading slug + $this->heading_slug = $args[0]; + + // Locate the file for the topic in the doc directory + $this->find_help_file(implode('/', $args), $this->lang['language']); + + $this->set_page_title(); + + if (empty($this->file_name)) { + header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found')); + $tpl = get_markup_template("404.tpl"); + return replace_macros($tpl, array( + '$message' => t('Page not found.') + )); + + } else { + $tpl = get_markup_template('help.tpl'); + return replace_macros($tpl, [ '$module' => $this ]); + } + } + + public function render_content(): string { + return $this->render_help_file($this->file_name, $this->file_type); + } + + public function render_help_file(string $file_name, string $file_type): string { + $raw_text = file_get_contents($file_name); + + switch ($file_type) { + case 'md': + // We need to escape the `#include` statements in the original file, + // to be sure it's not rendered as a heading by markdown. + $raw_text = preg_replace('/#include/ism', '%%include', $raw_text); + $content = MarkdownExtra::defaultTransform($raw_text); + $content = preg_replace('/%%include/ism', '#include', $content); + break; + + case 'bb': + $content = zidify_links(bbcode($raw_text)); + break; + + case 'html': + $content = parseIdentityAwareHTML($raw_text); + break; + } + + // Replace includes with the contents of the included file + $content = preg_replace_callback( + "/#include (.*?)\;/ism", + function ($matches) { + $sub_file_type = array_pop(explode('.', $matches[1])); + $included_content = $this->render_help_file($matches[1], $sub_file_type); + return str_replace($matches[0], $included_content, $matches[0]); + }, + $content + ); + + return translate_projectname($content); + } + + public function get_page_title(): string { + $title = t('$Projectname Documentation'); + $heading = $this->get_heading(); + + if (! empty($heading)) { + $title .= ': ' . $heading; + } + + return $title; + } + + public function get_toc_heading(): string { + return t('Contents'); + } + + + private function get_heading(): string { $headings = [ 'about' => t('About'), 'member' => t('Members'), @@ -89,21 +245,22 @@ class Help extends \Zotlabs\Web\Controller { 'tutorials' => t('Tutorials') ]; - $heading = ''; - if(array_key_exists(argv(1), $headings)) - $heading = $headings[argv(1)]; - - $content = get_help_content(); - - $language = determine_help_language()['language']; - - return replace_macros(get_markup_template('help.tpl'), array( - '$title' => t('$Projectname Documentation'), - '$tocHeading' => t('Contents'), - '$content' => $content, - '$heading' => $heading, - '$language' => $language - )); + if(array_key_exists($this->heading_slug, $headings)) { + return $headings[$this->heading_slug]; + } else { + return ''; + } } + /** + * Set the page title to an unslugified version of the file name. + * + * @Note This modifies the global `App::$page['title']` property. + */ + private function set_page_title(): void { + $title = basename($this->file_name, ".{$this->file_type}"); + \App::$page['title'] = + t('Help:') . ' ' + . ucwords(str_replace(['-', '_'],' ',notags($title))); + } } diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index 63e686d3a..a7120b47f 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -1,6 +1,9 @@ '; - - $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); - } + use \Zotlabs\Lib\Traits\HelpHelper; - $level_0 = preg_replace('/\/','
    ',$level_0); + private string $contents = ''; - $levels = array(); + function widget() { + $this->determine_help_language(); + $this->find_help_file('toc', $this->lang['language']); - // 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; - } + if (! empty($this->file_name)) { + $this->contents = file_get_contents($this->file_name); } - $o .= ''; + $tpl = get_markup_template('widget.tpl'); + return replace_macros($tpl, [ '$widget' => $this ]); + } + + public function title(): string { + return t('Help Contents'); + } - return $o; + public function contents(): string { + return $this->contents; } } diff --git a/doc/AdvancedSearch.md b/doc/AdvancedSearch.md deleted file mode 100644 index a67c1fc1f..000000000 --- a/doc/AdvancedSearch.md +++ /dev/null @@ -1,53 +0,0 @@ -Advanced Directory Search -========================= - - -Advanced Directory Search is enabled in "Expert Mode" from your Settings => Additional features page. - -On the Directory page an option named "Advanced" will apear in the "Find Channels" widget (typically in the sidebar). Clicking "Advanced" will open another search box for entering advanced search requests. - -Advanced requests include - -* name=xxx -[Channel name contains xxx] - -* address=xxx -[Channel address (webbie) contains xxx] - -* locale=xxx -[Locale (typically 'city') contains xxx] - -* region=xxx -[Region (state/territory) contains xxx] - -* postcode=xxx -[Postcode or zip code contains xxx] - -* country=xxx -[Country name contains xxx] - -* gender=xxx -[Gender contains xxx] - -* marital=xxx -[Marital status contains xxx] - -* sexual=xxx -[Sexual preference contains xxx] - -* keywords=xxx -[Keywords contain xxx] - -There are many reasons why a match may not return what you're looking for, as many channels do not provide detailed information in their default (public) profile, and many of these fields allow free-text input in several languages - and this may be difficult to match precisely. For instance you may have better results finding somebody in the USA with 'country=u' (along with some odd channels from Deutschland and Bulgaria and Australia) because this could be represented in a profile as US, U.S.A, USA, United States, etc... - -Future revisions of this tool may try to smooth over some of these difficulties. - -Requests may be joined together with 'and', 'or', and 'and not'. - -Terms containing spaces must be quoted. - -Example: - - name="charlie brown" and country=canada and not gender=female - -#include doc/macros/main_footer.bb; diff --git a/doc/Comparison-of-activity-stream-networks.md b/doc/Comparison-of-activity-stream-networks.md deleted file mode 100644 index d76ae1006..000000000 --- a/doc/Comparison-of-activity-stream-networks.md +++ /dev/null @@ -1,23 +0,0 @@ -Comparison of different server-client networks providing activity streams to users -==================================== -The goal of this table was to provide an overview of the security and privacy provided by server-client networks providing activity-streams. - -| project | license | distributed | supports node isolation | server-to-server encryption | 1-click E2EE* | database encryption sceme | supports cloning[^5] | encryption of private messages | PFS chat | wall-to-wall interaction | supports post editing and unsend private message | other | -|-----------+---------------+-------------+-------------------------+-------------------------------------------+------------------------------------------+-----------------------------------------------------+-------------------------+-------------------------------------------------------------------------------------------------+-----------------------------------------------+--------------------------------------------------------------+--------------------------------------------------+------------------------------------------------------------------------------| -| hubzilla | ISC aka MIT | yes | yes | Zot (PKI) + TLS | yes (via JavaScript, AES-256) | content obfuscation, private keys hidden in the DB. | yes, partly implemented | impossible to message privately in plaintext | no | yes, multiple separated channels possible within one account | yes | privacy built in, run your own @ home, nodes are called hubs | -| diaspora | AGPLv3orlater | yes | no[^1] | PKI + SSL/TLS[^1] | no[^2] | mostly plaintext | no | ? | no | yes, no naming policy | no | nodes are called pods | -| facebook | proprietary | no | no | planned, probably not implemented yet[^3] | implemented but not offered to users[^4] | unknown | no, walled garden | no, 3-d party plugin Cryptocat and pidgin is availiable but the user is not informed about this | no, with Cryptocat: yes, with pidgin+OTR: yes | only one wall allowed | only post editing | "real name"-policy enforced, advertising-driven, for profit company US-based | -| twitter | proprietary | no | no | unknown | no | unknown, probably none | no, walled garden | no | no | yes | only post editing | advertising-driven, for profit company US-based | -| | | | | | | | | | | | | | - -This table was edited with emacs using org-mode. - -[^1]: https://wiki.diasporafoundation.org/Federation_protocol_overview - -[^2]: forks providing this exists - -[^3]: http://news.softpedia.com/news/Facebook-Aims-to-Encrypt-Everything-Between-Data-Centers-433091.shtml - -[^4]: http://www.computerworld.com/article/2488773/cybercrime-hacking/facebook-holds-back-on-end-to-end-encryption.html - -[^5]: see the hubzilla help files for details about this feature. diff --git a/doc/Creating-Templates.md b/doc/Creating-Templates.md deleted file mode 100644 index fc3f18dd3..000000000 --- a/doc/Creating-Templates.md +++ /dev/null @@ -1,93 +0,0 @@ -Creating Page Templates -======================= - - -A page template for use with Comanche requires two files - a PHP template and a CSS file. Page templates will need to be installed by the system administrator of your site. - - -First choose a name. Here we'll create a template and call it "demo". - -You will need to create the files "view/php/demo.php" and "view/css/demo.css" to hold the PHP template and CSS respectively. - -To get a better idea of this process, let's look at an existing template - the "default" template. This is used by default throughout the application. - -view/php/default.php -==================== - - - - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - - - -
      -
      -
      -
      - -
      - - - - -Here's is the corresponding CSS file - -view/php/default.css -==================== - - - aside#region_1 { - display: block; - width: 210px; - position: absolute; - top: 65px; - left: 0; - margin-left: 10px; - } - - aside input[type='text'] { - width: 174px; - } - - - section { - position: absolute; - top: 65px; - left: 250px; - display: block; - right: 15px; - padding-bottom: 350px; - } - - -Some things you may notice when looking at these definitions: - -* We have not specified any CSS for the "nav", "right_aside", or "footer" regions. In this template "nav" and "footer" will be the full page width and we will let the size and placement of these elements be controlled by the theme. "right_aside" is not currently used. - -* There are elements on the page such as "page-footer" and "pause" for which there is no apparent content. This content will come from Javascript elements. - -* Our default template uses absolute positioning. Modern web design often uses "float" div containers so that scrollbars aren't typically needed when viewing on small-screen devices. - -To design a new template, it is best to start with an existing template, and modify it as desired. That is what we will do here. - -The way that Comanche provides content inside a specific region is by using a region tag. - - [region=aside][widget=profile][/widget][/region] - -This example will place a "profile" widget in the "aside" region. But what it actually does is place the HTML for the widget into a code variable **$page['aside']**. Our default page template defines a region on the page (the CSS positions this as an absolute sidebar) and then inserts the contents of $page['aside'] (if it exists). - -So if you wanted to create a template with a region named "foo", you would provide a place for it on the page, then include the contents of $page['foo'] wherever you wanted to use it, and then using Comanche, you could specify - - [region=foo][widget=profile][/widget][/region] - -and this would place a profile widget into the "foo" region you created. - -Use the CSS file to position the region on the page where desired and optionally control its size. - -[To be continued] - -#include doc/macros/main_footer.bb; diff --git a/doc/DerivedTheme1.md b/doc/DerivedTheme1.md deleted file mode 100644 index b120c628c..000000000 --- a/doc/DerivedTheme1.md +++ /dev/null @@ -1,101 +0,0 @@ -Creating a Derived Theme -======================== - -**Lesson 1** - -A derived theme takes most of the settings from its "parent" theme and lets you change a few things to your liking without creating an entire theme package. - - -To create a derived theme, first choose a name. For our example we'll call our theme 'mytheme'. Hopefully you'll be a bit more creative. But throughout this document, wherever you see 'mytheme', replace that with the name you chose. - -**Directory Structure** - -First you need to create a theme directory structure. We'll keep it simple. We need a php directory and a css directory. Here are the Unix/Linux commands to do this. Assume that 'mywebsite' is your top level $Projectname folder. - - - cd mywebsite - mkdir view/theme/mytheme - mkdir view/theme/mytheme/css - mkdir view/theme/mytheme/php - - -Great. Now we need a couple of files. The first one is your theme info file, which describes the theme. - -It will be called view/theme/mytheme/php/theme.php (clever name huh?) - -Inside it, put the following information - edit as needed - - Display Settings as their default theme. - -**Lesson 2** - -If you want to use the redbasic schemas for your derived theme, you have to do a bit more. - -Do everything as above, but don't create view/theme/mytheme/php/style.php, but copy instead view/theme/redbasic/php/style.php to view/theme/mytheme/php/style.php. Modify that file and remove (or comment out) these two lines: - - if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') - set_pconfig(local_channel(), 'redbasic', 'schema', '---'); - -Also add this line at the bottom: - - echo @file_get_contents('view/theme/mytheme/css/style.css'); - -To show the schema selector you have to copy view/theme/redbasic/tpl/theme_settings.tpl to view/theme/mytheme/tpl/theme_settings.tpl. Modify that file and replace the lines: - - {{if $theme == redbasic}} - {{include file="field_select.tpl" field=$schema}} - {{/if}} - -with: - - {{include file="field_select.tpl" field=$schema}} - - - -#include doc/macros/main_footer.bb; diff --git a/doc/Developers.md b/doc/Developers.md deleted file mode 100644 index 624c058d2..000000000 --- a/doc/Developers.md +++ /dev/null @@ -1,54 +0,0 @@ -Developer Guide -=================== - -**Here is how you can join us.** - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -You may fork/clone the $Projectname repository from [https://framagit.org/hubzilla/core.git](https://framagit.org/hubzilla/core.git). - -Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) -to create and use your own tracking fork on framagit - -Then go to your framagit page and create a "Pull request" when you are ready -to notify us to merge your work. - -**Translations** - -Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/hubzilla/](https://www.transifex.com/projects/p/hubzilla/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. - -[Translations - More Info](help/Translations) - -**Important** - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. - -Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. - - -**Licensing** - -All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. - -**Coding Style** - -In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. - -* All comments should be in English. - -* We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged. - -* Indentation is accomplished primarily with tabs using a tab-width of 4. - -* String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';" - -* Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes. - -* Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability. - -* Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. - -#include doc/macros/main_footer.bb; diff --git a/doc/Features.md b/doc/Features.md deleted file mode 100644 index a43fd73fa..000000000 --- a/doc/Features.md +++ /dev/null @@ -1,108 +0,0 @@ -Extra Features -============== - -The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page. - -**Content Expiration** - -Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed. - -**Multiple Profiles** - -The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. - -**Web Pages** - -Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks. - -**Private Notes** - -On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. - -**Enhanced Photo Albums** - -Provides a photo album viewer that is a bit prettier than the normal interface. - -**Extended Identity Sharing** - -By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix. - -**Expert Mode** - -This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking. - -**Premium Channel** - -This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect. - - -**Richtext Editor** - -The status post editor is plaintext, but the matrix allows a wide range of markup using BBcode. The visual editor provides "what you see is what you get" for many of the most frequently used markup tags. - -**Post Preview** - -Allows previewing posts and comments exactly as they would look on the page before publishing them. - -**Channel Sources** - -Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel. - -**Even More Encryption** - -Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog". - - -**Search by Date** - -This provides the ability to select posts by date ranges - -**Privacy Group Filter** - -Enable widget to display stream posts only from selected groups of connection. This also toggles the outbound permissions while you are viewing a privacy group. This is analogous to Google "circles" or Disapora "aspects". - -**Saved Searches** - -Provides a search widget on your matrix page which can save selected search terms for re-use. - -**Personal Tab** - -Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. - -**New Tab** - -Enables a tab to display all new matrix activity as a firehose or timeline. - -**Affinity Tool** - -Filter matrix stream activity by the depth of your relationships - -**Edit Sent Posts** - -Edit and correct posts and comments after sending - -**Tagging** - -Ability to tag existing posts, including those written by others. - -**Post Categories** - -Add categories to your channel posts - -**Saved Folders** - -Ability to file posts under folders or tags for later recall - -**Dislike Posts** - -Ability to dislike posts/comments - -**Star Posts** - -Ability to mark special posts with a star indicator - -**Tag Cloud** - -Provide a personal tag cloud on your channel page - -#include doc/macros/main_footer.bb; diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/Hubzilla_on_OpenShift.bb deleted file mode 100644 index 7bdd70955..000000000 --- a/doc/Hubzilla_on_OpenShift.bb +++ /dev/null @@ -1,105 +0,0 @@ -[b]$Projectname on OpenShift[/b] -You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes. - -As of this writing, 2015-10-28, you do not have to pay for OpenShift on the Free plan, which gives you three gears at no cost. The Bronze plan gives you three gears at no cost too, but you can expand to 16 gears by paying, and this requires you to register your payment card. The three gears can give three instances of Hubzilla with one gear each, or you can combine two gears into one high-availability Hubzilla instance and one extra gear. The main difference to be aware of is this: gears on the Free plan will go into hibernation if left idle for too long, this does not happen on the Bronze plan. - -Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so. See for example https://developers.openshift.com/en/getting-started-debian-ubuntu.html on how to do this on Debian GNU/Linux, or in the menu on that page for other GNU/Linux distributions or other operating systems. - -[code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://framagit.org/hubzilla/core.git -l your@email.address -p your_account_password -[/code] - -Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup. You MUST change server address from 127.0.0.1 to localhost. - -NOTE: PostgreSQL is NOT supported by the deploy script yet, see [zrl=https://zot-mor.rhcloud.com/display/3c7035f2a6febf87057d84ea0ae511223e9b38dc27913177bc0df053edecac7c@zot-mor.rhcloud.com?zid=haakon%40zot-mor.rhcloud.com]this thread[/zrl]. - -[b]Update[/b] -To update, consider your own workflow first. I have forked Hubzilla code into my GitHub account to be able to try things out, this remote repo is called origin. Here is how I fetch new code from upstream, merge into my local repo, then push the updated code both into origin and the remote repo called openshift. - -[code]git fetch upstream;git checkout master;git merge upstream/master;git push origin;git push openshift HEAD -[/code] - -[b]Administration[/b] -Symptoms of need for MySQL database administration are: -[list] -[*] you can visit your domain and see the Hubzilla frontpage, but trying to login throws you back to login. This can mean your session table is marked as crashed. -[*] you can login, but your channel posts are not visible. This can mean your item table is marked as crashed. -[*] you can login and you can see your channel posts, but apparently nobody is getting your posts, comments, likes and so on. This can mean your outq table is marked as crashed. -[/list] - -You can check your OpenShift logs by doing - -[code] -rhc tail -a your_app_name -n your_domain -l your@email.address -p your_account_password -[/code] - -and you might be able to confirm the above suspicions about crashed tables, or other problems you need to fix. - -[b]How to fix crashed tables in MySQL[/b] -Using MySQL and the MyISAM database engine can result in table indexes coming out of sync, and you have at least two options for fixing tables marked as crashed. -[list] -[*] Use the database username and password OpenShift creates for your instance at [url=https://your_app_name-your_domain.rhcloud.com/phpmyadmin/]https://your_app_name-your_domain.rhcloud.com/phpmyadmin/[/url] to login via the web into your phpMyAdmin web interface, click your database in the left column, in the right column scroll down to the bottom of the list of tables and click the checkbox for marking all tables, then select Check tables from the drop down menu. This will check the tables for problems, and you can then checkmark only those tables with problems, and select Repair table from the same drop down menu at the bottom. -[*] You can port-forward the MySQL database service to your own machine and use the MySQL client called mysqlcheck to check, repair and optimize your database or individual database tables without stopping the MySQL service on OpenShift. Run the following in two separate console windows. - -To port-forward do - -[code]rhc port-forward -a your_app_name -n your_domain -l your@email.address -p your_password[/code] - -in one console window, then do either -o for optimize, -c for check or -r for repair, like this - -[code]mysqlcheck -h 127.0.0.1 -r your_app_name -u your_app_admin_name -p[/code] - -and give the app's password at the prompt. If all goes well you should see a number of table names with an OK behind them. - -You can now -[code]Press CTRL-C to terminate port forwarding[/code] -[*] You can do - -[code]rhc cartridge stop mysql-5.5 -a your_app_name[/code] - -to stop the MySQL service running in your app on OpenShift before running myisamchk - which should only be run when MySQL is stopped, and then -login to your instance with SSH - see OpenShift for details - and do - -[code]cd mysql/data/your_database -myisamchk -r *.MYI[/code] - -or if you get - -[code]Can't create new tempfile[/code] - -check your OpenShift's gear quota with - -[code]quota -gus[/code] - -and if you are short on space, then locally (not SSH) do - -[code]rhc app-tidy your_app_name -l your_login -p your_password[/code] - -to have rhc delete temporary files and OpenShift logs to free space first, then check the size of your local repo dir and execute - -[code]git gc[/code] - -against it and check the size again, and then to minimize your remote repo connect via SSH to your application gear and execute the same command against it by changing to the remote repo directory - your repo should be in - -[code]~/git/your_app_name.git[/code] - -(if not, do find -size +1M to find it), then do - -[code] -cd -cd mysql/data/yourdatabase -myisamchk -r -v -f*.MYI[/code] - -and hopefully your database tables are now okay. -You can now start the MySQL service on OpenShift by locally doing - -[code]rhc cartridge start mysql-5.5 -a your_app_name[/code] -[/list] - -[b]Notes[/b] -[list] -[*] definitely DO turn off feeds and discovery by default and limit delivery reports from 30 days to 3 days if you are on the Free or Bronze plan on OpenShift with a single 1Gb gear by visiting [observer.baseurl]/admin/site when logged in as administrator of your Hubzilla site. -[*] The above defaults have been added into the deploy script. -[*] DO add git gc to the deploy script -[*] MAYBE DO add myisamchk - only checking? to the end of the deploy script. -[*] mysqlcheck is similar in function to myisamchk, but works differently. The main operational difference is that mysqlcheck must be used when the mysqld server is running, whereas myisamchk should be used when it is not. The benefit of using mysqlcheck is that you do not have to stop the server to perform table maintenance - this means this documenation should be fixed. -[/list] diff --git a/doc/Plugins.md b/doc/Plugins.md deleted file mode 100644 index 88b42185b..000000000 --- a/doc/Plugins.md +++ /dev/null @@ -1,263 +0,0 @@ - -Creating Plugins/Addons for $Projectname -========================================== - - -So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. - - -In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. - - - mkdir addon - -Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. - -Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. - - mkdir addon/randplace - -Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file - - addon/randplace/randplace.php - -The very first line of this file needs to be - - - * - */ - -These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. - -The typical plugin will have at least the following functions: - -* pluginname_load() -* pluginname_unload() - -In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named - -* pluginname_install() -* pluginname_uninstall() - - -Next we'll talk about **hooks**. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. - -We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. - - - function randplace_load() { - register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - - register_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - register_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - - } - - -So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. - -Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. - - function randplace_unload() { - unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - - unregister_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - unregister_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - - } - - -Hooks are called with two arguments. The first is always $a, which is our global App structure and contains a huge amount of information about the state of the web request we are processing; as well as who the viewer is, and what our login state is, and the current contents of the web page we're probably constructing. - -The second argument is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the second argument is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. - -Let's go ahead and add some code to implement our post_local hook handler. - - function randplace_post_hook($a, &$item) { - - /** - * - * An item was posted on the local system. - * We are going to look for specific items: - * - A status post by a profile owner - * - The profile owner must have allowed our plugin - * - */ - - logger('randplace invoked'); - - if(! local_channel()) /* non-zero if this is a logged in user of this system */ - return; - - if(local_channel() != $item['uid']) /* Does this person own the post? */ - return; - - if(($item['parent']) || (! is_item_normal($item))) { - /* If the item has a parent, or isn't "normal", this is a comment or something else, not a status post. */ - return; - } - - /* Retrieve our personal config setting */ - - $active = get_pconfig(local_channel(), 'randplace', 'enable'); - - if(! $active) - return; - /** - * - * OK, we're allowed to do our stuff. - * Here's what we are going to do: - * load the list of timezone names, and use that to generate a list of world cities. - * Then we'll pick one of those at random and put it in the "location" field for the post. - * - */ - - $cities = array(); - $zones = timezone_identifiers_list(); - foreach($zones as $zone) { - if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) - $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); - } - - if(! count($cities)) - return; - $city = array_rand($cities,1); - $item['location'] = $cities[$city]; - - return; - } - - -Now let's add our functions to create and store preference settings. - - /** - * - * Callback from the settings post function. - * $post contains the global $_POST array. - * We will make sure we've got a valid user account - * and that only our own submit button was clicked - * and if so set our configuration setting for this person. - * - */ - - function randplace_settings_post($a,$post) { - if(! local_channel()) - return; - if($_POST['randplace-submit']) - set_pconfig(local_channel(),'randplace','enable',intval($_POST['randplace'])); - } - - - - /** - * - * Called from the Feature Setting form. - * The second argument is a string in this case, the HTML content region of the page. - * Add our own settings info to the string. - * - * For uniformity of settings pages, we use the following convention - *
      - *

      title

      - * .... settings html - many elements will be floated... - *
      - * - *
      - */ - - - - function randplace_settings(&$a,&$s) { - - if(! local_channel()) - return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - head_add_css('/addon/randplace/randplace.css'); - - /* Get the current state of our config variable */ - - $enabled = get_pconfig(local_channel(),'randplace','enable'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= '
      '; - $s .= '

      ' . t('Randplace Settings') . '

      '; - $s .= '
      '; - $s .= ''; - $s .= ''; - $s .= '
      '; - - /* provide a submit button */ - - $s .= '
      '; - - } - - - - - -***Advanced Plugins*** - -Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. - -The key to this is to create a simple function named pluginname_module() which does nothing. - - function randplace_module() { return; } - -Once this function exists, the URL https://yoursite/randplace will access your plugin as a module. Then you can define functions which are called at various points to build a webpage just like the modules in the mod/ directory. The typical functions and the order which they are called is - - modulename_init($a) // (e.g. randplace_init($a);) called first - if you wish to emit json or xml, - // you should do it here, followed by killme() which will avoid the default action of building a webpage - modulename_aside($a) // Often used to create sidebar content - modulename_post($a) // Called whenever the page is accessed via the "post" method - modulename_content($a) // called to generate the central page content. This function should return a string - // consisting of the central page content. - -Your module functions have access to the URL path as if they were standalone programs in the Unix operating system. For instance if you visit the page - - https://yoursite/randplace/something/somewhere/whatever - -we will create an argc/argv list for use by your module functions - - $x = argc(); $x will be 4, the number of path arguments after the sitename - - for($x = 0; $x < argc(); $x ++) - echo $x . ' ' . argv($x); - - - 0 randplace - 1 something - 2 somewhere - 3 whatever - - -***Porting Friendica Plugins*** - -$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica plugins can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: - -* Friendica's pluginname_install() is pluginname_load() - -* Friendica's pluginname_uninstall() is pluginname_unload() - -$Projectname has _install and _uninstall functions but these are used differently. - -* Friendica's "plugin_settings" hook is called "feature_settings" - -* Friendica's "plugin_settings_post" hook is called "feature_settings_post" - -Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. - -#include doc/macros/main_footer.bb; diff --git a/doc/Primary-Directory.md b/doc/Primary-Directory.md deleted file mode 100644 index 92460c346..000000000 --- a/doc/Primary-Directory.md +++ /dev/null @@ -1,47 +0,0 @@ -#Primary Directory# - -By default, $Projectname will use available Directories on the web, which show you channels available around the world. - -There are certain scenarios where you might want your own directory-server that you can connect multiple hubs to. This will limit the channels that appear in all of your hubs to only channels on hubs connected to your directory-server. - - - -##Instuctions on how to set up one hub as the Primary Directory for a series of private hubs.## -*** - - -* On the hub that will be the Directory Server, open the .htconfig.php file and set: - - `App::$config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;` - - - By default it should already be set as **DIRECTORY_MODE_NORMAL**, so just edit that line to say **DIRECTORY_MODE_PRIMARY** - -* Next, for each hub (including the Directory Server), from a terminal, cd into the folder where it is installed and run this : - - `util/config system directory_realm YOURREALMNAME` - - (**YOURREALMNAME** can be whatever you want your realm-name to be) - - then: - - `util/config system realm_token THEPASSWORD` - - (**THEPASSWORD** is whatever password you want for your realm) - - **NOTE:** Use the same realm-name and password for each hub - -* Lastly, for each "client" hub, (from a terminal) run: - - `util/config system directory_server https://theaddressofyourdirectoryserver.com` - -*** -Now when you view the directory of each hub, it should only show the channels that exist on the hubs in your realm. I have tested with two hubs so far, and it seems to be working fine. -Channels created in each hub are reflected in the Primary Directory, and subsequently in the directory of all client hubs - -##Issues## -*** - -When I created the first hub,it was up and running for an hour or so before I changed it to PRIMARY_MODE, and after changing it, there were a few channels from across the matrix still present in the directory. I deleted them from the xchan table and that seems to have fixed the issue. - - diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md deleted file mode 100644 index a8ef733a6..000000000 --- a/doc/Remove-Account.md +++ /dev/null @@ -1,26 +0,0 @@ -// this page is out of date... -Remove Account -============== - -It is presently not possible to remove an account without asking your site administrator for assistance. -We'll have better doco when somebody finishes that bit. - - -Remove Channel -============== - -Visit the URL - - https://yoursite/removeme - -(replace 'yoursite' with the domain name of your $Projectname site). - -You will need to confirm your password and the channel you are currently logged into will be removed. - -This is irreversible. - -If you have identity clones on other sites this only removes the channel instance which exists -on this site. - - -#include doc/macros/main_footer.bb; diff --git a/doc/Schema-development.md b/doc/Schema-development.md deleted file mode 100644 index e811bb8c3..000000000 --- a/doc/Schema-development.md +++ /dev/null @@ -1,81 +0,0 @@ -Red development - a guide to the schema system -============================================== - - -A schema, in a nutshell, is a collection of settings for a bunch of variables to define -certain elements of a theme. A schema is loaded as though it were part of config.php -and has access to all the same information. Importantly, this means it is identity aware, -and can be used to do some interesting things. One could, for example, restrict options -by service class, or present different options to different members. - -By default, we filter only by whether or not expert mode is enabled. If expert mode is -enabled, all options are presented to the member. If it is not, only scheme, background -image, font face, and iconset are available as choices. - -A schema is loaded *after* the member's personal settings. Therefore, to allow a member -to overwrite a particular aspect of a schema you would use the following syntax: - - if (! $foo) - $foo = 'bar'; - -However, there are circumstances - particularly with positional elements - where it -may be desirable (or necessary) to override a member's settings. In this case, the syntax -is even simpler: - - $foo = 'bar'; - -Members will not thank you for this, however, so only use it when it is required. - -If no personal options are set, and no schema is selected, we will first try to load a schema -with the file name "default.php". This file should never be included with a theme. If it -is, merge conflicts will occur as people update their code. Rather, this should be defined -by administrators on a site by site basis. -default.php and default.css MUST be symlinks to existing scheme files. - -You schema does not need to - and should not - contain all of these values. Only the values -that differ from the defaults should be listed. This gives you some very powerful options -with very few lines of code. - -Note the options available differ with each theme. The options available with the Redbasic -theme are as follows: - -* nav_colour - The colour of the navigation bar. Options are red, black and silver. Alternatively, - one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and - hover effects. -* banner_colour - The font colour of the banner element. Accepts an RGB or Hex value. -* bgcolour - Set the body background colour. Accepts an RGB or Hex value. -* background_image - Sets a background image. Accepts a URL or path. -* item_colour - Set the background colour of items. Accepts an RGB or Hex value. -* item_opacity - Set the opacity of items. Accepts a value from 0.01 to 1 -* toolicon_colour - Set the colour of tool icons. Accepts an RGB or Hex value. -* toolicon_activecolour - Set the colour of active or hovered icon tools. -* font_size - Set the size of fonts in items and posts. Accepts px or em. -* body_font_size - Sets the size of fonts at the body level. Accepts px or em. -* font_colour - Sets the font colour. Accepts an RGB or Hex value. -* radius - Set the radius of corners. Accepts a numeral, and is always in px. -* shadow - Set the size of shadows shown with inline images. Accepts a numerical - value. Note shadows are not applied to smileys. -* converse_width - Set the maximum width of the content region in px. -* nav_min_opacity -* top_photo -* reply_photo - -If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. -This gives the schem developer the possiblity to override any style component. - - -#include doc/macros/main_footer.bb; diff --git a/doc/TermsOfService.md b/doc/TermsOfService.md deleted file mode 100644 index 1e085559e..000000000 --- a/doc/TermsOfService.md +++ /dev/null @@ -1,11 +0,0 @@ -Privacy Policy -============== - -#include doc/gdpr1.md; - - -Terms of Service -================ - -#include doc/SiteTOS.md; - diff --git a/doc/Translations.md b/doc/Translations.md deleted file mode 100644 index 6106e43b1..000000000 --- a/doc/Translations.md +++ /dev/null @@ -1,93 +0,0 @@ -Translating $Projectname -========================== - -Translation Process -------------------- - -The strings used in the UI of $Projectname is translated at [Transifex][1] and then -included in the git repository at github. If you want to help with translation -for any language, be it correcting terms or translating $Projectname to a -currently not supported language, please register an account at transifex.com -and contact the Redmatrix translation team there. - -Translating $Projectname is simple. Just use the online tool at transifex. If you -don't want to deal with git & co. that is fine, we check the status of the -translations regularly and import them into the source tree at github so that -others can use them. - -We do not include every translation from transifex in the source tree to avoid -a scattered and disturbed overall experience. As an uneducated guess we have a -lower limit of 50% translated strings before we include the language. This -limit is judging only by the amount of translated strings under the assumption -that the most prominent strings for the UI will be translated first by a -translation team. If you feel your translation useable before this limit, -please contact us and we will probably include your teams work in the source -tree. - -If you want to get your work into the source tree yourself, feel free to do so -and contact us with and question that arises. The process is simple and -$Projectname ships with all the tools necessary. - -The location of the translated files in the source tree is - /view/LNG-CODE/ -where LNG-CODE is the language code used, e.g. de for German or fr for French. -For the email templates (the *.tpl files) just place them into the directory -and you are done. The translated strings come as a "hmessages.po" file from -transifex which needs to be translated into the PHP file $Projectname uses. To do -so, place the file in the directory mentioned above and use the "po2php" -utility from the util directory of your $Projectname installation. - -Assuming you want to convert the German localization which is placed in -view/de/hmessages.po you would do the following. - -1. Navigate at the command prompt to the base directory of your - $Projectname installation - -2. Execute the po2php script, which will place the translation - in the hstrings.php file that is used by $Projectname. - - $> php util/po2php.php view/de/hmessages.po - - The output of the script will be placed at view/de/hstrings.php where - froemdoca os expecting it, so you can test your translation mmediately. - -3. Visit your $Projectname page to check if it still works in the language you - just translated. If not try to find the error, most likely PHP will give - you a hint in the log/warnings.about the error. - - For debugging you can also try to "run" the file with PHP. This should - not give any output if the file is ok but might give a hint for - searching the bug in the file. - - $> php view/de/hstrings.php - -4. commit the two files with a meaningful commit message to your git - repository, push it to your fork of the $Projectname repository at github and - issue a pull request for that commit. - -Utilities ---------- - -Additional to the po2php script there are some more utilities for translation -in the "util" directory of the $Projectname source tree. If you only want to -translate $Projectname into another language you wont need any of these tools most -likely but it gives you an idea how the translation process of $Projectname -works. - -For further information see the utils/README file. - -Known Problems --------------- - -* $Projectname uses the language setting of the visitors browser to determain the - language for the UI. Most of the time this works, but there are some known - quirks. -* the early translations are based on the friendica translations, if you - some rough translations please let us know or fix them at Transifex. - -Links ------- -[1]: http://www.transifex.com/projects/p/hubzilla/ - - -#include doc/macros/main_footer.bb; diff --git a/doc/Widgets.md b/doc/Widgets.md deleted file mode 100644 index 6779d7ffd..000000000 --- a/doc/Widgets.md +++ /dev/null @@ -1,174 +0,0 @@ -Core Widgets -============ - -Some/many of these widgets have restrictions which may restrict the type of page where they may appear or may require login - - -* clock - displays the current time - * args: military (1 or 0) - use 24 hour time as opposed to AM/PM -
       
      - -* profile - displays a profile sidebar on pages which load profiles (pages with nickname in the URL) - -* tagcloud - display a tagcloud of webpage items - - * args: count - number of items to return (default 24) -
       
      - -* collections - privacy group selector for the current logged in channel - - * args: mode - one of "conversation", "group", "abook" depending on module -
       
      - -* suggestions - friend suggestions for the current logged on channel - -* follow - presents a text box for following another channel - -* notes - private notes area for the current logged in channel if private_notes feature is enabled - -* savedsearch - network/matrix search with save - must be logged in and savedsearch feature enabled - -* filer - select filed items from network/matrix stream - must be logged in - -* archive - date range selector for network and channel pages - * args: 'wall' - 1 or 0, limit to wall posts or network/matrix posts (default) -
       
      - -* fullprofile - same as profile currently - -* categories - categories filter (channel page) - -* tagcloud_wall - tagcloud for channel page only - * args: 'limit' - number of tags to return (default 50) -
       
      - -* catcloud_wall - tagcloud for channel page categories - * args: 'limit' - number of categories to return (default 50) -
       
      - -* affinity - affinity slider for network page - must be logged in - -* settings_menu - sidebar menu for settings page, must be logged in - -* mailmenu - sidebar menu for private message page - must be logged in - -* design_tools - design tools menu for webpage building pages, must be logged in - -* findpeople - tools to find other channels - -* photo_albums - list photo albums of the current page owner with a selector menu - -* vcard - mini profile sidebar for the person of interest (page owner, whatever) - -* dirsafemode - directory selection tool - only on directory pages - -* dirsort - directory selection tool - only on directory pages - -* dirtags - directory tool - only on directory pages - -* menu_preview - preview a menu - only on menu edit pages - -* chatroom_list - list of chatrooms for the page owner - -* bookmarkedchats - list of bookmarked chatrooms collected on this site for the current observer - -* suggestedchats - "interesting" chatrooms chosen for the current observer - -* item - displays a single webpage item by mid or page title - * args: - * channel_id - channel that owns the content, defualt is the profile_uid - * mid - message_id of webpage to display (must be webpage, not a conversation item) - * title - URL page title of webpage (must provide one of either title or mid) -
       
      - -* photo - display a single photo - * args: - * src - URL of photo, must be http or https - * zrl - use zid authenticated link - * style - CSS style string -
       
      - -* cover_photo - display the cover photo for the selected channel - * args: - * channel_id - channel to use, default is the profile_uid - * style - CSS style string (default is dynamically resized to width of region) -
       
      - - -* photo_rand - display a random photo from one of your photo albums. Photo permissions are honoured - * args: - * album - album name (very strongly recommended if you have lots of photos) - * scale - typically 0 (original size), 1 (1024px), 2, (640px), or 3 (320px) - * style - CSS style string - * channel_id - if not your own -
       
      - -* random_block - display a random block element from your webpage design tools collection. Permissions are honoured. - * args: - * contains - only return blocks which include the contains string in the block name - * channel_id - if not your own -
       
      - -* tasklist - provide a task or to-do list for the currently logged-in channel. - * args: - * all - display completed tasks if all is non-zero. -
       
      - -* forums - provide a list of connected public forums with unseen counts for the current logged-in channel. -
       
      - -* activity - provide a list of authors of unread network content for the current logged-in channel. - -* album - provides a widget containing a complete photo album from albums belonging to the page owner; this may be too large to present in a sidebar region as is best implemented as a content region widget. - * args: - * album - album name - * title - optional title, album name is used if not present -
       
      - - -Creating New Widgets -==================== - -### Class Widgets - -To create a class-based widget named 'slugfish' create a file with the following contents: - -```` - 3 ] - - } - -```` - -The resultant file may be placed in widget/Slugfish/Slugfish.php , or Zotlabs/SiteWidgets/Slugfish.php . It also may be linked from a git repository using util/add_widget_repo. - - - -Traditional function based widget: - -If you want a widget named 'slugfish', create widget/widget_slugfish.php containing - - - - -

      Post Permissions

      - -

      The permissions dialog lets you select which channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "Show" the Friends group but "Don't show" that one person.

      - -
      -
      Tip! -
      The border color of each channel indicates whether that channel — or one of the groups it's a member of — will have access to the post. The border color will also indicate when a channel, or group it belongs to, has been explicitly set to "Don't show".
      -
      - -

      Why can't I edit a post's permissions after I saved it?

      - -

      You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it.

      -

      If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.

      \ No newline at end of file diff --git a/doc/addons.bb b/doc/addons.bb deleted file mode 100644 index 4bfa7a9fd..000000000 --- a/doc/addons.bb +++ /dev/null @@ -1,117 +0,0 @@ -[h3]Plugins/Addons[/h3] -[list=1] -[*] abcjsplugin - Create musical scores in your posts -[*] adultphotoflag - prevents nsfw photos from being displayed in public albums -[*] authchoose - only send identity assertions to sites of friends -[*] b2tbtn - provide button to go directly to top of page if you are scrolled a long way down -[*] bbmath - use complex math expressions in your posts -[*] bookmarker - replace #^ with bookmark link in posts -[*] buglink - provide a bug reporting icon in the lower-left corner of every page -[*] calc - a scientific calculator -[*] chess - cross domain identity aware interactive chess games -[*] chords - generate fingering charts and alternatives for every known guitar chord -[*] custom_home - set a custom page as the hub start page -[*] diaspora - Diaspora protocol emulator -[*] dirstats - show some interesting statistics generated by the directory server -[*] docs - alternate documentation pages -[*] donate - provides a project donation page -[*] dreamhost - provide a more reliable service on Dreamhost shared hosting -[*] dwpost - crosspost to Dreamwidth -[*] emojione - allow emojis as emoticons -[*] extcron - use an external cron service to run your hub's scheduled tasks -[*] firefox - provide a link to install the Firefox Sharing API -[*] flattrwidget - provides a "Flattr Us" button -[*] flip - create upside down text -[*] fortunate - displays random quote (fortune cookie). Requires setting up a fortune server. -[*] friendica - Friendica (DFRN) protocol. Under development. -[*] frphotos - import photo albums from Friendica -[*] gnusoc - GNU-Social (OStatus) protocol. Under development. -[*] hexit - hexadecimal conversion tool -[*] hilite - allow language-specific highlighted code blocks in posts -[*] hubwall - send an admin email to all hub accounts -[*] ijpost - crosspost to Insanejournal -[*] irc - connect to IRC chatrooms -[*] jappixmini - XMPP chat -[*] js_upload - upload multiple photos to photo albums at once. -[*] keepout - prevents nearly all use of site when not logged in, more restrictive than 'block public' setting -[*] ldapauth - login via account on LDAP or Windows Active Directory domain -[*] libertree - crosspost to Libertree -[*] likebanner - create a "like us on red#matrix" banner image -[*] ljpost - crosspost to LiveJournal -[*] logrot - logfile rotation utility -[*] mahjongg - Chinese puzzle game -[*] mailhost - when using multiple channel clones, select one to receive email notifications -[*] mailtest - interface for testing mail delivery system -[*] metatag - provide SEO friendly pages -[*] mayan_places - set location field to a random city in the Mayan world -[*] morechoice - additional gender/sexual-preference choices for profiles (not safe for work) -[*] moremoods - Additional mood options -[*] morepokes - additional poke options (not safe for work) -[*] msgfooter - provide legal or other text on each outgoing post -[*] noembed - use noembed.com as an addition to $Projectname native oembed functionality (currently broken) -[*] nofed - prevent "federation" of channel posts, maintains all interaction on your site -[*] nsabait - add random terrorism related hashtags to your posts -[*] nsfw - Highly recommended plugin to collpase posts with inappropriate content -[*] openclipatar - choose a profile photo from hundreds of royalty free images -[*] openid - OpenID authentication and OpenID server. Your OpenID URL is [observer.baseurl]/id/[observer.webname] -[*] opensearch - allow your site to become a browser search provider -[*] openstreetmap - render locations and maps using OpenStreetMap -[*] pageheader - display text at the top of every page on the site -[*] phpmailer - alternate mail delivery system with more configurability -[*] piwik - open source website analytics -[*] planets - set location field to a random planet from Star Wars -[*] pong - classic pong game -[*] pubcrawl - ActivityPub protocol emulator -[*] pubsubhubbub - PuSH protocol for optimised delivery to feed subscribers (required by GNU-Social protocol) -[*] pumpio - crosspost to Pump.io -[*] qrator - generate QR code images -[*] rainbowtag - display your tag and category clouds in colours -[*] randpost - post/reply bot based on and requires fortunate -[*] redfiles - import file storage from redmatrix -[*] redphotos - import photo albums from redmatrix -[*] redred - Crosspost to another Red Matrix or Hubzilla channel -[*] rendezvous - group location tracking -[*] rtof - Crosspost to Friendica -[*] sendzid - add 'zid' auth parmaters to all outbound links, not just in-network links -[*] skeleton - sample addon/plugin to demonstrate plugin development -[*] smiley_pack - extend the built-in smilie (emoticon) support -[*] smileybutton - provides a smiley selector on the post window -[*] startpage - set a personal preferred page to redirect after logging in. -[*] statistics - Diaspora statistics generator -[*] statusnet - GNU-social and StatusNet crosspost [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl] -[*] std_embeds - allow unfiltered embeds for popular providers like youtube, vimeo and soundcloud -[*] superblock - Highly recommended - completely block an offensive channel from your stream -[*] testdrive - Turns your hub into a test drive site with accounts that expire after a trail period. -[*] tictac - 3D tic-tac-toe -[*] torch - flashlight app -[*] tour - feature tour for new members -[*] tripleaes - demo plugin for providing custom encryption algorithms -[*] twitter - crosspost to Twitter -[*] twitter_api - Twitter/Statusnet compatible API -[*] upload_limits - discover what server setting (there are a few) may be causing large photo uploads to fail -[*] visage - show visitors to your channel -[*] webmention - process webmentions -[*] wholikesme - provides a page to display what connections have 'liked' your posts the most -[*] webRTC - use an external server (mayfirst.org) to negotiate webRTC hookups -[*] wppost - crosspost to WordPress (or other wordpress XMLRPC service) -[*] xmpp - XMPP chat based on converse.js -[/list] - -[h3]Addon Repositories[/h3] - -We [b]strongly recommend[/b] that authors of addons publish/submit them to the project addon repository. This has several advantages. Project developers can easily fix security flaws and make changes to comply with recent changes in core code. Addons provided in third-party repositories are considered untrusted. If the project core code changes in an incompatible way, there may be no alternative but to physically remove or rename the addon files in order to get your site working again. Often only the plugin/addon author can help you regain control of your website, and project developers are unable to assist you; because by definition your site configuration has been modified in ways that we cannot easily test or verify. - -For these reasons we [b]strongly recommend[/b] that you do NOT install addons from third-party repositories. - -We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. - - -[url=https://framagit.org/hubzilla/addons]https://framagit.org/hubzilla/addons[/url] Main project addon repository - -[url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip) - - - -#include doc/macros/main_footer.bb; - - diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb deleted file mode 100644 index fbb387476..000000000 --- a/doc/addons_gnusocial.bb +++ /dev/null @@ -1,65 +0,0 @@ -[b]How to cross-post to a GNUsocial instance[/b] - -Start on the GNUSocial instance where you have your account. - -In the GNUSocial instance, go to Settings > Connections. In the right column under "Developers," click the link to "Register an OAuth client application to use with this instance of StatusNet." This link may be found at your instance here: - -https://yourgnusocialinstance.org/settings/oauthapps - -Next, click the link to Register a new application. That brings up the new application form. Here's what to do on each field. - -Icon. I uploaded $Projectname icon located at this link, after saving it to my computer: - -https://framagit.org/hubzilla/core/blob/master/images/rm-32.png - -Name. Give the application an appropriate name. I called mine hubzilla. You might prefer r2g. - -Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from $Projectname to GNUsocial. - - -Source URL. Put the main domain name of the Red site you're using. Don't forget to put the "s" in https://yourhubzillasite.com. If your Red installation is a subdomain, that would probably be called for. - -Organization. Since $Projectname is unorganized, I put that. If you use your installation for a group or business, that might be a good option. - -Homepage. If your group is using a subdomain, you probably want to put your main domain URI here. Since I'm on a hosted site, I put redmatrix.me. - -Callback URL. Leave blank. - -Type of application: select "desktop." - -Default access: select "Read-write." - -All fields except the callback URL must be filled in. - -Click on the save button. - -Then click on the icon or the name of the application for the information you'll need to insert over on $Projectname. - -***** - -Now open up a new tab or window and go to your $Projectname account, to Settings > Feature settings. Find the StatusNet Posting Settings. - -Insert the strings of numbers given on the GNUsocial site into $Projectname fields for Consumer Key and Consumer Secret. - -The Base API Path (remember the trailing /) will be your instance domain, plus the /api/ following. It will probably look like this: - -https://yourgnusocialinstance.org/api/ - -In case of doubt check on your GNUsocial instance site in order to find the domain URLs of the Request token, Access token, and Authorization. It will be the first part of the domains, minus the /oauth/.... - -StatusNet application name: Insert the name you gave to the application over on the GNUsocial site. - -Click Submit. - -A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to $Projectname app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit. - -If successful, your information from the GNUsocial instance should appear in $Projectname app. - -You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your $Projectname account to your GNUsocial instance. - -If you don't choose this option, you will have an option to send a post to your GNUsocial instance by first opening the post (by clicking in the post text area) and clicking on the lock icon next to the Share button. Select the GNUsocial icon made up of three colored dialog baloons. Close that window, then make your post. - -If all goes well, you have just cross-posted your $Projectname post to your account on a GNUsocial instance. - -#include doc/macros/addons_footer.bb; - diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md deleted file mode 100644 index bf4dc7355..000000000 --- a/doc/admin/administrator_guide.md +++ /dev/null @@ -1,464 +0,0 @@ -### Overview - -$Projectname is more than a simple web application. It is a -complex communications system which more closely resembles an email server -than a web server. For reliability and performance, messages are delivered in -the background and are queued for later delivery when sites are down. This -kind of functionality requires a bit more of the host system than the typical -blog. Not every PHP/MySQL hosting provider will be able to support -$Projectname. Many will but please review the requirements and confirm these -with your hosting provider prior to installation. - -We've tried very hard to ensure that $Projectname will run on commodity -hosting platforms such as those used to host Wordpress blogs and Drupal -websites. It will run on most any Linux VPS system. Windows LAMP platforms -such as XAMPP and WAMP are not officially supported at this time however -we welcome patches if you manage to get it working. - -### Where to find more help -If you encounter problems or have issues not addressed in this documentation, -please let us know via the [Github issue -tracker](https://framagit.org/hubzilla/core/issues). Please be as clear as you -can about your operating environment and provide as much detail as possible -about any error messages you may see, so that we can prevent it from happening -in the future. Due to the large variety of operating systems and PHP platforms -in existence we may have only limited ability to debug your PHP installation or -acquire any missing modules, but we will do our best to solve any general code -issues. - -### Before you begin - -#### Choose a domain name or subdomain name for your server - -$Projectname can only be installed into the root of a domain or sub-domain, and can -not be installed using alternate TCP ports. - -#### Decide if you will use SSL and obtain an SSL certificate before software installation - -You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate. -*You MUST NOT use self-signed certificates!* - -Please test your certificate prior to installation. A web tool for testing your -certificate is available at "http://www.digicert.com/help/". When visiting your -site for the first time, please use the SSL ("https://") URL if SSL is available. -This will avoid problems later. The installation routine will not allow you to -use a non browser-valid certificate. - -This restriction is incorporated because public posts from you may contain -references to images on your own hub. Other members viewing their stream on -other hubs will get warnings if your certificate is not trusted by their web -browser. This will confuse many people because this is a decentralised network -and they will get the warning about your hub while viewing their own hub and may -think their own hub has an issue. These warnings are very technical and scary to -some folks, many of whom will not know how to proceed except to follow the browser -advice. This is disruptive to the community. That said, we recognise the issues -surrounding the current certificate infrastructure and agree there are many -problems, but that doesn't change the requirement. - -Free "browser-valid" certificates are available from providers such as StartSSL -and LetsEncrypt. - -If you do NOT use SSL, there may be a delay of up to a minute for the initial -install script - while we check the SSL port to see if anything responds there. -When communicating with new sites, $Projectname always attempts connection on the -SSL port first, before falling back to a less secure connection. If you do not -use SSL, your webserver MUST NOT listen on port 443 at all. - -If you use LetsEncrypt to provide certificates and create a file under -.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership, -please remove or rename the .well-known directory as soon as the certificate is -generated. $Projectname will provide its own handler for ".well-known" services when -it is installed, and an existing directory in this location may prevent some of -these services from working correctly. This should not be a problem with Apache, -but may be an issue with nginx or other web server platforms. - -### Deployment -There are several ways to deploy a new hub. - -* Manual installation on an existing server -* Automated installation on an existing server using a shell script -* Automated deployment using an OpenShift virtual private server (VPS) - -### Requirements -* Apache with mod-rewrite enabled and "AllowOverride All" so you can use a - local .htaccess file. Some folks have successfully used nginx and lighttpd. - Example config scripts are available for these platforms in doc/install. - Apache and nginx have the most support. - -* PHP 8.1 or later. - Note that on some shared hosting environments, the _command line_ - version of PHP might differ from the _webserver_ version - -* PHP *command line* access with register_argc_argv set to true in the - php.ini file, and with no hosting provider restrictions on the use of - exec() and proc_open(). - -* curl, gd (with at least jpeg and png support), pdo-mysql (or pdo-postgres), mbstring, zip, - and openssl extensions. The imagick extension is not required, but recommended. - -* xml extension is required if you want webdav to work. - -* some form of email server or email gateway such that PHP mail() works. - -* A supported database server. The supported databases are: - - Mysql version 8.0.22 or later - - MariaDB version 10.4 or later - - PostgreSQL version 12 or later - -* ability to schedule jobs with cron. - -* Installation into a top-level domain or sub-domain (without a - directory/path component in the URL) is REQUIRED. - -### Manual Installation - -#### Unpack the $Projectname files into the root of your web server document area -If you copy the directory tree to your webserver, make sure that you include the -hidden files like .htaccess. - -If you are able to do so, we recommend using git to clone the source -repository rather than to use a packaged tar or zip file. This makes the -software much easier to update. The Linux command to clone the repository -into a directory "mywebsite" would be: - - git clone https://framagit.org/hubzilla/core.git mywebsite - -and then you can pick up the latest changes at any time with: - - git pull - -make sure folders ``store/[data]/smarty3`` and ``store`` exist and are -writable by the webserver: - - mkdir -p "store/[data]/smarty3" - chmod -R 777 store - - This permission (777) is very dangerous and if you have sufficient - privilege and knowledge you should make these directories writeable - only by the webserver and, if different, the user that will run the - cron job (see below). In many shared hosting environments this may be - difficult without opening a trouble ticket with your provider. The - above permissions will allow the software to work, but are not - optimal. - -The following directories also need to be writable by the webserver in order for certain -web-based administrative tools to function: - -* `addon` -* `extend` -* `view/theme` -* `widget` - -#### Official addons -##### Installation -Navigate to your website. Then you should clone the addon repository (separately). We'll give this repository a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by giving them different nicknames: - - cd mywebsite - util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons - -##### Updating -For keeping the addon tree updated, you should be on your top level website directory and issue an update command for that repository:: - - cd mywebsite - util/update_addon_repo hzaddons - -Create searchable representations of the online documentation. You may do this -any time that the documentation is updated : - - cd mywebsite - util/importdoc - -### Automated installation via the .homeinstall shell script -There is a shell script in (``.homeinstall/hubzilla-setup.sh``) that will install $Projectname and its dependencies on a fresh installation of Debian 9 stable (Stetch). It should work on similar Linux systems but your results may vary. - -#### Requirements -The installation script was originally designed for a small hardware server behind your home router. However, it has been tested on several systems running Debian 9: - -* Home-PC (Debian-9.2-amd64) and Rapberry-Pi 3 (Rasbian = Debian 9.3) - - * Internet connection and router at home - * Mini-PC / Raspi connected to your router - * USB drive for backups - * Fresh installation of Debian on your mini-pc - * Router with open ports 80 and 443 for your Debian - -#### Overview of installation steps -1. `apt-get install git` -1. `mkdir -p /var/www/html` -1. `cd /var/www/html` -1. `git clone https://framagit.org/hubzilla/core.git .` -1. `nano .homeinstall/hubzilla-config.txt` -1. `cd .homeinstall/` -1. `./hubzilla-setup.sh` -1. `service apache2 reload` -1. Open your domain with a browser and step throught the initial configuration of $Projectname. - -### Recommended Addons - -We recommend the following addons be installed on all public sites: - - nsfw - hide inappropriate posts/comments - superblock - block content from offensive channels - -### Federation Addons - -Several web communities have begun to converge using common protocols. The protocols involved are somewhat limited in their abilities. The GNU-Social protocol for instance offers no privacy modes, and the Diaspora protocol is somewhat restrictive in what kinds of communications are allowed. All comments must be signed in a very unique manner by the original author. The ActivityPub protocol is also being considered and may be supported at a future date. No other existing protocol supports nomadic location as used by this project. This presents some support challenges as some features work with some networks and don't work with others. Nevertheless the federation protocols allow connections to be made to a much larger community of people worldwide. They are provided as addons. - -* diaspora - The Diaspora Protocol used by Diaspora and Friendica. You should enable 'Diaspora Statistics' (statistics) first to enable all the available features. - -* gnusoc - The GNU-Social Protocol, used by GNU-Social, Mastodon and several other communities. This addon requires you first install the 'pubsubhubbub' service (also an addon). - -Each member of your site must choose whether or not to allow these protocols individually as they may conflict with several desirable core features and abilities of this software (such as channel migration and cloning). They do this from their 'Settings -> Feature/Addon Settings' page. The administrator may also set the following: - - util/config system.diaspora_allowed 1 - util/config system.gnusoc_allowed 1 - -and enable these protocols automatically for all newly created channels. - -### Service Classes - -Service classes allow you to set limits on system resources by limiting what individual -accounts can do, including file storage and top-level post limits. Define custom service -classes according to your needs in the `.htconfig.php` file. For example, create -a _standard_ and _premium_ class using the following lines: - - // Service classes - - App::$config['system']['default_service_class']='standard'; // this is the default service class that is attached to every new account - - // configuration for standard service class - App::$config['service_class']['standard'] = - array('photo_upload_limit'=>2097152, // total photo storage limit per channel (here 2MB) - 'total_identities' =>1, // number of channels an account can create - 'total_items' =>0, // number of top level posts a channel can create. Applies only to top level posts of the channel user, other posts and comments are unaffected - 'total_pages' =>100, // number of pages a channel can create - 'total_channels' =>100, // number of channels the user can add, other users can still add this channel, even if the limit is reached - 'attach_upload_limit' =>2097152, // total attachment storage limit per channel (here 2MB) - 'chatters_inroom' =>20); - - // configuration for premium service class - App::$config['service_class']['premium'] = - array('photo_upload_limit'=>20000000000, // total photo storage limit per channel (here 20GB) - 'total_identities' =>20, // number of channels an account can create - 'total_items' =>20000, // number of top level posts a channel can create. Applies only to top level posts of the channel user, other posts and comments are unaffected - 'total_pages' =>400, // number of pages a channel can create - 'total_channels' =>2000, // number of channels the user can add, other users can still add this channel, even if the limit is reached - 'attach_upload_limit' =>20000000000, // total attachment storage limit per channel (here 20GB) - 'chatters_inroom' =>100); - -To apply a service class to an existing account, use the command line utility from the -web root: - -`util/service_class` -list service classes - -`util/config system default_service_class firstclass` -set the default service class to 'firstclass' - -`util/service_class firstclass` -list the services that are part of 'firstclass' service class - -`util/service_class firstclass photo_upload_limit 10000000` -set firstclass total photo disk usage to 10 million bytes - -`util/service_class --account=5 firstclass` -set account id 5 to service class 'firstclass' (with confirmation) - -`util/service_class --channel=blogchan firstclass` -set the account that owns channel 'blogchan' to service class 'firstclass' (with confirmation) - -**Service class limit options** - -* photo_upload_limit - maximum total bytes for photos -* total_items - maximum total toplevel posts -* total_pages - maximum comanche pages -* total_identities - maximum number of channels owned by account -* total_channels - maximum number of connections -* total_feeds - maximum number of rss feed connections -* attach_upload_limit - maximum file upload storage (bytes) -* minimum_feedcheck_minutes - lowest setting allowed for polling rss feeds -* chatrooms - maximum chatrooms -* chatters_inroom - maximum chatters per room -* access_tokens - maximum number of Guest Access Tokens per channel - -### Theme management -#### Repo management example -1. Navigate to your hub web root - - ``` - root@hub:/root# cd /var/www - ``` -2. Add the theme repo and give it a name - - ``` - root@hub:/var/www# util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHero - ``` -3. Update the repo by using - - ``` - root@hub:/var/www# util/update_theme_repo DeadSuperHero - ``` - -### Channel Directory - -#### Keywords - -There is a "tag cloud" of keywords that can appear on the channel directory page. -If you wish to hide these keywords, which are drawn from the directory server, you -can use the *config* tool: - - util/config system disable_directory_keywords 1 - -If your hub is in the standalone mode because you do not wish to connect to the -global grid, you may instead ensure the the _directory_server_ system option is -empty: - - util/config system directory_server "" - -### Administration - -#### Site Administration - -Administration of the website is commonly done through the admin webpage located at /admin on your website. In order to access this page you must have administration rights to the server. Administration rights are granted to the first account to register on your site, **provided** the email address of that account exactly matches the email address you provided as the administrator's email address during setup. - -There are several ways that this can fail and leave the system without an administrator account, for instance if the first account that was created provided a different email address than the administrator email address that was supplied during setup. - -For security reasons there is no web page or interface on the system which will give you administrator access. If you need to correct a situation where a system has no administrator account it **must** be done by editing the account table in the database. There is no other way. To do this, you will need to locate the entry in the account table which belongs to the desired administrator, and set 'account_roles' for that entry to 4096. You will then be able to access the admin page from your system's profile menu or directly via /admin . - -A hub can have multiple admins and there is no limit to how administrators you can have. Repeat the above process for every account you wish to provide with administration rights. - -### Troubleshooting - -#### Log files - -The system logfile is an extremely useful resource for tracking down -things that go wrong. This can be enabled in the admin/log -configuration page. A loglevel setting of `LOGGER_DEBUG` is preferred -for stable production sites. Most things that go wrong with -communications or storage are listed here. A setting of LOGGER_DATA -provides *much* more detail, but may fill your disk. In either -case we recommend the use of logrotate on your operating system to -cycle logs and discard older entries. - -At the bottom of your .htconfig.php file are several lines (commented -out) which enable PHP error logging. This reports issues with code -syntax and executing the code and is the first place you should look -for issues which result in a "white screen" or blank page. This is -typically the result of code/syntax problems. Database errors are -reported to the system logfile, but we've found it useful to have a -file in your top-level directory called dbfail.out which *only* -collects database related issues. If the file exists and is writable, -database errors will be logged to it as well as to the system logfile. - -In the case of "500" errors, the issues may often be logged in your -webserver logs, often /var/log/apache2/error.log or something -similar. Consult your operating system documentation. - -There are three different log facilities. - -**The first is the database failure log**. This is only used if you - create a file called specifically `dbfail.out` in the root folder of - your website and make it write-able by the web server. If we have - any database failed queries, they are all reported here. They - generally indicate typos in our queries, but also occur if the - database server disconnects or tables get corrupted. On rare - occasions we'll see race conditions in here where two processes - tried to create an xchan or cache entry with the same ID. Any other - errors (especially persistent errors) should be investigated. - -**The second is the PHP error log**. This is created by the language - processor and only reports issues in the language environment. Again - these can be syntax errors or programming errors, but these - generally are fatal and result in a "white screen of death"; - e.g. PHP terminates. You should probably look at this file if - something goes wrong that doesn't result in a white screen of death, - but it isn't uncommon for this file to be empty for days on end. - - There are some lines at the bottom of the supplied `.htconfig.php` - file; which if uncommented will enable a PHP error log (*extremely* - useful for finding the source of white screen failures). This isn't - done by default due to potential issues with logfile ownership and - write permissions and the fact that there is no logfile rotation by - default. - -**The third is the "application log"**. This is used by $Projectname - to report what is going on in the program and usually reports any - difficulties or unexpected data we received. It also occasionally - reports "heartbeat" status messages to indicate that we reached a - certain point in a script. **This** is the most important log file - to us, as we create it ourself for the sole purpose of reporting the - status of background tasks and anything that seems weird or out of - place. It may not be fatal, but maybe just unexpected. If you're - performing a task and there's a problem, let us know what is in this - file when the problem occurred. (Please don't send me 100M dumps - you'll only piss me off). Just a few relevant lines so I can rule - out a few hundred thousand lines of code and concentrate on where - the problem starts showing up. - -These are your site logs, not mine. We report serious issues at any -log level. I highly recommend `DEBUG` log level for most sites - which -provides a bit of additional info and doesn't create huge -logfiles. When there's a problem which defies all attempts to track, -you might wish to use `DATA` log level for a short period of time to -capture all the detail of what structures we were dealing with at the -time. This log level will use a lot of space so is recommended only -for brief periods or for developer test sites. - -I recommend configuring logrotate for both the php log and the -application log. I usually have a look at dbfail.out every week or -two, fix any issues reported and then starting over with a fresh -file. Likewise with the PHP logfile. I refer to it once in a while to -see if there's something that needs fixing. - -If something goes wrong, and it's not a fatal error, I look at the -application logfile. Often I will - -``` -tail -f logfile.out -``` - -While repeating an operation that has problems. Often I'll insert -extra logging statements in the code if there isn't any hint what's -going wrong. Even something as simple as "got here" or printing out -the value of a variable that might be suspect. You can do this too - -in fact I encourage you to do so. Once you've found what you need to -find, you can - -``` -git checkout file.php -``` - -To immediately clear out all the extra logging stuff you added. Use -the information from this log and any detail you can provide from your -investigation of the problem to file your bug report - unless your -analysis points to the source of the problem. In that case, just fix -it. - -##### Rotating log files - -1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/addons) repo -1. Create a directory in your web root called `log` with webserver write permissions -1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files. - -#### Reporting issues - -When reporting issues, please try to provide as much detail as may be -necessary for developers to reproduce the issue and provide the -complete text of all error messages. - -We encourage you to try to the best of your abilities to use these -logs combined with the source code in your possession to troubleshoot -issues and find their cause. The community is often able to help, but -only you have access to your site logfiles and it is considered a -security risk to share them. - -If a code issue has been uncovered, please report it on the project -bugtracker (https://framagit.org/hubzilla/core/issues). Again provide -as much detail as possible to avoid us going back and forth asking -questions about your configuration or how to duplicate the problem, so -that we can get right to the problem and figure out what to do about -it. You are also welcome to offer your own solutions and submit -patches. In fact we encourage this as we are all volunteers and have -little spare time available. The more people that help, the easier the -workload for everybody. It's OK if your solution isn't perfect. Every -little bit helps and perhaps we can improve on it. diff --git a/doc/admin/hub_snapshots.md b/doc/admin/hub_snapshots.md deleted file mode 100644 index ab0948aa8..000000000 --- a/doc/admin/hub_snapshots.md +++ /dev/null @@ -1,127 +0,0 @@ -### Hub Snapshot Tools - -Hubzilla developers frequently need to switch between branches that might have -incompatible database schemas or content. The following two scripts create and -restore complete snapshots of a Hubzilla instance, including both the hub web -root and the entire database state. Each script requires a config file called -`hub-snapshot.conf` residing in the same folder and containing the specific -directories and database details of your hub. - -### Config - -The format of the config file is very strict. There must be no spaces between the -variable name and the value. Replace only the content inside the quotes with your -configuration. Save this file as `hub-snapshot.conf` alongside the scripts. - - # Location of hub root. Typically this is the location of the Hubzilla repo clone. - HUBROOT="/var/www/" - # MySQL database name - DBNAME="hubzilla" - # MySQL database user - DBUSER="hubzilla" - # MySQL database password - DBPWD="akeufajeuwfb" - # The target snapshot folder where the git repo will be initialized - SNAPSHOTROOT="/root/snapshots/hubzilla/" - -### Snapshot - -Example usage: - - sh hub-snapshot.sh my-hub.conf "Commit message for the snapshot" - -**hub-snapshot.sh**: - - #!/bin/bash - - if ! [ -f "$1" ]; then - echo "$1 is not a valid file. Aborting..." - exit 1 - fi - source "$1" - #echo "$DBNAME" - #echo "$DBUSER" - #echo "$DBPWD" - #echo "$HUBROOT" - #echo "$SNAPSHOTROOT" - MESSAGE="snapshot: $2" - - if [ "$DBPWD" == "" -o "$SNAPSHOTROOT" == "" -o "$DBNAME" == "" -o "$DBUSER" == "" -o "$HUBROOT" == "" ]; then - echo "Required variable is not set. Aborting..." - exit 1 - fi - - if [ ! -d "$SNAPSHOTROOT"/db/ ]; then - mkdir -p "$SNAPSHOTROOT"/db/ - fi - if [ ! -d "$SNAPSHOTROOT"/www/ ]; then - mkdir -p "$SNAPSHOTROOT"/www/ - fi - - if [ ! -d "$SNAPSHOTROOT"/www/ ] || [ ! -d "$SNAPSHOTROOT"/db/ ]; then - echo "Error creating snapshot directories. Aborting..." - exit 1 - fi - - echo "Export database..." - mysqldump -u "$DBUSER" -p"$DBPWD" "$DBNAME" > "$SNAPSHOTROOT"/db/"$DBNAME".sql - echo "Copy hub root files..." - rsync -va --delete --exclude=.git* "$HUBROOT"/ "$SNAPSHOTROOT"/www/ - - cd "$SNAPSHOTROOT" - - if [ ! -d ".git" ]; then - git init - fi - if [ ! -d ".git" ]; then - echo "Cannot initialize git repo. Aborting..." - exit 1 - fi - - git add -A - echo "Commit hub snapshot..." - git commit -a -m "$MESSAGE" - - exit 0 - -### Restore - - #!/bin/bash - # Restore hub to a previous state. Input hub config and commit hash - - if ! [ -f "$1" ]; then - echo "$1 is not a valid file. Aborting..." - exit 1 - fi - source "$1" - COMMIT=$2 - - if [ "$DBPWD" == "" -o "$SNAPSHOTROOT" == "" -o "$DBNAME" == "" -o "$DBUSER" == "" -o "$HUBROOT" == "" ]; then - echo "Required variable is not set. Aborting..." - exit 1 - fi - RESTOREDIR="$(mktemp -d)/" - - if [ ! -d "$RESTOREDIR" ]; then - echo "Cannot create restore directory. Aborting..." - exit 1 - fi - echo "Cloning the snapshot repo..." - git clone "$SNAPSHOTROOT" "$RESTOREDIR" - cd "$RESTOREDIR" - echo "Checkout requested snapshot..." - git checkout "$COMMIT" - echo "Restore hub root files..." - rsync -a --delete --exclude=.git* "$RESTOREDIR"/www/ "$HUBROOT"/ - echo "Restore hub database..." - mysql -u "$DBUSER" -p"$DBPWD" "$DBNAME" < "$RESTOREDIR"/db/"$DBNAME".sql - - chown -R www-data:www-data "$HUBROOT"/{store,extend,addon,.htlog,.htconfig.php} - - echo "Restored hub to snapshot $COMMIT" - echo "Removing temporary files..." - - rm -rf "$RESTOREDIR" - - exit 0 - diff --git a/doc/admin/zarlog_msgs.md b/doc/admin/zarlog_msgs.md deleted file mode 100644 index 0fe16a1e2..000000000 --- a/doc/admin/zarlog_msgs.md +++ /dev/null @@ -1,112 +0,0 @@ -~~~ -L regate ZAR1131E dId2 mistaken -L ZAR1132E Identity unknown - ZAR1133A Sorry for any inconvience. Thank you for your response. -L ZAR1134S email verfication denied {did2} -L ZAR1135E not awaited url parameter received - -L regate ZAR1230S Unexpected registration verification request for -L ZAR1231E dId2 mistaken -L ZAR1232E Identity unknown -L ZAR1234W Request not inside time frame -L ZAR1235E Token verification failed - ZAR1236I Verify successfull -L ZAR1236E Verify failed -L ZAR1237D unexpected - (reason may be caused by new account flags implemented still not known) - ZAR1238I Email resent - ZAR1238E Resent failed -L ZAR1239I Account successfull created -L ZAR1239E Account creation error - - register ZAR0130E Registration on this hub is disabled. - ZAR0131I Registration on this hub is by approval only. - Register at another affiliated hub in case when prefered - ZAR0132I Registration on this hub is by invitation only. - Register at another affiliated hub - ZAR0133I If the registation was already submitted with your data once ago, - enter your identity (like email) here and submit - ZAR0134I I have an invite code - ZAR0135I This site requires verification. After completing this form, - please check the notice or your email for further instructions. - ZAR0136I Your email address (or leave blank to register without email) - -L register ZAR0230S Unexpected registration request - ZAR0231E Email address mistake - ZAR0231E Passwords do not match. - ZAR0231E Please indicate acceptance of the Terms of Service. Registration failed. - ZAR0232E Invitations are not available -L ZAR0233E Registration on this hub is by invitation only -L ZAR0234S Invitation code failed -L ZAR0235S Invitation email failed - ZAR0236E Invitation not in time or too late - ZAR0237I Invitation code succesfully applied -L ZAR0238E Email address already in use -L ZAR0239D Error creating dId A - ZAR0239I Your didital id is {did2} and your pin for is {pin} - Keep these infos and your entered password safe - Valid from ... nd expire ... -L ZAR0239S Exceeding same ip register request of - - ui:admin:site - ZAR0810C Register text - Will be displayed prominently on the registration page. - ZAR0820C register_policy - Does this site allow new member registration? - ZAR0830C Registration office on duty - The weekdays and hours the register office is open for registrations - ZAR0831I Testmode duties - (interactive) - ZAR0840C Account registrations max per day - How many registration requests the site accepts during one day. Unlimited if zero or no value. - ZAR0850C Account registrations from same ip - How many pending registration requests the site accepts from a same ip address. - ZAR0860C Account registration delay - How long a registration request has to wait before validation can perform - ZAR0862C Account registration expiration - How long a registration to confirm remains valid. Not expire if zero or no value - ZAR0870C Auto channel create - Auto create a channel when register a new account. When On, the register form will show - additional fields for the channel-name and the nickname. - ZAR0880C Invitation only - Only allow new member registrations with an invitation code. - Above register policy must be set to Yes. - ZAR0881C Invitation also - Also allow new member registrations with an invitation code. - Above register policy must be set to Yes. - ZAR0890C Verify Email Addresses - Check to verify email addresses used in account registration (recommended). - - invite ZAI0100E All users invitation limit exceeded - ZAI0101E Permission denied. - ZAI0102E Invite App (Not Installed) - ZAI0103E Invites not proposed by configuration. Contact the site admin - ZAI0104E Invites by users not enabled - ZAI0105W You have no more invitations available - ZAI0106I Invitations I am using - ZAI0107I Invitations we are using - ZAI0109E Not on xchan - ZAI0110I § Note, the email(s) sent will be recorded in the system logs - (see ZAI0208I @ L) - ZAI0111I Enter email addresses, one per line - ZAI0112I Your message - Here you may enter personal notes to the recipient(s) - ZAI0113I Invite template - ZAI0114I Note, the invitation code is valid up to ... - - invite ZAI0201E Permission denied. - ZAI0202E Invite App (Not Installed) - ZAI0203E Not a valid email address - ZAI0204E Not a real email address - ZAI0205E Not allowed email address - ZAI0206E mail address already in use - ZAI0207I Note, the invitation code is valid up to - ZAI0208E Message delivery failed. - ZAI0208I Message delivery success. -L ZAI0208I to {email} Message delivery success. ({account#}, {channel#}, from:{email}}) - ZAI0209I Accepted email address - ZAI0210E Too many recipients for one invitation (max n) - ZAI0211E No recipients for this invitation - ZAI0212I n mail(s) sent, n mail error(s) - ZAI0213E Register is closed -~~~ diff --git a/doc/admins.bb b/doc/admins.bb deleted file mode 100644 index 6c78ce999..000000000 --- a/doc/admins.bb +++ /dev/null @@ -1,15 +0,0 @@ -[h2]Documentation for Hub Administrators[/h2] -[h3]Deploying your hub[/h3] -[zrl=[baseurl]/help/install]Install[/zrl] -[zrl=[baseurl]/help/red2pi]Installing $Projectname on the Raspberry Pi[/zrl] -[zrl=[baseurl]/help/Hubzilla_on_OpenShift]$Projectname on OpenShift[/zrl] -[h3]Taking care of your hub[/h3] -[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl] -[zrl=[baseurl]/help/theme_management]Theme Management[/zrl] -[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl] -[zrl=[baseurl]/help/service_classes]Service Classes[/zrl] -[zrl=[baseurl]/help/directories]Working with and configuring Directories[/zrl] -[h3]Frequently asked questions[/h3] -[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] - -#include doc/macros/main_footer.bb; diff --git a/doc/api/api_albums.md b/doc/api/api_albums.md deleted file mode 100644 index 230daae3c..000000000 --- a/doc/api/api_albums.md +++ /dev/null @@ -1,66 +0,0 @@ -API albums -========== - -Description: list photo albums - -GET /api/z/1.0/albums - - -Output: - - text - textual name - - total - number of photos in this album - - url - web URL - - urlencode - textual name, urlencoded - - bin2hex - textual name using bin2hex (which is used in the web URL link) - - -Example: - - - { - - "success": true, - "albums": [ - { - "text": "/", - "total": "2", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/", - "urlencode": "", - "bin2hex": "" - }, - { - "text": "2016-01", - "total": "6", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3031", - "urlencode": "2016-01", - "bin2hex": "323031362d3031" - }, - { - "text": "2016-02", - "total": "7", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3032", - "urlencode": "2016-02", - "bin2hex": "323031362d3032" - }, - { - "text": "Cover Photos", - "total": "5", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/436f7665722050686f746f73", - "urlencode": "Cover+Photos", - "bin2hex": "436f7665722050686f746f73" - }, - { - "text": "Profile Photos", - "total": "26", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/50726f66696c652050686f746f73", - "urlencode": "Profile+Photos", - "bin2hex": "50726f66696c652050686f746f73" - } - ] - - } diff --git a/doc/api/api_filedata.md b/doc/api/api_filedata.md deleted file mode 100644 index 1d46a495c..000000000 --- a/doc/api/api_filedata.md +++ /dev/null @@ -1,66 +0,0 @@ -API filedata -============= - -Provides the ability to download a file from cloud storage in chunks - -GET /api/z/1.0/filedata - - -Required: - - - file_id - attach.hash of desired file ('begins with' match) - - -Optional: - - - start - starting byte of returned data in file (counting from 0) - - - length - length (prior to base64 encoding) of chunk to download - - -Returns: - - attach (DB) structure with base64 encoded 'content' comprised of the desired chunk - - - -Example: - - https://xyz.macgirvin.com/api/z/1.0/filedata?f=&file_id=9f5217770fd&start=0&length=48 - -Returns: - - { - - "attach": { - "id": "107", - "aid": "1", - "uid": "2", - "hash": "9f5217770fd55d563bd77f84d534d8e119a187514bbd391714626cd9c0e60207", - "creator": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "filename": "pcxtopbm.c", - "filetype": "application/octet-stream", - "filesize": "3934", - "revision": "0", - "folder": "", - "flags": "0", - "is_dir": "0", - "is_photo": "0", - "os_storage": "1", - "os_path": "", - "display_path": "", - "content": "LyogcGN4dG9wYm0uYyAtIGNvbnZlcnQgUEMgcGFpbnRicnVzaCAoLnBjeCkgZmls", - "created": "2016-07-24 23:13:01", - "edited": "2016-07-24 23:13:01", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "", - "start": 0, - "length": 48 - } - - } \ No newline at end of file diff --git a/doc/api/api_files.md b/doc/api/api_files.md deleted file mode 100644 index c2a10fce5..000000000 --- a/doc/api/api_files.md +++ /dev/null @@ -1,103 +0,0 @@ -API files -========= - -List file storage (attach DB) - -GET /api/z/1.0/files - - -Options: - - - hash - return only entries matching hash (exactly) - - - filename - return only entries matching filename (substring) - - - filetype - return only entries matching filetype/mimetype (substring) - - - start - start at record (default 0) - - - records - number of records to return or 0 for unlimited - - - -Example: - -curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/files -d filetype=multipart/mixed - - -Returns: - - { - - "success": true, - "results": [ - { - "id": "1", - "aid": "1", - "uid": "2", - "hash": "44ee8b2a1a7f36dea07b93b7747a2383a1bc0fdd08339e8928bfcbe45f65d939", - "filename": "Profile Photos", - "filetype": "multipart/mixed", - "filesize": "0", - "revision": "0", - "folder": "", - "os_storage": "1", - "is_dir": "1", - "is_photo": "0", - "flags": "0", - "created": "2016-01-02 21:51:17", - "edited": "2016-01-02 21:51:17", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "" - }, - { - "id": "12", - "aid": "1", - "uid": "2", - "hash": "71883f1fc64af33889229cbc79c5a056deeec5fc277d765f182f19073e1b2998", - "filename": "Cover Photos", - "filetype": "multipart/mixed", - "filesize": "0", - "revision": "0", - "folder": "", - "os_storage": "1", - "is_dir": "1", - "is_photo": "0", - "flags": "0", - "created": "2016-01-15 00:24:33", - "edited": "2016-01-15 00:24:33", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "" - }, - { - "id": "16", - "aid": "1", - "uid": "2", - "hash": "f48f7ec3278499d1dd86b72c3207beaaf4717b07df5cc9b373f14d7aad2e1bcd", - "filename": "2016-01", - "filetype": "multipart/mixed", - "filesize": "0", - "revision": "0", - "folder": "", - "os_storage": "1", - "is_dir": "1", - "is_photo": "0", - "flags": "0", - "created": "2016-01-22 03:24:55", - "edited": "2016-01-22 03:26:57", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "" - } - ] - } diff --git a/doc/api/api_functions.bb b/doc/api/api_functions.bb deleted file mode 100644 index fe7cb11ba..000000000 --- a/doc/api/api_functions.bb +++ /dev/null @@ -1,133 +0,0 @@ -[b]Red Twitter API[/b] - -The "basic" Red web API is based on the Twitter API, as this provides instant compatibility with a huge number of third-party clients and applications without requiring any code changes on their part. It is also a super-set of the StatusNet version of the Twitter API, as this also has existing wide support. - -Red has a lot more capability that isn't exposed in the Twitter interfaces or where we are forced to "dumb-down" the API functions to work with the primitive Twitter/StatusNet communications and privacy model. So we plan to extend the Twitter API in ways that will allow Red-specific clients to make full use of Red features without being crippled. - -A dedicated Red API is also being developed to work with native data structures and permissions and which do not require translating to different privacy and permission models and storage formats. This will be described in other documents. The prefix for all of the native endpoints is 'api/red'. - -Red provides multiple channels accesible via the same login account. With Red, any API function which requires authentication will accept a parameter &channel={channel_nickname} - and will select that channel and make it current before executing the API command. By default, the default channel associated with an account is selected. - -Red also provides an extended permission model. In the absence of any Red specific API calls to set permissions, they will be set to the default permissions settings which are associated with the current channel. - -Red will probably never be able to support the Twitter 'api/friendships' functions fully because Red is not a social network and has no concept of "friendships" - it only recognises permissions to do stuff (or not do stuff as the case may be). - -Legend: T= Twitter, S= StatusNet, F= Friendica, R= Red, ()=Not yet working, J= JSON only (XML formats deprecated) - -Twitter API compatible functions: - - api/account/verify_credentials T,S,F,R - api/statuses/update T,S,F,R - api/users/show T,S,F,R - api/statuses/home_timeline T,S,F,R - api/statuses/friends_timeline T,S,F,R - api/statuses/public_timeline T,S,F,R - api/statuses/show T,S,F,R - api/statuses/retweet T,S,F,R - api/statuses/destroy T,S,F,(R) - api/statuses/mentions T,S,F,(R) - api/statuses/replies T,S,F,(R) - api/statuses/user_timeline T,S,F,(R) - api/favorites T,S,F,R - api/account/rate_limit_status T,S,F,R - api/help/test T,S,F,R - api/statuses/friends T,S,F,R - api/statuses/followers T,S,F,R - api/friends/ids T,S,F,R - api/followers/ids T,S,F,R - api/direct_messages/new T,S,F,R - api/direct_messages/conversation T,S,F,R - api/direct_messages/all T,S,F,R - api/direct_messages/sent T,S,F,R - api/direct_messages T,S,F,R - api/oauth/request_token T,S,F,R - api/oauth/access_token T,S,F,R - api/favorites T,S,R - api/favorites/create T,S,R - api/favorites/destroy T,S,R - -Twitter API functions supported by StatusNet but not currently by Friendica or Red - - api/statuses/retweets_of_me T,S - api/friendships/create T,S - api/friendships/destroy T,S - api/friendships/exists T,S - api/friendships/show T,S - api/account/update_location T,S - api/account/update_profile_background_image T,S - api/account/update_profile_image T,S - api/blocks/create T,S - api/blocks/destroy T,S - -Twitter API functions not currently supported by StatusNet - - api/statuses/retweeted_to_me T - api/statuses/retweeted_by_me T - api/direct_messages/destroy T - api/account/end_session T,(R) - api/account/update_delivery_device T - api/notifications/follow T - api/notifications/leave T - api/blocks/exists T - api/blocks/blocking T - api/lists T - -Statusnet compatible extensions to the Twitter API supported in both Friendica and Red - - api/statusnet/version S,F,R - api/statusnet/config S,F,R - -Friendica API extensions to the Twitter API supported in both Friendica and Red - - api/statuses/mediap F,R - -Red specific API extensions to the Twitter API not supported in Friendica - - api/account/logout R - api/export/basic R,J - api/friendica/config R - api/red/config R - api/friendica/version R - - api/red/version R - - api/red/channel/export/basic R,J - api/red/channel/stream R,J (currently post only) - api/red/albums R,J - api/red/photos R,J (option album=xxxx) - -Red proposed API extensions to the Twitter API - - api/statuses/edit (R),J - api/statuses/permissions (R),J - api/statuses/permissions/update (R),J - api/statuses/ids (R),J # search for existing message_id before importing a foreign post - api/files/show (R),J - api/files/destroy (R),J - api/files/update (R),J - api/files/permissions (R),J - api/files/permissions/update (R),J - api/pages/show (R),J - api/pages/destroy (R),J - api/pages/update (R),J - api/pages/permissions (R),J - api/pages/permissions/update (R),J - api/events/show (R),J - api/events/update (R),J - api/events/permissions (R),J - api/events/permissions/update (R),J - api/events/destroy (R),J - api/photos/show (R),J - api/photos/update (R),J - api/photos/permissions (R),J - api/photos/permissions/update (R),J - api/albums/destroy (R),J - api/albums/show (R),J - api/albums/update (R),J - api/albums/permissions (R),J - api/albums/permissions/update (R),J - api/albums/destroy (R),J - api/friends/permissions (R),J - -#include doc/macros/main_footer.bb; - diff --git a/doc/api/api_group_members.md b/doc/api/api_group_members.md deleted file mode 100644 index 497e0aac6..000000000 --- a/doc/api/api_group_members.md +++ /dev/null @@ -1,133 +0,0 @@ -API group_members -================= - -GET /api/z/1.0/group_members - - - -Required: - - group_id or group_name - - -Returns: - - group_member+abook+xchan (DB join) for each member of the privacy group - - - [ - - { - "id": "1", - "uid": "2", - "gid": "1", - "xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "abook_id": "2", - "abook_account": "1", - "abook_channel": "2", - "abook_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "abook_my_perms": "218555", - "abook_their_perms": "0", - "abook_closeness": "0", - "abook_created": "2016-01-02 21:16:26", - "abook_updated": "2016-01-02 21:16:26", - "abook_connected": "0000-00-00 00:00:00", - "abook_dob": "0000-00-00 00:00:00", - "abook_flags": "0", - "abook_blocked": "0", - "abook_ignored": "0", - "abook_hidden": "0", - "abook_archived": "0", - "abook_pending": "0", - "abook_unconnected": "0", - "abook_self": "1", - "abook_feed": "0", - "abook_profile": "", - "abook_incl": "", - "abook_excl": "", - "abook_instance": "", - "xchan_hash": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "xchan_guid": "lql-1VnxtiO4-WF0h72wLX1Fu8szzHDOXgQaTbELwXW77k8AKFfh-hYr70vqMrc3SSvWN-Flrc5HFhRTWB7ICw", - "xchan_guid_sig": "PafvEL0VpKfxATxlCqDjfOeSIMdmpr3iU7X-Sysa1h5LzDpjSXsjO37tYZL-accb1M5itLlfnW5epkTa5I4flsW21zSY1A2jCuBQUTLLGV7rNyyBy7lgqJUFvAMRx0TfXzP9lcaPqlM9T1tA6jfWOsOmkdzwofGeXBnsjGfjsO2xdGYe6vwjOU0DSavukvzDMnOayB9DekpvDnaNBTxeGLM45Skzr7ZEMcNF7TeXMbnvpfLaALYEKeQs9bGH-UgAG8fBWgzVAzeBfx_XSR1rdixjyiZGP0kq0h35SlmMPcEjliodOBFwMXqpXFB7Ibp4F6o6te2p2ErViJccQVG8VNKB6SbKNXY6bhP5zVcVsJ-vR-p4xXoYJJvzTN7yTDsGAXHOLF4ZrXbo5yi5gFAlIrTLAF2EdWQwxSGyLRWKxG8PrDkzEzX6cJJ0VRcLh5z6OI5QqQNdeghPZbshMFMJSc_ApCPi9_hI4ZfctCIOi3T6bdgTNKryLm5fhy_eqjwLAZTGP-aUBgLZpb1mf2UojBn6Ey9cCyq-0T2RWyk-FcIcbV4qJ-p_8oODqw13Qs5FYkjLr1bGBq82SuolkYrXEwQClxnrfKa4KYc2_eHAXPL01iS9zVnI1ySOCNJshB97Odpooc4wk7Nb2Fo-Q6THU9zuu0uK_-JbK7IIl6go2qA", - "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA18JB76lyP4zzL/y7BCej\neJnfZIWZNtM3MZvI1zEVMWmmwOS+u/yH8oPwyaDk4Y/tnj8GzMPj1lCGVRcd8EJa\nNrCMd50HODA5EsJtxpsOzRcILYjOcTtIAG1K4LtKqELi9ICAaFp0fNfa+Jf0eCek\nvPusx2/ORhy+o23hFoSMhL86o2gmaiRnmnA3Vz4ZMG92ieJEDMXt9IA1EkIqS4y5\nBPZfVPLD1pv8iivj+dtN1XjwplgjUbtxmU0/Ej808nHppscRIqx/XJ0XZU90oNGw\n/wYoK2EzJlPbRsAkwNqoFrAYlr5HPpn4BJ2ebFYQgWBUraD7HwS5atsQEaxGfO21\nlUP0+lDg9t3CXvudDj0UG1jiEKbVIGA+4aG0GN2DSC5AyRq/GRxqyay5W2vQbAZH\nyvxPGrZFO24I65g3pjhpjEsLqZ4ilTLQoLMs0drCIcRm5RxMUo4s/LMg16lT4cEk\n1qRtk2X0Sb1AMQQ2uRXiVtWz77QHMONEYkf6OW4SHbwcv5umvlv69NYEGfCcbgq0\nAV7U4/BWztUz/SWj4r194CG43I9I8dmaEx9CFA/XMePIAXQUuABfe1QMOR6IxLpq\nTHG1peZgHQKeGz4aSGrhQkZNNoOVNaZoIfcvopxcHDTZLigseEIaPPha4WFYoKPi\nUPbZ5o8gTLc750uzrnb2jwcCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "xchan_photo_mimetype": "image/png", - "xchan_photo_l": "https://xyz.macgirvin.com/photo/profile/l/2", - "xchan_photo_m": "https://xyz.macgirvin.com/photo/profile/m/2", - "xchan_photo_s": "https://xyz.macgirvin.com/photo/profile/s/2", - "xchan_addr": "teller@xyz.macgirvin.com", - "xchan_url": "https://xyz.macgirvin.com/channel/teller", - "xchan_connurl": "https://xyz.macgirvin.com/poco/teller", - "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", - "xchan_connpage": "", - "xchan_name": "Teller", - "xchan_network": "zot", - "xchan_instance_url": "", - "xchan_flags": "0", - "xchan_photo_date": "2016-10-19 01:26:50", - "xchan_name_date": "2016-01-02 21:16:26", - "xchan_hidden": "0", - "xchan_orphan": "0", - "xchan_censored": "0", - "xchan_selfcensored": "0", - "xchan_system": "0", - "xchan_pubforum": "0", - "xchan_deleted": "0" - }, - { - "id": "12", - "uid": "2", - "gid": "1", - "xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", - "abook_id": "24", - "abook_account": "1", - "abook_channel": "2", - "abook_xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", - "abook_my_perms": "218555", - "abook_their_perms": "218555", - "abook_closeness": "80", - "abook_created": "2016-01-27 00:48:43", - "abook_updated": "2016-12-04 17:16:58", - "abook_connected": "2016-12-04 17:16:58", - "abook_dob": "0001-01-01 00:00:00", - "abook_flags": "0", - "abook_blocked": "0", - "abook_ignored": "0", - "abook_hidden": "0", - "abook_archived": "0", - "abook_pending": "0", - "abook_unconnected": "0", - "abook_self": "0", - "abook_feed": "0", - "abook_profile": "debb5236efb1626cfbad33ccb49892801e5f844aa04bf81f580cfa7d13204819", - "abook_incl": "", - "abook_excl": "", - "abook_instance": "", - "xchan_hash": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", - "xchan_guid": "d5EMLlt1tHHZ0dANoA7B5Wq9UgXoWcFS9-gXOkL_AAejcPApoQRyxfHTuu8DoTbUaO-bYmX5HPuWuK9PHyqNmA", - "xchan_guid_sig": "CVWEMRPtzI1YcHfnnWHTuv3H964OAmSElgUfxMoX6RdQdxNpqb_POirpVuyP8s3W17mVCfO5V9IAjkg5iKcqCk6YcvOD_egmMy-AnM9TC1kKndQHw55CunD82Q8K_xBNSXkSROizcNkKh9DVLjJPFjW1AqtI4njkZ3EMgrWqnbFRM1qPToUoCY9zM3tEMHoAD9YX1zP90wl40LzfN-dtcNWpSBbiz9owou62uzLbN7mrCwKOMlXLjwwGswRnxIsEnb3O-FXOs8hs0mArKe9snq1-BKeD16LyzxgwlpVLElzIJZGEZGtMdIJgeRzKuBvPjsOIpQ1yAkuOpFJ3nGCM-IPOIIjAmyVl5zD3xPVcxxpZlJRn5fG1Y-gnqTgsrEQCA7M6XPWQdrdHU4akZfyUyFJDhv3uM-jon9VzrYTBw68R0WA-1Z8WafEHA4qh5OWAj85lUarwhr7iTiEckH51ypPCPs6VbT6Pw7yMaxfjFOcipashQagx0tfOlDhE5dQANOXKASFtH1J9-CZY2MQdLPQ6u54d5whuHKMGaJ0V68pnmZ2rOn7g344Ah2WCJrm17jj60QsRMorqRFj7GMdPIA1XB8Wrk88MuYOe3Dhyuu6ZWKI7YTWJS690ZVkKUqAiNHqj0W86DtaiPUc_mmGR0fHl4Gksnko3WmCFv9q2X2E", - "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoj2xCJktBA8Ww7Hp+ZNL\nrNuQpo8UB/bfvRkIy+yua3xpF1TuXcnAH61kyRz8vXgOu/l2CyxQbIoaGslCV5Sy\n8JKeNXe+IilUdSSEjMIwCPfSPsYnMHsSnHWmPmclvJwEtQUKOZmW5mMuVBvXy7D2\njomFwc69AYphdyys6eQ7Dcn6+FRBiQbyMprZ5lxyVW+O4DuXVNa3ej2ebx0gCJZ4\ntTIlBoKwEey91dY+FyKVFjdwfNczpmL7LgmZXqcVx+MG3mYgibwdVMiXVj5X06cs\nV9hJ5Xi+Aklsv/UWJtjw9FVt7y9TLptnhh4Ra6T/MDmnBBIAkOR7P/X8cRv078MT\nl0IMsP0RJcDEtTLtwHFVtDs6p52KDFqclKWbqmxmxqV3OTPVYtArRGIzgnJi/5ur\nHRr5G6Cif7QY3UowsIOf78Qvy28LwSbdymgBAWwPPKIviXWxGO+9kMWdmPSUQrWy\nK0+7YA9P9fBUFfn9Hc+p8SJQmQ6OAqLwrDGiPSOlGaNrbEqwqLGgIpXwK+lEFcFJ\n3SPOjJRWdR2whlMxvpwX+39+H7dWN3vSa3Al4/Sq7qW8yW2rYwf+eGyp4Z0lRR+8\nJxFMCwZkSw5g14YdlikAPojv5V1c6KuA5ieg8G1hwyONV7A4JHPyEdPt0W0TZi6C\nCOVkPaC3xGrguETZpJfVpwUCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "xchan_photo_mimetype": "image/png", - "xchan_photo_l": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-4", - "xchan_photo_m": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-5", - "xchan_photo_s": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-6", - "xchan_addr": "cloner@xyz.macgirvin.com", - "xchan_url": "http://abc.macgirvin.com/channel/cloner", - "xchan_connurl": "http://abc.macgirvin.com/poco/cloner", - "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", - "xchan_connpage": "", - "xchan_name": "Karen", - "xchan_network": "zot", - "xchan_instance_url": "", - "xchan_flags": "0", - "xchan_photo_date": "2016-03-31 19:59:20", - "xchan_name_date": "2016-01-26 23:23:42", - "xchan_hidden": "0", - "xchan_orphan": "0", - "xchan_censored": "0", - "xchan_selfcensored": "0", - "xchan_system": "0", - "xchan_pubforum": "0", - "xchan_deleted": "0" - } - - ] \ No newline at end of file diff --git a/doc/api/api_item_update.md b/doc/api/api_item_update.md deleted file mode 100644 index cf1a28044..000000000 --- a/doc/api/api_item_update.md +++ /dev/null @@ -1,225 +0,0 @@ -API item/update -=============== - - -Usage: POST /api/z/1.0/item/update - -Description: item/update posts an item (typically a conversation item or post, but can be any item) using form input. - - -Required: - -- body - - text/bbcode contents by default. - - -Optional: - -- $_FILES['media'] - - uploaded media file to include with post - -- title - - title of post/item - -- contact_allow - - array of xchan.xchan_hash allowed to view this item - -- group_allow - - array of group.hash allowed to view this item - -- contact_deny - - array of xchan.xchan_hash not allowed to view this item - -- group_deny - - array of group.hash not allowed to view this item - -- coord - - geographic coordinates - -- location - - freefrom location - -- expire - - datetime this post will expire or be removed - -- mimetype - - mimetype if not text/bbcode - -- parent - - item.id of parent to this post (makes it a comment) - -- parent_mid - - alternate form of parent using message_id - -- remote_xchan - - xchan.xchan_hash of this message author if not the channel owner - -- consensus - - boolean set to true if this is a consensus or voting item (default false) - -- nocomment - - boolean set to true if comments are to be disabled (default false) - -- origin - - do not use this without reading the code - -- namespace - - persistent identity for a remote network or service - -- remote_id - - message_id of this resource on a remote network or service - -- message_id - - message_id of this item (leave unset to generate one) - -- created - - datetime of message creation - -- post_id - - existing item.id if this is an edit operation - -- app - - application or network name to display with item - -- categories - - comma separated categories for this item - -- webpage - - item.page_type if not 0 - -- pagetitle - - for webpage and design elements, the 'page name' - -- layout_mid - - item.mid of layout for this design element - -- plink - - permalink for this item if different than the default - -- verb - - activitystream verb for this item/activity - -- obj_type - - activitystream object type for this item/activity - - - -Example: - -curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/item/update -d body="hello world" - - -Returns: - - - { - - "success": true, - "item_id": "2245", - "item": { - "id": "2245", - "mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "aid": "1", - "uid": "2", - "parent": "2245", - "parent_mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "thr_parent": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "created": "2016-12-03 20:00:12", - "edited": "2016-12-03 20:00:12", - "expires": "0001-01-01 00:00:00", - "commented": "2016-12-03 20:00:12", - "received": "2016-12-03 20:00:12", - "changed": "2016-12-03 20:00:12", - "comments_closed": "0001-01-01 00:00:00", - "owner_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "author_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "source_xchan": "", - "mimetype": "text/bbcode", - "title": "", - "body": "hello world", - "html": "", - "app": "", - "lang": "", - "revision": "0", - "verb": "http://activitystrea.ms/schema/1.0/post", - "obj_type": "http://activitystrea.ms/schema/1.0/note", - "obj": "", - "tgt_type": "", - "target": "", - "layout_mid": "", - "postopts": "", - "route": "", - "llink": "https://xyz.macgirvin.com/display/14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "plink": "https://xyz.macgirvin.com/channel/mychannel/?f=&mid=14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "resource_id": "", - "resource_type": "", - "attach": "", - "sig": "sa4TOQNfHtV13HDZ1tuQGWNBpZp-nWhT2GMrZEmelXxa_IvEepD2SEsCTWOBqM8OKPJLfNy8_i-ORXjrOIIgAa_aT8cw5vka7Q0C8L9eEb_LegwQ_BtH0CXO5uT30e_8uowkwzh6kmlVg1ntD8QqrGgD5jTET_fMQOIw4gQUBh40GDG9RB4QnPp_MKsgemGrADnRk2vHO7-bR32yQ0JI-8G-eyeqGaaJmIwkHoi0vXsfjZtU7ijSLuKEBWboNjKEDU89-vQ1c5Kh1r0pmjiDk-a5JzZTYShpuhVA-vQgEcADA7wkf4lJZCYNwu3FRwHTvhSMdF0nmyv3aPFglQDky38-SAXZyQSvd7qlABHGCVVDmYrYaiq7Dh4rRENbAUf-UJFHPCVB7NRg34R8HIqmOKq1Su99bIWaoI2zuAQEVma9wLqMoFsluFhxX58KeVtlCZlro7tZ6z619-dthS_fwt0cL_2dZ3QwjG1P36Q4Y4KrCTpntn9ot5osh-HjVQ01h1I9yNCj6XPgYJ8Im3KT_G4hmMDFM7H9RUrYLl2o9XYyiS2nRrf4aJHa0UweBlAY4zcQG34bw2AMGCY53mwsSArf4Hs3rKu5GrGphuwYX0lHa7XEKMglwBWPWHI49q7-oNWr7aWwn1FnfaMfl4cQppCMtKESMNRKm_nb9Dsh5e0", - "diaspora_meta": "", - "location": "", - "coord": "", - "public_policy": "", - "comment_policy": "contacts", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "", - "item_restrict": "0", - "item_flags": "0", - "item_private": "0", - "item_origin": "1", - "item_unseen": "0", - "item_starred": "0", - "item_uplink": "0", - "item_consensus": "0", - "item_wall": "1", - "item_thread_top": "1", - "item_notshown": "0", - "item_nsfw": "0", - "item_relay": "0", - "item_mentionsme": "0", - "item_nocomment": "0", - "item_obscured": "0", - "item_verified": "1", - "item_retained": "0", - "item_rss": "0", - "item_deleted": "0", - "item_type": "0", - "item_hidden": "0", - "item_unpublished": "0", - "item_delayed": "0", - "item_pending_remove": "0", - "item_blocked": "0" - } - - } \ No newline at end of file diff --git a/doc/api/api_posting.bb b/doc/api/api_posting.bb deleted file mode 100644 index c708ad143..000000000 --- a/doc/api/api_posting.bb +++ /dev/null @@ -1,24 +0,0 @@ -[b][size=xx-large]Posting to the Matrix via the API[/size][/b] - -The API allows you to post to the red# by HTTP POST request. Below you see an example using the command line tool cURL: - -[code]curl -ssl -u [color=blue]$E-Mail[/color]:[color=blue]$Password[/color] -d "[color=blue]$Parameters[/color]" [url][observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update -[/url][/code] -[table][tr][td]$E-Mail:[/td][td]The E-Mail Address you use to login, or the channel nickname (without the hostname)[/td][/tr] -[tr][td]$Password:[/td][td]The Password you use to login[/td][/tr] -[tr][td]$Parameters:[/td][td]That's the interesting part, here you insert the content you want to send using the following parameters:[/td][/tr][/table] - -[ul] -[*]title: the title of the posting -[*]channel: the channel you want to post to (do not use this parameter with HTTP Basic auth) -[*]category: a comma-seperated list of categories for the posting -[*]status: the content of the posting, formatted with BBCode - OR -[*]htmlstatus:the content of the posting, formatted in HTML. -[/ul] - -To post to a specific channel, replace the email address with the channel nickname. If you supply the channel parameter, it has to match the "email", but is superfluous anyway. - -Instead of calling [observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update which returns a json (you could also add .json on the end to clarify) output, you can use [observer.baseurl]/api/statuses/update.xml to get an xml formatted return. - -Instead of Basic HTTP Authentification you could also use oAuth. diff --git a/doc/api/api_xchan.md b/doc/api/api_xchan.md deleted file mode 100644 index d2b15e04c..000000000 --- a/doc/api/api_xchan.md +++ /dev/null @@ -1,44 +0,0 @@ -API xchan -========= - -An xchan is a global location independent channel and is the primary record for a network -identity. It may refer to channels on other websites, networks, or services. - -GET /api/z/1.0/xchan - -Required: one of [ address, hash, guid ] as GET parameters - -Returns a portable xchan structure - -Example: https://xyz.macgirvin.com/api/z/1.0/xchan?f=&address=mike@macgirvin.com - -Returns: - - { - "hash": "jr54M_y2l5NgHX5wBvP0KqWcAHuW23p1ld-6Vn63_pGTZklrI36LF8vUHMSKJMD8xzzkz7s2xxCx4-BOLNPaVA", - "guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg", - "guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4", - "pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "photo_mimetype": "image/jpeg", - "photo_l": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-4", - "photo_m": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-5", - "photo_s": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-6", - "address": "mike@macgirvin.com", - "url": "https://macgirvin.com/channel/mike", - "connurl": "https://macgirvin.com/poco/mike", - "follow": "https://macgirvin.com/follow?f=&url=%s", - "connpage": "https://macgirvin.com/connect/mike", - "name": "Mike Macgirvin", - "network": "zot", - "instance_url": "", - "flags": "0", - "photo_date": "2012-12-06 05:06:11", - "name_date": "2012-12-06 04:59:13", - "hidden": "1", - "orphan": "0", - "censored": "0", - "selfcensored": "0", - "system": "0", - "pubforum": "0", - "deleted": "0" - } \ No newline at end of file diff --git a/doc/api/group.md b/doc/api/group.md deleted file mode 100644 index 8829ff416..000000000 --- a/doc/api/group.md +++ /dev/null @@ -1,41 +0,0 @@ -API group -========= - -GET /api/z/1.0/group - - -Description: list privacy groups - - -Returns: DB tables of all privacy groups. - -To use with API group_members, provide either 'group_id' from the id element returned in this call, or 'group_name' from the gname returned in this call. - - - [ - - { - "id": "1", - "hash": "966c946394f3e2627bbb8a55026b5725e582407098415c02f85232de3f3fde76Friends", - "uid": "2", - "visible": "0", - "deleted": "0", - "gname": "Friends" - }, - { - "id": "2", - "hash": "852ebc17f8c3ed4866f2162e384ded0f9b9d1048f93822c0c84196745f6eec66Family", - "uid": "2", - "visible": "1", - "deleted": "0", - "gname": "Family" - }, - { - "id": "3", - "hash": "cc3cb5a7f9818effd7c7c80a58b09a189b62efa698a74319117babe33ee30ab9Co-workers", - "uid": "2", - "visible": "0", - "deleted": "0", - "gname": "Co-workers" - } - ] \ No newline at end of file diff --git a/doc/api/statuses_update.bb b/doc/api/statuses_update.bb deleted file mode 100644 index acad440de..000000000 --- a/doc/api/statuses_update.bb +++ /dev/null @@ -1,23 +0,0 @@ -[h2]statuses/update[/h2] -Parameters - - title: Title of the status - status: Status in text [or bbcode] format - htmlstatus: Status in HTML format - in_reply_to_status_id - lat: latitude - long: longitude - media: image data - source: Application name - group_allow - contact_allow - group_deny - contact_deny - - -Example - -[code] -curl -u theUsername:thePassword http://mywebsite/api/statuses/update.xml -d status='Hello world' -[/code] - diff --git a/doc/bugs.bb b/doc/bugs.bb deleted file mode 100644 index 3bf2a0e29..000000000 --- a/doc/bugs.bb +++ /dev/null @@ -1,32 +0,0 @@ -[h2]Bugs, Issues, and things that go bump in the night...[/h2] -[h3]Something went wrong! Who is in charge of fixing it?[/h3] - -[b]$Projectname Community Server[/b] - -$Projectname Community Server is open source software which is maintained by "the community" - essentially unpaid volunteers. Nobody is in charge of fixing bugs. We work together to keep the software and network running smoothly and error free. You are a member of this community, so we also require your help to provide quality software. There are no mythical "developers" who magically fix everything. It's up to all of us to pitch in and help. - -The first thing you need to do is talk to your hub administrator - the person who runs and manages your site. They are in the unique position of having access to the internal software and database and [b]logfiles[/b] and will need to be involved in fixing your problem. Other people "on the net" can't really help with this. The first thing the hub administrator needs to do is look at their logs and/or try to reproduce the problem. So try to be as helpful and courteous as possible in helping them look into the problem. - -To find your hub administrator (if you don't know who they are) please look at [url=[baseurl]/siteinfo]this page[/url]. If they have not provided any contact info on that page or provided an "Impressum" there, see [url=[baseurl]/siteinfo.json]this site info summary[/url] under the heading "admin:". - -It is highly recommended that bug reports be filed by hub administrators so that they can include the relevant logfile and database information relevant to the issue and be available to try workarounds and followup tests. Without this level of cooperation it may not be possible to fix the problem. - -[h3]I'm a hub administrator; what do I do?[/h3] - -The software instructions which provide this web service are open source and are available for your inspection. We encourage everybody to read it and see how everything works and verify that we aren't doing anything evil or negligent with your personal communications. If an error message was reported, often one can do a search on the source files for that error message and find out what triggered it. With this information and the site logfiles it may be possible to figure out the sequence of events leading to the error. There could also be other sites involved, and the problem may not even be on your site but elsewhere in the network. Try to pin down the communication endpoints (hubs or sites) involved in the problem and contact the administrator of that site or those sites. Please try and provide an event time of when things went wrong so it can be found in the logs. Work with the other administrator(s) to try and find the cause of the problem. Logfiles are your friend. When something happens in the software that we didn't expect, it is nearly always logged. - -[h3]The white screen of death[/h3] - -If you get a blank white screen when doing something, this is almost always a code or syntax error. There are instructions in the site .htconfig.php file which will allow the site administrator to enabling syntax logging. We recommend all sites use this. With syntax logging enabled repeat the sequence which led to the error and it should log the offending line of code. Hopefully you will be able to fix the problem with this information. When you do, please submit the fix "upstream" so that we can share the fix with the rest of the project members and other communities. This is a key benefit of using open source software - we share with each other and everybody benefits. - -[h3]I'm stumped. I can't figure out what is wrong.[/h3] - -At this point it might be worthwhile discussing the issue on one of the online forums. There may be several of these and some may be more suited to your spoken language. At this time, the 'Hubzilla Support' channel (support@zotadel.net) is the recommended forum for discussing bugs. - -If community members with software engineering training/expertise can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on framagit.org to do this. So register, and then visit https://framagit.org/hubzilla/core/issues . Create an issue here and provide all the same information that you provided online. Don't leave out anything. - -Then you wait. If it's a high profile issue, it may get fixed quickly. But nobody is in charge of fixing bugs. If it lingers without resolution, please spend some more time investigating the problem. Ask about anything you don't understand related to the behaviour. You will learn more about how the software works and quite possibly figure out why it isn't working now. Ultimately it is somebody in the community who is going to fix this and you are a member of the community; and this is how the open source process works. - - -Other people working to fix the problem may need to find out more, so do your homework and document what is happening and everything you've tried. Don't say "I did xyz and it didn't work." That doesn't tell us anything. Tell us precisely what steps you took and what you expected the result to be, and precisely what happened as a result. What page/URL were you looking at or what form were you filling in? If there were any error messages, don't say "there was an error message". Tell us exactly what the message said. Also tell us what hub you are using, what software version you're running and any other details that may be unique about your site configuration. It is understood that you might wish to keep some information and your connections private, however if you aren't willing to share the information other people need to reproduce/fix the problem, it may not get fixed. - diff --git a/doc/campaign.bb b/doc/campaign.bb deleted file mode 100644 index dddc614f9..000000000 --- a/doc/campaign.bb +++ /dev/null @@ -1,237 +0,0 @@ -[b]Initial Indiegg pitch[/b] - -[b][color= grey][size=20]What have we done, and what we hope to achieve[/size][/color][/b] - -[b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b] - -We started $Projectname project by asking ourselves a few questions: - -- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site. Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites. -Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online. - -We liked this idea and went ahead with coding it immediately. Today, single-click sign is in alpha state. It needs more love, which means a solid three months of full-time development efforts. - -- Think of your Facebook, Twitter, WordPress, or any other website where you currently have an account. Now imagine being able to clone your account, to make an exact duplicate of it (with all of your friends, posts and settings), then export your cloned account into another server that is part of this communication network. After you're done, both of your accounts are synced from the time they were cloned. It doesn't matter where you log in (at your original location, or where you imported your clone). You see the same content, the same friends, posts, and account settings. -At that point, it is more appropriate to call your account an identity that is nomadic (it is not tied to one home, unless you choose to do so!). -It's 2013, our online presence no longer has to be tied to a single server, domain name or IP address. We should be able to clone and import our identities to other servers. In such a network, it should only matter who you are, not where you are. - -We're very intrigued by the possibilities nomadic identities open up for freedom, censorship-resistance, and identity resilience. Consider the following scenarios: - - -- Should a repressive government or corporation decide to delete your account, your cloned identity lives on, because it is located on another server, across the world, which is part of the same communication network. You can't be silenced! - - -- What if there is a server meltdown, and your identity goes off line. No problem, you log into your clone and all is good. - - -- Your server administrator can no longer afford to keep paying to support a free service (a labor love and principle, which all of us have participating in as system administrators of Friendica sites!). She notifies you that you must clone your account before the shutoff date. Rather than loose all your friends, and start from scratch by creating a new identity somewhere, you clone and move to another server. -We feel this is especially helpful for the free web, where administrators of FOSS community sites are often faced with difficult financial decisions. Since many of them rely on donations, sometimes servers have to be taken offline, when costs become prohibitive for the brave DIY souls running those server. Nomadic identities should relieve some of the pressures associated with such situations. - -At the same time, we are also thinking of solutions that would make it possible for people running Red hubs to be financially sustainable. To that end, we're starting to implement service classes in our code, which would allow administrators to structure paid levels of service, if they choose to do so. - -Today, nomadic identity is currently in alpha state. It also needs more love, which means a solid three months of full-time development efforts. - -- Imagine a social network that is censorship-resistant, and privacy-respecting by design. It is not controlled by one mega-corporation, and where users cannot be easily censored by oppressive governments. So, in addition to nomadic identities, we are talking about decentralization, open source, freely software, that can run on any hardware that supports a database and a modern web browser. And we mean "any hardware", from a self-hosted $35 Raspberry Pi, to the very latest Intel Xeon and AMD Bulldozer-powered server behemoths. - -We've realized that privacy requires full control over content. We should be able to delete, backup and download all of our content, as well as associated account/identity information. To this end, we have already implemented the initial version of account export and backup. - -Concerned about pages and pages of posts from months and years past? The solution should be simple: visit your settings page, specify that all content older than 7 days, with the exception of starred posts, should be automatically deleted. Done, the clutter is gone! (Consider also the privacy and anti-mass surveillance implications of this feature. PRISM disclosures have hinted that three-letter spying agencies around the world are recording all internet traffic and storing it for a few days at a time. We feel that automatic post expiration becomes a rather useful feature in this context, and implementing it is one of our near future priorities.) - -[b][color= grey][size=18]The Affinity Slider and Access Control Lists[/size][/color][/b] - -- What if the permissions and access control lists that help secure modern operating systems were extended into a communication network that lived on the internet? This means somebody could log into this network from their home site, and with the simple click of a few buttons dynamically sort who can have access to their online content on a very fine level: from restricting others from seeing your latest blog post, to sharing your bookmarks with the world. - -We've coded the initial version of such a new feature. It is called the "Affinity Slider", and in our very-alpha user interface it looks like this. -[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img] - -{INSERT SCREENSHOT OF A MATRIX PAGE} - -Think of it as an easy way to filter content that you see, based on the degree of "closeness" to you. Move the slider to Friends, and only content coming from contacts you've tagged as friends is displayed on your home page. Uncluttering thousands of contacts, friends, RSS feeds, and other content should be a basic feature of modern communication on the web, but not at the expense of ease of use. - -In addition to the Affinity Slider, we also have the ACL (Access Control List). Say you want to share something with only 5 of your contacts (a blog, two friends from college, and two forums). You click on the padlock, choose the recipients, and that's it. Only those identities will recieve their posts. Furthermore, the post will be encrypted via PKI (pulic key encryption) to help maintain privacy. In the age of PRISM, we don't know all the details on what's safe out there, but we still think that privacy by design should be automatically present, invisible to the user, and easy to use. -Attaching permissions to any data that lives on this network, potentially solves a great many headaches, while achieving simplicity in communication. - -Think of it this way: the internet is nothing, but a bunch of permissions and a folder of data. You, the user controls the permissions and thus the data that is relevant to you. - -[b][color= grey][size=20]The Matrix is Born![/size][/color][/b] - -After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy. - -It's a lot of work, for anyone. So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot. We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication. - -We need your help to finish it and release it to the world! - -[b][color= grey][size=20]What have we written so far[/size][/color][/b] - -As of the today, $Projectname is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include: - -- Zot, the protocol powering the matrix -- Single-signon logins. -- Nomadic identities -- Basic content manipulation: creation, deletion, rudimentary handling of photos, and media files -- A bare-bones outline of the API and user documentation. - - -[b][color= grey][size=20]Our TO-DO List[/size][/color][/b] - -However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make $Projectname ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: - -- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git. - -- Comanche, our new markup language, similar to BBCode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. You can read more about it on our github wiki: https://github.com/friendica/red/wiki/Comanche - -- A unique help system that lives in the matrix, but is not based on the principles of a search engine. We have some interesting ideas about decentralizing help documentation, without going down the road of distributed search engines. Here's a hint: We shouldn't be searching at all, we should just be filtering what's already there in new, and cunning ways. - -- An appropriate logo, along with professionally done documentation system, both for our API, as well as users. - -- WordPress-like single button software upgrades - -- A built-in development environment, using an integrated web-based code editor such as Ace9 - -[b][color= grey][size=20]What will the money be used for[/size][/color][/b] - -If we raise our targeted amount of funds, we plan to use it as follows: - -1) Fund 6 months {OR WHATEVER} of full time work for our current core developers, Mike, Thomas, and Tobias {ANYONE ELSE?] - -2) Pay a professional web developer to design an kick ass reference theme, along with a project logo. - -3) {WHAT ELSE?} - -[b][color= grey][size=20]Deadlines[/size][/color][/b] - -[b]March, 2014: $Projectname Beta with the following features[/b] - -- {LIST FEATURES} - -[b][color= grey][size=20]Who We Are[/size][/color][/b] - -Mike: {FILL IN BIO, reference Friendica, etc.} - -Thomas: {bio blurb} - -Tobias: {bio blurb} - -Arto: {documentation, etc.} - -{WHO ELSE? WE NEED A TEAM, AT LEAST 3-4 PEOPLE} - -[b][color= grey][size=20]What Do I Get as a Supporter?[/size][/color][/b] - -Our ability to reach 1.0 stable release depends on your generosity and support. We appreciate your help, regardless of the amount! Here's what we're thinking as far as different contribution levels go: - -[b]$1: {CATCHY TAGLINE}[/b] - -We'll list your name on our initial supporters list, a Hall of Fame of the matrix! - -[b]$5:[/b] - -[b]$10: [/b] - -[b]$16: [/b] - -You get one of your $Projectname t-shirts, as well as our undying gratitude. - -[b]$32: [/b] - -[b]$64 [/b] - -[b]128 [/b] - -[b]$256: [/b] - -[b]$512: [/b] - -[b]$1024 [/b] - -[b]$2048[/b] - -Each contributor at this level gets their own $Projectname virtual private server, installed, hosted and supported by us for a period of 1 year. - -[b][color= grey][size=20]Why are we so excited about $Projectname?[/size][/color][/b] - -{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC> - -[b][color= grey][size=20]Other Ways to Help[/size][/color][/b] - -We're a handful of volunteers, and we understand that not everyone can contribute by donating money. There are many other ways you can in getting the Matrix to version 1.0! - -First, you can checkout our source code on github: https://framagit.org/hubzilla/core/ - -Maybe you can dive in and help us out with some development. - -Second, you can install the current developer preview on a server and start compiling bug reports. - -Third, register at one of the public alpha Red hubs, and get a feel for what Red is trying to do! - -Perhaps you're good at writing and documenting stuff. Grab an account at one of the public alphas and give us a hand. - -[b][color= grey][size=20]Frequently Asked Questions[/size][/color][/b] - -[b]1. Is Red a social network?[/b] - -$Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix. - -[b]2. What is the difference between Red and Friendica?[/b] - -What's the difference between a passport, and a postcard? - -Friendica is really, really good at sending postcards. It can do all sorts of things with postcards. It can send them to your friends. It can send them to people you don't know. It can put them in an envelope and send them privately. It can run them through a photocopier and plaster them all over the internet. It can even take postcards in one language and convert them to many others so your friends who speak a different language can read them. - -What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are. Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity. - -$Projectname offers a passport. - -You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity. No longer do you need to register at every single site you use. You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead. - -Once you've proven your identity, a Red hub lets you use our services, as though you'd registered with directly, and we'd verified your credentials as would have happened in the olden days. These resources can, of course, be anything at all. - -[b]2. Why did you choose PHP, instead of Ruby or Python?[/b] - -The reference implementation is in PHP. We chose PHP, because it is available everywhere, and is easily configurable. We understand the debates between proponents and opponents of PHP, Ruby and Python. Nothing prevents implementations of Zot and the matrix in those languages. In fact, people on the matrix have already started developing a version of Red in Python [SOURCE?], and there is talk about future implementations in C (aiming for blazing native performance) and Java. It's free and open source, so we feel it's only a matter of time, once Red is initially completed. - -[b]4. Other than PHP, what other technology does Red use?[/b] - -We use MySQL as our database (this include any forks such as, MariaDB or Percona), and any modern webserver (Apache, nginx, etc.). - -[b]5. How is the Affinity Slider different from Mozilla's Persona?[/b] -{COMPLETE} - -[b]6. Does $Projectname use encryption? Details please![/b] - -Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance. - -Communication between web browsers and Red hubs is encrypted using SSL certificates. - -Private communication on the matrix is protected by AES symmetric encryption, which is itself protected by RSA PKI (public key encryption). By default, we use AES-256-CBC, and our RSA keys are set to 4096-bits. - -For more info on our initial implementation of encrypted communication, check out our source code at Github: https://github.com/friendica/red/blob/master/include/crypto.php - -[b]7. What do you mean by decentralization? [/b] - - -[b]8. Can I build my own website with in $Projectname?[/b] - -Yes. The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix. The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix. - -The longer explanation: Comanche is a markup language, similar to bbcode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Description Language file (".pdl", pronounced "puddle") to create these pages. Bbcode is not a requirement; an XML PDL file could also be used. The tag delimiters would be different. Usage is the same. - -Additional information is available on our Github project wiki: https://github.com/friendica/red/wiki/Comanche - -Comanche is another one of our priorities for the next six months. - -[b]9. Where can I see some technical description of Zot?[/b] - -Our github wiki contains a number of high-level and technical descriptions of Zot, Comanche, and Red in general: https://github.com/friendica/red/wiki - -[b]10. What happens if you raise more than {TARGETED NUMBER}?[/b] - -Raising more than our initial goal of funds, will speed up our development efforts. More developers will be able to take time off from other jobs, and concentrate efforts on finishing Red. - -[b]11 Can I make a contribution via Bitcoin?[/b] - -{YES/NO} - -[b]12. I have additional Questions[/] - -Awesome. We'd be more than happy to chat. You can find us {HERE} - -#include doc/macros/main_footer.bb; - diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb deleted file mode 100644 index 7612d03d8..000000000 --- a/doc/checking_account_quota_usage.bb +++ /dev/null @@ -1,20 +0,0 @@ -[b]Checking your account quota usage (service limits usage)[/b] - -Your hub might implement service class limits, assigning limits to the total size of file, photo, channels, top-level posts, etc., that can be created by an account holder for a specific service level. - -Here's how you can quickly check how much of your assigned quota you're currently using: - -[b]Check file storage quota levels[/b] -Visit the following URL in your browser: -[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] -[observer=0]example.com/filestorage/username[/observer] - -[b]Check uploaded photos storage quota levels[/b] -[observer=1][observer.baseurl]/photos/[observer.webname][/observer] -[observer=0]example.com/photos/username[/observer] - -Example: -[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] -[observer=0]example.com/filestorage/username[/observer] - -#include doc/macros/main_footer.bb; diff --git a/doc/comanche.bb b/doc/comanche.bb deleted file mode 100644 index faf7e695e..000000000 --- a/doc/comanche.bb +++ /dev/null @@ -1,261 +0,0 @@ -[b]Comanche Page Description Language[/b] - -Comanche is a markup language similar to bbcode with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages. - -Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose. - -[b]Page Templates[/b] -Currently there are five layout templates, unless your site provides additional layouts. - -[code] - [b]default[/b] - The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, - "content" for the main content region, and "footer" for a page footer. - - - [b]full[/b] - The full template defines the same as the default template with the exception that there is no "aside" region. - - - [b]choklet[/b] - The choklet template provides a number of fluid layout styles which can be specified by flavour: - - (default flavour) - a two column layout similar to the "default" template, but more fluid - bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays - three - three column layout (adds a "right_aside" region to the default template) - edgestwo - two column layout with fixed side margins - edgesthree - three column layout with fixed side margins - full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar - - [b]redable[/b] (sic) - A template for reading longer texts full screen (so without navigation bar). Three columns: aside, content and right_aside. - For maximum readability it is advised to only use the middle content column. - - [b]zen[/b] - Gives you the freedom to do everything yourself. Just a blank page with a content region. - -[/code] - -To choose a layout template, use the 'template' tag. - -[code] - [template]full[/template] - -[/code] - -To choose the "choklet" template with the "three" flavour: - -[code] - [template=three]choklet[/template] - -[/code] - -The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions. - -Three "macros" have been defined for your use. -[code] - $htmlhead - replaced with the site head content. - $nav - replaced with the site navigation bar content. - $content - replaced with the main page content. - -[/code] - -By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions. - - -To select a theme for your page, use the 'theme' tag. -[code] - [theme]suckerberg[/theme] - -[/code] -This will select the theme named "suckerberg". By default your channel's preferred theme will be used. - -[code] - [theme=passion]suckerberg[/theme] - -[/code] -This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. - -[code] - [theme]suckerberg:passion[/theme] - -[/code] - -The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier. - -[b]Regions[/b] -Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag. - -[code] - [region=htmlhead]....content goes here....[/region] - [region=aside]....content goes here....[/region] - [region=nav]....content goes here....[/region] - [region=content]....content goes here....[/region] - -[/code] - -[b]CSS and Javascript[/b] -We have the possibility to include javascript and css libraries in the htmlhead region. At present we make use of jquery (js), bootstrap (css/js) and foundation (css/js). -This will overwrite the selected themes htmlhead. - -[code] - [region=htmlhead] - [css]bootstrap[/css] - [js]jquery[/js] - [js]bootstrap[/js] - [/region] - -[/code] - -[b]Menus and Blocks[/b] -Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created. - -[code] - [menu]mymenu[/menu] - -[/code] -This places the menu called "mymenu" at this location on the page, which must be inside a region. - -[code] - [menu=horizontal]mymenu[/menu] - -[/code] -This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. - -[code] - [menu][var=wrap]none[/var]mymenu[/menu] - -[/code] -The variable [var=wrap]none[/var] in a block removes the wrapping div element from the menu. - -[code] - [block]contributors[/block] -[/code] -This places a block named "contributors" in this region. - -[code] - [block=someclass]contributors[/block] - -[/code] -This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget". - -[code] - [block][var=wrap]none[/var]contributors[/block] - -[/code] -The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block. - -[b]Widgets[/b] -Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. (TODO: list available widgets and arguments). The base system provides - -[code] - profile - widget which duplicates the profile sidebar of your channel page. This widget takes no arguments - tagcloud - provides a tag cloud of categories - count - maximum number of category tags to list - -[/code] - -Widgets and arguments are specified with the 'widget' and 'var' tags. -[code] - [widget=recent_visitors][var=count]24[/var][/widget] - -[/code] - -This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". - -[b]Comments[/b] -The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page. - -[code] - [comment]This is a comment[/comment] - -[/code] - -[b]Conditional Execution[/b] -You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer. - -[code] - [if $config.system.foo] - ... the configuration variable system.foo evaluates to 'true'. - [else] - ... the configuration variable system.foo evaluates to 'false'. - [/if] - - [if $observer] - ... this content will only be show to authenticated viewers - [/if] - -[/code] - - The 'else' clause is optional. - - Several tests are supported besides boolean evaluation. - -[code] - [if $config.system.foo == bar] - ... the configuration variable system.foo is equal to the string 'bar' - [/if] - [if $config.system.foo != bar] - ... the configuration variable system.foo is not equal to the string 'bar' - [/if] - [if $config.system.foo {} bar ] - ... the configuration variable system.foo is a simple array containing a value 'bar' - [/if] - [if $config.system.foo {*} bar] - ... the configuration variable system.foo is a simple array containing a key named 'bar' - [/if] -[/code] - -[b]Complex Example[/b] -[code] - [comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment] - - [template]3-column-with-header[/template] - - [comment]Use the "darknight" theme[/comment] - - [theme]darkknight[/theme] - - [comment]Use the existing site navigation menu[/comment] - - [region=nav]$nav[/region] - - [region=side] - - [comment]Use my chosen menu and a couple of widgets[/comment] - - [menu]myfavouritemenu[/menu] - - [widget=recent_visitors] - [var=count]24[/var] - [var=names_only]1[/var] - [/widget] - - [widget=tagcloud][/widget] - [block]donate[/block] - - [/region] - - - - [region=middle] - - [comment]Show the normal page content[/comment] - - $content - - [/region] - - - - [region=right] - - [comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment] - - [widget]channel[/widget] - - [/region] - -[/code] - -#include doc/macros/main_footer.bb; diff --git a/doc/context/de/admin/logs/help.html b/doc/context/de/admin/logs/help.html deleted file mode 100644 index 1441d9075..000000000 --- a/doc/context/de/admin/logs/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite können die Einstellungen zur Protokollierung angepasst und vorhandene Protokolle angezeigt werden.
      -
      Protokoll Einstellungen
      -
      Bei aktivierter Debugging-Option werden System-Log Informationen an die Datei in der Protokolldatei im EIngabefeld hinzugefügt. Der Pfad ist relativ zum Hub-Wurzelverzeichnis. Daauf achten, dass diese Datei vom Webserver geschrieben werden kann.
      -
      Protokollstufe
      -
      Die Protokollstufe bestimmt, wie viele Informationen an die Protokolldatei angefügt werden. Warnung: Eine hohe Protokollstufe kann sehr schnell die Größe der Protokolldatei anwachsen lassen, vor allem, wenn der Hub viele Mitglieder hat.
      -
      diff --git a/doc/context/de/admin/queue/help.html b/doc/context/de/admin/queue/help.html deleted file mode 100644 index e59fdcaee..000000000 --- a/doc/context/de/admin/queue/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      Allgemein
      -
      Die Warteschlangenstatistik zeigt, wie viele Nachrichten zur Auslieferung an andere Hubs noch in der Warteschlange stehen. Die Priorität steht in Beziehung mit der Anzahl fehlgeschlagener Auslieferungsversuche.
      -
      diff --git a/doc/context/de/admin/security/help.html b/doc/context/de/admin/security/help.html deleted file mode 100644 index 6465e8f0e..000000000 --- a/doc/context/de/admin/security/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite können verschiedene Sicherheitseinstellungen vorgenommen werden. Um geänderte Einstellungen zu speichern, muss der Knopf "Bestätigen" gedrückt werden.
      -
      diff --git a/doc/context/de/appman/help.html b/doc/context/de/appman/help.html deleted file mode 100644 index 888ee6206..000000000 --- a/doc/context/de/appman/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      Allgemein
      -
      Ändere die individuellen Eigenschaften der ausgewählten App. Kategorien erlauben dir das Einsortieren der Apps um sie in der Liste leichter zu finden. Kundenspezifische Apps, die du oder dein Administrator erstellt haben, können weitere Felder enthalten wie "Preis der App" oder "Ort (URL), um die App zu kaufen". Dies gilt nicht für Hubzilla Core Apps.
      -
      \ No newline at end of file diff --git a/doc/context/de/apps/edit/help.html b/doc/context/de/apps/edit/help.html deleted file mode 100644 index 5381aeea6..000000000 --- a/doc/context/de/apps/edit/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      Allgemein
      -
      Ändere oder lösche deine Apps mit Hilfe der Steuerknöpfe neben jedem App-Icon in der Liste.
      -
      \ No newline at end of file diff --git a/doc/context/de/apps/help.html b/doc/context/de/apps/help.html deleted file mode 100644 index b63352324..000000000 --- a/doc/context/de/apps/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Allgemein
      -
      Diese Seite listet alle verfügbaren Apps für Deinen Kanal. Sie enthält die Core Apps wie auch die von Addons. Wenn eine App im App Menü erscheinen soll, dann markiere die App in der Liste mit dem Stern.
      -
      Apps verwalten
      -
      Der Knopf "Apps verwalten" öffnet eine Seite, mit der Du den Namen, die Kategorie und andere Eigenschaften deiner Apps ändern kannst.
      -
      \ No newline at end of file diff --git a/doc/context/de/channel/help.html b/doc/context/de/channel/help.html deleted file mode 100644 index fbfcac3c1..000000000 --- a/doc/context/de/channel/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite wird der eigene aktuelle Kanal angezeigt. Dies entspricht ungefähr den Profilseiten in anderen sozialen Netzwerken. Im Kanal veröffentliche Beiträge werden gemäß den Anzeige-Berechtigungen des Betrachters angezeigt.
      -
      Beitrag anlegen
      -
      Falls der Betrachter/Besucher die Berechtigung zum Anlegen von Beiträgen besitzt, wird im oberen Bereich der Beitragseditor angezeigt.
      -
      Kanal-Inhalte-Tabs
      -
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      -
      diff --git a/doc/context/de/chat/help.html b/doc/context/de/chat/help.html deleted file mode 100644 index ba355365f..000000000 --- a/doc/context/de/chat/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Allgemein
      -
      Chaträume können angelegt und für die Echtzeit-Kommunikation verwendet werden. Die Zugriffskontrolle verwendet dabei das Hubzilla-Berechtigungssystem.
      -
      Chatraum anlegen
      -
      Über den Knopf "Neu anlegen" wird ein neuer Chatraum eröffnet. Hierfür einen Namen und angeben, wie lange Nachrichten aufbewahrt werden sollen.
      -
      Chatten
      -
      Die Nachricht in der der Nachrichtenbox eingeben und "Bestätigen" drücken. Über den Menüknopf neben "Bestätigen" kann ein Anwesenheitsstatus gesetzt werden. Andere Teilnehmer am Chatraum werden im Seitenpanel unter "Chatmitglieder" angezeigt.
      -
      diff --git a/doc/context/de/cloud/help.html b/doc/context/de/cloud/help.html deleted file mode 100644 index e72ad1743..000000000 --- a/doc/context/de/cloud/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Allgemein
      -
      Diese Seite zeigt die veröffentlichten und geteilten Dateien des Kanals an. Welche Dateien ein Besucher sehen kann, wird über die individuellen Dateiberechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Dateien vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
      -
      Kanal-Inhalte-Tabs
      -
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      -
      diff --git a/doc/context/de/connections/help.html b/doc/context/de/connections/help.html deleted file mode 100644 index 61789ea38..000000000 --- a/doc/context/de/connections/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite werden die Verbindungen des Kanals angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
      -
      Verbindungsdetails
      -
      Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
      -
      Verbindungsstatus
      -
      Eine Verbindung kann sich in verschiedenen Stati befinden:
      • Archiviert
      • Ignoriert
      • Blockiert
      • Versteckt
      -
      diff --git a/doc/context/de/connections/ifpending/help.html b/doc/context/de/connections/ifpending/help.html deleted file mode 100644 index 3e55b34c3..000000000 --- a/doc/context/de/connections/ifpending/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite werden Verbindungswünsche von anderen Kanälen an diesen Kanal angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
      -
      Verbindungsdetails
      -
      Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
      -
      Verbindungsstatus
      -
      Eine Verbindung kann sich in verschiedenen Stati befinden:
      • Archiviert
      • Ignoriert
      • Blockiert
      • Versteckt
      -
      diff --git a/doc/context/de/events/help.html b/doc/context/de/events/help.html deleted file mode 100644 index b0dc95b3e..000000000 --- a/doc/context/de/events/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite wird ein Kalender mit eigenen und von anderen verbundenen Kanälen geteilte Ereignisse angezeigt.
      -
      Kalenderanzeige
      -
      Die Monats-, Wochen- und Tagesansicht des Kalenders kann im Panel ausgewählt werden.
      -
      Export/Import
      -
      Kalendereinträge können Eim Standard-Format iCalendar (.ics) exportiert oder importiert werden.
      -
      diff --git a/doc/context/de/mail/help.html b/doc/context/de/mail/help.html deleted file mode 100644 index b89135d8c..000000000 --- a/doc/context/de/mail/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      Allgemein
      -
      Die Privaten Nachrichten sind nur für den Kanal-Besitzer und den Empfänger sichtbar.
      -
      Konversationen
      -
      Über Konversationen kann eine vollständige fortlaufene Ansicht einer Konversation angezeigt werden. Verfügbare Konversationen werden unter dem Punkt Konversationen im Panel angezeigt.
      -
      Eingang/Ausgang
      -
      Einzelne versandte Nachrichten kännen über den Punkt Ausgang und empfangene Nachrichten über Eingang gefiltert dargestellt werden.
      -
      Neue Nachricht
      -
      Über Neue Nachricht kann eine neue Nachricht erstellt werden.
      -
      Sonstiges
      -
      Über das Menü einzelner Nachrichten können besondere Funktionen ausgelöst werden: Zustellungsbericht kann abgerufen werden, Nachrichten (die noch nicht angesehen wurden!) können widerrufen und gelöscht werden.
      -
      diff --git a/doc/context/de/network/help.html b/doc/context/de/network/help.html deleted file mode 100644 index 6590f597d..000000000 --- a/doc/context/de/network/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      Allgemein
      -
      Auf der Netzwerkseite wird der Strom von Beiträgen und Konversationen angezeigt. Typischerweise wird nach kürzlich aktualisierten Beiträgen sortiert. Diese Seite kann sehr weitgehend angepasst werden.
      -
      Beitrag anlegen
      -
      Im oberen Bereich der Seite wird eine Textbox "Teilen" angezeigt. Nach Klick in diese Box wird der Beitragseditor angezeigt. Der Beitragseditor kann angepasst werden; in den Basiseinstellungen stehen Felder für Inhalt und einem optionalen Titel bereit. Knöpfe unterhalb des Inhaltes erleichtern die Eingabe von Formatierungen, Links, Bildern und anderen Daten im Beitrag. Über die Knöpfe im rechten Bereich kann eine Vorschau aktiviert, Berechtigungen gesetzt und der Beitrag abgesendet werden.
      -
      Gruppen
      -
      Die erstellten Gruppen werden im Panel angezeigt. Über die Gruppen kann nach Beiträgen von Gruppenmitgliedern gefiltert werden.
      -
      Beitragsberechtigungen
      -
      Die Zugriffskontrollliste (Access Control List; ACL) steuert, wer den Beitrag sehen darf. Nach Klick auf das Schloß neben dem Knopf "Teilen" öffnet sich ein Dialog, in dem Kanäle oder Gruppen ausgewählt werdenkönnen, die diesen Beitrag sehen dürfen. s kann auch gezielt verboten werden, dass ein Kanal oder eine Gruppe den Artikel sehen darf (nützlich beispielsweise für die Planung einer Überraschungsparty in einer Gruppe, in der der Überraschte Mitglied ist).
      -
      diff --git a/doc/context/de/photos/help.html b/doc/context/de/photos/help.html deleted file mode 100644 index 437d2c369..000000000 --- a/doc/context/de/photos/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Allgemein
      -
      Diese Seite zeigt die veröffentlichten und geteilten Fotos des Kanals an. Welche Fotos ein Besucher sehen kann, wird über die individuellen Berechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Bildern vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
      -
      Kanal-Inhalte-Tabs
      -
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      -
      diff --git a/doc/context/de/profile/help.html b/doc/context/de/profile/help.html deleted file mode 100644 index ece33457d..000000000 --- a/doc/context/de/profile/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Allgemein
      -
      Dies ist die Profilseite eines Kanals. Hier werden typischerweise Informationen angezeigt, die den Kanal beschreiben. Wenn der Kanal beispielsweise eine Person in einem sozialen Netzwerk repräsentiert, könnten Kontaktinformationen und andere persönliche Details hier veröffentlicht werden. Kanäle können mehrere Profile besitzen, die abhängig vom Betrachter/Besucher angezeigt werden.
      -
      Kanal-Inhalte-Tabs
      -
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      -
      diff --git a/doc/context/de/register/help.html b/doc/context/de/register/help.html deleted file mode 100644 index 9ee062ee8..000000000 --- a/doc/context/de/register/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      Allgemein
      -
      Auf dieser Seite können sich Besucher registrieren, um mit einer Anmeldungskennung Zugang zum Portal zu erhalten. Angemeldeten Benutzern sehen nicht nur die öffentlichen Inhalte, sondern können selber Inhalte veröffentlichen und Soziale Netzwerk Kommunikationen durchführen, und sehr viel mehr.
      -
      Arten der Registrierung
      -
      Eine Registrierung ist mit einer eMail Adresse möglich, oder auch anonym (dann das eMail Feld nicht ausfüllen). Vielleicht haben Sie auch einen Einladungscode erhalten, der dann mit der eMail Adresse angegeben werden kann. Der Link oberhalb des Feldes eMail ermöglich die Eingabe des Einladungscodes.
      -
      Ablauf der Registrierung
      -
      Für Anmeldungen nach einer erfolgreichen Registrierung ist ein eigenes Kennwort festzulegen. Es ist sicherheitshalber zweimal mit identischen Werten einzugeben, weil es nicht angezeigt wird. Das Kennwort ist geheim zu halten und nur für den eigenen Gebrauch bestimmt. Anonym registrierte Benutzer erhalten eine automatisch zugewiesene Kennung, und sollten das eigene Kennwort nicht vergessen, weil es im Gegensatz zur eMail Registrierung zunächst keine Rücksetzfunktion gibt. Je nach Konfiguration der Hub-Instanz kann eine Bestätigungsfunktion erforderlich sein. Benutzer der eMail Registrierung erhalten eine entsprechende Nachricht. Bei anonymen Registrierungen wird ein weiterer Dialog angezeigt, der die Zugangskennung und eine Pin zeigt. Jene Dialogseite sollte unbedingt sicher und langfristig aufbewahrt werden (z.B. durch Ausdruck, Screenshot, Foto), weil die Daten zu einem späten Zeitpunkt noch einmal zu bestätigen sind.
      -
      Die Digitale Identität
      -
      Je nach Konfiguration der Hub-Instanz kann bereits bei der Registrierung (alternativ auch bei der ersten Anmeldung) ein anzeigbarer Name und ein Spitzname ("nickname") eingegeben werden. Der Nickname hat eine sehr weitreichende Bedeutung und läßt sich nachträglich nicht mehr ändern. Es handelt sich dabei um eine eindeutige Digitale Identität (DID), die mit allen eigenen Aktivitäten verknüft ist, sein wird, und bleibt. Diese DID eignet sich nicht nur zur Anmeldung in dieser Hub-Instanz, sondern auch in allen verbundenen Instanzen des Federalen Netzwerkes. Im Sprachgebrauch der Federalen Netze ist diese digitale Identität ein "Kanal". Das ist vergleichbar etwa mit einer Rufnummer im Telefonnetz. Die DID hat das Format kanal@instanz.tld = nickname@instanz.tld und ist, wie gesagt, nachträglich nicht mehr änderbar. Obwohl sich das Format wie eine eMail Adresse darstellt, handelt es sich nicht um eine solche.
      -
      Bevor die Registrierung begonnen wird ...
      -
      sollte (oben rechts im Hamburger Menü ) die bevorzugte Sprache (Englisch, Spanisch, Deutsch z.B.) gewählt werden. Die aktuelle Sprache wird in den Folgeschritten und auch bei und nach der Anmeldung verwendet. Das läßt sich aber jederzeit und je nach Bedarf ändern. Auch sei darauf hingewiesen, dass diese Hub-Instanz nicht die einzige ist. Eine Übersicht über andere Hub-Instanzen ist hier zu finden.
      -
      diff --git a/doc/context/de/settings/account/help.html b/doc/context/de/settings/account/help.html deleted file mode 100644 index 03fc0cc14..000000000 --- a/doc/context/de/settings/account/help.html +++ /dev/null @@ -1,19 +0,0 @@ -
      -
      Allgemein
      -
      - Wenn du dich registriert und dir damit einen Zugang zum Grid verschafft hast, hast du ein Profil und einen Kanal erzeugt. -
      -
      Zugang
      -
      - Du hast einen Zugang, der sich aus deiner Emailadresse mit deinem Passwort zusammen setzt. Damit greifst du auf dein Profil und deinen Kanal zu. - Du authetifizierst dich also einmal auf einem Hub von Hubzilla, und es erlaubt dir beliebig Profile und Kanäle anzulegen und dich mit anderen Leuten zu verbinden. -
      -
      Profil
      -
      - Du bist sicherlich bei anderen Services im Internet registriert, wie irgendwelchen Foren oder anderen Online Communities. Überall hinterläßt du Informationen über dich wie deinen Geburtstag, dein Alter, dein Land und Ähnliches. Im Gegensatz zu anderen Services erlaubt dir Hubzilla das Anlegen vieler verschiedener Profile. So kannst du ein öffentliches Profil anlegen, das zur allgemeinen Verwendung gedacht ist, ein Profil für deine Arbeitskollegen, deine Familie oder deinen Lebenspartner. Deine Profile sind die grundlegende Information, die du anderen Leuten je nach Beziehung zur Verfügung stellen willst. -
      -
      Kanal
      -
      - Während der Registrierung hast du deinen ersten Kanal erzeugt. In der Tat, neben verschiedenen Profilen kannst du auch verschiedene Kanäle haben. Das könnte etwas verwirrend sein am Anfang, aber lass uns die Dinge besser verstehen. Du hast also bereits einen Kanal erstellt, den du zum Beispiel für die breite Öffentlichkeit und für den Alltag verwenden kannst. Aber vielleicht bist du ein Bücherwurm, und viele deiner Leser langweilt das. Also eröffnest Du einen zweiten Kanal für Bücherfreunde, in dem ihr euch ungezwungen über Bücher austauschen könnt. Offensichtlich ergibt sich daraus ein neuer Stream von Beiträgen, womöglich mit einem neuen Profil oder neuen Profilen und komplett eigenen Verbindungen oder Kontakten. Einige finden sich in beiden Kanälen, aber die meisten werden wohl nur in einem der Kanäle mitlesen. Du wechselst zwischen den Kanälen wie im richtigen Leben je nachdem, ob du dich auf der Straße mit Leuten triffst oder mit Bücherfreunden sprichst. Im Prinzip können sich deine Kanäle auch untereinander verbinden, du also mit dir selbst sprechen, wenn du das möchtest. Deine Kanäle sind also wie Räume für unterschiedliche Themen, in denen du auf verschiedene Leute triffst. -
      -
      \ No newline at end of file diff --git a/doc/context/de/settings/channel/help.html b/doc/context/de/settings/channel/help.html deleted file mode 100644 index 98a388f77..000000000 --- a/doc/context/de/settings/channel/help.html +++ /dev/null @@ -1,19 +0,0 @@ -
      -
      Allgemein
      -
      - Wenn du dich registriert und dir damit einen Zugang zum Grid verschafft hast, hast du ein Profil und einen Kanal erzeugt. -
      -
      Zugang
      -
      - Du hast einen Zugang, der sich aus deiner Emailadresse mit deinem Passwort zusammensetzt. Damit greifst du auf dein Profil und deinen Kanal zu. - Du authetifizierst dich also einmal auf einem Hub von Hubzilla, und es erlaubt dir beliebig Profile und Kanäle anzulegen und dich mit anderen Leuten zu verbinden. -
      -
      Profil
      -
      - Du bist sicherlich bei anderen Services im Internet registriert, wie irgendwelchen Foren oder anderen Online Communities. Überall hinterläßt du Informationen über dich wie deinen Geburtstag, dein Alter, dein Land und Ähnliches. Im Gegensatz zu anderen Services erlaubt dir Hubzilla das Anlegen vieler verschiedener Profile. So kannst du ein öffentliches Profil anlegen, das zur allgemeinen Verwendung gedacht ist, ein Profil für deine Arbeitskollegen, deine Familie oder deinen Lebenspartner. Deine Profile sind die grundlegende Information, die du anderen Leuten je nach Beziehung zur Verfügung stellen willst. -
      -
      Kanal
      -
      - Während der Registrierung hast du deinen ersten Kanal erzeugt. In der Tat, neben verschiedenen Profilen kannst du auch verschiedene Kanäle haben. Das könnte etwas verwirrend sein am Anfang, aber lass uns die Dinge besser verstehen. Du hast also bereits einen Kanal erstellt, den du zum Beispiel für die breite Öffentlichkeit und für den Alltag verwenden kannst. Aber vielleicht bist du ein Bücherwurm und viele deiner Leser langweilt das. Also eröffnest Du einen zweiten Kanal für Bücherfreunde, in dem ihr euch ungezwungen über Bücher austauschen könnt. Offensichtlich ergibt sich daraus ein neuer Stream von Beiträgen, womöglich mit einem neuen Profil oder neuen Profilen und komplett eigenen Verbindungen oder Kontakten. Einige finden sich in beiden Kanälen, aber die meisten werden wohl nur in einem der Kanäle mitlesen. Du wechselst zwischen den Kanälen wie im richtigen Leben je nachdem, ob du dich auf der Straße mit Leuten triffst oder mit Bücherfreunden sprichst. Im Prinzip können sich deine Kanäle auch untereinander verbinden, du also mit dir selbst sprechen, wenn du das möchtest. Deine Kanäle sind also wie Räume für unterschiedliche Themen, in denen du auf verschiedene Leute triffst. -
      -
      \ No newline at end of file diff --git a/doc/context/de/settings/features/help.html b/doc/context/de/settings/features/help.html deleted file mode 100644 index a019d2d60..000000000 --- a/doc/context/de/settings/features/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      Allgemein
      -
      Diese Seite ermöglicht dir viele zusätzliche Funktionen von Hubzilla einzustellen.
      -
      Allgemeine Funktionen
      -
      Die Einstellungen für allgemeine Funktionen beinhalten Optionen, die relevant sind für deinen Kanal, zum Beispiel bei Webseiten oder Wikis.
      -
      Funktionen für die Beitragserstellung
      -
      Diese Funktionen bieten weitere Optionen und Möglichkeiten für die Erstellung neuer Beiträge.
      -
      Filterung von Streams
      -
      Diese Einstellungen verändern Funktionen, die mit der Filterung und der Ansichtskontrolle enkommender Beiträge verbunden sind.
      -
      Werkzeuge für Beiträge und Kommentare
      -
      Hier findest du zusätzliche Werkzeuge um Beiträge zu kategorisieren, und erweiterte Methoden der Kommentierung wie Emojis und Community Tagging.
      -
      \ No newline at end of file diff --git a/doc/context/de/settings/tokens/help.html b/doc/context/de/settings/tokens/help.html deleted file mode 100644 index 4a7776109..000000000 --- a/doc/context/de/settings/tokens/help.html +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      Gastzugangs-Token
      -
      - Hubzilla verwendet befristete "Wegwerf"-Logins oder "Zot Access Tokens", um das Teilen privater Informationen mit Nichtmitgliedern oder Mitgliedern im Fediverse zu ermöglichen, deren Knoten nur eingeschränkte Möglichkeiten zur Identifizierung bieten. Diese Token können zur Authentifizierung an einem Hub für den Zweck verwendet werden privilegierte oder zugangskontrollierte Ressourcen (Dateien, Fotos, Beiträge, Webseiten, Chaträume, usw.) zugänglich zu machen. -
      -
      Einen Token erzeugen
      -
      - Das Formular zur Erzeugung von Token benötigt drei Parameter: einen lesbaren Zugangsnamen, ein Passwort oder Zugangs-Token, und optional ein Verfallsdatum. Ein verfallenes Token kann nicht länger verwendet werden und wird von der Liste befristeter Zugänge entfernt. Hinweis Das Passwort-Feld zeigt das Token oder Passwort im Klartext. -
      -
      Einen Token teilen
      -
      - Wir geben keine Mechanismen für das Teilen der Zugangs-Token vor, jede Kommunikationsmethode ist recht. Alle Token, die du erzeugt hast, werden zu den Listen für die Zugangskontrolle hinzugefügt und können von überall verwendet werden, wo anhand dieser Listen authentifiziert werden kann. - - Ein Beispiel: Ein Besucher trifft auf deine Seite. Er hat ein von dir zur Verfügung gestelltes Zugangs-Token für eines Deiner Fotoalben, das nur von Dir und eben diesem befristeten Zugangsnamen betrachtet werden darf. Der Besucher erhält zunächst keinen Zugang. - - Nun wählt er "Login" aus der Navigation und erhält die Loginseite angezeigt, in die er seine Zugangsdaten eingibt. Ab sofort erhält er Zugang zum Fotoalbum. - - Alternativ kannst du einen Link mit deinem Besucher teilen, dessen URL um den Parameter "&zat=abc123" erweitert ist, wobei "abc123" das Zugangs-Token oder das Passwort für den befristeten Login ist. Mit dieser Erweiterung ist kein Login erforderlich, der Besucher erhält sofort den Zugang. -
      -
      diff --git a/doc/context/de/wiki/help.html b/doc/context/de/wiki/help.html deleted file mode 100644 index e203ee221..000000000 --- a/doc/context/de/wiki/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      Allgemein
      -
      Jedes Wiki ist eine Sammlung aus mit Markdown formatierten Seiten.
      -
      Wiki Liste
      -
      Wikis die dem eigenen Kanal gehören und mit der Berechtigung zum Anschauen, sind in der Seitenleiste gelistet.
      -
      Seiten Versionen
      -
      Jede Änderung einer Seite wird gespeichert, um eine schnelle Berichtigung zu ermöglichen. Klick auf das Versionsgeschichte Tab um den Verlauf der Seitenbearbeitung zu sehen, einschließlich Datum und Autor. Der Zurück-Knopf lädt die ausgewählte Änderung, aber ohne die Seite automatisch zu spreichern.
      -
      Seiten
      -
      Die Seiten des Wikis werden in Wiki Seiten gelistet. Vor dem Speichern einer Seite über das Seiten Dropdown Menu, hast Du die Möglichkeit eine Zusammenfassung der Änderungen einzutragen. Dieser Text wird anschließend unter Seiten Versionen in der Versionsgeschichte angezeigt.
      -
      \ No newline at end of file diff --git a/doc/context/en/admin/addons/assets/addon_repo_gui_1.png b/doc/context/en/admin/addons/assets/addon_repo_gui_1.png deleted file mode 100644 index 37139b345..000000000 Binary files a/doc/context/en/admin/addons/assets/addon_repo_gui_1.png and /dev/null differ diff --git a/doc/context/en/admin/addons/help.html b/doc/context/en/admin/addons/help.html deleted file mode 100644 index bfb5e416a..000000000 --- a/doc/context/en/admin/addons/help.html +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      General
      -
      This page manages which addons (also known as plugins) are installed.
      -
      Manage Repos
      -
      If your webserver has the necessary write permissions, you will see a button labeled Manage Repos, - which opens a control panel for managing what plugin repositories are installed. These repos are - stored in extend/addon/[repo name]/. The official Hubzilla - addon repo can be added by entering the repo URL - https://framagit.org/hubzilla/addons.git - and choosing a name for the repo such as official. You should see this repo in the list similar - to the following: -
      -
      -
      diff --git a/doc/context/en/admin/logs/help.html b/doc/context/en/admin/logs/help.html deleted file mode 100644 index 708ec9bde..000000000 --- a/doc/context/en/admin/logs/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      This page allows you to adjust log settings and to view and existing log.
      -
      Log Settings
      -
      When you enable the Debugging option, system log information will begin appending to the file specified in the "Log File" box (path is relative to the hub root, for example /var/www). Note that this file must be writable by the web server.
      -
      Log Level
      -
      The log level option allows you to set how much information is appended to the log file. Warning: Increasing this level can quickly inflate the size of the log file to >100MB, especially on hubs with more than a few members.
      -
      \ No newline at end of file diff --git a/doc/context/en/admin/queue/help.html b/doc/context/en/admin/queue/help.html deleted file mode 100644 index 28885a154..000000000 --- a/doc/context/en/admin/queue/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      The queue statistics display how many posts are in the queue for delivery to other hubs. The priority is related to how many times the delivery has been unsuccessfully attempted.
      -
      \ No newline at end of file diff --git a/doc/context/en/admin/security/help.html b/doc/context/en/admin/security/help.html deleted file mode 100644 index bfe81b132..000000000 --- a/doc/context/en/admin/security/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      This page contains various administrator settings related to security. To save any changes you make to these settings, you must press the Submit button.
      -
      \ No newline at end of file diff --git a/doc/context/en/appman/help.html b/doc/context/en/appman/help.html deleted file mode 100644 index 27cb03624..000000000 --- a/doc/context/en/appman/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      Edit individual properties of the app you selected. Categories allow you to sort your apps to help you find them in the list more easily. Support for custom apps you or your administrator may choose to create includes fields such as "Price of app" and "Location for purchase" that are not applicable to core Hubzilla apps.
      -
      \ No newline at end of file diff --git a/doc/context/en/apps/edit/help.html b/doc/context/en/apps/edit/help.html deleted file mode 100644 index 1d378f962..000000000 --- a/doc/context/en/apps/edit/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      Edit or delete your apps using the control buttons beside each app icon in the list.
      -
      \ No newline at end of file diff --git a/doc/context/en/apps/help.html b/doc/context/en/apps/help.html deleted file mode 100644 index ad6daade5..000000000 --- a/doc/context/en/apps/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      This page shows you what apps are available to your channel, including both core apps and those supplied by addons. To add an app to the app menu "star" the app in the list below.
      -
      Manage Apps
      -
      Press the "Manage Apps" button to open a page where you can edit the name, categories, and other properties of your apps.
      -
      \ No newline at end of file diff --git a/doc/context/en/cards/help.html b/doc/context/en/cards/help.html deleted file mode 100644 index 9dbed3f97..000000000 --- a/doc/context/en/cards/help.html +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      General
      -
      Cards represent a persistent area for collaboration that is separate from the social stream. They are somewhat more lightweight than webpages and wikis for quick organisation of information and have the advantage of allowing collaboration and commentary. They are well suited for helping to organise complex tasks where there are frequent updates and feedback. -
      -
      Add Card
      -
      - Creating a new card is very similar to composing a new post.

      -
        -
      • - Page link name: The page link name is the name of the card for the static URL -
        • -
      • - Title: The title is displayed at the top of the card -
        • -
      • - Categories: If you have the Post Categories feature enabled for your channel, then you can add categories to the card. These categories populate the Categories list on the left panel and allow filtering your collection of cards. -
        • -
      -
      -
      diff --git a/doc/context/en/channel/help.html b/doc/context/en/channel/help.html deleted file mode 100644 index 0c5b99754..000000000 --- a/doc/context/en/channel/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      This is the home page of a channel. It is similar to someone's profile "wall" in a social network context. Posts created by the channel are displayed according to the observer's viewing permissions.
      -
      Create a Post
      -
      If you have permission to create posts on the channel page, then you will see the post editor at the top.
      -
      diff --git a/doc/context/en/chat/help.html b/doc/context/en/chat/help.html deleted file mode 100644 index cc71686d8..000000000 --- a/doc/context/en/chat/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      Create and use chat rooms to communicate in real-time, using the standard Hubzilla permissions system for chat room access control.
      -
      Create new chat room
      -
      Use the "Create New" button to create a new chat room. Enter a name and how long messages should be retained.
      -
      Chatting
      -
      Enter your message in the message box and press Submit. You can set a status by selecting the chat room menu button beside the Submit button. Other people "in the room" are visible in the side panel in the "Chat Members" panel.
      -
      \ No newline at end of file diff --git a/doc/context/en/cloud/help.html b/doc/context/en/cloud/help.html deleted file mode 100644 index a8f193223..000000000 --- a/doc/context/en/cloud/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      This page displays a channel's "cloud" files. The files visible to the observer depend on the individual file permissions set by the channel owner. If you have permission to create/upload files you will see control buttons above the file list.
      -
      Channel Content Tabs
      -
      The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
      -
      \ No newline at end of file diff --git a/doc/context/en/connections/help.html b/doc/context/en/connections/help.html deleted file mode 100644 index 0f95fde63..000000000 --- a/doc/context/en/connections/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
      -
      Connection Details
      -
      Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
      -
      Connection Status
      -
      A connection can be in different states:
      • Archived
      • Ignored
      • Blocked
      • Hidden
      -
      \ No newline at end of file diff --git a/doc/context/en/connections/ifpending/help.html b/doc/context/en/connections/ifpending/help.html deleted file mode 100644 index 0f95fde63..000000000 --- a/doc/context/en/connections/ifpending/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
      -
      Connection Details
      -
      Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
      -
      Connection Status
      -
      A connection can be in different states:
      • Archived
      • Ignored
      • Blocked
      • Hidden
      -
      \ No newline at end of file diff --git a/doc/context/en/connedit/help.html b/doc/context/en/connedit/help.html deleted file mode 100644 index 9eb62ecc7..000000000 --- a/doc/context/en/connedit/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      General
      -
      This page allows you to change or edit any individual settings for a particular connection or delete a connection completely. You may have arrived at this page after creating or approving a new connection. If so, you are not required to do anything. Your connection has already been established. You may wish to add them to a group or adjust special permissions, and this page is presented so that you may do this while the opportunity is fresh.
      -
      Connection Tools
      -
      The Connection Tools menu access several settings. View Profile, View Recent Activity, Refresh Permissions, set or reset flags (Block, Ignore, Archive, Hide) and Delete the connection.
      -
      Privacy Groups
      -
      Each connection may be assigned to one or more Privacy Groups for grouping collections of friends with access to specific posts, media and other content. You may add them to an existing privacy group here, or create a new privacy group. When you add them to an existing group the action is immediate and you are not required to submit a form.
      -
      Individual Permissions
      -
      Granting of permissions is usually automatic and require no action on your part. However you may wish to adjust specific permsisions for this connection which are different than for others.
      -
      Feature Specific Settings
      -
      A number of individual settings are controlled through additional features which may or may not be activated on your hub or for your channel. Several optional features have settings for each connection, and those may be set on this page through additional form tabs which may be present.
      -
      diff --git a/doc/context/en/events/help.html b/doc/context/en/events/help.html deleted file mode 100644 index 8c0b1d4ab..000000000 --- a/doc/context/en/events/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      This page displays a calendar of events both owned by you and shared with you from other channels.
      -
      Calendar View
      -
      The calendar can be displayed in month, week, or day mode using the options in the side panel.
      -
      Export/Import
      -
      Export or import calendar events using standard iCalendar format (.ics) files.
      -
      \ No newline at end of file diff --git a/doc/context/en/mail/help.html b/doc/context/en/mail/help.html deleted file mode 100644 index a2361a135..000000000 --- a/doc/context/en/mail/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      General
      -
      The messages displayed in private mail are visible only to you and the single recipient.
      -
      Combined View
      -
      Complete conversations can be viewed in a continuous thread by selecting Combined View. Available conversations are displayed beneath the menu in the side panel.
      -
      Inbox/Outbox
      -
      Individual sent messages are viewed by selecting Outbox, and incoming messages are viewed using the Inbox filter.
      -
      New Message
      -
      Individual messages have delivery reports that can be viewed using the drop-down menu. Messages can also be recalled from the same menu, which can prevent the recipient from viewing the message if they have not already read it.
      -
      \ No newline at end of file diff --git a/doc/context/en/network/help.html b/doc/context/en/network/help.html deleted file mode 100644 index 53e993b69..000000000 --- a/doc/context/en/network/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      General
      -
      The network page displays a stream of posts and conversations, typically ordered by the most recently updated. This page is highly customizable.
      -
      Create a Post
      -
      At the top of the page there is a text box that says "Share". Clicking this box opens a new post editor. The post editor is customizable, but the basic editor provides fields for a post body and an optional post Title. Buttons below the text area to the left provide shortcuts to text formatting and inserting links, images, and other data into the post. The buttons to the right provide a post preview, the post permissions setting, and a Submit button to send the post.
      -
      Privacy Groups
      -
      The privacy groups you have created are displayed in the side panel. Selecting them filters posts to those created by channels in the chosen group.
      -
      Post Permissions
      -
      The access control list (ACL) is what you use to set who can see your new post. Pressing the ACL button beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "show" the Friends group but "don't show" that one person.
      -
      \ No newline at end of file diff --git a/doc/context/en/photos/help.html b/doc/context/en/photos/help.html deleted file mode 100644 index 78b442bb4..000000000 --- a/doc/context/en/photos/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      This page displays a channel's photo albums. The images visible to the observer depend on the individual image permissions.
      -
      Channel Content Tabs
      -
      The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
      -
      \ No newline at end of file diff --git a/doc/context/en/profile/help.html b/doc/context/en/profile/help.html deleted file mode 100644 index 563e0df99..000000000 --- a/doc/context/en/profile/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      This is the profile page of a channel. It typically displays information describing the channel. If the channel represents a person in a social network, for example, then the profile might provide contact information and other personal details about the person. Channels can have multiple profiles, where the displayed profile depends on the observer.
      -
      Channel Content Tabs
      -
      The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
      -
      \ No newline at end of file diff --git a/doc/context/en/profiles/help.html b/doc/context/en/profiles/help.html deleted file mode 100644 index 41f00fe64..000000000 --- a/doc/context/en/profiles/help.html +++ /dev/null @@ -1,35 +0,0 @@ -
      -
      General
      -
      - Once you have registered an account at the matrix you have also created a profile and a channel. -
      -
      Account
      -
      - You have one account. This consists of your email account and your password. With your account you access your - profile and your channel.Think of your account as the way you authenticate at one Hubzilla site. It lets you - do things, such as creating profiles and channels with which you can connect to other people. -
      -
      Profile
      -
      - You have surely registered with some other internet services, such as forums or online communities. For all of them - you provided some information about yourself, such as date of birth, country, age and the likes. Unlike other - services Hubzilla offers you the advantage of creating - many more profiles. That way you are able to distinguish between profiles targeted specially at everyone - (your public profile), your work mates, your family and your partner.Think of your profile as the basic - information about yourself you tell other people. -
      -
      Channel
      -
      - During the registration you created your first channel. Yes, besides several profiles you are able to have - several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have - created one channel. You can use this one for the public, to communicate with people about every day life. But - perhaps you are an avid book reader and many people are bored by that. So you open a second channel just - for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of - posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections - might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just - switch between both of them just like you would in real life switch when talking to people you meet on the street - or people you meet specially to talk about books. You can even connect to yourself, or better: to your other - channel. :)Think of a channel as different spaces dedicated to different topics where you meet with different - people. -
      -
      \ No newline at end of file diff --git a/doc/context/en/register/help.html b/doc/context/en/register/help.html deleted file mode 100644 index 9e94ab762..000000000 --- a/doc/context/en/register/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      General
      -
      On this page visitors can register to get access to the portal with a login ID. Logged in users not only see the public content, but can publish content themselves and perform social network communications, and much more.
      -
      Modes of registration
      -
      Registration is possible with an eMail address, or anonymously (then do not fill in the eMail field). You may also have received an invitation code, which can then be entered with the eMail address. The link above the eMail field allows you to enter the invitation code.
      -
      Registration procedure
      -
      For logins after a successful registration, a separate password must be set. To be on the safe side, enter it twice with identical values, because it will not be displayed. The password is to be kept secret and is only intended for the user's own use. Anonymously registered users receive an automatically assigned ID, and should not forget their own password because, unlike eMail registration, there is initially no reset function. Depending on the configuration of the hub instance, a confirmation function may be required. Users of the eMail registration will receive a corresponding message. For anonymous registrations, another dialog will be displayed showing the access ID and a pin. This dialog page should be stored securely and for a long time (e.g. by printout, screenshot, photo), because the data must be confirmed again at a later point in time.
      -
      The Digital Identity
      -
      Depending on the configuration of the hub instance, a displayable name and a nickname can already be entered during registration (alternatively also during the first login). The nickname has a very extensive meaning and cannot be changed later. It is a unique Digital Identity (DID) that is, will be, and remains linked to all of one's activities. This DID is not only suitable for logging into this hub instance, but also into all connected instances of the federal network. In federal network parlance, this digital identity is a "channel". This is comparable to a telephone number in the telephone network. The DID has the format channel@instance.tld = nickname@instance.tld and, as mentioned, cannot be changed afterwards. Although the format looks like an eMail address, it is not.
      -
      Before starting the registration ...
      -
      ... the preferred language (English, Spanish, German, for example) should be selected (top right in the hamburger menu ). The current language is used in the subsequent steps and also during and after login. However, this can be changed at any time and as needed. It should also be noted that this Hub instance is not the only one. An overview of other Hub instances can be found here .
      -
      diff --git a/doc/context/en/settings/account/help.html b/doc/context/en/settings/account/help.html deleted file mode 100644 index 41f00fe64..000000000 --- a/doc/context/en/settings/account/help.html +++ /dev/null @@ -1,35 +0,0 @@ -
      -
      General
      -
      - Once you have registered an account at the matrix you have also created a profile and a channel. -
      -
      Account
      -
      - You have one account. This consists of your email account and your password. With your account you access your - profile and your channel.Think of your account as the way you authenticate at one Hubzilla site. It lets you - do things, such as creating profiles and channels with which you can connect to other people. -
      -
      Profile
      -
      - You have surely registered with some other internet services, such as forums or online communities. For all of them - you provided some information about yourself, such as date of birth, country, age and the likes. Unlike other - services Hubzilla offers you the advantage of creating - many more profiles. That way you are able to distinguish between profiles targeted specially at everyone - (your public profile), your work mates, your family and your partner.Think of your profile as the basic - information about yourself you tell other people. -
      -
      Channel
      -
      - During the registration you created your first channel. Yes, besides several profiles you are able to have - several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have - created one channel. You can use this one for the public, to communicate with people about every day life. But - perhaps you are an avid book reader and many people are bored by that. So you open a second channel just - for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of - posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections - might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just - switch between both of them just like you would in real life switch when talking to people you meet on the street - or people you meet specially to talk about books. You can even connect to yourself, or better: to your other - channel. :)Think of a channel as different spaces dedicated to different topics where you meet with different - people. -
      -
      \ No newline at end of file diff --git a/doc/context/en/settings/channel/help.html b/doc/context/en/settings/channel/help.html deleted file mode 100644 index 41f00fe64..000000000 --- a/doc/context/en/settings/channel/help.html +++ /dev/null @@ -1,35 +0,0 @@ -
      -
      General
      -
      - Once you have registered an account at the matrix you have also created a profile and a channel. -
      -
      Account
      -
      - You have one account. This consists of your email account and your password. With your account you access your - profile and your channel.Think of your account as the way you authenticate at one Hubzilla site. It lets you - do things, such as creating profiles and channels with which you can connect to other people. -
      -
      Profile
      -
      - You have surely registered with some other internet services, such as forums or online communities. For all of them - you provided some information about yourself, such as date of birth, country, age and the likes. Unlike other - services Hubzilla offers you the advantage of creating - many more profiles. That way you are able to distinguish between profiles targeted specially at everyone - (your public profile), your work mates, your family and your partner.Think of your profile as the basic - information about yourself you tell other people. -
      -
      Channel
      -
      - During the registration you created your first channel. Yes, besides several profiles you are able to have - several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have - created one channel. You can use this one for the public, to communicate with people about every day life. But - perhaps you are an avid book reader and many people are bored by that. So you open a second channel just - for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of - posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections - might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just - switch between both of them just like you would in real life switch when talking to people you meet on the street - or people you meet specially to talk about books. You can even connect to yourself, or better: to your other - channel. :)Think of a channel as different spaces dedicated to different topics where you meet with different - people. -
      -
      \ No newline at end of file diff --git a/doc/context/en/settings/features/help.html b/doc/context/en/settings/features/help.html deleted file mode 100644 index 86e4f5dae..000000000 --- a/doc/context/en/settings/features/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      General
      -
      This page allows you to configure settings for the many additional features of Hubzilla.
      -
      General Features
      -
      General feature settings include options relevant to your channel, such as webpage and wiki hosting.
      -
      Post Composition Features
      -
      The post composition features provide extra options and capabilities when composing new posts.
      -
      Network and Stream Filtering
      -
      These settings modify features associated with filtering and controlling your view of incoming posts.
      -
      Post/Comment Tools
      -
      These provide additional tools for categorizing posts and allowing additional commenting methods such as emoji or community tagging.
      -
      \ No newline at end of file diff --git a/doc/context/en/settings/tokens/help.html b/doc/context/en/settings/tokens/help.html deleted file mode 100644 index 6d7e6b98d..000000000 --- a/doc/context/en/settings/tokens/help.html +++ /dev/null @@ -1,23 +0,0 @@ -
      -
      Guest Access Tokens
      -
      - In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). -
      -
      Create a token
      -
      - The form to create/edit accepts three parameters, a human readable name, a password or access token, and an - optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be - automatically purged from the list of temporary accounts. The password field in the create/edit forms - displays the text of the access token and not an obscured password. -
      -
      Share a token
      -
      - We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided. - - Example: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied. - - The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album. - - Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented. -
      -
      \ No newline at end of file diff --git a/doc/context/en/webpages/help.html b/doc/context/en/webpages/help.html deleted file mode 100644 index a4817e4bf..000000000 --- a/doc/context/en/webpages/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      You can create modular, identity-aware websites composed of shareable elements.
      -
      Pages
      -
      This page lists your "pages", which are assigned URLs where people can visit your site. The structure of pages are typically described by an associated layout, and their content is constructed from a collection of blocks.
      -
      Website portation tools
      -
      The website portation tools allows you import/export multiple webpage elements (pages, layouts, blocks). You can import either from an uploaded zip file or from an existing cloud files folder. You can export to either a zip file containing a select group of webpage elements in a form compatible with the import tool, or you can export directly to a cloud files folder. Read more...
      -
      \ No newline at end of file diff --git a/doc/context/en/wiki/help.html b/doc/context/en/wiki/help.html deleted file mode 100644 index 5dee85375..000000000 --- a/doc/context/en/wiki/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      General
      -
      Each wiki is a collection of pages, composed as Markdown-formatted text files.
      -
      Wiki List
      -
      Wikis owned by the channel that you have permission to view are listed in the side panel.
      -
      Page History
      -
      Every revision of a page is saved to allow quick reversion. Click the History tab to view a history of page revisions, including the date and author of each. The revert button will load the selected revision but will not automatically save the page.
      -
      Pages
      -
      The list of pages in the wiki are listed in the Wiki Pages panel. Prior to saving page edits using the Page control dropdown menu, you may enter a custom message to be displayed in the Page History viewer along with the revision.
      -
      diff --git a/doc/context/es b/doc/context/es deleted file mode 120000 index c8ba7666b..000000000 --- a/doc/context/es +++ /dev/null @@ -1 +0,0 @@ -es-es \ No newline at end of file diff --git a/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png b/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png deleted file mode 100644 index 37139b345..000000000 Binary files a/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png and /dev/null differ diff --git a/doc/context/es-es/admin/addons/help.html b/doc/context/es-es/admin/addons/help.html deleted file mode 100644 index 49a047f5e..000000000 --- a/doc/context/es-es/admin/addons/help.html +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      General
      -
      Esta página gestiona qué addons (también llamados plugins o complementos) están instalados.
      -
      Gestión de los repositorios
      -
      Si su servidor web tiene los permisos de escritura necesarios, verá un botón etiquetado como Gestión de repositorios, - que abre un panel de control para administrar qué repositorios de addons están instalados. Estos repositorios están - almacenados en extend/addon/[nombre del repositorio]/. El repositorio de addons oficial de Hubzilla - se puede añadir escribiendo la URL del repositorio - https://framagit.org/hubzilla/addons.git - y eligiendo un nombre para el repositorio como oficial. Debería ver este repositorio en una lista parecida - a esta: -
      -
      -
      diff --git a/doc/context/es-es/admin/logs/help.html b/doc/context/es-es/admin/logs/help.html deleted file mode 100644 index 3a2ec413d..000000000 --- a/doc/context/es-es/admin/logs/help.html +++ /dev/null @@ -1,9 +0,0 @@ -
      -
      General
      -
      Esta página le permite ajustar los parámetros de los informes del sistema (logs) y para ver uno existente.
      -
      Ajustes de los informes (logs)
      -
      Cuando se habilita la opción de depuración, el sistema de información comenzará a añadir los informes (logs) en el archivo especificado en el cuadro "Fichero de informes" - (la ruta es relativa al directorio raíz del servidor, por ejemplo, /var /www). Tenga en cuenta que este archivo tiene que ser modificable por el servidor web.
      -
      Nivel de depuración
      -
      La opción de nivel de depuración le permite establecer la cantidad de información que se anexa al fichero de informes (logs). Advertencia: El aumento de este nivel puede aumentar rápidamente el tamaño de este fichero hasta en más de 100 MB, especialmente en los hubs con más que unos pocos miembros.
      -
      diff --git a/doc/context/es-es/admin/queue/help.html b/doc/context/es-es/admin/queue/help.html deleted file mode 100644 index de9e6cdbb..000000000 --- a/doc/context/es-es/admin/queue/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      Las estadísticas de la cola muestran cuántos mensajes están en la cola para su entrega a otros hubs. La prioridad está relacionada con la cantidad de veces que la entrega se ha intentado, sin éxito.
      -
      diff --git a/doc/context/es-es/admin/security/help.html b/doc/context/es-es/admin/security/help.html deleted file mode 100644 index 229a91561..000000000 --- a/doc/context/es-es/admin/security/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      Esta página contiene varios ajustes para el administrador relacionados con la seguridad. Para guardar los cambios que realice en estos ajustes, debe pulsar el botón "Enviar".
      -
      diff --git a/doc/context/es-es/appman/help.html b/doc/context/es-es/appman/help.html deleted file mode 100644 index 1b799a52b..000000000 --- a/doc/context/es-es/appman/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      Editar las propiedades individuales de la aplicación seleccionada. Las categorías le permiten ordenar sus aplicaciones para ayudarle a encontrarlas más fácilmente en la lista. El soporte para aplicaciones personalizadas que usted o su administrador puedan elegir para crear incluye campos como "Precio de la aplicación" y "Ubicación para la compra" que no son aplicables a las aplicaciones principales de Hubzilla.
      -
      \ No newline at end of file diff --git a/doc/context/es-es/apps/edit/help.html b/doc/context/es-es/apps/edit/help.html deleted file mode 100644 index 28e92328e..000000000 --- a/doc/context/es-es/apps/edit/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      General
      -
      Modificar o eliminar sus "apps" usando el botón de control que está junto al icono de cada aplicación de la lista.
      -
      \ No newline at end of file diff --git a/doc/context/es-es/apps/help.html b/doc/context/es-es/apps/help.html deleted file mode 100644 index a6bfd0093..000000000 --- a/doc/context/es-es/apps/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      Esta página le muestra qué aplicaciones están disponibles para su canal, incluyendo tanto las aplicaciones principales como las proporcionadas por addons. Para añadir una aplicación al menú de aplicaciones "estrelle" la aplicación de la siguiente lista.
      -
      Gestionar las aplicaciones (apps)
      -
      Pulse el botón "Gestionar aplicaciones" para abrir una página en la podrá editar el nombre, las categorías y otras propiedades de sus aplicaciones.
      -
      diff --git a/doc/context/es-es/articles/help.html b/doc/context/es-es/articles/help.html deleted file mode 100644 index 0bf176fdd..000000000 --- a/doc/context/es-es/articles/help.html +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      General
      -
      El artículo es un tipo de documento de una naturaleza un poco especial, a mitad de camino entre las fichas de organización de trabajo ("cards") y las entradas normales, pero que está separado del stream social. Son muy adecuados para ayudar a escribir y organizar textos, con un formateo básico, pero completo, sobre cualquier tema, especialmente sobre documentación seriada, de forma más amplia que un wiki pero menos que un página web. Al no formar parte del stream social, para acceder a él hace falta conocer su dirección: [URL del sitio]/articles/[nombre del usuario, sin dominio]. Ahí estarán disponibles los distintas artículos que escriba, por orden de publicación.
      -
      Crear un artículo
      -
      - Crear un artículo nuevo es muy parecido a componer un nuevo post.

      -
        -
      • - Nombre del enlace de la página: Este nombre es el del nombre del artículo para una URL estática -
        • -
      • - Título: El título se muestra en la parte de arriba del artículo -
        • -
      • - Temas o Categorías: Si tiene activada la opción Temas de las entradas en su canal, entonces puede añadirlos al artículo. Estas categorías o temas se despliegan en la lista Temas en el panel de la izquierda y permiten filtrar su colección de artículos. -
        • -
      • Sumario: Es el espacio, entre las etiquetas predefinidas [summary][/summary], reservado para redactar un resumen del artículo, que aparecerá en su encabezado. El espacio disponible a continuación del sumario, en la ventana de composición, es el adecuado para la redacción del artículo en sí. -
      -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/cards/help.html b/doc/context/es-es/cards/help.html deleted file mode 100644 index 34889cd25..000000000 --- a/doc/context/es-es/cards/help.html +++ /dev/null @@ -1,19 +0,0 @@ -
      -
      General
      -
      Las fichas representan un área persistente para la colaboración que está separada del stream social. Son algo más ligeras que las páginas web y los wikis para una rápida organización de la información y tienen la ventaja de permitir la colaboración y los comentarios. Son muy adecuados para ayudar a organizar tareas complejas en las que hay actualizaciones y retroalimentación frecuentes.
      -
      Añadir una ficha
      -
      - Crear una ficha nueva es muy parecido a componer un nuevo post.

      -
        -
      • - Nombre del enlace de la página: Este nombre es el de la ficha para una URL estática -
        • -
      • - Título: El título se muestra en la parte de arriba de la ficha -
        • -
      • - Categorías: Si tiene activada la opción Temas de las entradas en su canal, entonces puede añadirlas a la ficha. Estas categorías o temas se despliegan en la lista Temas en el panel de la izquierda y permiten filtrar su colección de fichas. -
        • -
      -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/channel/help.html b/doc/context/es-es/channel/help.html deleted file mode 100644 index 682125e27..000000000 --- a/doc/context/es-es/channel/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      General
      -
      Esta es la página principal de un canal. Es similar al "muro" del perfil de una persona en un contexto de red social. Las entradas creadas por el canal se muestran de acuerdo con los permisos de visualización -del observador.
      -
      Crear una entrada
      -
      Si tiene permiso para crear entradas en la página del canal, a continuación, podrá ver el editor de entradas en la parte superior.
      -
      Pestañas de los contenidos del canal
      -
      Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerías -de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
      \ No newline at end of file diff --git a/doc/context/es-es/chat/help.html b/doc/context/es-es/chat/help.html deleted file mode 100644 index 94df6a1d2..000000000 --- a/doc/context/es-es/chat/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      Creación y uso de salas de chat para comunicarse en tiempo real, utilizando el sistema de permisos estándar de Hubzilla para el control de acceso a la sala de chat.
      -
      Crear una nueva sala de chat
      -
      Utilice el botón "Crear" para crear una nueva sala de chat. Introduzca un nombre y cuánto tiempo se deben conservar los mensajes.
      -
      Chatear
      -
      Introduzca su mensaje en el cuadro de mensaje y pulse "Enviar". Se puede establecer un estado seleccionando el botón de menú sala de chat junto al botón "Enviar". Si hay otras personas en la sala, serán visibles en el panel lateral, en "Miembros del chat".
      -
      diff --git a/doc/context/es-es/cloud/help.html b/doc/context/es-es/cloud/help.html deleted file mode 100644 index af891da17..000000000 --- a/doc/context/es-es/cloud/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      Esta página muestra los archivos "cloud" de un canal. Los archivos visibles para el observador dependen de los permisos de fichero individuales establecidos por el propietario del canal. Si tiene permiso para crear o cargar archivos verá botones de control encima de la lista de ficheros.
      -
      Pestañas de contenidos del canal
      -
      Las pestañas de contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña Mi canal enlaza con el perfil del canal. La pestaña Fotos enlaza con las galerías de fotos del canal. La pestaña Ficheros enlaza con los ficheros compartidos publicados por el canal.
      -
      \ No newline at end of file diff --git a/doc/context/es-es/connections/help.html b/doc/context/es-es/connections/help.html deleted file mode 100644 index a0aa9cf32..000000000 --- a/doc/context/es-es/connections/help.html +++ /dev/null @@ -1,15 +0,0 @@ -
      -
      General
      -
      Esta página muestra una lista de todas las conexiones de este canal. La lista se puede ordenar y filtrar usando el botón de menú al lado del botón de búsqueda.
      -
      Detalles de la conexión
      -
      Cada entrada de la lista muestra los detalles de una conexión específica. Una imagen de avatar translúcida indica una conexión archivada.
      -
      Estado de la conexión
      -
      Una conexión puede estar en diferentes estados: -
        -
      • Archivada
        • -
      • Ignorada
        • -
      • Bloqueada
        • -
      • Oculta
        • -
      -
      -
      diff --git a/doc/context/es-es/connections/ifpending/help.html b/doc/context/es-es/connections/ifpending/help.html deleted file mode 100644 index 84e547851..000000000 --- a/doc/context/es-es/connections/ifpending/help.html +++ /dev/null @@ -1,15 +0,0 @@ -
      -
      General
      -
      Esta página muestra una lista de todas las conexiones de este canal. La lista se puede ordenar y filtrar usando el botón de menú al lado del botón de búsqueda.
      -
      Detalles de la conexión
      -
      Cada entrada de la lista muestra los detalles de una conexión específica. Una imagen de avatar translúcida indica una conexión archivada.
      -
      Estado de la conexión
      -
      Una conexión puede estar en diferentes estados: -
        -
      • Archivada
        • -
      • Ignorada
        • -
      • Bloqueada
        • -
      • Oculta
        • -
      -
      -
      diff --git a/doc/context/es-es/connedit/help.html b/doc/context/es-es/connedit/help.html deleted file mode 100644 index e8c92ca28..000000000 --- a/doc/context/es-es/connedit/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      General
      -
      Esta página le permite cambiar o modificar cualquier ajuste individual para una conexión en concreto o eliminar una conexión completamente. Ha podido llegar a esta página tras crear o aprobar una conexión nueva. Si es así, no tiene por qué hacer nada. Su conexión ya se ha establecido. Es posible que desee añadirla a un grupo o ajustar para ella permisos especiales; si es así, esta página se presenta de modo que usted pueda hacerlo mientras todo el proceso es aún reciente.
      -
      Conexiones
      -
      El menú Conexiones le da acceso a varios ajustes: "Ver el perfil", "Ver la actividad reciente", "Recargar los permisos", añadir o quitar estados ("flags") ("Bloquear", "Ignorar", "Archivar", "Ocultar") y eliminar la conexión.
      -
      Grupos de canales
      -
      Todas las conexiones se pueden incluir en uno o varios grupos de canales para formar conjuntos de amigos con acceso a publicaciones concretas, ficheros multimedia y otros tipos de contenido. Puede añadirla aquí a un grupo de canales ya existente o crear un grupo nuevo. Cuando añade la conexión a un grupo que ya existe, el efecto es inmediato y no será requerido para confirmarlo.
      -
      Permisos individuales
      -
      La concesión de permisos es, generalmente, automática y no requiere ninguna acción por su parte. Sin embargo, puede, si lo desea, ajustar permisos especiales, diferentes de los permisos concedidos a otros, para una conexión concreta.
      -
      Ajustes de funcionalidades concretas
      -
      Una serie de ajustes individuales se controlan mediante funcionalidades adicionales que pueden, o no, estar activadas en un hub o para su canal en concreto. Varias funcionalidades adicionales tienen ajustes para cada conexión, Estas funcionalidades se pueden configurar en esta página, de forma adicional, mediante pestañas que pueden estar presentes.
      -
      diff --git a/doc/context/es-es/events/help.html b/doc/context/es-es/events/help.html deleted file mode 100644 index b0ac1f9ea..000000000 --- a/doc/context/es-es/events/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      Esta página muestra un calendario de eventos tanto de su propiedad como compartido con usted desde otros canales.
      -
      Vistas del calendario
      -
      El calendario se puede mostrar en modo mensual, semanal o diario usando las opciones del panel lateral.
      -
      Exportar/Importar
      -
      Exportar o importar eventos del calendario usando el formato estándar de los ficheros de iCalendar (.ics).
      -
      diff --git a/doc/context/es-es/mail/help.html b/doc/context/es-es/mail/help.html deleted file mode 100644 index 794af38a9..000000000 --- a/doc/context/es-es/mail/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      General
      -
      Los mensajes que aparecen en el correo privado son visibles sólo para usted y un único destinatario.
      -
      Vista combinada
      -
      Las conversaciones completas se pueden ver en un hilo continuo seleccionando "Vista combinada". Las conversaciones disponibles se muestran debajo del menú en el panel lateral.
      -
      Bandeja de entrada/Bandeja de salida
      -
      Los mensajes individuales enviados son visibles seleccionando la Bandeja de salida y los mensajes recibidos se pueden ver usando el filtro de la Bandeja de entrada.
      -
      Mensaje nuevo
      -
      Los mensajes individuales tienen informes de entrega que se pueden ver usando el menú desplegable. Los mensajes también se pueden revocar desde el mismo menú, lo que puede evitar que el destinatario vea el mensaje, si aún no lo ha leído.
      -
      \ No newline at end of file diff --git a/doc/context/es-es/network/help.html b/doc/context/es-es/network/help.html deleted file mode 100644 index 082f52a49..000000000 --- a/doc/context/es-es/network/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      General
      -
      La página de "Mi red" muestra un flujo de entradas y conversaciones, normalmente ordenadas según la actualización más reciente. Esta página es altamente personalizable.
      -
      Crear una entrada
      -
      En la parte superior de la página hay un cuadro de texto que dice "Compartir". Al hacer clic en esta casilla se abre un nuevo editor de entradas. El editor de entradas es personalizable, pero el editor básico proporciona campos para el cuerpo de la publicación y un título opcional. Los botones que hay debajo de la zona de texto, a la izquierda, proporcionan - accesos directos para el Formato de texto y para  insertar enlaces, imágenes y otros datos en la entrada. Los botones a la derecha proporcionan una vista previa del mensaje, los ajustes de permisos de la entrada, y un botón Enviar para publicarla.
      -
      Grupos de canales
      -
      Los grupos de canales que ha creado se muestran en el panel lateral. Seleccionándolos, se filtran las entradas creadas por los canales incluidos en el grupo elegido.
      -
      Permisos de una entrada
      -
      La lista de control de acceso (ACL) es lo que se utiliza para establecer quién puede ver su nueva entrada. Al pulsar el botón ACL, al lado del botón Enviar, se mostrará un cuadro de diálogo en el que puede seleccionar qué canales y / o grupos de canales pueden ver el mensaje. También puede seleccionar a quién se le niega el acceso explícitamente. Por ejemplo,di gamos que usted está planeando una - fiesta sorpresa para un amigo. Puede enviar un mensaje de invitación a todos los miembros de su grupo de Amigos, excepto el amigo al que quiere sorprender. En este caso, "se mostrará" al grupo de amigos, pero "no se mostrará" a esa única persona.
      -
      diff --git a/doc/context/es-es/photos/help.html b/doc/context/es-es/photos/help.html deleted file mode 100644 index 6623456eb..000000000 --- a/doc/context/es-es/photos/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      Esta página muestra los álbumes de fotos de un canal. Las imágenes visibles para el observador dependen de los permisos individuales de cada imagen.
      -
      Pestañas de los contenidos del canal
      -
      Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
      -
      diff --git a/doc/context/es-es/profile/help.html b/doc/context/es-es/profile/help.html deleted file mode 100644 index 28ff22499..000000000 --- a/doc/context/es-es/profile/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      General
      -
      Esta es la página de perfil de un canal. Por lo general muestra la información que describe el canal. Si el canal representa a una persona en una red social, por ejemplo, el perfil podría proporcionar información de contacto y otros datos personales. Los canales pueden tener varios perfiles, en cuyo caso el perfil que se muestra depende del observador.
      -
      Pestañas de los contenidos del canal
      -
      Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" nlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
      -
      diff --git a/doc/context/es-es/profiles/help.html b/doc/context/es-es/profiles/help.html deleted file mode 100644 index 9303e049c..000000000 --- a/doc/context/es-es/profiles/help.html +++ /dev/null @@ -1,35 +0,0 @@ -
      -
      General
      -
      - Al registar cuenta en Hubzilla, también ha creado un perfil y un canal. -
      -
      Cuenta
      -
      - Tiene una cuenta. Esta consta de su correo electrónico y su contraseña. Mediante su cuenta, accede a su - perfil y su canal. Piense en su cuenta como la vía para identificarse en un sitio Hubzilla. Le permite - hacer cosas, como crear perfiles y canales a través de los cuelas podrá conectar con otra gente. -
      -
      Perfil
      -
      - Usted está registrado, seguramente, con algunos otros servicios de Internet, como foros o comunidades en línea. Para todos ellos - usted proporcionó algún tipo de información sobre usted mismo, tal como su fecha de nacimiento, país, edad y gustos o preferencias. Frente a otros - servicios, Hubzilla le ofrece la ventaja de crear - muchos más perfiles. De esa manera usted puede distinguir entre los perfiles dirigidos especialmente a todo el mundo - (su perfil público), Sus compañeros de trabajo, su familia y su pareja.Piense en su perfil como la información básica - básica que acerca de usted mismo muestra a otra gente, -
      -
      Canal
      -
      - Durante el registro, creó su primer canal. Sí, además de los varios perfiles, usted puede tener - varios canales. Esto podría ser un poco confuso al principio, pero vamos a aclarar las cosas. Usted ya ha creado - un canal. Puede usarlo para el público en general, para informar a los demás sobre su vida cotidiana. Pero - Tal vez usted es un ávido lector de libros y muchas personas se aburren con eso. Así que abre un segundo canal sólo - para los amantes de los libros, en el que todos ustedes pueden hablar de libros tanto como quieran. Obviamente, este es un nuevo flujo de - entradas, con un nuevo perfil (...o nuevos perfiles...) y contactos completamente diferentes. Algunas conexiones - pueden existir en ambos canales, pero habrá algunas que estén exclusivamente en uno de los dos. Usted mismo simplemente - cambie entre ambos como cambia de interlocutor en el mundo real cuando habla con varias personas en la calle - o personas con las que se reúne especialmente para hablar de libros. Incluso puede conectarse a sí mismo, o mejor: a su otro - canal. :) Piense en un canal como en diferentes espacios dedicados a diferentes temas en los que puede hablar con diferentes - personas. -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/settings/account/help.html b/doc/context/es-es/settings/account/help.html deleted file mode 100644 index 9303e049c..000000000 --- a/doc/context/es-es/settings/account/help.html +++ /dev/null @@ -1,35 +0,0 @@ -
      -
      General
      -
      - Al registar cuenta en Hubzilla, también ha creado un perfil y un canal. -
      -
      Cuenta
      -
      - Tiene una cuenta. Esta consta de su correo electrónico y su contraseña. Mediante su cuenta, accede a su - perfil y su canal. Piense en su cuenta como la vía para identificarse en un sitio Hubzilla. Le permite - hacer cosas, como crear perfiles y canales a través de los cuelas podrá conectar con otra gente. -
      -
      Perfil
      -
      - Usted está registrado, seguramente, con algunos otros servicios de Internet, como foros o comunidades en línea. Para todos ellos - usted proporcionó algún tipo de información sobre usted mismo, tal como su fecha de nacimiento, país, edad y gustos o preferencias. Frente a otros - servicios, Hubzilla le ofrece la ventaja de crear - muchos más perfiles. De esa manera usted puede distinguir entre los perfiles dirigidos especialmente a todo el mundo - (su perfil público), Sus compañeros de trabajo, su familia y su pareja.Piense en su perfil como la información básica - básica que acerca de usted mismo muestra a otra gente, -
      -
      Canal
      -
      - Durante el registro, creó su primer canal. Sí, además de los varios perfiles, usted puede tener - varios canales. Esto podría ser un poco confuso al principio, pero vamos a aclarar las cosas. Usted ya ha creado - un canal. Puede usarlo para el público en general, para informar a los demás sobre su vida cotidiana. Pero - Tal vez usted es un ávido lector de libros y muchas personas se aburren con eso. Así que abre un segundo canal sólo - para los amantes de los libros, en el que todos ustedes pueden hablar de libros tanto como quieran. Obviamente, este es un nuevo flujo de - entradas, con un nuevo perfil (...o nuevos perfiles...) y contactos completamente diferentes. Algunas conexiones - pueden existir en ambos canales, pero habrá algunas que estén exclusivamente en uno de los dos. Usted mismo simplemente - cambie entre ambos como cambia de interlocutor en el mundo real cuando habla con varias personas en la calle - o personas con las que se reúne especialmente para hablar de libros. Incluso puede conectarse a sí mismo, o mejor: a su otro - canal. :) Piense en un canal como en diferentes espacios dedicados a diferentes temas en los que puede hablar con diferentes - personas. -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/settings/channel/help.html b/doc/context/es-es/settings/channel/help.html deleted file mode 100644 index 9303e049c..000000000 --- a/doc/context/es-es/settings/channel/help.html +++ /dev/null @@ -1,35 +0,0 @@ -
      -
      General
      -
      - Al registar cuenta en Hubzilla, también ha creado un perfil y un canal. -
      -
      Cuenta
      -
      - Tiene una cuenta. Esta consta de su correo electrónico y su contraseña. Mediante su cuenta, accede a su - perfil y su canal. Piense en su cuenta como la vía para identificarse en un sitio Hubzilla. Le permite - hacer cosas, como crear perfiles y canales a través de los cuelas podrá conectar con otra gente. -
      -
      Perfil
      -
      - Usted está registrado, seguramente, con algunos otros servicios de Internet, como foros o comunidades en línea. Para todos ellos - usted proporcionó algún tipo de información sobre usted mismo, tal como su fecha de nacimiento, país, edad y gustos o preferencias. Frente a otros - servicios, Hubzilla le ofrece la ventaja de crear - muchos más perfiles. De esa manera usted puede distinguir entre los perfiles dirigidos especialmente a todo el mundo - (su perfil público), Sus compañeros de trabajo, su familia y su pareja.Piense en su perfil como la información básica - básica que acerca de usted mismo muestra a otra gente, -
      -
      Canal
      -
      - Durante el registro, creó su primer canal. Sí, además de los varios perfiles, usted puede tener - varios canales. Esto podría ser un poco confuso al principio, pero vamos a aclarar las cosas. Usted ya ha creado - un canal. Puede usarlo para el público en general, para informar a los demás sobre su vida cotidiana. Pero - Tal vez usted es un ávido lector de libros y muchas personas se aburren con eso. Así que abre un segundo canal sólo - para los amantes de los libros, en el que todos ustedes pueden hablar de libros tanto como quieran. Obviamente, este es un nuevo flujo de - entradas, con un nuevo perfil (...o nuevos perfiles...) y contactos completamente diferentes. Algunas conexiones - pueden existir en ambos canales, pero habrá algunas que estén exclusivamente en uno de los dos. Usted mismo simplemente - cambie entre ambos como cambia de interlocutor en el mundo real cuando habla con varias personas en la calle - o personas con las que se reúne especialmente para hablar de libros. Incluso puede conectarse a sí mismo, o mejor: a su otro - canal. :) Piense en un canal como en diferentes espacios dedicados a diferentes temas en los que puede hablar con diferentes - personas. -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/settings/features/help.html b/doc/context/es-es/settings/features/help.html deleted file mode 100644 index a9c3c2d6c..000000000 --- a/doc/context/es-es/settings/features/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      General
      -
      Esta página le permite configurar los ajustes para muchas funcionalidades adicionales de Hubzilla.
      -
      Funcionalidades básicas
      -
      Las ajustes de las funcionalidades básicas incluyen opciones importantes para su canal, tales como el hospedaje de páginas web y wikis.
      -
      Opciones para la redacción de entradas
      -
      Los ajustes de la redacción de entradas incluyen opciones adicionales para la composición de nuevas publicaciones.
      -
      Filtrado del contenido
      -
      Estos ajustes modifican funcionalidades asociadas al filtrado del contenido y a cómo ver las publicaciones nuevas.
      -
      Gestión de entradas y comentarios
      -
      Estos ajustes proporcionan herramientas adicionales para establecer el tema de las entradas y permiten métodos adicionales para los comentarios, tales como los emojis y el etiquetado de la comunidad.
      -
      \ No newline at end of file diff --git a/doc/context/es-es/settings/tokens/help.html b/doc/context/es-es/settings/tokens/help.html deleted file mode 100644 index 6d6a8d81f..000000000 --- a/doc/context/es-es/settings/tokens/help.html +++ /dev/null @@ -1,23 +0,0 @@ -
      -
      Guest Access Tokens
      -
      - Para facilitar el intercambio de recursos privados con no miembros o miembros de otros nodos federados con una identificación limitada, Hubzilla debe proporcionar a los miembros un mecanismo para crear y administrar inicios de sesión temporales ("desechables"), también conocidos como "Zot Access Tokens". Estos tokens/credenciales se pueden utilizar para autenticarse en un sitio de hubzilla con el único propósito de acceder a recursos privilegiados o de acceso controlado (archivos, fotos, publicaciones, páginas web, salas de chat, etc.). -
      -
      Crear un token
      -
      - El formulario para crear / editar acepta tres parámetros, un nombre legible por el usuario, una contraseña o un token de acceso, y un - límite de caducidad opcional. Una vez que ha caducado, el acceso mediante el token deja de ser válido, ya no puede usarse, y será - purgado automáticamente de la lista de cuentas temporales. El campo de la contraseña, en los formularios para crear/editar, - muestra el texto del token de acceso y no una displays the text of the access token and not una contraseña oscurecida. -
      -
      Compartir un token
      -
      - No especificamos mecanismos para compartir estos tokens con otros. Se puede usar cualquier método de comunicación. Cualquier token que haya creado se añade al selector de la Lista de Control y puede ser usado por cualquiera que esté en esa lista. - - Ejemplo: Una visitante llega a su sitio. Tiene un token de acceso que usted le ha proporcionado e intenta ver uno de sus álbumes de fotos (que está restringido para que solo lo puedan ver usted mismo y una identidad temporal). El permiso es denegado. - - La visitante, ahora, selecciona "Iniciar sesión" del menú de la barra de navegación, que muestra la página de inicio de sesión. Ella escribe el nombre y contraseña que usted le ha proporcionado: ahora ya puede ver el álbum privado de fotos. - - De forma alternativa, puede compartir un enlace a un fichero protegido, añadiendo un parámetro del tipo "&zat=abc123" a la dirección URL, en el que la cadena "abc123" es el token de acceso o contraseña para el inicio de sesión temporal. No se requiere ninguna negociación posterior: el fichero será mostrado. -
      -
      \ No newline at end of file diff --git a/doc/context/es-es/webpages/help.html b/doc/context/es-es/webpages/help.html deleted file mode 100644 index 7cd7f7c11..000000000 --- a/doc/context/es-es/webpages/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      General
      -
      Puede crear sitios web modulares, con identidad propia, compuestos de elementos compartibles.
      -
      Páginas
      -
      Esta página enumera sus "páginas", a las que se asignan URLs en las que la gente pueden visitar su sitio. La estructura de las páginas se describe típicamente mediante una plantilla de diseño asociada, y su contenido se construye a partir de una colección de bloques.
      -
      Herramientas de portabilidad de sitios web
      -
      Las herramientas de portabilidad de sitios web le permiten importar y exportar múltiples elementos de páginas web (páginas, plantillas, bloques). Puede importar tanto de un fichero zip como de una carpeta de ficheros existente en la nube. Puede exportar tanto a un fichero zip que contenga un grupo seleccionado de elementos de páginas web, o exportarlos directamente a una carpeta de ficheros en la nube. Leer más...
      -
      \ No newline at end of file diff --git a/doc/context/es-es/wiki/help.html b/doc/context/es-es/wiki/help.html deleted file mode 100644 index fdae1f095..000000000 --- a/doc/context/es-es/wiki/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      General
      -
      Cada wiki es una colección de páginas, compuestas como ficheros de texto formateados en Markdown.
      -
      Lista de wikis
      -
      Las páginas wiki propiedad del canal que esté autorizado a ver aparecen en el panel lateral.
      -
      Historial de la página
      -
      Cada revisión de una página se salva para permitir su rápida recuperación. Pulsar en la pestaña Historial para ver las revisiones de la página, incluyendo la fecha y el autor de cada una. El botón de reversión cargará la revisión seleccionada, pero no salvará automáticamente la página.
      -
      Páginas
      -
      La lista de páginas en el wiki aparece en el panel Páginas del wiki. Antes de salvar las páginas editadas usando el control Página en el menú desplegable, puede escribir un mensaje personalizado que se verá en el visor Historial de la página junto con la revisión.
      -
      diff --git a/doc/context/fr/admin/logs/help.html b/doc/context/fr/admin/logs/help.html deleted file mode 100644 index 53f8e65c3..000000000 --- a/doc/context/fr/admin/logs/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Informations de base
      -
      Cette page vous permet d'ajuster les paramètres du journal d'événements et d'afficher le journal existant.
      . -
      Réglages du journal
      -
      Lorsque vous activez l'option "Débogage", les informations du journal système commenceront à s'ajouter au fichier spécifié dans la boîte "Fichier du journal" (le chemin est relatif à la racine du hub, par exemple /var/www). Notez que ce fichier doit être inscriptible par le serveur web.
      . -
      Niveau de journalisation
      -
      L'option "Niveau de journalisation" vous permet de définir la quantité d'informations ajoutées au fichier journal. Attention : Augmenter ce niveau peut rapidement gonfler la taille du fichier journal à >100MB, en particulier sur les hubs avec plusieurs membres.
      . -
      diff --git a/doc/context/fr/admin/queue/help.html b/doc/context/fr/admin/queue/help.html deleted file mode 100644 index 836d81b92..000000000 --- a/doc/context/fr/admin/queue/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      Informations de base
      -
      Les statistiques de file d'attente affichent le nombre de messages dans la file d'attente pour livraison à d'autres centres. La priorité est liée au nombre de fois où la livraison a été tentée sans succès.
      -
      diff --git a/doc/context/fr/appman/help.html b/doc/context/fr/appman/help.html deleted file mode 100644 index d65f78378..000000000 --- a/doc/context/fr/appman/help.html +++ /dev/null @@ -1,5 +0,0 @@ -
      -
      Information de base
      -
      Modifiez les propriétés individuelles de l'application que vous avez sélectionnée. Les catégories vous permettent de trier vos applications pour vous aider à les trouver plus facilement dans la liste. La prise en charge des applications personnalisées que vous ou votre administrateur pouvez choisir de créer inclut des champs tels que «Prix de l'application» et «Lieu d'achat» qui ne sont pas applicables aux applications centrales Hubzilla. -
      -
      diff --git a/doc/context/fr/apps/edit/index.html b/doc/context/fr/apps/edit/index.html deleted file mode 100644 index 93fd8dec6..000000000 --- a/doc/context/fr/apps/edit/index.html +++ /dev/null @@ -1,4 +0,0 @@ -
      -
      Informations de base
      -
      Modifiez ou supprimez vos applications à l'aide des boutons de contrôle situés à côté de chaque icône d'application dans la liste.
      -
      diff --git a/doc/context/fr/apps/help.html b/doc/context/fr/apps/help.html deleted file mode 100644 index 65eb63d84..000000000 --- a/doc/context/fr/apps/help.html +++ /dev/null @@ -1,7 +0,0 @@ -
      -
      Informations de base
      -
      Cette page vous montre quelles applications sont disponibles pour votre canal, y compris les applications centrales et celles fournies par les greffons. Pour ajouter une application au menu de l'application, cliquez sur le bouton étoile l'application dans la liste ci-dessous.
      -
      Gérer les applications
      -
      Appuyez sur le bouton «Gérer les applications» pour ouvrir une page où vous pouvez éditer le nom, les catégories et autres propriétés de vos applications. -
      -
      diff --git a/doc/context/fr/cards/help.html b/doc/context/fr/cards/help.html deleted file mode 100644 index a58a9a73e..000000000 --- a/doc/context/fr/cards/help.html +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      Informations de base
      -
      Les cartes représentent un domaine persistant de collaboration qui est distinct du volet social. Ils sont un peu plus légers que les pages web et les wikis pour une organisation rapide de l'information et ont l'avantage de permettre la collaboration et le commentaire. Ils sont bien adaptés pour aider à organiser des tâches complexes où il y a des mises à jour et des retours d'information fréquents. -
      -
      Ajouter une carte
      -
      - La création d'une nouvelle carte est très similaire à la composition d'un nouveau message.

      -
        -
      • - Nom du lien de page : Le nom du lien de page est le nom de la carte pour l'URL statique. -
        • -
      • - Titre : Le titre est affiché en haut de la carte. -
        • -
      • - Catégories : Si la fonction catégories de messages est activée pour votre chaîne, vous pouvez ajouter des catégories à la carte. Ces catégories remplissent la liste des catégories sur le panneau de gauche et permettent de filtrer votre collection de cartes. -
        • -
      -
      -
      diff --git a/doc/context/fr/channel/help.html b/doc/context/fr/channel/help.html deleted file mode 100644 index b2cf958b9..000000000 --- a/doc/context/fr/channel/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Informations de base
      -
      C'est la page d'accueil d'un canal. Il est similaire au "mur" de quelqu'un dans un contexte de réseau social. Les messages créés par le canal sont affichés en fonction des permissions de visualisation de l'observateur.
      -
      Créer un message
      -
      Si vous avez la permission de créer des messages sur la page du canal, alors vous verrez l'éditeur de messages en haut de la page.
      -
      diff --git a/doc/context/fr/chat/help.html b/doc/context/fr/chat/help.html deleted file mode 100644 index 5f354c3c6..000000000 --- a/doc/context/fr/chat/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Informations de base
      -
      Créez et utilisez des salons de discussion pour communiquer en temps réel, en utilisant le système standard de permissions Hubzilla pour le contrôle d'accès aux salons de discussion.
      -
      Créer un nouveau salon de discussion
      -
      Utilisez le bouton «Nouveau» pour créer un nouveau salon de discussion. Entrez un nom et la durée de conservation des messages.
      -
      Discussion
      -
      Entrez votre message dans la boîte de message et cliquez sur «Envoyer». Vous pouvez définir un statut en sélectionnant le bouton du menu de la salle de discussion à côté du bouton «Envoyer». D'autres personnes «dans la salon» sont visibles dans le panneau latéral du panneau «Membres du Salon».
      -
      diff --git a/doc/context/fr/cloud/help.html b/doc/context/fr/cloud/help.html deleted file mode 100644 index c72e2ca1b..000000000 --- a/doc/context/fr/cloud/help.html +++ /dev/null @@ -1,7 +0,0 @@ -
      -
      Informations de base
      -
      Cette page affiche les fichiers cloud d'un canal. Les fichiers visibles par l'observateur dépendent des permissions individuelles définies par le propriétaire du canal. Si vous avez l'autorisation de créer/télécharger des fichiers, vous verrez des boutons de contrôle au-dessus de la liste des fichiers. -
      -
      Onglets de contenu de la chaîne
      -
      Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil du canal. L'onglet Photos permet d'accéder aux galeries de photos de la chaîne. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
      -
      diff --git a/doc/context/fr/connections/help.html b/doc/context/fr/connections/help.html deleted file mode 100644 index 38e581866..000000000 --- a/doc/context/fr/connections/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Informations de base
      -
      Cette page affiche une liste de toutes les connexions de ce canal. La liste peut être triée et filtrée à l'aide du bouton de menu à côté du bouton de recherche.
      -
      Détails de connexion
      -
      Chaque entrée de liste affiche les détails d'une connexion spécifique. Une image d'avatar translucide indique une connexion archivée.
      -
      État de la connexion
      -
      Une connexion peut être dans différents états :
      • Archivé
      • Ignoré
      • Bloqué
      • Caché
      -
      diff --git a/doc/context/fr/connections/ifpending/help.html b/doc/context/fr/connections/ifpending/help.html deleted file mode 100644 index 38e581866..000000000 --- a/doc/context/fr/connections/ifpending/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Informations de base
      -
      Cette page affiche une liste de toutes les connexions de ce canal. La liste peut être triée et filtrée à l'aide du bouton de menu à côté du bouton de recherche.
      -
      Détails de connexion
      -
      Chaque entrée de liste affiche les détails d'une connexion spécifique. Une image d'avatar translucide indique une connexion archivée.
      -
      État de la connexion
      -
      Une connexion peut être dans différents états :
      • Archivé
      • Ignoré
      • Bloqué
      • Caché
      -
      diff --git a/doc/context/fr/connedit/help.html b/doc/context/fr/connedit/help.html deleted file mode 100644 index c9b784d3e..000000000 --- a/doc/context/fr/connedit/help.html +++ /dev/null @@ -1,13 +0,0 @@ -
      -
      Informations de base
      -
      Cette page vous permet de modifier ou d'éditer les paramètres individuels pour une connexion particulière ou de supprimer complètement une connexion. Vous êtes peut-être arrivé sur cette page après avoir créé ou approuvé une nouvelle connexion. Si c'est le cas, vous n'êtes pas tenu de faire quoi que ce soit. Votre connexion a déjà été établie. Vous pouvez les ajouter à un groupe ou ajuster des permissions spéciales, et cette page est présentée de façon à ce que vous puissiez le faire pendant que l'occasion se présente. -
      -
      Outils de connexion
      -
      Le menu Outils de connexion permet d'accéder à plusieurs paramètres. Afficher le profil, Afficher l'activité récente, Rafraîchir les autorisations, définir ou réinitialiser les indicateurs (Bloquer, Ignorer, Archiver, Cacher) et supprimer la connexion.
      -
      Groupes de protection de la vie privée
      -
      Chaque connexion peut être assignée à un ou plusieurs groupes de confidentialité pour regrouper des collections d'amis ayant accès à des messages, médias et autres contenus spécifiques. Vous pouvez les ajouter à un groupe de confidentialité existant ici, ou créer un nouveau groupe de confidentialité. Lorsque vous les ajoutez à un groupe existant, l'action est immédiate et vous n'avez pas besoin de soumettre un formulaire.
      -
      Permissions individuelles
      -
      L'octroi de permissions est généralement automatique et n'exige aucune action de votre part. Cependant, il se peut que vous souhaitiez ajuster des paramètres spécifiques pour cette connexion qui sont différents des autres.
      -
      Paramètres spécifiques aux fonctions
      -
      Un certain nombre de paramètres individuels sont contrôlés par des fonctions supplémentaires qui peuvent ou non être activées sur votre hub ou pour votre canal. Plusieurs fonctions optionnelles ont des paramètres pour chaque connexion, et ceux-ci peuvent être définis sur cette page par le biais d'onglets de formulaire supplémentaires qui peuvent être présents.
      -
      diff --git a/doc/context/fr/events/help.html b/doc/context/fr/events/help.html deleted file mode 100644 index aafd49703..000000000 --- a/doc/context/fr/events/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Informations de base
      -
      Cette page affiche un calendrier des événements qui vous appartiennent et que vous partagez avec d'autres canaux.
      -
      Vue du calendrier
      -
      Le calendrier peut être affiché en mode mois, semaine ou jour en utilisant les options du panneau latéral.
      -
      Exportation/Importation
      -
      Exporter ou importer des événements de calendrier en utilisant des fichiers au format standard iCalendar (.ics).
      -
      diff --git a/doc/context/fr/mail/help.html b/doc/context/fr/mail/help.html deleted file mode 100644 index fcf4eff21..000000000 --- a/doc/context/fr/mail/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      Informations de base
      -
      Les messages affichés dans courrier privé ne sont visibles que pour vous et le destinataire unique.
      -
      Vue combinée
      -
      Les conversations complètes peuvent être visualisées dans un fil continu en sélectionnant Vue combinée . Les conversations disponibles sont affichées sous le menu dans le panneau latéral.
      -
      Boîte de réception/Boîte d'envoi
      -
      Les messages individuels envoyés sont visualisés en sélectionnant Boîte d'envoi, et les messages entrants sont visualisés en utilisant le filtre Boîte de réception.
      -
      Nouveau message.
      -
      Les messages individuels ont des rapports de livraison qui peuvent être visualisés à l'aide du menu déroulant. Les messages peuvent également être rappelés à partir du même menu, ce qui peut empêcher le destinataire de voir le message s'il ne l'a pas déjà lu.
      -
      diff --git a/doc/context/fr/photos/help.html b/doc/context/fr/photos/help.html deleted file mode 100644 index 8609e9849..000000000 --- a/doc/context/fr/photos/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Informations de base
      -
      Cette page affiche les albums photos du canal. Les images visibles pour l'observateur dépendent des permissions d'images individuelles.
      -
      Onglets de contenu du canal
      -
      Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil de canal. L'onglet Photos permet d'accéder aux galeries de photos des chaînes. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
      -
      diff --git a/doc/context/fr/profile/help.html b/doc/context/fr/profile/help.html deleted file mode 100644 index 26559db6f..000000000 --- a/doc/context/fr/profile/help.html +++ /dev/null @@ -1,6 +0,0 @@ -
      -
      Informations de base
      -
      Ceci est la page de profil d'un canal. Il affiche typiquement des informations décrivant le canal. Si le canal représente une personne dans un réseau social, par exemple, le profil peut fournir des informations de contact et d'autres détails personnels sur la personne. Les canaux peuvent avoir plusieurs profils, où le profil affiché dépend de l'observateur.
      -
      Onglets de contenu du canal
      -
      Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil de canal. L'onglet Photos permet d'accéder aux galeries de photos des chaînes. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
      -
      diff --git a/doc/context/fr/settings/account/help.html b/doc/context/fr/settings/account/help.html deleted file mode 100644 index ed8e7f374..000000000 --- a/doc/context/fr/settings/account/help.html +++ /dev/null @@ -1,18 +0,0 @@ -
      -
      Informations de base
      -
      - Une fois que vous avez enregistré un compte dans la matrice, vous avez également créé un profil et un canal. -
      -
      Compte
      -
      - Vous avez un compte. Il contient votre compte de courriel et votre mot de passe. Avec votre compte, vous accédez à votre profil et votre canal. Pensez à votre compte comme la façon dont vous vous authentifiez sur un site Hubzilla. Il vous permet de faire des choses, comme créer des profils et des canaux avec lesquels vous pouvez vous connecter à d'autres personnes. -
      -
      Profile
      -
      - Vous vous êtes sûrement inscrit à d'autres services Internet, comme les forums ou les communautés en ligne. Pour chacun d'entre eux, vous avez fourni des informations sur vous-même, telles que la date de naissance, le pays, l'âge et autres. Contrairement à d'autres services, Hubzilla vous offre l'avantage de créer plus de profils. Vous pouvez ainsi faire la distinction entre les profils qui s'adressent à tous (votre profil public) et vos collègues de travail, votre famille et votre partenaire. Pensez à votre profil comme étant l'information de base sur vous-même que vous donnez aux autres. -
      -
      Channel
      -
      - Lors de l'enregistrement, vous avez créé votre premier canal. Oui, en plus de plusieurs profils, vous pouvez avoir plusieurs canaux. Cela pourrait être un peu confus au début, mais mettons les choses au clair. Vous avez déjà créé un canal. Vous pouvez utiliser celui-ci pour le public, pour communiquer avec les gens sur la vie de tous les jours. Mais vous êtes peut-être un lecteur de livres passionné et beaucoup de gens s'ennuient. Ainsi, vous ouvrez un second canal juste pour les amateurs de livres, où vous pouvez tous parler de livres autant que vous le souhaitez. Il s'agit évidemment d'un nouveau flux de messages, avec un nouveau profil (ou nouveaux profils) et des contacts complètement différents. Certaines connexions peuvent exister dans les deux canaux, mais il y en aura qui sont exclusives à l'un d'entre eux. Vous-même vous changez entre les deux comme vous le feriez dans la vie réelle lorsque vous parlez à des gens que vous rencontrez dans la rue ou à des gens que vous rencontrez pour parler de livres spécifiquement. Vous pouvez même vous connecter à vous-même, ou mieux : à votre autre canal .
      Penser un canal comme différents espaces dédiés à différents sujets où vous rencontrez différentes personnes.      . -
      -
      diff --git a/doc/context/fr/settings/channel/help.html b/doc/context/fr/settings/channel/help.html deleted file mode 100644 index ed8e7f374..000000000 --- a/doc/context/fr/settings/channel/help.html +++ /dev/null @@ -1,18 +0,0 @@ -
      -
      Informations de base
      -
      - Une fois que vous avez enregistré un compte dans la matrice, vous avez également créé un profil et un canal. -
      -
      Compte
      -
      - Vous avez un compte. Il contient votre compte de courriel et votre mot de passe. Avec votre compte, vous accédez à votre profil et votre canal. Pensez à votre compte comme la façon dont vous vous authentifiez sur un site Hubzilla. Il vous permet de faire des choses, comme créer des profils et des canaux avec lesquels vous pouvez vous connecter à d'autres personnes. -
      -
      Profile
      -
      - Vous vous êtes sûrement inscrit à d'autres services Internet, comme les forums ou les communautés en ligne. Pour chacun d'entre eux, vous avez fourni des informations sur vous-même, telles que la date de naissance, le pays, l'âge et autres. Contrairement à d'autres services, Hubzilla vous offre l'avantage de créer plus de profils. Vous pouvez ainsi faire la distinction entre les profils qui s'adressent à tous (votre profil public) et vos collègues de travail, votre famille et votre partenaire. Pensez à votre profil comme étant l'information de base sur vous-même que vous donnez aux autres. -
      -
      Channel
      -
      - Lors de l'enregistrement, vous avez créé votre premier canal. Oui, en plus de plusieurs profils, vous pouvez avoir plusieurs canaux. Cela pourrait être un peu confus au début, mais mettons les choses au clair. Vous avez déjà créé un canal. Vous pouvez utiliser celui-ci pour le public, pour communiquer avec les gens sur la vie de tous les jours. Mais vous êtes peut-être un lecteur de livres passionné et beaucoup de gens s'ennuient. Ainsi, vous ouvrez un second canal juste pour les amateurs de livres, où vous pouvez tous parler de livres autant que vous le souhaitez. Il s'agit évidemment d'un nouveau flux de messages, avec un nouveau profil (ou nouveaux profils) et des contacts complètement différents. Certaines connexions peuvent exister dans les deux canaux, mais il y en aura qui sont exclusives à l'un d'entre eux. Vous-même vous changez entre les deux comme vous le feriez dans la vie réelle lorsque vous parlez à des gens que vous rencontrez dans la rue ou à des gens que vous rencontrez pour parler de livres spécifiquement. Vous pouvez même vous connecter à vous-même, ou mieux : à votre autre canal .
      Penser un canal comme différents espaces dédiés à différents sujets où vous rencontrez différentes personnes.      . -
      -
      diff --git a/doc/context/fr/settings/features/help.html b/doc/context/fr/settings/features/help.html deleted file mode 100644 index 2811c932e..000000000 --- a/doc/context/fr/settings/features/help.html +++ /dev/null @@ -1,12 +0,0 @@ -
      -
      Informations de base
      -
      Cette page vous permet de configurer les paramètres pour les nombreuses fonctionnalités supplémentaires de Hubzilla.
      -
      Paramètres généraux
      -
      Les paramètres généraux des fonctionnalités incluent des options pertinentes pour votre canal, telles que la page web et l'hébergement wiki.
      -
      Fonctions de composition de messages
      -
      Les fonctions de composition de messages offrent des options et des capacités supplémentaires lors de la composition de nouveaux messages.
      -
      Filtrage des réseaux et des flux
      -
      Ces paramètres modifient les fonctions associées au filtrage et au contrôle de l'affichage des messages entrants.
      -
      Outils d'affichage et de commentaires
      -
      Ceux-ci fournissent des outils supplémentaires pour catégoriser les messages et permettre des méthodes de commentaires supplémentaires telles que l'emoji ou le balisage de la communauté.
      -
      diff --git a/doc/context/fr/settings/tokens b/doc/context/fr/settings/tokens deleted file mode 100644 index 6be17a615..000000000 --- a/doc/context/fr/settings/tokens +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      Jetons d'accès invités
      -
      - Afin de faciliter le partage de ressources privées avec des non-membres ou des membres de nœuds de fédération à découverte d'identification limitée, Hubzilla devrait fournir aux membres un mécanisme pour créer et gérer des logins temporaires («jetables»), alias «Zot Access Tokens». Ces jetons/accréditations peuvent être utilisés pour s'authentifier sur un site hubzilla dans le seul but d'accéder à des ressources privilégiées ou contrôlées (fichiers, photos, posts, pages web, salons de discussion, etc. -
      -
      Créer un jeton
      -
      - Le formulaire à créer/éditer accepte trois paramètres, un nom lisible par l'homme, un mot de passe ou un jeton d'accès, et une expiration facultative. Une fois expiré, le jeton d'accès n'est plus valide, ne peut plus être utilisé et sera automatiquement supprimé de la liste des comptes temporaires. Le champ mot de passe dans les formulaires de création/édition affiche le texte du jeton d'accès et non un mot de passe masqué. -
      -
      Partager un jeton
      -
      - Nous ne spécifions pas de mécanismes pour partager ces jetons avec d'autres. Toute méthode de communication peut être utilisée. Tous les jetons que vous avez créés sont ajoutés au sélecteur de liste de contrôle d'accès et peuvent être utilisés partout où des listes de contrôle d'accès sont fournies. - - Exemple : Un visiteur arrive sur votre site. Elle a un jeton d'accès que vous lui avez fourni et tente de visiter l'un de vos albums photos (qui ne peut être visionné que par vous-même et une identité temporaire). La permission est refusée. - - Le visiteur sélectionne maintenant «Login» dans la barre de navigation du menu. Ceci présente une page de connexion. Elle entre le nom et le mot de passe que vous lui avez fournis, et elle peut maintenant voir l'album photo restreint. - - Alternativement, vous pouvez partager un lien vers un fichier protégé en ajoutant un paramètre «&zat=abc123» à l'URL, où la chaîne «abc123» est la clé d'accès ou le mot de passe pour la connexion temporaire. Aucune autre négociation n'est nécessaire et le dossier est présenté. -
      -
      diff --git a/doc/context/fr/webpages/help.html b/doc/context/fr/webpages/help.html deleted file mode 100644 index c9d34c08f..000000000 --- a/doc/context/fr/webpages/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Informations de base
      -
      Vous pouvez créer des sites Web modulaires, conscients de l'identité, composés d'éléments partageables.
      -
      Pages
      -
      Cette page énumère vos "pages", qui sont assignées des URLs où les gens peuvent visiter votre site. La structure des pages est généralement décrite par une mise en page associée , et leur contenu est construit à partir d'une collection de blocs.
      -
      Outils de portage de site Web
      -
      Les outils de portation de site Web vous permettent d'importer/exporter plusieurs éléments de pages Web (pages, mises en page, mises en page, blocs). Vous pouvez importer soit à partir d'un fichier zip téléchargé, soit à partir d'un dossier de fichiers cloud existant. Vous pouvez exporter vers un fichier zip contenant un groupe choisi d'éléments de page Web sous une forme compatible avec l'outil d'importation, ou vous pouvez exporter directement vers un dossier de fichiers dans le cloud. en savoir plus...
      -
      diff --git a/doc/context/fr/wiki/help.html b/doc/context/fr/wiki/help.html deleted file mode 100644 index af46899e4..000000000 --- a/doc/context/fr/wiki/help.html +++ /dev/null @@ -1,13 +0,0 @@ -
      -
      Informations de base
      -
      Chaque wiki est une collection de pages, composée sous forme de fichiers texte au format Markdown.
      -
      Liste des wikis
      -
      Les wikis appartenant au canal que vous avez la permission de voir sont listés dans le panneau latéral.
      -
      Historique de la page
      -
      Chaque révision d'une page est sauvegardée pour permettre un retour rapide. Cliquez sur l'onglet History pour afficher l'historique des révisions de page, y compris la date et l'auteur de chacune d'entre elles. Le bouton Revenir chargera la révision sélectionnée mais n'enregistrera pas automatiquement la page.
      -
      Pages
      -
      La liste des pages du wiki est listée dans le panneau Pages Wiki. Avant d'enregistrer les modifications de page à l'aide du menu déroulant Page, vous pouvez entrer un message personnalisé à afficher dans le visualiseur d'historique de page avec la révision.
      -
      - - - diff --git a/doc/context/it/wiki/help.html b/doc/context/it/wiki/help.html deleted file mode 100644 index e93e18eb4..000000000 --- a/doc/context/it/wiki/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      General
      -
      Ogni wiki è una raccolta di pagine, composta di file di testo formattati con Markdown.
      -
      Elenco dei Wiki
      -
      I Wiki del canale che sei abilitato a vedere sono elencati nel pannello laterale.
      -
      Cronologia della pagina
      -
      Le revisioni di ogni pagina vengono salvate per rendere possibile un ripristino veloce. Fai click sulla tab Cronologia per vedere l'elenco delle revisioni, con autore e data delle stesse. Il bottone di ripristino riporterà alla revisione selezionata, senza salvare automaticamente la pagina.
      -
      Pagine
      -
      L'elenco delle pagine del wiki si trova nel pannello Pagine del wiki. Prima di salvare le modifiche con il menu a discela Pagina, puoi inserire un messaggio che verrà visualizzato nella visualizzazione della storia della pagina insieme alla revisione.
      -
      \ No newline at end of file diff --git a/doc/context/pl/admin/addons/assets/addon_repo_gui_1.png b/doc/context/pl/admin/addons/assets/addon_repo_gui_1.png deleted file mode 100644 index 37139b345..000000000 Binary files a/doc/context/pl/admin/addons/assets/addon_repo_gui_1.png and /dev/null differ diff --git a/doc/context/pl/admin/addons/help.html b/doc/context/pl/admin/addons/help.html deleted file mode 100644 index fe63718df..000000000 --- a/doc/context/pl/admin/addons/help.html +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      Ogólne
      -
      Ta strona zarządza instalacją dodatków (zwanych też wtyczkami).
      -
      Zarządzanie repozytorium
      -
      Jeśli serwer internetowy ma niezbędne uprawnienia do zapisu, zobaczysz przycisk Zarządzaj repozytoriami, - co otwiera panel sterowania do zarządzania zainstalowanymi repozytoriami wtyczek. Te repozytoria są - przechowywane w katalogu extension/addon/[nazwa repozytorium]/. - Oficjalne repozytorium dodatków Hubzilla można dodać, wprowadzając adres URL repozytorium - https://framagit.org/hubzilla/addons.git - i wybierając nazwę repozytorium, na przykład oficjalne. Powinieneś zobaczyć to repozytorium na liście - podobnej do tej: -
      -
      -
      diff --git a/doc/context/pl/admin/logs/help.html b/doc/context/pl/admin/logs/help.html deleted file mode 100644 index 1d79d6a8c..000000000 --- a/doc/context/pl/admin/logs/help.html +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona umożliwia dostosowanie ustawień dziennika oraz przeglądanie - istniejącego dziennika. -
      -
      Ustawienia dziennika
      -
      - Po włączeniu opcji debugowania informacje o zdarzeniach systemowych zaczną - być dołączane do pliku określonego w polu "Plik dziennika" (ścieżka jest - względna w stosunku do katalogu głównego huba, na przykład /var/www). - Zauważ, że ten plik musi być możliwy do zapisywania przez serwer WWW.
      -
      Pozion rejestracji
      -
      - Opcja poziomu dziennika umożliwia ustawienie ilości informacji dołączanych - do pliku dziennika. Ostrzeżenie: zwiększenie tego poziomu może szybko - zwiększyć rozmiar pliku dziennika do ponad 100 MB, szczególnie w hubach z - więcej niż kilkoma członkami. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/admin/queue/help.html b/doc/context/pl/admin/queue/help.html deleted file mode 100644 index af5c06787..000000000 --- a/doc/context/pl/admin/queue/help.html +++ /dev/null @@ -1,7 +0,0 @@ -
      -
      Ogólne
      -
      - Statystyki kolejki pokazują, ile wpisów znajduje się w kolejce w celu dostarczenia - ich do innych portali. Priorytet jest związany z liczbą nieudanych prób dostawy. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/admin/security/help.html b/doc/context/pl/admin/security/help.html deleted file mode 100644 index 0e582e6b4..000000000 --- a/doc/context/pl/admin/security/help.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona zawiera różne ustawienia administratora związane z bezpieczeństwem. - Aby zapisać zmiany wprowadzone w tych ustawieniach, musisz nacisnąć przycisk - "Prześlij". -
      -
      \ No newline at end of file diff --git a/doc/context/pl/appman/help.html b/doc/context/pl/appman/help.html deleted file mode 100644 index 867b5b482..000000000 --- a/doc/context/pl/appman/help.html +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      Ogólne
      -
      - Edytowanie poszczególnych właściwości wybranej aplikacji. Kategorie umożliwiają - sortowanie aplikacji, aby ułatwić znajdowanie ich na liście. Wsparcie dla - niestandardowych aplikacji, które Ty lub Twój administrator możecie wybrać, - obejmuje pola, takie jak ""Cena aplikacji"" i "Lokalizacja zakupu"", które nie - są zastosowane w podstawowych aplikacjach Hubzilla. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/apps/edit/help.html b/doc/context/pl/apps/edit/help.html deleted file mode 100644 index 42db07d17..000000000 --- a/doc/context/pl/apps/edit/help.html +++ /dev/null @@ -1,7 +0,0 @@ -
      -
      Ogólne
      -
      - Edytowanie lub usuwanie aplikacje za pomocą przycisków sterowania widocznych - na liście obok każdej ikony aplikacji. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/apps/help.html b/doc/context/pl/apps/help.html deleted file mode 100644 index 7ad3bef5c..000000000 --- a/doc/context/pl/apps/help.html +++ /dev/null @@ -1,15 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona pokazuje, jakie aplikacje są dostępne na Twoim kanale, w tym zarówno - aplikacje podstawowe, jak i te dostarczane przez dodatki. Aby dodać aplikację - do menu aplikacji oznacz gwiazdką - aplikację na poniższej liście. -
      -
      Zarządzanie aplikacjami
      -
      - Naciśnij przycisk "Zarządzaj aplikacjami", aby otworzyć stronę, na której - możesz edytować nazwę, kategorie i inne właściwości swoich aplikacji. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/cards/help.html b/doc/context/pl/cards/help.html deleted file mode 100644 index 2e9886283..000000000 --- a/doc/context/pl/cards/help.html +++ /dev/null @@ -1,31 +0,0 @@ -
      -
      Ogólne
      -
      - Karty reprezentują trwały obszar współpracy, który jest niezależny od - strumienia społecznościowego. Są nieco lżejsze niż strony internetowe i wiki, - dzięki czemu zapewniają szybką organizację informacji i mają tę zaletę, że - umożliwiają współpracę i komentowanie. Są dobrze przystosowane do pomocy w - organizowaniu złożonych zadań, w przypadku których często pojawiają się - aktualizacje i informacje zwrotne. -
      -
      Dodanie karty
      -
      - Tworzenie nowej karty jest bardzo podobne do tworzenia nowego postaa.

      -
        -
      • - Nazwa linku do strony: nazwa linku do strony jest nazwą - karty dla statycznego adresu URL -
        • -
      • - Tytuł: Tytuł jest wyświetlany u góry karty -
        • -
      • - Kategorie: Jeśli na swoim kanale masz włączoną - funkcjonalność kategorii postów , - możesz dodawać kategorie do karty. Kategorie te zawarte są na liście - Kategorie, na lewym panelu i umożliwiają filtrowanie - kolekcji kart. -
        • -
      -
      -
      diff --git a/doc/context/pl/channel/help.html b/doc/context/pl/channel/help.html deleted file mode 100644 index bd454c361..000000000 --- a/doc/context/pl/channel/help.html +++ /dev/null @@ -1,13 +0,0 @@ -
      -
      Ogólne
      -
      - To jest strona główna kanału. Jest ona podobna do "ściany" profilu w kontekście - sieci społecznościowej. Posty utworzone w kanale są wyświetlane zgodnie z - uprawnieniami obserwatora do oglądania treści. -
      -
      Tworzenie posta
      -
      - Jeśli masz uprawnienia do tworzenia postów na stronie kanału, u góry zobaczysz - edytor postów. -
      -
      diff --git a/doc/context/pl/chat/help.html b/doc/context/pl/chat/help.html deleted file mode 100644 index 0cf063aa8..000000000 --- a/doc/context/pl/chat/help.html +++ /dev/null @@ -1,19 +0,0 @@ -
      -
      Ogólne
      -
      - Twórz pokoje rozmów i wykorzystuj je do komunikacji w czasie rzeczywistym, - używając standardowego systemu uprawnień Hubzilla do kontroli dostępu do - pokojów rozmów. -
      -
      Tworzenie nowego pokoju rozmów
      -
      - Użyj przycisku "Utwórz nowy", aby utworzyć nowy pokój rozmów. Wpisz nazwę i - jak długo wiadomości mają być przechowywane. -
      -
      Czatowanie
      -
      - Wpisz wiadomość w polu wiadomości i naciśnij "Prześlij". Możesz ustawić status, - wybierając przycisk menu pokoju rozmów sieciowych obok przycisku "Wyślij". - Inne osoby "w pokoju" są widoczne w panelu bocznym w panelu "Członkowie czatu". -
      -
      \ No newline at end of file diff --git a/doc/context/pl/cloud/help.html b/doc/context/pl/cloud/help.html deleted file mode 100644 index d629e6d41..000000000 --- a/doc/context/pl/cloud/help.html +++ /dev/null @@ -1,17 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona wyświetla pliki "w chmurze" kanału. To co widzi przeglądajacy zależy - od jego indywidualnych uprawnień do plików, które ustawia właściciel kanału. - Jeśli masz uprawnienia do tworzenia i przesyłania plików, zobaczysz przyciski - kontrolne nad listą plików. -
      -
      Karty zawartości kanału
      -
      - Karty zawarości kanału to linki do innych treści publikowanych przez kanał. - Karta Informacje prowadzi do profilu kanału. Karta Zdjęcia - prowadzi do galerii zdjęć kanału. Zakładka Pliki zawiera linki do - ogólnych plików udostępnionych do publikacji w kanale. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/connections/help.html b/doc/context/pl/connections/help.html deleted file mode 100644 index 837184334..000000000 --- a/doc/context/pl/connections/help.html +++ /dev/null @@ -1,24 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona wyświetla listę wszystkich połączeń tego kanału. Lista można - posortować i przefiltrować - za pomocą przycisku menu obok przycisku wyszukiwania . -
      -
      Szczegóły połączenia
      -
      - Każdy wpis na liście przedstawia szczegóły określonego połączenia. - Przezroczysty obraz awatara wskazuje na zarchiwizowane połączenie. -
      -
      Stan połączenie
      -
      - Połączenie może mieć różne stany: -
        -
      • Zarchiwizowane
        • -
      • Zignorowane
        • -
      • Zablokowane
        • -
      • Ukryte
        • -
      -
      -
      \ No newline at end of file diff --git a/doc/context/pl/connections/ifpending/help.html b/doc/context/pl/connections/ifpending/help.html deleted file mode 100644 index b2d05947a..000000000 --- a/doc/context/pl/connections/ifpending/help.html +++ /dev/null @@ -1,24 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona wyświetla listę wszystkich połączeń tego kanału. Lista można - posortować i przefiltrować - za pomocą przycisku menu obok przycisku wyszukiwania. -
      -
      Szczegóły połączenia
      -
      - Każdy wpis na liście przedstawia szczegóły określonego połączenia. - Przezroczysty obraz awatara wskazuje na zarchiwizowane połączenie. -
      -
      Stan połączenia
      -
      - Połączenie może mieć różne stany: -
        -
      • Zarchiwizowane
        • -
      • Zignorowane
        • -
      • Zablokowane
        • -
      • Ukryte
        • -
      -
      -
      \ No newline at end of file diff --git a/doc/context/pl/connedit/help.html b/doc/context/pl/connedit/help.html deleted file mode 100644 index 746908cf2..000000000 --- a/doc/context/pl/connedit/help.html +++ /dev/null @@ -1,44 +0,0 @@ -
      -
      Ogólne
      -
      - Ta strona umożliwia zmianę lub edycję dowolnych indywidualnych ustawień dla - określonego połączenia lub całkowite usunięcie połączenia. Być może dotarłeś - do tej strony po utworzeniu lub zatwierdzeniu nowego połączenia. Jeśli tak, - nie musisz nic robić. Twoje połączenie zostało już nawiązane. - Możesz chcieć dodać je do grupy lub dostosować specjalne - uprawnienia, a ta strona jest prezentowana, abyś mógł to zrobić przy okazji - ustanowienie nowego połączenia. -
      -
      Narzędzia do połączeń
      -
      - Menu naarzędzi połączeń - umożliwia dostęp do kilku ustawień. Wyświetl profil, wyświetl ostatnią aktywność, - odśwież uprawnienia, ustaw lub zresetuj flagi (blokuj, ignoruj, archiwizuj, ukryj) - i usuń połączenie. -
      -
      Grupy prywatności
      -
      - Każde połączenie może być przypisane do jednej lub więcej grup prywatności - w celu grupowania kolekcji znajomych z dostępem do określonych wpisów, - multimediów i innych treści. Możesz dodać je tutaj do istniejącej grupy - prywatności lub utworzyć nową grupę prywatności. Po dodaniu ich do istniejącej - grupy akcja jest natychmiastowa i nie musisz przesyłać formularza. -
      -
      Indywidualne uprawniena
      -
      - Udzielanie uprawnień jest zwykle automatyczne i nie wymaga żadnych działań - z Twojej strony. Możesz jednak chcieć dostosować określone uprawnienia dla - tego połączenia, które są inne niż dla innych. -
      -
      Ustawienia specyficznych funkcji
      -
      - Szereg indywidualnych ustawień jest kontrolowanych za pomocą dodatkowych - funkcji, które mogą, ale nie muszą być aktywowane na Twoim węźle lub na Twoim - kanale. Kilka opcjonalnych funkcji ma ustawienia dla każdego połączenia, - które można ustawić na tej stronie za pomocą dodatkowych zakładek formularza. -
      -
      diff --git a/doc/context/pl/events/help.html b/doc/context/pl/events/help.html deleted file mode 100644 index 542661fa5..000000000 --- a/doc/context/pl/events/help.html +++ /dev/null @@ -1,18 +0,0 @@ -
      -
      Ogólne
      -
      - Na tej stronie wyświetlany jest kalendarz wydarzeń, który należy do Ciebie - oraz kalendarze, które zostały Ci udostępnione z innych kanałów. - /dd> -
      Widok kalendarza
      -
      - Kalendarz może być wyświetlany w trybie miesiąca, tygodnia lub dnia, przy użyciu - opcji widocznych na panelu bocznym. -
      -
      Eksport/Import
      -
      - Eksportuj lub importuj wydarzenia kalendarza przy użyciu plików w standardowym - formacie iCalendar (.ics). -
      -
      \ No newline at end of file diff --git a/doc/context/pl/mail/help.html b/doc/context/pl/mail/help.html deleted file mode 100644 index b077aa2c4..000000000 --- a/doc/context/pl/mail/help.html +++ /dev/null @@ -1,25 +0,0 @@ -
      -
      Ogólne
      -
      - Wiadomości wyświetlane w poczcie prywatnej są widoczne tylko dla Ciebie i - pojedynczego odbiorcy. -
      -
      Widok łączony
      -
      - Wybór opcji Widok łączony spowoduje wyświetlanie wszystkich rozmów w ciągłym - wątku. Dostępne rozmowy są wyświetlane poniżej menu w panelu bocznym. -
      -
      Skrzynka odbiorcza/nadawcza
      -
      - Poszczególne wysłane wiadomości można wyświetlić, wybierając opcję - Skrzynka nadawcza, a wiadomości przychodzące - za pomocą filtru - Skrzynka odbiorcza. -
      -
      Nowa wiadomość
      -
      - Poszczególne wiadomości mają raporty doręczenia, które można wyświetlić za - pomocą rozwijanego menu. Wysłane wiadomości można również odwołać, posługując - się tym samym menu, co może uniemożliwić odbiorcy przegląd takich wiadomości, - jeśli jeszcze ich nie przeczytał. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/network/help.html b/doc/context/pl/network/help.html deleted file mode 100644 index f6ba75241..000000000 --- a/doc/context/pl/network/help.html +++ /dev/null @@ -1,36 +0,0 @@ -
      -
      Ogólne
      -
      - Strona strumienia sieciowego wyświetla strumień wpisów i rozmów, zwykle - uporządkowanych według ostatnio zaktualizowanych. Jest to strona wysoce konfigurowalna. -
      -
      Tworzenie wpisu
      -
      - U góry strony znajduje się pole tekstowe z napisem "Udostępnij". Kliknięcie - tego pola otwiera nowy edytor wpisów. Edytor wpisów można dostosowywać, ale - podstawowy edytor udostępnia pola dla treści wpisu i opcjonalnego tytułu. - Przyciski poniżej obszaru tekstowego po lewej stronie zapewniają skróty do - formatowania tekstu i wstawiania linków, obrazów i innych danych do wpisu. - Przyciski po prawej stronie zapewniają podgląd wpisu, ustawienia uprawnień do - publikowania oraz przycisk Prześlij do wysłania wpisu. -
      -
      Grupy prywatności
      -
      - Utworzone grupy prywatności są wyświetlane w panelu bocznym. Wybranie ich - powoduje filtrowanie wpisów do tych utworzonych przez kanały w wybranej grupie. -
      -
      Uprawnienia do wpisu
      -
      - Lista kontroli dostępu (ACL) służy do określania, kto może zobaczyć Twój nowy - wpis. Naciśnięcie przycisku ACL obok przycisku Prześlij spowoduje wyświetlenie - okna dialogowego, w którym możesz wybrać kanały albo grupy prywatności, które - będą widzieć wpis. Możesz także wybrać, komu wyraźnie odmówiono dostęp. - Załóżmy na przykład, że planujesz przyjęcie niespodziankę dla znajomego. - Możesz wysłać zaproszenie do wszystkich w swojej grupie Znajomi - oprócz znajomego, którego zaskakujesz. W tym przypadku "pokazujesz" - go grupie Znajomi, ale "nie pokazujesz" tej jednej osobie. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/photos/help.html b/doc/context/pl/photos/help.html deleted file mode 100644 index e9ff7ee9d..000000000 --- a/doc/context/pl/photos/help.html +++ /dev/null @@ -1,15 +0,0 @@ -
      -
      Ogólne
      -
      - Na tej stronie wyświetlane są albumy ze zdjęciami opublikowane w kanale. - Widoczność obrazów zależy od indywidualnych uprawnień odwiedzającego do tych zdjęć. -
      -
      Zakładki treści kanału
      -
      - Karty treści kanału to odnośniki do innych treści publikowanych przez kanał. - Karta Informacje prowadzi do profilu kanału. Karta Zdjęcia - prowadzi do galerii zdjęć kanału. Zakładka Pliki zawiera linki do - ogólnych plików udostępnionych w kanale. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/profile/help.html b/doc/context/pl/profile/help.html deleted file mode 100644 index 9ec5b0e73..000000000 --- a/doc/context/pl/profile/help.html +++ /dev/null @@ -1,17 +0,0 @@ -
      -
      Ogólne
      -
      - To jest strona profilu kanału. Zwykle wyświetla informacje opisujące kanał. - Jeśli na przykład kanał reprezentuje osobę w sieci społecznościowej, profil - może zawierać informacje kontaktowe i inne dane osobowe tej osoby. Kanały mogą - mieć wiele profili, przy czym wyświetlany profil zależy od obserwatora. -
      -
      Zakładki treści kanału
      -
      - Karty treści kanału to odnośniki do innych treści publikowanych przez kanał. - Karta Informacje prowadzi do profilu kanału. Karta Zdjęcia - prowadzi do galerii zdjęć kanału. Zakładka Pliki zawiera linki do ogólnych - plików opublikowanych i udostępnionych w kanale. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/profiles/help.html b/doc/context/pl/profiles/help.html deleted file mode 100644 index 874303908..000000000 --- a/doc/context/pl/profiles/help.html +++ /dev/null @@ -1,49 +0,0 @@ -
      -
      Ogólne
      -
      - Po zarejestrowaniu konta w matrycy, utworzony został również - profil i kanał. -
      -
      Konto
      -
      - Masz teraz jedno konto. Składa się z Twojego adresu e-mail i - hasła. Za pomocą swojego konta uzyskujesz dostęp do profili i kanałów. - Pomyśl o swoim koncie jak o sposobie uwierzytelniania w jednym - serwisie Hubzilla. To pozwala wykonywać różne czynności, takie jak - tworzenie profili i kanałów, za pomocą których można łączyć się z - innymi osobami. -
      -
      Profil
      -
      - Z pewnością już zarejestrowałeś/zarejestrowałaś się w innych usługach - internetowych, takich jak fora lub społeczności internetowe. W nich - wszystkich trzeba było podać pewne informacje o sobie, takie jak data - urodzenia, kraj, wiek i upodobania. W przeciwieństwie do nich - usługi Hubzilla daje Ci przewagę tworzenia wielu profili . - W ten sposób możesz rozróżniać profil przeznaczone specjalnie dla - wszystkich (Twój profil publiczny), od profili przeznaczonych dla - współpracowników, rodziny czy partnera. Potraktuj swój profil - jak pojemnik zawierający podstawowe informacje o Tobie, jakie - przekazujesz innym osobom. -
      -
      Kanał
      -
      - Podczas rejestracji utworzyłeś/utworzyłaś swój pierwszy kanał. - Tak, poza kilkoma profilami, również możesz mieć kilka kanałów. Na - początku może to być nieco zagmatwane, ale wyjaśnijmy to. Już masz - utworzony jeden kanał. Możesz używać go do publicznego komunikowania - się z osobami w życiu codziennym. Lecz być może jesteś zapalonym - czytelnikiem książek a wielu ludzi się tym nudzi. Otwierasz więc - drugi kanał dla miłośników książek, gdzie wszyscy mogą rozmawiać - o książkach tyle, ile zechcą. Oczywiście jest to nowy strumień wpisów, - z nowym profilem (... lub nowymi profilami) i zupełnie z innymi - kontaktami. Niektóre połączenia mogą istnieć w obu kanałach, ale będą - takie, które będą występować wyłącznie w jednym z nich. Ty po prostu - przełączaj się między nimi tak, jak w prawdziwym życiu, gdy rozmawiasz - z ludźmi, których spotykasz na ulicy lub z osobami, które spotykasz - specjalnie, aby porozmawiać o książkach. Możesz nawet połączyć się - ze sobą lub lepiej: ze swoim innym kanał. :) Pomyśl o kanałach - jak o różnych przestrzeniach poświęconych różnym tematom, w których - spotykasz się z różnymi osobami. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/register/help.html b/doc/context/pl/register/help.html deleted file mode 100644 index c5c879e36..000000000 --- a/doc/context/pl/register/help.html +++ /dev/null @@ -1,54 +0,0 @@ -
      -
      Ogólne
      -
      - Na tej stronie odwiedzający mogą zarejestrować się, aby uzyskać dostęp do - portalu za pomocą identyfikatora logowania. Zalogowani użytkownicy nie tylko - widzą treści publiczne, ale mogą je sami publikować, komunikować się w sieciach - społecznościowych i nie tylko. -
      -
      Tryby rejestracji
      -
      - Rejestracja jest możliwa na adres e-mail lub anonimowo, jeśli regulamin portalu - to dopuszcza (wówczas nie wypełniaj pola e-mail). Możliwe, że masz również - kod zaproszenia, który trzeba wprowadzić wraz z adresem e-mail. Link nad polem - e-mail umożliwia wprowadzenie kodu zaproszenia. Ustaw też swoje hasło logowania. - Musisz podać go dwukrotnie. Nie jest ono jawnie wyświetlane w formularzu, więc - uważaj przy jego wprowadzaniu. -
      -
      Procedura rejestracji
      -
      - Aby zalogować się po udanej rejestracji, należy ustawić osobne hasło. - Ze względów bezpieczeństwa wprowadź je dwukrotnie z identycznymi wartościami. - Zarejestrowani anonimowo użytkownicy otrzymują automatycznie przypisywany identyfikator - i nie powinni zapomnieć własnego hasła, ponieważ w przeciwieństwie do rejestracji - adresem e-mail początkowo nie ma funkcji resetowania. W zależności od konfiguracji - portalu może być wymagana funkcja potwierdzenia. Użytkownicy rejestracji - przy użyciu adresu e-mail otrzymają odpowiednią wiadomość. W przypadku rejestracji - anonimowych zostanie wyświetlone inne okno dialogowe zawierające identyfikator - dostępu i kod PIN. Dane z tej strony powinny być przechowywana bezpiecznie i przez - długi czas (np. przez wydruk, zrzut ekranu, zdjęcie), ponieważ dane muszą zostać - ponownie potwierdzone w późniejszym czasie. -
      -
      Tożsamość cyfrowa
      -
      - W zależności od portalu, wyświetlaną nazwę (imię i nazwisko) oraz pseudonim można - wprowadzić już podczas rejestracji (alternatywnie również podczas pierwszego logowania). - Pseudonim ma bardzo ważne znaczenie i nie można go później zmienić. Jest to unikalna - tożsamość cyfrowa (Digital Identity, DID), która jest, będzie i pozostanie powiązana - ze wszystkimi naszymi działaniami. Ten DID nadaje się nie tylko do logowania na - tym portalu, ale także do wszystkich połączonych portali sieci federacyjnej. - W języku sieci federacyjnych ta tożsamość cyfrowa jest "kanałem". - Jest to porównywalne z numerem telefonu w sieci telefonicznej. DID ma format - kanał@portal.tld = pseudonim@portal.tld i jak wspomniano, nie można go później - zmienić. Chociaż format wygląda jak adres e-mail, tak nie jest. -
      -
      Nim rozpoczniesz rejestrację ...
      -
      - ... należy wybrać preferowany język (na przykład polski, angielski, hiszpański, - niemiecki) (w prawym górnym rogu menu hamburgera ). - Aktualny język jest używany w kolejnych krokach, a także podczas logowania i po - zalogowaniu. Można to jednak zmienić w dowolnym momencie i w razie potrzeby. - Należy również zauważyć, że ten portal nie jest jedyny. Przegląd innych portali - można znaleźć tutaj . -
      -
      diff --git a/doc/context/pl/settings/account/help.html b/doc/context/pl/settings/account/help.html deleted file mode 100644 index dfe82f025..000000000 --- a/doc/context/pl/settings/account/help.html +++ /dev/null @@ -1,49 +0,0 @@ -
      -
      Ogólne
      -
      - Po zarejestrowaniu konta w matrycy, utworzony został również - profil i kanał. -
      -
      Konto
      -
      - Masz teraz jedno konto. Składa się z Twojego adresu e-mail i - hasła. Za pomocą swojego konta uzyskujesz dostęp do profili i kanałów. - Pomyśl o swoim koncie jak o sposobie uwierzytelniania w jednym - serwisie Hubzilla. To pozwala wykonywać różne czynności, takie jak - tworzenie profili i kanałów, za pomocą których można łączyć się z - innymi osobami. -
      -
      Profil
      -
      - Z pewnością już zarejestrowałeś/zarejestrowałaś się w innych usługach - internetowych, takich jak fora lub społeczności internetowe. W nich - wszystkich trzeba było podać pewne informacje o sobie, takie jak data - urodzenia, kraj, wiek i upodobania. W przeciwieństwie do nich - usługi Hubzilla daje Ci przewagę tworzenia wielu profili . - W ten sposób możesz rozróżniać profil przeznaczone specjalnie dla - wszystkich (Twój profil publiczny), od profili przeznaczonych dla - współpracowników, rodziny czy partnera. Potraktuj swój profil - jak pojemnik zawierający podstawowe informacje o Tobie, jakie - przekazujesz innym osobom. -
      -
      Kanał
      -
      - Podczas rejestracji utworzyłeś/utworzyłaś swój pierwszy kanał. - Tak, poza kilkoma profilami, również możesz mieć kilka kanałów. Na - początku może to być nieco zagmatwane, ale wyjaśnijmy to. Już masz - utworzony jeden kanał. Możesz używać go do publicznego komunikowania - się z osobami w życiu codziennym. Lecz być może jesteś zapalonym - czytelnikiem książek a wielu ludzi się tym nudzi. Otwierasz więc - drugi kanał dla miłośników książek, gdzie wszyscy mogą rozmawiać - o książkach tyle, ile zechcą. Oczywiście jest to nowy strumień wpisów, - z nowym profilem (... lub nowymi profilami) i zupełnie z innymi - kontaktami. Niektóre połączenia mogą istnieć w obu kanałach, ale będą - takie, które będą występować wyłącznie w jednym z nich. Ty po prostu - przełączaj się między nimi tak, jak w prawdziwym życiu, gdy rozmawiasz - z ludźmi, których spotykasz na ulicy lub z osobami, które spotykasz - specjalnie, aby porozmawiać o książkach. Możesz nawet połączyć się - ze sobą lub lepiej: ze swoim innym kanał. :) Pomyśl o kanałach - jak o różnych przestrzeniach poświęconych różnym tematom, w których - spotykasz się z różnymi osobami. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/settings/channel/help.html b/doc/context/pl/settings/channel/help.html deleted file mode 100644 index dfe82f025..000000000 --- a/doc/context/pl/settings/channel/help.html +++ /dev/null @@ -1,49 +0,0 @@ -
      -
      Ogólne
      -
      - Po zarejestrowaniu konta w matrycy, utworzony został również - profil i kanał. -
      -
      Konto
      -
      - Masz teraz jedno konto. Składa się z Twojego adresu e-mail i - hasła. Za pomocą swojego konta uzyskujesz dostęp do profili i kanałów. - Pomyśl o swoim koncie jak o sposobie uwierzytelniania w jednym - serwisie Hubzilla. To pozwala wykonywać różne czynności, takie jak - tworzenie profili i kanałów, za pomocą których można łączyć się z - innymi osobami. -
      -
      Profil
      -
      - Z pewnością już zarejestrowałeś/zarejestrowałaś się w innych usługach - internetowych, takich jak fora lub społeczności internetowe. W nich - wszystkich trzeba było podać pewne informacje o sobie, takie jak data - urodzenia, kraj, wiek i upodobania. W przeciwieństwie do nich - usługi Hubzilla daje Ci przewagę tworzenia wielu profili . - W ten sposób możesz rozróżniać profil przeznaczone specjalnie dla - wszystkich (Twój profil publiczny), od profili przeznaczonych dla - współpracowników, rodziny czy partnera. Potraktuj swój profil - jak pojemnik zawierający podstawowe informacje o Tobie, jakie - przekazujesz innym osobom. -
      -
      Kanał
      -
      - Podczas rejestracji utworzyłeś/utworzyłaś swój pierwszy kanał. - Tak, poza kilkoma profilami, również możesz mieć kilka kanałów. Na - początku może to być nieco zagmatwane, ale wyjaśnijmy to. Już masz - utworzony jeden kanał. Możesz używać go do publicznego komunikowania - się z osobami w życiu codziennym. Lecz być może jesteś zapalonym - czytelnikiem książek a wielu ludzi się tym nudzi. Otwierasz więc - drugi kanał dla miłośników książek, gdzie wszyscy mogą rozmawiać - o książkach tyle, ile zechcą. Oczywiście jest to nowy strumień wpisów, - z nowym profilem (... lub nowymi profilami) i zupełnie z innymi - kontaktami. Niektóre połączenia mogą istnieć w obu kanałach, ale będą - takie, które będą występować wyłącznie w jednym z nich. Ty po prostu - przełączaj się między nimi tak, jak w prawdziwym życiu, gdy rozmawiasz - z ludźmi, których spotykasz na ulicy lub z osobami, które spotykasz - specjalnie, aby porozmawiać o książkach. Możesz nawet połączyć się - ze sobą lub lepiej: ze swoim innym kanał. :) Pomyśl o kanałach - jak o różnych przestrzeniach poświęconych różnym tematom, w których - spotykasz się z różnymi osobami. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/settings/features/help.html b/doc/context/pl/settings/features/help.html deleted file mode 100644 index fc5a62363..000000000 --- a/doc/context/pl/settings/features/help.html +++ /dev/null @@ -1,50 +0,0 @@ -
      -
      Informacje ogólne
      -
      - Ta strona umożliwia skonfigurowanie ustawień dla wielu dodatkowych funkcji Hubzilli, które możesz włączyć na swoim koncie. -
      -
      Kalendarz
      -
      - Są to dodatkowe opcje, które możesz włączyć dla wszystkich swoich kalendarzy. - Można to zmienić indywidualnie w każdym kalendarzu.
      -
      -
      Strona główna kanału
      -
      - Kilka dodatkowych możliwości związanych ze stroną główną kanału. -
      -
      Połączenia
      -
      - Obecnie jest tu tylko ustawienie opcji umożliwiającej filtrowanie strumienia wg - słów kluczowych lub treści (fraz). -
      -
      Rozmowa
      -
      - Kilka dodatkowych opcji rozszerzających obsługę rozmów i dyskusji. -
      -
      Katalog
      -
      - Dostępna tu opcja zaawansowanego przeszukiawania katalogu może być bardzo użyteczna - dla osób chcących dotrzeć do konkretnych informacji publikowanych w sieci Hubzilla. -
      -
      Zarządzanie
      -
      - Dostępna tu opcja włącza funkcję zmiany kanału bezpośrednio z rozwijanego menu nawigacji. -
      -
      Sieć
      -
      - Znajduje się tu szereg opcji włączających funkcje związane z siecią i strumieniem - sieciowym. Przede wszystkim dostępnych jest tu kilka dodatkowych filtrów i inne - użyteczne funkcje. Szczegóły można znaleźć dokumentacji. -
      -
      Zdjęcia
      -
      - Tutaj można włączyć funkcję wyświetlania na mapie lokalizacji zdjęcia, jeśli - polik zdjęcia zawiera potrzebne metadane. -
      -
      Profile
      -
      - W tej sekcji zawarte są opcje włączające dodatkowe funkcje dotyczące profilu. - Jeśli chcesz i możesz zakładać na swoim koncie wiele profili (i tożsamości), - włącz tu opcję "wiele profili". -
      -
      \ No newline at end of file diff --git a/doc/context/pl/settings/tokens/help.html b/doc/context/pl/settings/tokens/help.html deleted file mode 100644 index 4c79841d6..000000000 --- a/doc/context/pl/settings/tokens/help.html +++ /dev/null @@ -1,43 +0,0 @@ -
      -
      Tokeny dostępu gościa
      -
      - Aby ułatwić udostępnianie prywatnych zasobów osobom niebędących członkami - tego portalu lub sfederyzowanych portali (hubów) i zapewnić zabezpieczone - wykrywaniem danych identyfikacyjnych, Hubzilla posiada mechanizm tworzenia - i zarządzania tymczasowymi ("jednorazowymi") loginami, zwanymi "tokenami - dostępu Zot”. Tokeny te, będące swojego rodzaju danymi uwierzytelniającymi, - mogą być używane do uwierzytelniania w serwisie Hubzilla wyłącznie w celu - uzyskania dostępu do uprzywilejowanych lub kontrolowanych zasobów (pliki, - zdjęcia, wpisy, strony internetowe, pokoje rozmów itp.). -
      -
      Utworzenie tokenu
      -
      - Formularz do tworzenia i edycji akceptuje trzy parametry: czytelną dla - człowieka nazwę, hasło lub token dostępu oraz opconalną okres ważności. - Po wygaśnięciu token dostępu nie jest już ważny, nie może być już używany - i będzie automatycznie usunięte z listy kont tymczasowych. Pole hasła - w formularzach tworzenia i edycji wyświetla tekst tokenu dostępu, a nie - zasłonięte hasło. -
      -
      Udostępnienie tokenu
      -
      - Nie jest narzucony sposób udostępniania tych tokenów innym osobom. Można - użyć dowolnej metody komunikacji. Wszystkie utworzone tokeny są dodawane - do selektora listy kontroli dostępu i mogą być używane wszędzie tam, gdzie - są dostępne listy kontroli dostępu. - - Przykład: Odwiedzający nawiguje w przeglądarce do Twojąej witryny. - Ma podany przez Ciebie token dostępu i próbuje odwiedzić jeden z Twoich - albumów ze zdjęciami (który jest ograniczony do przeglądania tylko przez - Ciebie i jedną tymczasową tożsamość). Odmowa dostępu. - - Odwiedzający wybiera teraz opcję „Zaloguj się” z paska nawigacji menu. - To wyświetli stronę logowania. Wpisuje tam nazwę i hasło, które podałeś - i może teraz przeglądać zabezpieczony album ze zdjęciami. - - Alternatywnie możesz udostępnić łącze do chronionego pliku, dodając parametr - "&zat=abc123" do adresu URL, gdzie ciąg "abc123" to token dostępu lub - hasło do tymczasowego logowania. Nie są wymagane dalsze negocjacje - a żądany zasób zostanie wyświetlony. -
      -
      \ No newline at end of file diff --git a/doc/context/pl/webpages/help.html b/doc/context/pl/webpages/help.html deleted file mode 100644 index 64858fcf6..000000000 --- a/doc/context/pl/webpages/help.html +++ /dev/null @@ -1,24 +0,0 @@ -
      -
      Ogólne
      -
      - Możesz tworzyć modułowe, rozpoznające tożsamość witryny internetowe, składające - się z elementów, które można udostępniać. -
      -
      Strony
      -
      - Tutaj znajduje się lista Twoich "stron" z przypisanymi adresami URL, - pod którymi osoby mogą je odwiedzać. Struktura stron jest zwykle opisywana - przez powiązany układ, a ich zawartość jest tworzona ze zbioru bloków. -
      -
      Narzędzia do przenoszenia stron internetowych
      -
      - Narzędzia do przenoszenia witryn umożliwiają importowanie i eksportowanie wielu - elementów strony internetowej (stron, układów, bloków). Możesz zaimportować - te alementy albo z przesłanego pliku ZIP, albo z istniejącego folderu plików - w chmurze. Możesz je wyeksportować do pliku zip zawierającego wybraną - grupę elementów strony internetowej w formie zgodnej z narzędziem do importowania - lub możesz wyeksportować bezpośrednio do folderu plików w chmurze. - Czytaj więcej ... -
      -
      \ No newline at end of file diff --git a/doc/context/pl/wiki/help.html b/doc/context/pl/wiki/help.html deleted file mode 100644 index 6aa6a7192..000000000 --- a/doc/context/pl/wiki/help.html +++ /dev/null @@ -1,29 +0,0 @@ -
      -
      Ogólne
      -
      - Każda wiki to zbiór stron utworzonych jako pliki tekstowe w formacie Markdown. -
      -
      Wykaz Wiki
      -
      - Strony wiki należące do kanału, do przeglądania którego masz uprawnienia, - są wymienione w panelu bocznym. -
      -
      Historia strony
      -
      - Zapisywana jest każda wersja strony, aby umożliwić szybkie przywrócenie. - Kliknij kartę Historia, aby wyświetlić historię zmian strony, w tym - datę i autora każdej z nich. Przycisk przywróć załaduje wybraną wersję, ale - nie zapisze automatycznie strony. -
      -
      Strony
      -
      - Lista stron wiki znajduje się w panelu Strony Wiki. Przed zapisaniem - zmian na stronie za pomocą rozwijanego menu Strona można - wprowadzić - własny komunikat, który będzie wyświetlany w - Historii - strony przeglądarki wraz z wersją. -
      -
      diff --git a/doc/context/ru/cards/help.html b/doc/context/ru/cards/help.html deleted file mode 100644 index ccdf9d6d9..000000000 --- a/doc/context/ru/cards/help.html +++ /dev/null @@ -1,16 +0,0 @@ -
      Резюме
      -
      Карточки используются для командной работы в виртуальном пространстве дополнительно к ленте сообщений. Карточки являются болле компактными по сравнению с веб-страницами и вики и предназначены для быстрой организации работы. Преимущество карточек в возможности совместной работы и комментирования. Карточки могут помочь организовать и упростить работу, связанную с частыми изменениями и с обсуждением в проекте. -
      -
      Добавить карточку
      -
      - Создание новой карточки подобно написанию нового поста.

      • - Имя ссылки для веб-страницы: Имя ссылки для веб-страницы - это имя карточки для статической URL -
        • -
      • - Заголовок: Текст заголовка карточки -
        • -
      • - Категории: Если Инструмент "Категории сообщения" в вашем канале разрешён, то вы можете присвоить карточке определённую категорию. Эта категория появится в списке Категорий в левой колонке и разрешает быстрый выбор записей определённой категории из картотеки одним щёлчком мышки. -
        • -
      -
      diff --git a/doc/context/ru/connections/help.html b/doc/context/ru/connections/help.html deleted file mode 100644 index 6c9b9a0e9..000000000 --- a/doc/context/ru/connections/help.html +++ /dev/null @@ -1,7 +0,0 @@ -
      -
      На этой странице отображается список всех подключений этого канала. Список можно отсортировать и отфильтровать с помощью кнопки рядом с кнопкой поиска.
      -
      Сведения о контакте
      -
      Каждая запись в списке показывает информацию о конкретном контакте. Полупрозрачное изображение профиля указывает на заархивированное соединение.
      -
      Статус контакта
      -
      Контакт может находиться в разных состояниях:
      • Заархивирован
      • Игнорируется
      • Заблокирован
      • Скрыт
      -
      \ No newline at end of file diff --git a/doc/context/ru/network/help.html b/doc/context/ru/network/help.html deleted file mode 100644 index 19b5452e2..000000000 --- a/doc/context/ru/network/help.html +++ /dev/null @@ -1,9 +0,0 @@ -
      -
      Здесь отображается поток сообщений и бесед, обычно упорядоченных по последнему обновлению. Данная страница имеет гибкие настройки.
      -
      Создать заметку
      -
      В верхней части страницы есть текстовое поле с надписью "Поделиться". Нажатие на это поле открывает редактор сообщений. Внешний ид редактора сообщений настраивается, однако по умолчанию редактор имеет поля для текста заметки и необязательного поля "Заголовок". Кнопки под полем для ввода текста слева служат для форматирования текста, вставки ссылок, изображений и других данных. Кнопки справа обеспечивают предварительный просмотр сообщения, настройку разрешений для публикации и кнопку для её отправки.
      -
      Группы конфиденциальности
      -
      Созданные вами группы конфиденциальности отображаются на боковой панели. Их выбор фильтрует сообщения по публикациям, которые созданы каналами в выбранной группе.
      -
      Разрешения публикации
      -
      Список контроля доступа (ACL) используется для того, чтобы указать, кто будет видеть вашу новую публикацию. При нажатии кнопки ACL рядом с кнопкой появится диалоговое окно, в котором вы можете выбрать, какие каналы и / или группы конфиденциальности могут видеть сообщение. Вы также можете выбрать, кому явно отказано в доступе. Например, вы планируете сюрприз для друга. Вы можете отправить сообщение с приглашением всем в вашей группе "Друзья" кроме друга, которого вы хотите поздравить. В этом случае публикацию увидят все члены группы "Друзья", кроме этого человека.
      -
      diff --git a/doc/database.bb b/doc/database.bb deleted file mode 100644 index a0c1e8841..000000000 --- a/doc/database.bb +++ /dev/null @@ -1,71 +0,0 @@ -[h2]Database updates[/h2] - -In the [observer.baseurl]/admin/dbsync page the administrator can check if any update was not successful and, if so, retry it. - -If an update has failed but doesn't register as failed for some reason, the administrator can attempt to re-execute the update. For example for DB update #1999, by visiting the webpage: - -https://hubzilla.com.bradmin/dbsync/1999 - - -[h2]Database Tables[/h2][table border=1][tr][th]Table[/th][th]Description[/th][/tr] -[tr][td][zrl=[baseurl]/help/database/db_abconfig]abconfig[/zrl][/td][td]arbitrary storage for connections of local channels[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_abook]abook[/zrl][/td][td]connections of local channels[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_account]account[/zrl][/td][td]service provider account[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_addon]addon[/zrl][/td][td]registered plugins[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_app]app[/zrl][/td][td]personal app data[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_attach]attach[/zrl][/td][td]file attachments[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_auth_codes]auth_codes[/zrl][/td][td]OAuth usage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_cache]cache[/zrl][/td][td]OEmbed cache[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_cal]cal[/zrl][/td][td]CalDAV containers for events[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_channel]channel[/zrl][/td][td]local channels[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_chat]chat[/zrl][/td][td]chat room content[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_chatpresence]chatpresence[/zrl][/td][td]channel presence information for chat[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_chatroom]chatroom[/zrl][/td][td]data for the actual chat room[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_clients]clients[/zrl][/td][td]OAuth usage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_pgrp_member]pgrp_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_pgrp]pgrp[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_issue]issue[/zrl][/td][td]future bug/issue database[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_item]item[/zrl][/td][td]all posts and webpages[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td](deprecated by iconfig) other identifiers on other services for posts[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_likes]likes[/zrl][/td][td]likes of 'things'[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_mail]mail[/zrl][/td][td]private messages[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_menu]menu[/zrl][/td][td]webpage menu data[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_menu_item]menu_item[/zrl][/td][td]entries for webpage menus[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_notify]notify[/zrl][/td][td]notifications[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_obj]obj[/zrl][/td][td]object data for things (x has y)[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_outq]outq[/zrl][/td][td]output queue[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_pconfig]pconfig[/zrl][/td][td]personal (per channel) configuration storage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_photo]photo[/zrl][/td][td]photo storage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_poll]poll[/zrl][/td][td]data for polls[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_poll_elm]poll_elm[/zrl][/td][td]data for poll elements[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_profdef]profdef[/zrl][/td][td]custom profile field definitions[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_profext]profext[/zrl][/td][td]custom profile field data[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_profile]profile[/zrl][/td][td]channel profiles[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_profile_check]profile_check[/zrl][/td][td]DFRN remote auth use, may be obsolete[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_register]register[/zrl][/td][td]registrations requiring admin approval[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_session]session[/zrl][/td][td]web session storage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_shares]shares[/zrl][/td][td]shared item information[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_sign]sign[/zrl][/td][td]Diaspora signatures. To be phased out.[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_site]site[/zrl][/td][td]site table to find directory peers[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_source]source[/zrl][/td][td]channel sources data[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_sys_perms]sys_perms[/zrl][/td][td]extensible permissions for OAuth[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_term]term[/zrl][/td][td]item taxonomy (categories, tags, etc.) table[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_tokens]tokens[/zrl][/td][td]OAuth usage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_updates]updates[/zrl][/td][td]directory sync updates[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_verify]verify[/zrl][/td][td]general purpose verification structure[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_vote]vote[/zrl][/td][td]vote data for polls[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xchan]xchan[/zrl][/td][td]list of known channels in the universe[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xchat]xchat[/zrl][/td][td]bookmarked chat rooms[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xconfig]xconfig[/zrl][/td][td]as pconfig but for channels with no local account[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xign]xign[/zrl][/td][td]channels ignored by friend suggestions[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xlink]xlink[/zrl][/td][td]"friends of friends" linkages derived from poco, also ratings storage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xperm]xperm[/zrl][/td][td]OAuth/OpenID-Connect extensible permissions permissions storage[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xprof]xprof[/zrl][/td][td]if this hub is a directory server, contains basic public profile info of everybody in the network[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_xtag]xtag[/zrl][/td][td]if this hub is a directory server, contains tags or interests of everybody in the network[/td][/tr] -[/table] diff --git a/doc/database/db_abook.bb b/doc/database/db_abook.bb deleted file mode 100644 index a346480d7..000000000 --- a/doc/database/db_abook.bb +++ /dev/null @@ -1,55 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]abook_id[/td][td]Sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]abook_account[/td][td]account.account_id of the channel which owns this record[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]abook_channel[/td][td]channel.channel_id of the channel which owns this record[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]abook_xchan[/td][td]xchan.xchan_hash of the target identity (this channel's connection)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]abook_my_perms[/td][td]bitfield of all specific permissions granted this connection[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_their_perms[/td][td]bitfield of all permissions granted to you by this connection[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_closeness[/td][td]"closeness" value for optional affinity tool, 0-99[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]99[/td][td] -[/td][/tr] -[tr][td]abook_created[/td][td]Datetime this record was created[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]abook_updated[/td][td]Datetime this record was modified[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]abook_connected[/td][td]datetime of last successful "poll" for this connection[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]abook_dob[/td][td]Datetime of connection's birthday converted from *their* timezone to UTC[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]abook_flags[/td][td]No longer used[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_profile[/td][td]profile.guid of profile to display to this connection if authenticated[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]abook_blocked[/td][td]Bi-directional communications with this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_ignored[/td][td]Incoming communications from this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_hidden[/td][td]This connection will not be shown as a connection to anybody but the channel owner[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_archived[/td][td]This connection is likely non-functioning and the entry and conversations are preserved, but further polled communications will not be attempted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_pending[/td][td]A connection request was received from this channel but has not been approved by the channel owner, public communications may still be visible but no additional permissions have been granted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_account.bb b/doc/database/db_account.bb deleted file mode 100644 index 35d7a9eb3..000000000 --- a/doc/database/db_account.bb +++ /dev/null @@ -1,66 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]account_id[/td][td]table index[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]account_parent[/td][td]for hierarchical accounts, the account_id of the parent to this one, if account_parent = account_id, this is the top level account[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]account_default_channel[/td][td]channel_id of channel to connect on login[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]account_salt[/td][td]complexity token for account_password[/td][td]char(32)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]account_password[/td][td]hashed password for this account[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]account_email[/td][td]essentially the login ID, although it is usually possible to login with a channel address[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]account_external[/td][td]Currently unused[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]account_language[/td][td]default language (closest available browser-accept language when account was created)[/td][td]char(16)[/td][td]NO[/td][td][/td][td]en[/td][td] -[/td][/tr] -[tr][td]account_created[/td][td]timestamp of account creation[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]account_lastlog[/td][td]timestamp of last login (or daily update if "remember me" is in effect)[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]account_flags[/td][td]see notes[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]account_roles[/td][td]see notes[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]account_reset[/td][td]verification token for password reset[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]account_expires[/td][td]timestamp when account expires and will be deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]account_expire_notified[/td][td]timestamp of last warning of account expiration[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]account_service_class[/td][td]service class for this account, determines what if any limits/restrictions are in place[/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]account_level[/td][td]future use[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]account_password_changed[/td][td]timestamp of last password change - to limit account deletion for 48 hours to prevent malicious activity[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Notes: - - - -/** - * Account Flags - */ - -define ( 'ACCOUNT_OK', 0x0000 ); -define ( 'ACCOUNT_UNVERIFIED', 0x0001 ); -define ( 'ACCOUNT_BLOCKED', 0x0002 ); -define ( 'ACCOUNT_EXPIRED', 0x0004 ); -define ( 'ACCOUNT_REMOVED', 0x0008 ); -define ( 'ACCOUNT_PENDING', 0x0010 ); - -/** - * Account roles - */ - -define ( 'ACCOUNT_ROLE_SYSTEM', 0x0002 ); // 2 - this is the special system account -define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 ); -define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 ); // 4096 - this account is an administrator - - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_addon.bb b/doc/database/db_addon.bb deleted file mode 100644 index bccd295f5..000000000 --- a/doc/database/db_addon.bb +++ /dev/null @@ -1,24 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td]generated index[td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]aname[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]version[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]installed[/td][td]currently always 1[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]hidden[/td][td]currently unused[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]tstamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[tr][td]plugin_admin[/td][td]1 = has admin config, 0 = has no admin config[/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[/table] - -Notes: - -These are addons which have been enabled by the site administrator on the admin/plugin page - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_app.bb b/doc/database/db_app.bb deleted file mode 100644 index 09df473ee..000000000 --- a/doc/database/db_app.bb +++ /dev/null @@ -1,48 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]generated index[/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]app_id[/td][td]hash identifying this app[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]app_sig[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]app_author[/td][td]xchan_hash of app creator[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]app_name[/td][td]name of app[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]app_desc[/td][td]optional description of app[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]app_url[/td][td]target_url[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]app_photo[/td][td]app icon[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]app_version[/td][td]version of app[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]app_channel[/td][td]channel_id owning this instance of the app[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]app_addr[/td][td]reddress/webbie of app creator[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]app_price[/td][td]free-form price field[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]app_page[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]app_requires[/td][td]access rules[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] - -[tr][td]app_created[/td][td]datetime of app creation[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]app_edited[/td][td]datetime of last app edit[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] - -[tr][td]app_deleted[/td][td]1 = deleted, 0 = normal[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]app_system[/td][td]1 = imported system app, 0 = member created app[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] - - -[/table] - -Storage for personal apps - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_attach.bb b/doc/database/db_attach.bb deleted file mode 100644 index 5098401de..000000000 --- a/doc/database/db_attach.bb +++ /dev/null @@ -1,54 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]generated index[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]aid[/td][td]account_id of owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel_id of owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]hash[/td][td]hash for cross-site identification[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]creator[/td][td]xchan_hash of author/creator[/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]filename[/td][td]filename of original[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]filetype[/td][td]mimetype[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]filesize[/td][td]size in bytes[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]revision[/td][td]for version control (partially implemented)[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]folder[/td][td]attach.hash of parent folder[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]flags[/td][td]no longer used[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]is_dir[/td][td]0 (file) or 1 to indicate a directory[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]is_photo[/td][td]if 1, a photo is linked to this resource[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]os_storage[/td][td]if 0, data contains content; if 1 data contains path to content (always 1 in hubzilla)[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]os_path[/td][td]under construction, store the system path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]display_path[/td][td]under construction, store the human readable path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]content[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td]creation time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]edited[/td][td]last edit time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -permissions are xchan_hash or group_hash surrounded by angle chars. e.g. '' - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_auth_codes.bb b/doc/database/db_auth_codes.bb deleted file mode 100644 index c60f064a4..000000000 --- a/doc/database/db_auth_codes.bb +++ /dev/null @@ -1,19 +0,0 @@ - -OAuth2 authorisation register - currently implemented but unused - -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]varchar(40)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]client_id[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]expires[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]scope[/td][td][/td][td]varchar(250)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_cache.bb b/doc/database/db_cache.bb deleted file mode 100644 index 02c292f20..000000000 --- a/doc/database/db_cache.bb +++ /dev/null @@ -1,15 +0,0 @@ - -OEmbed information cache - -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]k[/td][td]horizontal width + url or resource[/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]v[/td][td]OEmbed response from site[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]updated[/td][td]datetime of cache insertion[/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_channel.bb b/doc/database/db_channel.bb deleted file mode 100644 index 518ff0978..000000000 --- a/doc/database/db_channel.bb +++ /dev/null @@ -1,104 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]channel_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]channel_account_id[/td][td]account.id of the account owning this channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]channel_primary[/td][td]1 = this is the primary instance of this channel[/td][td]tinyint(1) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]channel_name[/td][td]Name that this channel is known by[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_address[/td][td]"username" or URL-and-email safe nickname[/td][td]char(255)[/td][td]NO[/td][td]UNI[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_guid[/td][td]Long hash representing a psuedo-unique ID, does not have ot be globally unique[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_guid_sig[/td][td]channel.gui signed with channel.prvkey and base64url_encoded[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_hash[/td][td]base64url_encode of a 64-char whirlpool hash of channel.guid and channel_guid_sig concatenated, synonymous with xchan_hash.[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_timezone[/td][td]PHP-legal timezone[/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]UTC[/td][td] -[/td][/tr] -[tr][td]channel_location[/td][td]Default for item.location[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_theme[/td][td]channel theme preference[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_startpage[/td]relative site URL to visit after logging in[td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]channel_pubkey[/td][td]RSA public key 4096 bit[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_prvkey[/td][td]RSA private key 4096 bit[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_notifyflags[/td][td]bifield representing what notification types are active[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]65535[/td][td] -[/td][/tr] -[tr][td]channel_pageflags[/td][td]bitfield of special channel uses[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]channel_dirdate[/td][td]time when directory was last pinged. Must do this once a month[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]channel_lastpost[/td][td]date of last post for this channel. May not be fully implemented[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]channel_deleted[/td][td]time when channel was deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]channel_max_anon_mail[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td] -[/td][/tr] -[tr][td]channel_max_friend_req[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td] -[/td][/tr] -[tr][td]channel_expire_days[/td][td]expire imported content that hasn't been otherwise protected after this many days, 0 is no expiration[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]channel_passwd_reset[/td][td]password reset token[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]channel_default_group[/td][td]put all new connections into the group with this name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]channel_allow_cid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_allow_gid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_deny_cid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_deny_gid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channel_r_stream[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_r_profile[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_r_photos[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_r_abook[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_stream[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_wall[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_tagwall[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_comment[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_mail[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_photos[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_chat[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_a_delegate[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]channel_r_storage[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_storage[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_r_pages[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_pages[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_a_republish[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_w_like[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_removed[/td][td]if 1, this channel has been deleted[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_system[/td][td]if 1, this is the special system channel on this site[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] -[/td][/tr] -[tr][td]channel_moved[/td][td]URL of relocated channel, making this instance abandoned if set[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] diff --git a/doc/database/db_chat.bb b/doc/database/db_chat.bb deleted file mode 100644 index 1aac2bd15..000000000 --- a/doc/database/db_chat.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]chat_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]chat_room[/td][td]chatroom.cr_id for this chat[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]chat_xchan[/td][td]author xchan_hash[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]chat_text[/td][td]the text of the chat message[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td]timestamp of this message[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_chatpresence.bb b/doc/database/db_chatpresence.bb deleted file mode 100644 index 0a7f666c9..000000000 --- a/doc/database/db_chatpresence.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]cp_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]cp_room[/td][td]chatroom.cr_id of the chatroom[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]cp_xchan[/td][td]xchan_hash of the chatroom participant[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]cp_last[/td][td]datetime last ping[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]cp_status[/td][td]text status description e.g. "online"[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]cp_client[/td][td]IP address of this client[/td][td]char(128)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_chatroom.bb b/doc/database/db_chatroom.bb deleted file mode 100644 index 1d316288d..000000000 --- a/doc/database/db_chatroom.bb +++ /dev/null @@ -1,28 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]cr_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]cr_aid[/td][td]account.id of chatroom owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]cr_uid[/td][td]channel.channel_id of chatroom owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]cr_name[/td][td]visible name of chatroom[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]cr_created[/td][td]creation timestampe[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]cr_edited[/td][td]edited timestamp[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]cr_expire[/td][td]expiration period for chats in this chatroom in minutes, 0 is no expiration[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_clients.bb b/doc/database/db_clients.bb deleted file mode 100644 index 0c66a4fc2..000000000 --- a/doc/database/db_clients.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]client_id[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]pw[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]clname[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]icon[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_config.bb b/doc/database/db_config.bb deleted file mode 100644 index f32d3c259..000000000 --- a/doc/database/db_config.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]v[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_conv.bb b/doc/database/db_conv.bb deleted file mode 100644 index 5adfa8c80..000000000 --- a/doc/database/db_conv.bb +++ /dev/null @@ -1,25 +0,0 @@ - -Used in Diaspora private mails - -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]guid[/td][td]A unique identifier for this conversation[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]recips[/td][td]sender_handle;recipient_handle[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]creator[/td][td]handle of creator[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td]creation timestamp[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]updated[/td][td]edited timestamp[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]subject[/td][td]subject of initial message (obscured for privacy)[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_event.bb b/doc/database/db_event.bb deleted file mode 100644 index ad3c15789..000000000 --- a/doc/database/db_event.bb +++ /dev/null @@ -1,64 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]aid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]event_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]dtstart[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]dtend[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]summary[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]description[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]location[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]etype[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]nofinish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]adjust[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]1[/td][td] -[/td][/tr] -[tr][td]dismissed[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] - -[tr][td]event_status[/td][td][/td][td]charr(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_status_date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_percent[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_repeat[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_sequence[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_priority[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]event_vdata[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]cal_id[/td][td][/td][td]int(10)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] - -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_fcontact.bb b/doc/database/db_fcontact.bb deleted file mode 100644 index 9bd8c20fe..000000000 --- a/doc/database/db_fcontact.bb +++ /dev/null @@ -1,38 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]request[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]nick[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]addr[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]batch[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]notify[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]poll[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]confirm[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]priority[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]network[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]alias[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]pubkey[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]updated[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_ffinder.bb b/doc/database/db_ffinder.bb deleted file mode 100644 index c20158d56..000000000 --- a/doc/database/db_ffinder.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]cid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]fid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_fserver.bb b/doc/database/db_fserver.bb deleted file mode 100644 index 4c4b0b530..000000000 --- a/doc/database/db_fserver.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]server[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]posturl[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]key[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_fsuggest.bb b/doc/database/db_fsuggest.bb deleted file mode 100644 index 9da1f2f6d..000000000 --- a/doc/database/db_fsuggest.bb +++ /dev/null @@ -1,24 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]cid[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]request[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]note[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_hook.bb b/doc/database/db_hook.bb deleted file mode 100644 index 233062f98..000000000 --- a/doc/database/db_hook.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]hook[/td][td]name of hook[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]file[/td][td]relative filename of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]fn[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]priority[/td][td]can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[tr][td]hook_version[/td][td]version 0 hooks must have two arguments, the App and the hook data. version 1 hooks have 1 argument - the hook data[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_hubloc.bb b/doc/database/db_hubloc.bb deleted file mode 100644 index e4ab7159d..000000000 --- a/doc/database/db_hubloc.bb +++ /dev/null @@ -1,38 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]hubloc_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]hubloc_guid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_guid_sig[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]hubloc_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]hubloc_addr[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_network[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_flags[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]hubloc_status[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]hubloc_url[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_url_sig[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]hubloc_host[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_callback[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_connect[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]hubloc_sitekey[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]hubloc_updated[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]hubloc_connected[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_issue.bb b/doc/database/db_issue.bb deleted file mode 100644 index 0a6f2912b..000000000 --- a/doc/database/db_issue.bb +++ /dev/null @@ -1,20 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]issue_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]issue_created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]issue_updated[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]issue_assigned[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]issue_priority[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]issue_status[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]issue_component[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_item.bb b/doc/database/db_item.bb deleted file mode 100644 index 6383e13f8..000000000 --- a/doc/database/db_item.bb +++ /dev/null @@ -1,151 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]Sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]mid[/td][td]Message-id - globally unique, there can be several items with the same message-ID in the table as they may have different uid owners[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]aid[/td][td]channel_account_id of the channel_id (uid) which owns this copy of the item[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel_id (uid) which owns this copy of the item[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]parent[/td][td]item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]parent_mid[/td][td]Globally unique message-id of the parent to this item[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]thr_parent[/td][td]If the parent of this item is not the top-level item in the conversation, the message-id of the immediate parent; otherwise set to parent_mid[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]created[/td][td]Creation timestamp. If creation is more than ten minutes into the future, set item_delayed to 1; it will automatically be delivered by the poller once the created time has passed[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]edited[/td][td]Date of last edit (default is created)[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]expires[/td][td]Date this item expires and will be removed[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]commented[/td][td]Date of last comment/reply to this item[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]received[/td][Date the item was received at this sitetd][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]changed[/td][td]Date that something in the conversation changed, indicating clients should fetch the conversation again[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]comments_closed[/td][td]Date after which no more comments will be accepted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]owner_xchan[/td][td]xchan_hash of the owner of this conversation (this is who replies are sent to)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]author_xchan[/td][td]xchan_hash of the author of this item[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]source_xchan[/td][td]xchan_hash of the external source of this item belongs to multiple delivery chains and comments need to be uplinked[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]mimetype[/td][td]mime type of the content body[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]title[/td][td]item title[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]body[/td][td]item body content[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]app[/td][td]application which generated this item[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]lang[/td][td]auto-detected language[/td][td]char(64)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]revision[/td][td]future use, version control[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]verb[/td][td]ActivityStreams verb (old style URI)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]obj_type[/td][td]ActivityStreams object type (old style URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]obj[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]tgt_type[/td][td]ActivityStreams target type if applicable (URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]target[/td][td]JSON encoded target structure if used[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]layout_mid[/td][td]For webpages, which layout (mid or message_id) to use when displaying this page[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]postopts[/td][td]External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]route[/td][td]comma separated xchan list of xchans where this message was routed on its way to this destination, used for route loop discovery and rejection of comments which arrived by alternate routes and may have different permissions[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]llink[/td][td]URL of a displayable copy of this post/conversation on this site[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]plink[/td][td]permalink or URL toa displayable copy of the message at its source[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]resource_id[/td][td]Used to link other tables to items, it identifies the linked resource and if set must also set resource_type[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]resource_type[/td][td]default none, if a linked resource this should be the name of the resource type such as "photo" or "event"[/td][td]char(16)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]attach[/td][td]JSON structure representing attachments to this item[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]sig[/td][td]RSA signature of the item body by the original author if the private key is available[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]diaspora_meta[/td][td]Used to store Diaspora comment signatures with their weird requirements[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]location[/td][td]text location where this item originated[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]coord[/td][td] longitude/latitude pair representing location where this item originated[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]public_policy[/td][td]If the author has specified restrictions (this network, this site) etc. for distribution, the corresponding policy text is present here and item_private = 1[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]comment_policy[/td][td]If the author has specified comment restrictions (thei network, this site, etc.) the corresponding policy text is present here[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td]Access Control - list of allowed xchans '...'[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td]Access Control - list of allowed group hashes, see allow_cid[td][/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td]Access Control - list of denied xchans[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td]Access Control - list of denied groups[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]item_restrict[/td]no longer used[td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_flags[/td][td]no longer used[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_private[/td][td]distribution is restricted[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_origin[/td][td]item originated at this site[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_unseen[/td][td]item has not been seen[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_starred[/td][td]item has been favourited[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_uplink[/td][td]This item is part of a multiple delivery chain and must be uplinked to the original sender (source_xchan)[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_consensus[/td][td]This item allows voting tools[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_wall[/td][td]This item was posted to the wall of uid[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_thread_top[/td][td]parent = id, this is the top post in a conversation [/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_notshown[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_nsfw[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_relay[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_mentionsme[/td][td]The owner of this item was mentioned in it[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_nocomment[/td][td]if 1, no comments are allowed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_obscured[/td][td]no longer used[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_verified[/td][td]the signature has been verified on this site[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_retained[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_rss[/td][td]item originated in a feed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_deleted[/td][td]item has been deleted[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_type[/td][td]used to identify webpage and design element types, 0 is a normal conversation item[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_hidden[/td][td]0 or 1 if item is not to be displayed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_unpublished[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_delayed[/td][td]item is posted in the future[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_pending_remove[/td][td]item is in the process of being removed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]item_blocked[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] - -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_item_id.bb b/doc/database/db_item_id.bb deleted file mode 100644 index ba4cca247..000000000 --- a/doc/database/db_item_id.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]iid[/td][td]item.id of the referenced item[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]sid[/td][td]an additional identifier to attach or link to the referenced item (often used to store a message_id from another system in order to suppress duplicates)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]service[/td][td]the name or description of the service which generated this identifier[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_likes.bb b/doc/database/db_likes.bb deleted file mode 100644 index 118c9a87e..000000000 --- a/doc/database/db_likes.bb +++ /dev/null @@ -1,24 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]channel_id[/td][td][/td][td]int(11) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]liker[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]likee[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]iid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]target_type[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]target_id[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]target[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_mail.bb b/doc/database/db_mail.bb deleted file mode 100644 index 0628584ae..000000000 --- a/doc/database/db_mail.bb +++ /dev/null @@ -1,34 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]convid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]mail_flags[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]from_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]to_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]account_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]title[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]body[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]attach[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]mid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]parent_mid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]expires[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_menu.bb b/doc/database/db_menu.bb deleted file mode 100644 index 5b478115d..000000000 --- a/doc/database/db_menu.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]menu_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]menu_channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]menu_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]menu_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]menu_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_menu_item.bb b/doc/database/db_menu_item.bb deleted file mode 100644 index b14aac5e4..000000000 --- a/doc/database/db_menu_item.bb +++ /dev/null @@ -1,28 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]mitem_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]mitem_link[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]mitem_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]mitem_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]mitem_channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]mitem_menu_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]mitem_order[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_notify.bb b/doc/database/db_notify.bb deleted file mode 100644 index 4787266cd..000000000 --- a/doc/database/db_notify.bb +++ /dev/null @@ -1,36 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]hash[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]date[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]msg[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]aid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]link[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]parent[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]seen[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]ntype[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]otype[/td][td][/td][td]char(16)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_obj.bb b/doc/database/db_obj.bb deleted file mode 100644 index cc5e75598..000000000 --- a/doc/database/db_obj.bb +++ /dev/null @@ -1,26 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]obj_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]obj_page[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]obj_verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]obj_type[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]obj_obj[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]obj_channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_outq.bb b/doc/database/db_outq.bb deleted file mode 100644 index 970f99de5..000000000 --- a/doc/database/db_outq.bb +++ /dev/null @@ -1,28 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]outq_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]outq_account[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]outq_channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]outq_driver[/td][td][/td][td]char(32)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]outq_posturl[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]outq_async[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]outq_delivered[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]outq_created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]outq_updated[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]outq_notify[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]outq_msg[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_pconfig.bb b/doc/database/db_pconfig.bb deleted file mode 100644 index 2ac36e61a..000000000 --- a/doc/database/db_pconfig.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_pgrp.bb b/doc/database/db_pgrp.bb deleted file mode 100644 index 73265b90e..000000000 --- a/doc/database/db_pgrp.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]hash[/td][td]unique hash representing this group with the group name appended[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel.channel_id owning this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]visible[/td][td]1 indicates the member list is not private[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_pgrp_member.bb b/doc/database/db_pgrp_member.bb deleted file mode 100644 index b9ab8171d..000000000 --- a/doc/database/db_pgrp_member.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]gid[/td][td]groups.id of the associated group[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xchan[/td][td]xchan.xchan_hash of the member assigned to the associated group[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_photo.bb b/doc/database/db_photo.bb deleted file mode 100644 index 91840ec1e..000000000 --- a/doc/database/db_photo.bb +++ /dev/null @@ -1,52 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]aid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]resource_id[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]title[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]description[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]album[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]filename[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]mimetype[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td] -[/td][/tr] -[tr][td]height[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]width[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]filesize[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]content[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]scale[/td][td][/td][td]tinyint(3)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]profile[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]photo_flags[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_poll.bb b/doc/database/db_poll.bb deleted file mode 100644 index 57d808b71..000000000 --- a/doc/database/db_poll.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]poll_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]poll_channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]poll_desc[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]poll_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]poll_votes[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_poll_elm.bb b/doc/database/db_poll_elm.bb deleted file mode 100644 index fd649d5a6..000000000 --- a/doc/database/db_poll_elm.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]pelm_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]pelm_poll[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]pelm_desc[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]pelm_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]0[/td][td] -[/td][/tr] -[tr][td]pelm_result[/td][td][/td][td]float[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_profdef.bb b/doc/database/db_profdef.bb deleted file mode 100644 index a0904fd79..000000000 --- a/doc/database/db_profdef.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]field_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]field_type[/td][td][/td][td]char(16)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]field_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]field_help[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]field_inputs[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_profext.bb b/doc/database/db_profext.bb deleted file mode 100644 index ada9dce2a..000000000 --- a/doc/database/db_profext.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_profile.bb b/doc/database/db_profile.bb deleted file mode 100644 index 717fae585..000000000 --- a/doc/database/db_profile.bb +++ /dev/null @@ -1,94 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]profile_guid[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]aid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]profile_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]is_default[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]hide_friends[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]fullname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]pdesc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]chandesc[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]dob[/td][td][/td][td]char(32)[/td][td]NO[/td][td][/td][td]0000-00-00[/td][td] -[/td][/tr] -[tr][td]dob_tz[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]UTC[/td][td] -[/td][/tr] -[tr][td]address[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]locality[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]region[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]postal_code[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]country_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]hometown[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]gender[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]partner[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]howlong[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]sexual[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]politic[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]religion[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]keywords[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]likes[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]dislikes[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]about[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]summary[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]music[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]book[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]tv[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]film[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]interest[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]romance[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]employment[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]education[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]contact[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]channels[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]homepage[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]thumb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]publish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_profile_check.bb b/doc/database/db_profile_check.bb deleted file mode 100644 index 3be64c5da..000000000 --- a/doc/database/db_profile_check.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]cid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]dfrn_id[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]sec[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]expire[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_register.bb b/doc/database/db_register.bb deleted file mode 100644 index 50672b5e1..000000000 --- a/doc/database/db_register.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]password[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]language[/td][td][/td][td]char(16)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_session.bb b/doc/database/db_session.bb deleted file mode 100644 index d7ff0482d..000000000 --- a/doc/database/db_session.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]bigint(20) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]sid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]data[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]expire[/td][td][/td][td]bigint(20) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_shares.bb b/doc/database/db_shares.bb deleted file mode 100644 index be5255c03..000000000 --- a/doc/database/db_shares.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]share_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]share_type[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]share_target[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]share_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_sign.bb b/doc/database/db_sign.bb deleted file mode 100644 index e80ea7ef3..000000000 --- a/doc/database/db_sign.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]iid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]retract_iid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]signed_text[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]signature[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]signer[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_site.bb b/doc/database/db_site.bb deleted file mode 100644 index 8dea4dae6..000000000 --- a/doc/database/db_site.bb +++ /dev/null @@ -1,28 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]site_url[/td][td][/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]site_access[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]site_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]site_update[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]site_pull[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]site_sync[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]site_directory[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]site_register[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]site_sellpage[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]site_location[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]site_realm[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_source.bb b/doc/database/db_source.bb deleted file mode 100644 index 92850a82e..000000000 --- a/doc/database/db_source.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]src_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]src_channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]src_channel_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]src_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]src_patt[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_spam.bb b/doc/database/db_spam.bb deleted file mode 100644 index b75e1edd3..000000000 --- a/doc/database/db_spam.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]spam[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]ham[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]term[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_sys_perms.bb b/doc/database/db_sys_perms.bb deleted file mode 100644 index 04416a26b..000000000 --- a/doc/database/db_sys_perms.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]public_perm[/td][td][/td][td]tinyint(1) unsigned[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_term.bb b/doc/database/db_term.bb deleted file mode 100644 index bd155fe21..000000000 --- a/doc/database/db_term.bb +++ /dev/null @@ -1,28 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]tid[/td][td]sequential index[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]aid[/td][td]channel_account_id of the controlling channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel_id of the controlling channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]oid[/td][td]DB index of linked thing[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]otype[/td][td]type of linked thing[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]ttype[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]term[/td][td]the actual taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]url[/td]relevant link (for tags and mentions, a link to the associated resource)[td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]imgurl[/td][td]rarely used - an image associated with this taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]term_hash[/td][td]unique hash for this entry[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]parent_hash[/td][td]for hierarchical taxonomies, the hash of the relevant parent[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_tokens.bb b/doc/database/db_tokens.bb deleted file mode 100644 index 35da2458c..000000000 --- a/doc/database/db_tokens.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]varchar(40)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]secret[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]client_id[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]expires[/td][td][/td][td]bigint(20) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]scope[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_updates.bb b/doc/database/db_updates.bb deleted file mode 100644 index f2e25d84c..000000000 --- a/doc/database/db_updates.bb +++ /dev/null @@ -1,20 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]ud_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]ud_hash[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]ud_guid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]ud_date[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]ud_last[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]ud_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]ud_addr[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_verify.bb b/doc/database/db_verify.bb deleted file mode 100644 index 9d01181c5..000000000 --- a/doc/database/db_verify.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]type[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]token[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]meta[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_vote.bb b/doc/database/db_vote.bb deleted file mode 100644 index 0b9a423eb..000000000 --- a/doc/database/db_vote.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]vote_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]vote_poll[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]vote_element[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]vote_result[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]vote_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xchan.bb b/doc/database/db_xchan.bb deleted file mode 100644 index 8932969c5..000000000 --- a/doc/database/db_xchan.bb +++ /dev/null @@ -1,59 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]xchan_hash[/td][td]calculated hash of this extended channel[/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xchan_guid[/td][td]channel_guid of this extended channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_guid_sig[/td][td]base64url encoded signature of the guid[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xchan_pubkey[/td][td]public key for verifying signed data and assertions[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xchan_photo_mimetype[/td][td]mimetype of the profile photo[/td][td]char(32)[/td][td]NO[/td][td][/td][td]image/jpeg[/td][td] -[/td][/tr] -[tr][td]xchan_photo_l[/td][td]photo url 300px[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_photo_m[/td][td]photo url 80 px[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_photo_s[/td][td]photo url 48 px[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_addr[/td][td]user@host[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_url[/td][td]url of channel page on primary hub location[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_connurl[/td]poco url[td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_follow[/td]url template for following %s[td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_connpage[/td][td]for premium channels url of channel to display when connecting[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_name[/td][td]human readabl name of channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_network[/td][td]network of channel for instance 'zot', 'diaspora', 'unknown'[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_instance_url[/td][td]no longer used[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchan_flags[/td][td]no longer used[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_photo_date[/td][td]timestamp of last photo change in GMT[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]xchan_name_date[/td][td]timestamp of last name change in GMT[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[tr][td]xchan_hidden[/td][td]flag - channel is hidden[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_orphan[/td][td]flag - channel has no known hubloc locations[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_censored[/td][td]flag - channel has been censored[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_selfcensored[/td][td]flag - channel is self censored (adult or nsfw)[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_system[/td][td]flag - this represents a system channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_pubforum[/td][td]flag - channel is a public forum[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan_deleted[/td][td]flag - channel was deleted[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] - -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xchat.bb b/doc/database/db_xchat.bb deleted file mode 100644 index 0897408d1..000000000 --- a/doc/database/db_xchat.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]xchat_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]xchat_url[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchat_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchat_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xchat_edited[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xconfig.bb b/doc/database/db_xconfig.bb deleted file mode 100644 index 111d1ce3a..000000000 --- a/doc/database/db_xconfig.bb +++ /dev/null @@ -1,16 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xign.bb b/doc/database/db_xign.bb deleted file mode 100644 index 63c6569de..000000000 --- a/doc/database/db_xign.bb +++ /dev/null @@ -1,13 +0,0 @@ -xign - holds xchan information for channels that have been ignored in 'friend suggestions' -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td]local channel.channel_id[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xchan[/td][td]xchan.xchan_hash of ignored channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xlink.bb b/doc/database/db_xlink.bb deleted file mode 100644 index 528f8da19..000000000 --- a/doc/database/db_xlink.bb +++ /dev/null @@ -1,22 +0,0 @@ -xlink - used to store social graph and channel ratings -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]xlink_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]xlink_xchan[/td][td]xchan.xchan_hash of controlling channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xlink_link[/td][td]xchan.xchan_hash of link target (connection or rating)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xlink_rating[/td][td]int rating[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xlink_rating_txt[/td][td]rating text[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xlink_updated[/td][td]timestamp of update in GMT[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] -[tr][td]xlink_static[/td][td]0 for social graph, 1 for ratings[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xlink_sig[/td][td]base64url encoded signature of rating information[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xprof.bb b/doc/database/db_xprof.bb deleted file mode 100644 index bed79e9ca..000000000 --- a/doc/database/db_xprof.bb +++ /dev/null @@ -1,37 +0,0 @@ -xprof - stores searchable public profile information on directory servers -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]xprof_hash[/td][td]xchan.xchan_hash of this channel[/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xprof_age[/td][td]current age (updated monthly)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]xprof_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_dob[/td][td][/td][td]char(12)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_gender[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_sexual[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_locale[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_region[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_postcode[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_country[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_keywords[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xprof_about[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xprof_homepage[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] -[/td][/tr] -[tr][td]xprof_hometown[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_xtag.bb b/doc/database/db_xtag.bb deleted file mode 100644 index 1e6fb9961..000000000 --- a/doc/database/db_xtag.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]xtag_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]xtag_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xtag_term[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]xtag_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md deleted file mode 100644 index 4dccc8cef..000000000 --- a/doc/dev-function-overview.md +++ /dev/null @@ -1,51 +0,0 @@ -$Projectname development - some useful basic functions -====================================================== - - - -* get_account_id() - -Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. - -* local_channel() - -Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. - -* remote_channel() - -Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. - -* App::get_observer() - -returns an xchan structure representing the current viewer if authenticated (locally or remotely). - -* get_config($family,$key), get_pconfig($uid,$family,$key) - -Returns the config setting for $family and $key or false if unset. - -Deprecated: Use Zotlabs\Lib\Config::Get instead. - -* set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value) - -Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). - -Deprecated: Use Zotlabs\Lib\Config::Set instead. - -* dbesc() - -Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() - -* q($sql,$var1...) - -Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. - -* t($string) - -Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist. - -* x($var), $x($array,$key) - -Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. -If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; - -#include doc/macros/main_footer.bb; diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb deleted file mode 100644 index 4ac69c301..000000000 --- a/doc/dev_beginner.bb +++ /dev/null @@ -1,419 +0,0 @@ -[h2]You want to contribute code?[/h2] -[b]...and don't know how to start to...[/b] -[list] -[*] debug the red#matrix (php on the webserver), -[*] contribute code to the project, -[*] optionally - do it all from inside a virtual machine -[/list] -This manual was tested for Debian (Wheezy) as virtual machine on Lubuntu (Ubuntu 14.0) as host. - -Content - -[toc] - -[h2]Install a Virtual Machine (KVM)[/h2] - -[url=https://wiki.debian.org/KVM]Here[/url] the installation guide for Linux Debian. -The summary: -[list=1] -[*] install KVM -[code]# apt-get install qemu-kvm libvirt-bin[/code] -[*] add yourself to the group libvirt [code]# adduser libvirt[/code] -[*] install gui to manage virtual machines [code]# apt-get install virt-manager[/code] -[*] download an operating system to run inside the vm ([url=http://ftp.nl.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/mini.iso]mini.iso[/url]) -[*] start the virt manager -- create new virtual machine (click on icon) -- choose your iso image (just downloaded) as installation source -- optional: configure the new vm: ram, cpu's,... -- start virtual machine > result: linux debian starts in a new window. -[*] (optional) avoid network errors after restart of host os -[code]# virsh net-start default -# virsh net-autostart default[/code] -[/list] - - -[h2]Install Apache Webserver[/h2] - -Open a terminal and make yourself root -[code]su -l[/code] - -Create the standard group for the Apache webserver -[code]groupadd www-data[/code] -might exist already - -[code]usermod -a -G www-data www-data[/code] - -Check if the system is really up to date -[code]apt-get update -apt-get upgrade[/code] - -Optional restart services after installation -[code]reboot[/code] - -If you restarted, make yourself root -[code]su -l[/code] - -Install Apache: [code] -apt-get install apache2 apache2-doc apache2-utils[/code] - -Open webbrowser on PC and check [url=localhost]localhost[/url] -Should show you a page like "It works" - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[h2]Install PHP, MySQL, phpMyAdmin[/h2] - -[h3]PHP, MySQL[/h3] - -[code]su -l -apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl php5-mcrypt php5-xdebug -apt-get install php5-mysql -apt-get install mysql-server mysql-client[/code] -enter and note the mysql passwort - -Optional since its already enabled during phpmyadmin setup -[code] -php5enmod mcrypt -[/code] - -[h3]phpMyAdmin[/h3] - -Install php myadmin -[code]apt-get install phpmyadmin[/code] - -Configuring phpmyadmin -- Select apache2 (hint: use the tab key to select) -- Configure database for phpmyadmin with dbconfig-common?: Choose Yes - -(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - -[h3]Enable rewrite[/h3] - -The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load - -[code] -root@debian /var/www $ nano /etc/apache2/mods-available/rewrite.load -[/code] - - (You should find the content: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) -To enable and load mod_rewrite, do the rest of steps. -Create a symbolic link in /etc/apache2/mods-enabled - -[code] -cd /var/www -root@debian /var/www $ a2enmod rewrite -[/code] - -Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". - -[code] -root@debian /var/www $nano /etc/apache2/apache2.conf -[/code] -or -[code] -root@debian:/var# gedit /etc/apache2/sites-enabled/000-default -[/code] - -Finally, restart Apache2. - -[code] -root@debian /var/www $service apache2 restart -[/code] - -[h3]Test installation[/h3] - -[code]cd /var/www[/code] - -create a php file to test the php installation[code]nano phpinfo.php[/code] - -Insert into the file: -[code] - -[/code] -(save CTRL+0, ENTER, CTRL+X) - -open webbrowser on PC and try #^[url=http://localhost/phpinfo.php]http://localhost/phpinfo.php[/url] (page shows infos on php) - -connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf -[/code] -- CTRL+V... to the end of the file -- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] - -restart apache -[code]/etc/init.d/apache2 restart -apt-get update -apt-get upgrade -reboot[/code] - -[b]phpMyAdmin[/b] - -open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] - -(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - -[h3]Create an empty database... that is later used by the red#matrix[/h3] - - -open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] - -Create an empty database, for example named "red". -Create a database user, for example "red". -Grant all rights for the user "red" to the database "red". - -Note the access details (hostname, username, password, database name). - - -[h2]Fork the project on github[/h2] - -Please follow the instruction in the offiical [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project] documentation[/url] of git. -It is a good idea to read the whole manual! Git is different to other version control systems in many ways. - -Now you should -[list] -[*] create an account at github.com -[*] fork https://framagit.org/hubzilla/core -[*] fork https://framagit.org/hubzilla/addons -[/list] - -If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". - - -[h2]Install RED and its Addons[/h2] - -[h3]Git at your computer / vm[/h3] - -You should have created an account on github and forked the projects befor you procceed. - -Delete the directory www -[code]root@debian:/var# rm -R www/ -[/code] - -Install git (and optionally git-gui a client gui) -[code]apt-get install git git-gui[/code] - -[h3]Download red#matri and addons[/h3] - -Download the main project red and red-addons -[code] -root@debian:/var# git clone https://github.com/yourname/red www -root@debian:/var# cd www/ -root@debian:/var/www# git clone https://github.com/yourname/red-addons addon -[/code] - -Make this extra folder -[code] -root@debian:/var/www# mkdir -p "store/[data]/smarty3" -[/code] - -Create .htconfig.php and make it writable by the webserver -[code] -root@debian:/var/www# touch .htconfig.php -root@debian:/var/www# chmod ou+w .htconfig.php -[/code] - -Make user www-data (webserver) is the owner all the project files -[code] -root@debian:/var/www# cd .. -root@debian:/var# chown -R www-data:www-data www/ -[/code] - -Add yourself ("surfer" in this example) to the group www-data. Why? Later you want to modify files in eclipse or in another editor. -Then make all files writable by the group www-date you are now a member of. -[code] -root@debian:/var# cd www/ -root@debian:/var/www# usermod -G www-data surfer -root@debian:/var# chmod -R g+w www/ -[/code] - -Restart the computer (or vm) -If you are still not able to modify the project files you can check the members of the group www-data with -[code] -cat /etc/group -[/code] - -[h3]Register yourself as admin[/h3] - -Open http://localhost and init the matrix - -Befor you register a first user switch off the registration mails. -Open /var/www/.htconfig.php -and make sure "0" is set in this line -[code] -App::$config['system']['verify_email'] = 0; -[/code] -You should be able to change the file as "yourself" (instead of using root or www-data). - -[h3]Cron and the poller[/h3] - -Important! -Run the poller to pick up the recent "public" postings of your friends -Set up a cron job or scheduled task to run the poller once every 5-10 -minutes to pick up the recent "public" postings of your friends - -[code] -crontab -e -[/code] - -Add -[code] -*/10 * * * * cd /var/www/; /usr/bin/php include/poller.php -[/code] - -If you don't know the path to PHP type -[code] -whereis php -[/code] - - -[h2]Debug the server via eclipse[/h2] - -[h3]Check the configuration of xdebug[/h3] - -You shoud already have installed xdebug in the steps befor -[code] -apt-get install php5-xdebug -[/code] - -Configuring Xdebug - -Open your terminal and type as root (su -l) -[code] -gedit /etc/php5/mods-available/xdebug.ini -[/code] - -if the file is empty try this location -[code] -gedit /etc/php5/conf.d/xdebug.ini -[/code] - -That command should open the text editor gedit with the Xdebug configuration file -At the end of the file content append the following text - -xdebug.remote_enable=on -xdebug.remote_handler=dbgp -xdebug.remote_host=localhost -xdebug.remote_port=9000 - -Save changes and close the editor. -In you terminal type to restart the web server. -[code] -service apache2 restart -[/code] - - -[h3]Install Eclipse and start debugging[/h3] - -Install eclipse. -Start eclipse with default worspace (or as you like) - -Install the PHP plugin -Menu > Help > Install new software... -Install "PHP Developnent Tools ..." - -Optionally - Install the GitHub connector plugin -Menu > Help > Install new software... -Install "Eclipse Mylyn to GitHub connector" - -Configure the PHP plugin -Menu > Window > Preferences... -> General > Webbrowser > Change to "Use external web browser" -> PHP > Debug > Debug Settings > PHP Debugger > Change to "XDebug" - -Create a new PHP project -Menu > File > New Project > Choose PHP > "PHP Project" -> Choose Create project at existing location" and "/var/www" - -Start debugging -Open index.php and "Debug as..." -Choose as Launch URL: "http://localhost/" - -Expected: -[list] -[*] The web browser starts -[*] The debugger will stop at the first php line -[/list] - - -[h2]Contribute your changes via github[/h2] - -[h3]Preparations[/h3] - -There is a related page in this docs: [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]. -As stated befor it is recommended to read the official documentation [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project]GitHub-Contributing-to-a-Project[/url] of git. - -Eclipse has a usefull plugin for GIT: "Eclipse Mylyn to GitHub connector". - -Make sure you have set your data -[code] -surfer@debian:/var/www$ git config --global user.name "Your Name" -surfer@debian:/var/www$ git config --global user.email "your@mail.com" -[/code] - -[h3]Your first contribution[/h3] - -Create a descriptive topic branch -[code] -surfer@debian:/var/www$ git checkout -b dev_beginning -[/code] - -Make sure your local repository is up-to-date with the main project. -Add the original repository as a remote named “upstream” if not done yet -[code] -surfer@debian:/var/www$ git remote add upstream https://framagit.org/hubzilla/core/ -[/code] - -Fetch the newest work from that remote -[code] -surfer@debian:/var/www$ git fetch upstream -surfer@debian:/var/www$ git merge upstream/master -[/code] - -Hint: You can list the branches -[code] -surfer@debian:/var/www$ git branch -v -[/code] - -Make your changes. In this example it is a new doc file. - -Check your modifications -[code] -surfer@debian:/var/www$ git status -[/code] - -Add (stage) the new file -[code] -surfer@debian:/var/www$ git add doc/dev_beginner.bb -[/code] - -Commit the changes to your local branch. This will open an editor to provide a message. -[code] -surfer@debian:/var/www$ git commit -a -[/code] - -Push back up to the same topic branch online -[code] -surfer@debian:/var/www$ git push -[/code] - -Now you can go to your (online) account at github and create the pull request. - -[h3]Following contributions[/h3] - -In case the main devolpers want you to change something. -Fetch the newest work from the remote upstream/master to be sure you have the latest changes. -[code] -surfer@debian:/var/www$ git fetch upstream -surfer@debian:/var/www$ git merge upstream/master -[/code] -Make your changes, test them, commit (to local repository), push (to online repository) -[code] -surfer@debian:/var/www$ git status -surfer@debian:/var/www$ git commit -a -m "added modification of branch" -surfer@debian:/var/www$ git push -[/code] - - -#include doc/macros/main_footer.bb; diff --git a/doc/develop.bb b/doc/develop.bb deleted file mode 100644 index 20e987a5a..000000000 --- a/doc/develop.bb +++ /dev/null @@ -1,31 +0,0 @@ -[h2]Documentation for Developers[/h2] - -[h3]Technical Documentation[/h3] -[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl] -[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl] -[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] -[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl] -[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl] -[zrl=[baseurl]/help/Widgets]Widgets[/zrl] -[zrl=[baseurl]/help/plugins]Plugins[/zrl] -[zrl=[baseurl]/help/hooklist]Hooks (detailed - under construction)[/zrl] -[zrl=[baseurl]/help/doco]Contributing Documentation[/zrl] -[zrl=[baseurl]/help/DerivedTheme1]Creating Derivative Themes[/zrl] -[zrl=[baseurl]/help/schema_development]Schemas[/zrl] -[zrl=[baseurl]/help/Translations]Translations[/zrl] -[zrl=[baseurl]/help/developers]Developers[/zrl] -[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl] -[zrl=[baseurl]/help/database]Database schema documentation[/zrl] -[zrl=[baseurl]/help/api_functions]API functions[/zrl] -[zrl=[baseurl]/help/api_posting]Posting to $Projectname using the API[/zrl] -[zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl] -[zrl=[baseurl]/doc/html/]Code Reference (Doxygen generated - sets cookies)[/zrl] -[zrl=[baseurl]/help/to_do_doco]To-Do list for $Projectname Documentation Project[/zrl] -[zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl] -[zrl=[baseurl]/help/roadmap]Roadmap[/zrl] -[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl] -[zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl] - -[h3]External Resources[/h3] -[url=https://grid.reticu.li/channel/hubzilla]Development Channel[/url] -[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url] diff --git a/doc/developer/api_zot.bb b/doc/developer/api_zot.bb deleted file mode 100644 index ff937bfa5..000000000 --- a/doc/developer/api_zot.bb +++ /dev/null @@ -1,766 +0,0 @@ -[h3]Zot API[/h3] - -Many existing social applications and tools can interface directly using the Twitter/StatusNet API, which is available using the 'twitter_api' addon. - -This document describes the native API; which allows direct programmatic access to several internal data structures and libraries extending beyond the basic social interface. - -The API endpoints detailed below are relative to [code]api/z/1.0[/code], meaning that if an API is listed as [code]channel/stream[/code] the full API URL is [code][baseurl]/api/z/1.0/channel/stream[/code]. - -[h3]channel/export/basic[/h3] - -Export basic channel data - -Options: - - sections - comma-separated list of data types to export - - - posts - if true, return default sections plus 3 months of posts - - If no sections are requested, the following sections are returned: - channel, connections, config, apps, chatrooms, events, webpages, mail, wikis - - Files and large collections of posts may run into memory limits; these must generally be - requested separately. - - -[h3]channel/stream[/h3] - -Fetch channel conversation items - -[h3]network/stream[/h3] - - -Fetch network conversation items - - - -[h3]files[/h3] - - -List file storage (attach DB) - -GET /api/z/1.0/files - - -Options: - - - filehash - return only entries matching hash (exactly) - - - filename - return only entries matching filename (substring) - - - filetype - return only entries matching filetype/mimetype (substring) - - - start - start at record (default 0) - - - records - number of records to return or 0 for unlimited - - - -Example: - -curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/files -d filetype=multipart/mixed - - -Returns: -[code nowrap] - { - - "success": true, - "results": [ - { - "id": "1", - "aid": "1", - "uid": "2", - "hash": "44ee8b2a1a7f36dea07b93b7747a2383a1bc0fdd08339e8928bfcbe45f65d939", - "filename": "Profile Photos", - "filetype": "multipart/mixed", - "filesize": "0", - "revision": "0", - "folder": "", - "os_storage": "1", - "is_dir": "1", - "is_photo": "0", - "flags": "0", - "created": "2016-01-02 21:51:17", - "edited": "2016-01-02 21:51:17", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "" - }, - { - "id": "12", - "aid": "1", - "uid": "2", - "hash": "71883f1fc64af33889229cbc79c5a056deeec5fc277d765f182f19073e1b2998", - "filename": "Cover Photos", - "filetype": "multipart/mixed", - "filesize": "0", - "revision": "0", - "folder": "", - "os_storage": "1", - "is_dir": "1", - "is_photo": "0", - "flags": "0", - "created": "2016-01-15 00:24:33", - "edited": "2016-01-15 00:24:33", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "" - }, - { - "id": "16", - "aid": "1", - "uid": "2", - "hash": "f48f7ec3278499d1dd86b72c3207beaaf4717b07df5cc9b373f14d7aad2e1bcd", - "filename": "2016-01", - "filetype": "multipart/mixed", - "filesize": "0", - "revision": "0", - "folder": "", - "os_storage": "1", - "is_dir": "1", - "is_photo": "0", - "flags": "0", - "created": "2016-01-22 03:24:55", - "edited": "2016-01-22 03:26:57", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "" - } - ] - } -[/code] - - - -[h3]filemeta[/h3] - -Export file metadata for any uploaded file - - -[h3]filedata[/h3] - - -Provides the ability to download a file from cloud storage in chunks - -GET /api/z/1.0/filedata - - -Required: - - - file_id - attach.hash of desired file ('begins with' match) - - -Optional: - - - start - starting byte of returned data in file (counting from 0) - - - length - length (prior to base64 encoding) of chunk to download - - -Returns: - - attach (DB) structure with base64 encoded 'content' comprised of the desired chunk - - - -Example: - - https://xyz.macgirvin.com/api/z/1.0/filedata?f=&file_id=9f5217770fd&start=0&length=48 - -Returns: -[code nowrap] - { - - "attach": { - "id": "107", - "aid": "1", - "uid": "2", - "hash": "9f5217770fd55d563bd77f84d534d8e119a187514bbd391714626cd9c0e60207", - "creator": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "filename": "pcxtopbm.c", - "filetype": "application/octet-stream", - "filesize": "3934", - "revision": "0", - "folder": "", - "flags": "0", - "is_dir": "0", - "is_photo": "0", - "os_storage": "1", - "os_path": "", - "display_path": "", - "content": "LyogcGN4dG9wYm0uYyAtIGNvbnZlcnQgUEMgcGFpbnRicnVzaCAoLnBjeCkgZmls", - "created": "2016-07-24 23:13:01", - "edited": "2016-07-24 23:13:01", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "", - "start": 0, - "length": 48 - } - - } -[/code] - -[h3]file/export[/h3] - - -[h3]file[/h3] - - -[h3]albums[/h3] - - -Description: list photo albums - -GET /api/z/1.0/albums - - -Output: - - text - textual name - - total - number of photos in this album - - url - web URL - - urlencode - textual name, urlencoded - - bin2hex - textual name using bin2hex (which is used in the web URL link) - - -Example: - -[code nowrap] - { - - "success": true, - "albums": [ - { - "text": "/", - "total": "2", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/", - "urlencode": "", - "bin2hex": "" - }, - { - "text": "2016-01", - "total": "6", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3031", - "urlencode": "2016-01", - "bin2hex": "323031362d3031" - }, - { - "text": "2016-02", - "total": "7", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3032", - "urlencode": "2016-02", - "bin2hex": "323031362d3032" - }, - { - "text": "Cover Photos", - "total": "5", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/436f7665722050686f746f73", - "urlencode": "Cover+Photos", - "bin2hex": "436f7665722050686f746f73" - }, - { - "text": "Profile Photos", - "total": "26", - "url": "https://xyz.macgirvin.com/photos/hubzilla/album/50726f66696c652050686f746f73", - "urlencode": "Profile+Photos", - "bin2hex": "50726f66696c652050686f746f73" - } - ] - - } -[/code] - - -[h3]photos[/h3] - - -list photo metadata - - -[h3]photo[/h3] - - - -[h3]group[/h3] - - -[code]GET /api/z/1.0/group[/code] - -Description: list privacy groups - -Returns: DB tables of all privacy groups. - -To use with API group_members, provide either 'group_id' from the id element returned in this call, or 'group_name' from the gname returned in this call. - -[code nowrap] - [ - - { - "id": "1", - "hash": "966c946394f3e2627bbb8a55026b5725e582407098415c02f85232de3f3fde76Friends", - "uid": "2", - "visible": "0", - "deleted": "0", - "gname": "Friends" - }, - { - "id": "2", - "hash": "852ebc17f8c3ed4866f2162e384ded0f9b9d1048f93822c0c84196745f6eec66Family", - "uid": "2", - "visible": "1", - "deleted": "0", - "gname": "Family" - }, - { - "id": "3", - "hash": "cc3cb5a7f9818effd7c7c80a58b09a189b62efa698a74319117babe33ee30ab9Co-workers", - "uid": "2", - "visible": "0", - "deleted": "0", - "gname": "Co-workers" - } - ] -[/code] -[h3]group_members[/h3] - - -[code]GET /api/z/1.0/group_members[/code] - -Required: - -group_id or group_name - - -Returns: - -group_member+abook+xchan (DB join) for each member of the privacy group - -[code nowrap] - [ - - { - "id": "1", - "uid": "2", - "gid": "1", - "xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "abook_id": "2", - "abook_account": "1", - "abook_channel": "2", - "abook_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "abook_my_perms": "218555", - "abook_their_perms": "0", - "abook_closeness": "0", - "abook_created": "2016-01-02 21:16:26", - "abook_updated": "2016-01-02 21:16:26", - "abook_connected": "0000-00-00 00:00:00", - "abook_dob": "0000-00-00 00:00:00", - "abook_flags": "0", - "abook_blocked": "0", - "abook_ignored": "0", - "abook_hidden": "0", - "abook_archived": "0", - "abook_pending": "0", - "abook_unconnected": "0", - "abook_self": "1", - "abook_feed": "0", - "abook_profile": "", - "abook_incl": "", - "abook_excl": "", - "abook_instance": "", - "xchan_hash": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "xchan_guid": "lql-1VnxtiO4-WF0h72wLX1Fu8szzHDOXgQaTbELwXW77k8AKFfh-hYr70vqMrc3SSvWN-Flrc5HFhRTWB7ICw", - "xchan_guid_sig": "PafvEL0VpKfxATxlCqDjfOeSIMdmpr3iU7X-Sysa1h5LzDpjSXsjO37tYZL-accb1M5itLlfnW5epkTa5I4flsW21zSY1A2jCuBQUTLLGV7rNyyBy7lgqJUFvAMRx0TfXzP9lcaPqlM9T1tA6jfWOsOmkdzwofGeXBnsjGfjsO2xdGYe6vwjOU0DSavukvzDMnOayB9DekpvDnaNBTxeGLM45Skzr7ZEMcNF7TeXMbnvpfLaALYEKeQs9bGH-UgAG8fBWgzVAzeBfx_XSR1rdixjyiZGP0kq0h35SlmMPcEjliodOBFwMXqpXFB7Ibp4F6o6te2p2ErViJccQVG8VNKB6SbKNXY6bhP5zVcVsJ-vR-p4xXoYJJvzTN7yTDsGAXHOLF4ZrXbo5yi5gFAlIrTLAF2EdWQwxSGyLRWKxG8PrDkzEzX6cJJ0VRcLh5z6OI5QqQNdeghPZbshMFMJSc_ApCPi9_hI4ZfctCIOi3T6bdgTNKryLm5fhy_eqjwLAZTGP-aUBgLZpb1mf2UojBn6Ey9cCyq-0T2RWyk-FcIcbV4qJ-p_8oODqw13Qs5FYkjLr1bGBq82SuolkYrXEwQClxnrfKa4KYc2_eHAXPL01iS9zVnI1ySOCNJshB97Odpooc4wk7Nb2Fo-Q6THU9zuu0uK_-JbK7IIl6go2qA", - "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA18JB76lyP4zzL/y7BCej\neJnfZIWZNtM3MZvI1zEVMWmmwOS+u/yH8oPwyaDk4Y/tnj8GzMPj1lCGVRcd8EJa\nNrCMd50HODA5EsJtxpsOzRcILYjOcTtIAG1K4LtKqELi9ICAaFp0fNfa+Jf0eCek\nvPusx2/ORhy+o23hFoSMhL86o2gmaiRnmnA3Vz4ZMG92ieJEDMXt9IA1EkIqS4y5\nBPZfVPLD1pv8iivj+dtN1XjwplgjUbtxmU0/Ej808nHppscRIqx/XJ0XZU90oNGw\n/wYoK2EzJlPbRsAkwNqoFrAYlr5HPpn4BJ2ebFYQgWBUraD7HwS5atsQEaxGfO21\nlUP0+lDg9t3CXvudDj0UG1jiEKbVIGA+4aG0GN2DSC5AyRq/GRxqyay5W2vQbAZH\nyvxPGrZFO24I65g3pjhpjEsLqZ4ilTLQoLMs0drCIcRm5RxMUo4s/LMg16lT4cEk\n1qRtk2X0Sb1AMQQ2uRXiVtWz77QHMONEYkf6OW4SHbwcv5umvlv69NYEGfCcbgq0\nAV7U4/BWztUz/SWj4r194CG43I9I8dmaEx9CFA/XMePIAXQUuABfe1QMOR6IxLpq\nTHG1peZgHQKeGz4aSGrhQkZNNoOVNaZoIfcvopxcHDTZLigseEIaPPha4WFYoKPi\nUPbZ5o8gTLc750uzrnb2jwcCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "xchan_photo_mimetype": "image/png", - "xchan_photo_l": "https://xyz.macgirvin.com/photo/profile/l/2", - "xchan_photo_m": "https://xyz.macgirvin.com/photo/profile/m/2", - "xchan_photo_s": "https://xyz.macgirvin.com/photo/profile/s/2", - "xchan_addr": "teller@xyz.macgirvin.com", - "xchan_url": "https://xyz.macgirvin.com/channel/teller", - "xchan_connurl": "https://xyz.macgirvin.com/poco/teller", - "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", - "xchan_connpage": "", - "xchan_name": "Teller", - "xchan_network": "zot", - "xchan_instance_url": "", - "xchan_flags": "0", - "xchan_photo_date": "2016-10-19 01:26:50", - "xchan_name_date": "2016-01-02 21:16:26", - "xchan_hidden": "0", - "xchan_orphan": "0", - "xchan_censored": "0", - "xchan_selfcensored": "0", - "xchan_system": "0", - "xchan_pubforum": "0", - "xchan_deleted": "0" - }, - { - "id": "12", - "uid": "2", - "gid": "1", - "xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", - "abook_id": "24", - "abook_account": "1", - "abook_channel": "2", - "abook_xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", - "abook_my_perms": "218555", - "abook_their_perms": "218555", - "abook_closeness": "80", - "abook_created": "2016-01-27 00:48:43", - "abook_updated": "2016-12-04 17:16:58", - "abook_connected": "2016-12-04 17:16:58", - "abook_dob": "0001-01-01 00:00:00", - "abook_flags": "0", - "abook_blocked": "0", - "abook_ignored": "0", - "abook_hidden": "0", - "abook_archived": "0", - "abook_pending": "0", - "abook_unconnected": "0", - "abook_self": "0", - "abook_feed": "0", - "abook_profile": "debb5236efb1626cfbad33ccb49892801e5f844aa04bf81f580cfa7d13204819", - "abook_incl": "", - "abook_excl": "", - "abook_instance": "", - "xchan_hash": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", - "xchan_guid": "d5EMLlt1tHHZ0dANoA7B5Wq9UgXoWcFS9-gXOkL_AAejcPApoQRyxfHTuu8DoTbUaO-bYmX5HPuWuK9PHyqNmA", - "xchan_guid_sig": "CVWEMRPtzI1YcHfnnWHTuv3H964OAmSElgUfxMoX6RdQdxNpqb_POirpVuyP8s3W17mVCfO5V9IAjkg5iKcqCk6YcvOD_egmMy-AnM9TC1kKndQHw55CunD82Q8K_xBNSXkSROizcNkKh9DVLjJPFjW1AqtI4njkZ3EMgrWqnbFRM1qPToUoCY9zM3tEMHoAD9YX1zP90wl40LzfN-dtcNWpSBbiz9owou62uzLbN7mrCwKOMlXLjwwGswRnxIsEnb3O-FXOs8hs0mArKe9snq1-BKeD16LyzxgwlpVLElzIJZGEZGtMdIJgeRzKuBvPjsOIpQ1yAkuOpFJ3nGCM-IPOIIjAmyVl5zD3xPVcxxpZlJRn5fG1Y-gnqTgsrEQCA7M6XPWQdrdHU4akZfyUyFJDhv3uM-jon9VzrYTBw68R0WA-1Z8WafEHA4qh5OWAj85lUarwhr7iTiEckH51ypPCPs6VbT6Pw7yMaxfjFOcipashQagx0tfOlDhE5dQANOXKASFtH1J9-CZY2MQdLPQ6u54d5whuHKMGaJ0V68pnmZ2rOn7g344Ah2WCJrm17jj60QsRMorqRFj7GMdPIA1XB8Wrk88MuYOe3Dhyuu6ZWKI7YTWJS690ZVkKUqAiNHqj0W86DtaiPUc_mmGR0fHl4Gksnko3WmCFv9q2X2E", - "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoj2xCJktBA8Ww7Hp+ZNL\nrNuQpo8UB/bfvRkIy+yua3xpF1TuXcnAH61kyRz8vXgOu/l2CyxQbIoaGslCV5Sy\n8JKeNXe+IilUdSSEjMIwCPfSPsYnMHsSnHWmPmclvJwEtQUKOZmW5mMuVBvXy7D2\njomFwc69AYphdyys6eQ7Dcn6+FRBiQbyMprZ5lxyVW+O4DuXVNa3ej2ebx0gCJZ4\ntTIlBoKwEey91dY+FyKVFjdwfNczpmL7LgmZXqcVx+MG3mYgibwdVMiXVj5X06cs\nV9hJ5Xi+Aklsv/UWJtjw9FVt7y9TLptnhh4Ra6T/MDmnBBIAkOR7P/X8cRv078MT\nl0IMsP0RJcDEtTLtwHFVtDs6p52KDFqclKWbqmxmxqV3OTPVYtArRGIzgnJi/5ur\nHRr5G6Cif7QY3UowsIOf78Qvy28LwSbdymgBAWwPPKIviXWxGO+9kMWdmPSUQrWy\nK0+7YA9P9fBUFfn9Hc+p8SJQmQ6OAqLwrDGiPSOlGaNrbEqwqLGgIpXwK+lEFcFJ\n3SPOjJRWdR2whlMxvpwX+39+H7dWN3vSa3Al4/Sq7qW8yW2rYwf+eGyp4Z0lRR+8\nJxFMCwZkSw5g14YdlikAPojv5V1c6KuA5ieg8G1hwyONV7A4JHPyEdPt0W0TZi6C\nCOVkPaC3xGrguETZpJfVpwUCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "xchan_photo_mimetype": "image/png", - "xchan_photo_l": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-4", - "xchan_photo_m": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-5", - "xchan_photo_s": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-6", - "xchan_addr": "cloner@xyz.macgirvin.com", - "xchan_url": "http://abc.macgirvin.com/channel/cloner", - "xchan_connurl": "http://abc.macgirvin.com/poco/cloner", - "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", - "xchan_connpage": "", - "xchan_name": "Karen", - "xchan_network": "zot", - "xchan_instance_url": "", - "xchan_flags": "0", - "xchan_photo_date": "2016-03-31 19:59:20", - "xchan_name_date": "2016-01-26 23:23:42", - "xchan_hidden": "0", - "xchan_orphan": "0", - "xchan_censored": "0", - "xchan_selfcensored": "0", - "xchan_system": "0", - "xchan_pubforum": "0", - "xchan_deleted": "0" - } - - ] -[/code] - -[h3]xchan[/h3] - - -An xchan is a global location independent channel and is the primary record for a network -identity. It may refer to channels on other websites, networks, or services. - -[code]GET /api/z/1.0/xchan[/code] - -Required: one of [ address, hash, guid ] as GET parameters - -Returns a portable xchan structure - -Example: https://xyz.macgirvin.com/api/z/1.0/xchan?f=&address=mike@macgirvin.com - -Returns: -[code nowrap] - { - "hash": "jr54M_y2l5NgHX5wBvP0KqWcAHuW23p1ld-6Vn63_pGTZklrI36LF8vUHMSKJMD8xzzkz7s2xxCx4-BOLNPaVA", - "guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg", - "guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4", - "pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "photo_mimetype": "image/jpeg", - "photo_l": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-4", - "photo_m": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-5", - "photo_s": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-6", - "address": "mike@macgirvin.com", - "url": "https://macgirvin.com/channel/mike", - "connurl": "https://macgirvin.com/poco/mike", - "follow": "https://macgirvin.com/follow?f=&url=%s", - "connpage": "https://macgirvin.com/connect/mike", - "name": "Mike Macgirvin", - "network": "zot", - "instance_url": "", - "flags": "0", - "photo_date": "2012-12-06 05:06:11", - "name_date": "2012-12-06 04:59:13", - "hidden": "1", - "orphan": "0", - "censored": "0", - "selfcensored": "0", - "system": "0", - "pubforum": "0", - "deleted": "0" - } -[/code] -[h3]item/update[/h3] - - -Create or update an item (post, activity, webpage, etc.) - -Usage: [code]POST /api/z/1.0/item/update[/code] - -Description: item/update posts an item (typically a conversation item or post, but can be any item) using form input. - - -Required: - -- body - - text/bbcode contents by default. - - -Optional: - -- $_FILES['media'] - - uploaded media file to include with post - -- title - - title of post/item - -- contact_allow - - array of xchan.xchan_hash allowed to view this item - -- group_allow - - array of group.hash allowed to view this item - -- contact_deny - - array of xchan.xchan_hash not allowed to view this item - -- group_deny - - array of group.hash not allowed to view this item - -- coord - - geographic coordinates - -- location - - freefrom location - -- expire - - datetime this post will expire or be removed - -- mimetype - - mimetype if not text/bbcode - -- parent - - item.id of parent to this post (makes it a comment) - -- parent_mid - - alternate form of parent using message_id - -- remote_xchan - - xchan.xchan_hash of this message author if not the channel owner - -- consensus - - boolean set to true if this is a consensus or voting item (default false) - -- nocomment - - boolean set to true if comments are to be disabled (default false) - -- origin - - do not use this without reading the code - -- namespace - - persistent identity for a remote network or service - -- remote_id - - message_id of this resource on a remote network or service - -- message_id - - message_id of this item (leave unset to generate one) - -- created - - datetime of message creation - -- post_id - - existing item.id if this is an edit operation - -- app - - application or network name to display with item - -- category - - comma separated categories for this item - -- webpage - - item.page_type if not 0 - -- pagetitle - - for webpage and design elements, the 'page name' - -- layout_mid - - item.mid of layout for this design element - -- plink - - permalink for this item if different than the default - -- verb - - activitystream verb for this item/activity - -- obj_type - - activitystream object type for this item/activity - - - -Example: - - curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/item/update -d body="hello world" - - -Returns: - -[code nowrap] - { - - "success": true, - "item_id": "2245", - "item": { - "id": "2245", - "mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "aid": "1", - "uid": "2", - "parent": "2245", - "parent_mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "thr_parent": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "created": "2016-12-03 20:00:12", - "edited": "2016-12-03 20:00:12", - "expires": "0001-01-01 00:00:00", - "commented": "2016-12-03 20:00:12", - "received": "2016-12-03 20:00:12", - "changed": "2016-12-03 20:00:12", - "comments_closed": "0001-01-01 00:00:00", - "owner_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "author_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", - "source_xchan": "", - "mimetype": "text/bbcode", - "title": "", - "body": "hello world", - "html": "", - "app": "", - "lang": "", - "revision": "0", - "verb": "http://activitystrea.ms/schema/1.0/post", - "obj_type": "http://activitystrea.ms/schema/1.0/note", - "obj": "", - "tgt_type": "", - "target": "", - "layout_mid": "", - "postopts": "", - "route": "", - "llink": "https://xyz.macgirvin.com/display/14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "plink": "https://xyz.macgirvin.com/channel/mychannel/?f=&mid=14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", - "resource_id": "", - "resource_type": "", - "attach": "", - "sig": "sa4TOQNfHtV13HDZ1tuQGWNBpZp-nWhT2GMrZEmelXxa_IvEepD2SEsCTWOBqM8OKPJLfNy8_i-ORXjrOIIgAa_aT8cw5vka7Q0C8L9eEb_LegwQ_BtH0CXO5uT30e_8uowkwzh6kmlVg1ntD8QqrGgD5jTET_fMQOIw4gQUBh40GDG9RB4QnPp_MKsgemGrADnRk2vHO7-bR32yQ0JI-8G-eyeqGaaJmIwkHoi0vXsfjZtU7ijSLuKEBWboNjKEDU89-vQ1c5Kh1r0pmjiDk-a5JzZTYShpuhVA-vQgEcADA7wkf4lJZCYNwu3FRwHTvhSMdF0nmyv3aPFglQDky38-SAXZyQSvd7qlABHGCVVDmYrYaiq7Dh4rRENbAUf-UJFHPCVB7NRg34R8HIqmOKq1Su99bIWaoI2zuAQEVma9wLqMoFsluFhxX58KeVtlCZlro7tZ6z619-dthS_fwt0cL_2dZ3QwjG1P36Q4Y4KrCTpntn9ot5osh-HjVQ01h1I9yNCj6XPgYJ8Im3KT_G4hmMDFM7H9RUrYLl2o9XYyiS2nRrf4aJHa0UweBlAY4zcQG34bw2AMGCY53mwsSArf4Hs3rKu5GrGphuwYX0lHa7XEKMglwBWPWHI49q7-oNWr7aWwn1FnfaMfl4cQppCMtKESMNRKm_nb9Dsh5e0", - "diaspora_meta": "", - "location": "", - "coord": "", - "public_policy": "", - "comment_policy": "contacts", - "allow_cid": "", - "allow_gid": "", - "deny_cid": "", - "deny_gid": "", - "item_restrict": "0", - "item_flags": "0", - "item_private": "0", - "item_origin": "1", - "item_unseen": "0", - "item_starred": "0", - "item_uplink": "0", - "item_consensus": "0", - "item_wall": "1", - "item_thread_top": "1", - "item_notshown": "0", - "item_nsfw": "0", - "item_relay": "0", - "item_mentionsme": "0", - "item_nocomment": "0", - "item_obscured": "0", - "item_verified": "1", - "item_retained": "0", - "item_rss": "0", - "item_deleted": "0", - "item_type": "0", - "item_hidden": "0", - "item_unpublished": "0", - "item_delayed": "0", - "item_pending_remove": "0", - "item_blocked": "0" - } - - } -[/code] -[h3]item/full[/h3] - - -Get all data associated with an item - -[h3]abook[/h3] - - -Connections - -[h3]abconfig[/h3] - - -Connection metadata (such as permissions) - -[h3]perm_allowed[/h3] - - -Check a permission for a given xchan diff --git a/doc/developer/covenant.bb b/doc/developer/covenant.bb deleted file mode 100644 index 431cc74e9..000000000 --- a/doc/developer/covenant.bb +++ /dev/null @@ -1,47 +0,0 @@ -[size=large]Contributor Covenant Code of Conduct[/size] - -[h3]Our Pledge[/h3] - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -[h3]Our Standards[/h3] - -Examples of behavior that contributes to creating a positive environment -include: - -[list] - [*]Using welcoming and inclusive language - [*]Being respectful of differing viewpoints and experiences - [*]Gracefully accepting constructive criticism - [*]Focusing on what is best for the community - [*]Showing empathy towards other community members -[/list] - -Examples of unacceptable behavior by participants include: - -[list] - [*]The use of sexualized language or imagery and unwelcome sexual attention or advances - [*]Trolling, insulting/derogatory comments, and personal or political attacks - [*]Public or private harassment - [*]Publishing others' private information, such as a physical or electronic address, without explicit permission - [*]Other conduct which could reasonably be considered inappropriate in a professional setting -[/list] - -[h3]Our Responsibilities[/h3] - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -[h3]Scope[/h3] - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -[h3]Enforcement[/h3] - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at project@hubzilla.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -[h3]Attribution[/h3] - -This Code of Conduct is adapted from the [url=http://contributor-covenant.org]Contributor Covenant[/url], version 1.4, available at [url=http://contributor-covenant.org/version/1/4/]http://contributor-covenant.org/version/1/4[/url]. - diff --git a/doc/developer/developer_guide.bb b/doc/developer/developer_guide.bb deleted file mode 100644 index d04cec121..000000000 --- a/doc/developer/developer_guide.bb +++ /dev/null @@ -1,176 +0,0 @@ -[h3]Who is a $Projectname developer? Should I read this?[/h3] - -Anyone who contributes to making $Projectname better is a developer. There are many different and important ways you can contribute to this amazing technology, [i]even if you do not know how to write code[/i]. The software itself is only a part of the $Projectname project. You can contribute by -[list] -[*] translating text to your language so that people around the world have the opportunity to use $Projectname -[*] promoting $Projectname and spreading awareness of the platform through blog posts, articles, and word-of-mouth -[*] creating artwork and graphics for project assets such as icons and marketing material -[*] supporting project infrastructure like the project website and demo servers -[/list] -[i]Software[/i] developers are of course welcomed; there are so many great ideas to implement and not enough people to make them all a reality! The $Projectname code base is an advanced and mature system, but the platform is still very flexible and responsive to new ideas. - -We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/developer/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. - -This document will help you get started learning and contributing to $Projectname. - -[h3]Versions and Releases[/h3] - -$Projectname currently uses a standard version numbering sequence of $x.$y(.$z), for instance '1.12' or '1.12.1'. The first digit is the major version number. Major versions are released "roughly" once per year; often in December. - -The second digit is the minor release number. If this number is odd, it is a development version. If the number is even, it is a released version. Minor versions are released (moved from dev to master) typically once per month when development is 'stable', but this is likely to increase. Going forward minor releases will be made somewhere between one and three months; corresponding to a stable code point and when there is general community consensus that the current code base is stable enough to consider a release. - -The final digit is an interface or patch designator. - -The release process involves changing the version number (by definition the minor version number will be odd, and the minor number will be incremented). Once a year for a major release the major version will be incremented, and the minor number reset to 0. - -The release candidate is moved to a new branch; and testing will commence/continue for a period of 1-2 weeks afterward or until any significant issues have been resolved. This branch is usually labelled with RC (release candidate); for instance 1.8RC represents the pending release of version 1.8. At this time, the minor version number on the dev branch is incremented to the next odd number. (For instance 1.9). New development can then take place in the dev branch. - -Bug fixes should always be applied to 'dev' and from there merged forward (typically with git cherry-pick) to the RC branch and if necessary applied to the master or official release branch. - -At the time a release candidate is produced, the language strings file is frozen until a release is made. Translation work may continue, but all translations should be submitted to 'dev' and merged forward to RC. - -Once RC testing is completed, RC is merged to 'master' and the RC version designator removed; resulting in one final checkin to change the version number. The CHANGELOG file should also be updated at or just prior to this time. If there are merge conflicts during this final merge, the merge will be abandoned; and 'git merge -s ours' applied. This results in a replacement of master with the contents of the RC branch. Conflicts often arise with string updates which were made to master after the last release and cannot easily be resolved without hand editing. Since this is a release of tested code, hand editing is discouraged, and the replacement merge strategy should be used instead. It is assumed that RC now contains the most recent well-tested code. - -Once the release is live and merged to master, the RC branch may be removed. - -Fixes may be made to master after release. Where possible these should be made to dev and 'git cherry-pick' used to merge forward; which preserves the commit info and prevents merge conflicts in the next cycle. Only rarely does a patch only apply to the master branch. If necessary this can be made. If the change is severe, the interface version number should be incremented. This is at the discretion of the community. In any event, a 'git pull' of the master branch should always result in the latest release with any post-release patches applied. - -The interface number (the $z in $x.$y.$z) should be incremented in dev whenever a change is made which changes the interfaces or API in incompatible ways so that any external packages (especially addons and API clients) relying on a the current behaviour can discover and change their own interfaces accordingly at the point that it changed. - -[h3]Git repository branches[/h3] - -There are two official branches of the $Projectname git repo. -[list] -[*] The stable version is maintained on the [b]master[/b] branch. The latest commit in this branch is considered to be suitable for production hubs. -[*] Experimental development occurs on the [b]dev[/b] branch, which is merged into [b]master[/b] when it is deemed tested and stable enough. -[/list] - -[h3]Developer tools and workflows[/h3] - -[h4]Hub Snapshots[/h4] - -The [url=[baseurl]/help/admin/hub_snapshots]hub snapshots[/url] page provides instructions and scripts for taking complete snapshots of a hub to support switching between consistent and completely known states. This is useful to prevent situations where the content or database schema might be incompatible with the code. - -[h3]Translations[/h3] - -Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/Friendica/hubzilla/]Transifex[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. - -[h4]Translation Process[/h4] - -The strings used in the UI of $Projectname is translated at [url=https://www.transifex.com/Friendica/hubzilla/]Transifex[/url] and then -included in the git repository at github. If you want to help with translation -for any language, be it correcting terms or translating $Projectname to a -currently not supported language, please register an account at transifex.com -and contact the translation team there. - -Translating $Projectname is simple. Just use the online tool at transifex. If you -don't want to deal with git & co. that is fine, we check the status of the translations -regularly and import them into the source tree at github so that others can use them. - -We do not include every translation from transifex in the source tree to avoid -a scattered and disturbed overall experience. As an uneducated guess we have a -lower limit of 50% translated strings before we include the language. This -limit is judging only by the amount of translated strings under the assumption -that the most prominent strings for the UI will be translated first by a translation -team. If you feel your translation useable before this limit, -please contact us and we will probably include your teams work in the source tree. - -If you want to get your work into the source tree yourself, feel free to do so -and contact us with and question that arises. The process is simple and -$Projectname ships with all the tools necessary. - -The location of the translated files in the source tree is - /view/LNG-CODE/ -where LNG-CODE is the language code used, e.g. de for German or fr for French. -For the email templates (the *.tpl files) just place them into the directory -and you are done. The translated strings come as a "hmessages.po" file from -Transifex which needs to be translated into the PHP file $Projectname uses. To do -so, place the file in the directory mentioned above and use the "po2php" -utility from the util directory of your $Projectname installation. - -Assuming you want to convert the German localization which is placed in -view/de/hmessages.po you would do the following. - -1. Navigate at the command prompt to the base directory of your - $Projectname installation - -2. Execute the po2php script, which will place the translation - in the hstrings.php file that is used by $Projectname. - - $> php util/po2php.php view/de/hmessages.po - - The output of the script will be placed at view/de/hstrings.php where - froemdoca os expecting it, so you can test your translation mmediately. - -3. Visit your $Projectname page to check if it still works in the language you - just translated. If not try to find the error, most likely PHP will give - you a hint in the log/warnings.about the error. - - For debugging you can also try to "run" the file with PHP. This should - not give any output if the file is ok but might give a hint for - searching the bug in the file. - - $> php view/de/hstrings.php - -4. commit the two files with a meaningful commit message to your git - repository, push it to your fork of the $Projectname repository at github and - issue a pull request for that commit. - -[h4]Utilities[/h4] - -Additional to the po2php script there are some more utilities for translation -in the "util" directory of the $Projectname source tree. If you only want to -translate $Projectname into another language you wont need any of these tools most -likely but it gives you an idea how the translation process of $Projectname -works. - -For further information see the utils/README file. - -[h4]Known Problems[/h4] - -* $Projectname uses the language setting of the visitors browser to determain the - language for the UI. Most of the time this works, but there are some known - quirks. -* the early translations are based on the friendica translations, if you - some rough translations please let us know or fix them at Transifex. - -[h3]Licensing[/h3] - -All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. - -[h3]Coding Style[/h3] - -In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. -[list] -[*]All comments should be in English. -[*]We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged. -[*]Indentation is accomplished primarily with tabs using a tab-width of 4. -[*]String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';" -[*]Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes. -[*]Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability. -[*]Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. -[*]Some functions take arguments in argc/argv style like main() in C or function args in bash or Perl. Urls are broken up within a module. e.g, given "http://example.com/module/arg1/arg2", then $this->argc will be 3 (integer) and $this->argv will contain: [0] => 'module', [1] => 'arg1', [2] => 'arg2'. There will always be one argument. If provided a naked domain URL, $this->argv[0] is set to "home". -[/list] - -[h3]File system layout[/h3] -[table border=0] -[th]Directory[/th][th]Description[/th][/tr] -[tr][td]addon[/td][td]optional addons/plugins[/td][/tr] -[tr][td]boot.php[/td][td]Every process uses this to bootstrap the application structure[/td][/tr] -[tr][td]doc[/td][td]Help Files[/td][/tr] -[tr][td]images[/td][td]core required images[/td][/tr] -[tr][td]include[/td][td]The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing[/td][/tr] -[tr][td]index.php[/td][td]The front-end controller for web access[/td][/tr] -[tr][td]install[/td][td]Installation and upgrade files and DB schema[/td][/tr] -[tr][td]library[/td][td]Third party modules (must be license compatible)[/td][/tr] -[tr][td]mod[/td][td]Controller modules based on URL pathname (e.g. [url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php)[/td][/tr] -[tr][td]mod/site/[/td][td]site-specific mod overrides, excluded from git[/td][/tr] -[tr][td]util[/td][td]translation tools, main English string database and other miscellaneous utilities[/td][/tr] -[tr][td]version.inc[/td][td]contains current version (auto-updated via cron for the master repository and distributed via git)[/td][/tr] -[tr][td]view[/td][td]theming and language files[/td][/tr] -[tr][td]view/(css,js,img,php,tpl)[/td][td]default theme files[/td][/tr] -[tr][td]view/(en,it,es ...)[/td][td]language strings and resources[/td][/tr] -[tr][td]view/theme/[/td][td]individual named themes containing (css,js,img,php,tpl) over-rides[/td][/tr] -[/table] - -[b][url=[baseurl]/help/developer/unorganized]More information needing re-organization and updating...[/url][/b] diff --git a/doc/developer/testing.md b/doc/developer/testing.md deleted file mode 100644 index f7e8ffeba..000000000 --- a/doc/developer/testing.md +++ /dev/null @@ -1,130 +0,0 @@ -# Testing - -Hubzilla uses [PHPUnit] for automated testing, often called _unit testing_ or _integration testing_. - -The tests are written as PHP classes, and live under the `tests/unit` subdirectory of the main Hubzilla repository. This guide will explain how to run the tests, how the tests are structured, and how you can write your own tests. - -## Running the test suite - -### Installing the dependencies - -To be able to run the tests you have to install the developer dependencies listen in the `composer.json` file. Make sure you have [composer installed] on your development system, and then run: - - % composer install - -This will install phpunit and a few other dependencies. It will also update some files in the `vendor/composer` subdirectory. This may seem a bit noisy, but it's important that these changes are *not* committed to the repository! - -**Warning:** Do not commit the changes to the files in the `vendor/composer` directory to your repository! - -### Setting up the test database - -We have included a script (`tests/create_test_db.sh`) that will help you set up the test database. You can run it like this: - - % HZ_TEST_DB_TYPE=mysql ./tests/create_test_db.sh - -If you are running PostgreSQL instead, you create the test db like this: - - % HZ_TEST_DB_TYPE=postgres ./tests/create_test_db.sh - -The script make some assumptions about your setup, but everything is configurable using environment variables. If you need any customization, see the script source for the details. - -### Running the tests - -Once you have installed the developer dependencies and set up the test database, you can run the tests like this: - - % ./vendor/bin/phpunit -c tests/phpunit.xml - -Again, by default the configuration in `tests/phpunit.xml` makes some assumptions about your setup, which can be overridden using environment variables. See `tests/phpunit.xml` for the details. - -You can also run a specific test, or a specific set of tests using the `--filter` argument to PHPUnit: - - % ./vendor/bin/phpunit -c tests/phpunit.xml --filter Autoname - -Will run any test mathcing "Autoname". - -### Generating coverage reports - -To generate coverage reports you need a driver that is able to generate the coverage info that PHPUnit will collect. We recommend [Xdebug], but see the PHPUnit [page on code coverage analysis](https://docs.phpunit.de/en/9.6/code-coverage-analysis.html) for alternatives and details. - -With Xdebug properly set up, you can generate the coverage report like this: - - % XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./tests/phpunit.xml - -This will generate a number of HTML files in directories under the `tests/results/coverage/` subdirectory. - -Open the `index.php file in your web browser to view the stats. - -### Debugging - -With Xdebug installed, you can also do step debugging and a number of other things to debug and get information about the execution of the tests. See the [Xdebug] pages and your prefered editor for how to set this up. - -## Test structure and organization - -Tests are located in the `tests/unit` subdirectory, and subdirectories under there again, more or less reflecting the directory layout of the core code repository. - -Tests are written as PHP classes that extends the UnitTestCase class (located in `tests/unit/UnitTestcase.php`). The file name and the test class it contains should be the same, and they _must_ end with `Test.php`. - -Examples are: - -* `tests/unit/includes/AccountTest.php` -* `tests/unit/Lib/ActivityTest.php` - -The test classes contain one or more test functions, these must be public and prefixed with `test`. - -Here's an example: - - use Zotlabs\Tests\Unit\UnitTestCase; - - class AccountTest extends UnitTestCase { - public function test_get_account_by_id_returns_existing_account() { - $account = get_account_by_id(42); - $this->assertNotFalse($account); - $this->assertEquals( - $this->fixtures['account'][0]['account_email'], - $account['account_email'] - ); - } - -Notice that we try to make the name of the test funtion as descriptive as possible. - -The class can also contain any number of other functions to keep things tidy and nice. These can be private, protected or public as needed by the test code. - -Results and artifacts from the test runs will be left in the `tests/results/` directory. This will typically include the test log, code coverage report etc. - -### Hubzilla specific features - -#### Test database access: - -Ideally it should be able to test each part of the code in isolation, where any dependencies should be replaced by stubs, mocks or fakes. - -This is not feasible with a legacy codebase like Hubzilla, that has not been written with testability in mind. For this reason we use a separate test database, and make it available to the code under test using the same mechanisms as Hubzilla normally do. - -This means that any code that executes database queries will behave as normal when called by a test. - -To make this work we connect to the database before running each test function. We also load some initial data into the database to make sure things work as expected, and that we have a known state of the database when the test runs. - -When the test finishes, the test database is wiped clean, so that we have the same consistent state when the next test runs. - -All of this is handled by the `UnitTestCase` base class. - -#### Database fixtures: - -We need some predictable content in the database to set up things like logging, and other content that's useful in general for the tests. These are database fixtures that are loaded into the database for each test run. - -The database fixtures are located in the `tests/unit/include/dba/_files` directory, and consist of YAML files, where each file represents the content of a database table with the same name as the file itself. - -While database fixtures are nice to have, we try to keep the number of them as minimal as possible. It's usually better to add any content needed for a specific test in the test itself. - -#### Fakes: - -Fakes are classes that we can pass to the code under test that will look and (to the code under test) behave the same as the original class. These are useful when we're able to pass objects to the code under test, as we can control it completely from the test code. - -Fakes are located under the `tests/fakes` directory. - -## Writing your own tests - -To be done - -[PHPUnit]: https://phpunit.de -[composer installed]: https://getcomposer.org/ -[Xdebug]: https://xdebug.org/ \ No newline at end of file diff --git a/doc/developer/unorganized.md b/doc/developer/unorganized.md deleted file mode 100644 index 5ba719226..000000000 --- a/doc/developer/unorganized.md +++ /dev/null @@ -1,73 +0,0 @@ -### To-be-organized information - -**Here is how you can join us.** - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -You may fork/clone the Red repository from [https://framagit.org/hubzilla/core.git](https://framagit.org/hubzilla/core.git). - -Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) -to create and use your own tracking fork on github - -Then go to your github page and create a "Pull request" when you are ready -to notify us to merge your work. - - -**Important** - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. - -Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. - -**How to theme Hubzilla** - -This is a short documentation on what I found while trying to modify Hubzilla's appearance. - -First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . - -Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). - -At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). - -Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. - - -We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. - -**Here is how you can join us.** - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -You may fork/clone the Red repository from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] - -Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] -to create and use your own tracking fork on github - -Then go to your github page and create a "Pull request" when you are ready -to notify us to merge your work. - - -**Important** - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. - -Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. - -Further documentation can be found at the Github wiki pages at: [url=https://github.com/friendica/red/wiki]https://github.com/friendica/red/wiki[/url] - -**Concensus Building** - -Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature. - -We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to [url=https://zothub.com/channel/one]Channel One[/url]. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. - -There are places where opposition cannot be resolved. In these cases, please consider making your feature **optional** or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off. - -If a feature uses other networks or websites and or is only seen as desirable by a small minority of the community, consider making the functionality available via an addon or plugin. Once again, those who don't desire the feature won't need to install it. Plugins are relatively easy to create and "hooks" can be easily added or modified if the current hooks do not do what is needed to allow your plugin to work. - diff --git a/doc/developer/zot_protocol.bb b/doc/developer/zot_protocol.bb deleted file mode 100644 index e9355bca8..000000000 --- a/doc/developer/zot_protocol.bb +++ /dev/null @@ -1,478 +0,0 @@ -[h3] What is Zot?[/h3] -Zot is the revolutionary protocol that powers $Projectname, providing [b]communications[/b], [b]identity management[/b], and [b]access control[/b] across a fully [b]decentralised[/b] network of independent websites, often called "the grid". The resulting platform is a robust system that supports privacy and security while enabling the kind of rich web services typically seen only in centralized, proprietary solutions. - -Consider this typical scenario: - -Jaquelina wishes to share photos with Roberto from her blog at [b]jaquelina.org[/b], but to nobody else. Roberto maintains his own family hub at [b]roberto.net[/b] on a completely independent server. Zot allows Jaquelina to publish her photos using an [i]access control list (ACL)[/i] that includes only Roberto. That means that while Roberto can see the photos when he visits her blog, his brother Marco cannot, and neither can any of his other family members who have accounts on [b]roberto.net[/b]. - -The magic in this scenario comes from the fact that Roberto never logged in to Jaquelina's website. Instead, he had to login only once using his password on his [i]own[/i] website at [b]roberto.net[/b]. When Roberto visits [b]jaquelina.org[/b], her hub seamlessly authenticates him by remotely querying his server in the background. - -It is not uncommon for servers to have technical problems or become inaccessible for a variety of reasons. Zot provides robustness for Roberto's online activities by allowing him to have [i]clones[/i] of his online identity, or [i]channel[/i], on multiple independent hubs. Imagine that Roberto's server crashes for some reason and he cannot log in there. He simply logs in to one of his clones at [b]gadfly.com[/b], a site operated by his friend Peter. Once authenticated at [b]gadfly.com[/b], Roberto can view Jaquelina's blog as before, without Jaquelina having to grant any additional access! - -[h4] Communications[/h4] -Communications and social networking are an integral part of the grid. Any channel (and any services provided by that channel) can make full use of feature-rich social communications on a global scale. These communications may be public or private - and private communications comprise not only fully encrypted transport, but also encrypted storage to help protect against accidental snooping and disclosure by rogue system administrators and internet service providers. - -Zot supports a wide array of background services in the grid, from friend suggestions to directory services. New content and data updates are propagated in the background between hubs across the grid according to access control lists and permissions specified by both sender [i]and[/i] receiver channels. Data is also synchronized between an arbitrary number of channel clones, allowing hub members to access data and continue collaborating seamlessly in the event that their primary hub is inaccessible or offline. - -[h4] Identity [/h4] -Zot's identity layer is unique. It provides [b]invisible single sign-on[/b] across all sites in the grid. - -It also provides [b]nomadic identity[/b], so that your communications with friends, family, and or anyone else you're communicating with won't be affected by the loss of your primary communication node - either temporarily or permanently. - -The important bits of your identity and relationships can be backed up to a thumb drive, or your laptop, and may appear at any node in the grid at any time - with all your friends and preferences intact. - -Crucially, these nomadic instances are kept in sync so any instance can take over if another one is compromised or damaged. This protects you against not only major system failure, but also temporary site overloads and governmental manipulation or censorship. - -Nomadic identity, single sign-on, and $Projectname's decentralisation of hubs, we believe, introduce a high degree of degree of [b]resiliency[/b] and [b]persistence[/b] in internet communications, that are sorely needed amidst global trends towards corporate centralization, as well as mass and indiscriminate government surveillance and censorship. - -As you browse the grid, viewing channels and their unique content, you are seamlessly authenticated as you go, even across completely different server hubs. No passwords to enter. Nothing to type. You're just greeted by name on every new site you visit. - -How does Zot do that? We call it [b]magic-auth[/b], because $Projectname hides the details of the complexities that go into single sign-on logins, and nomadic identities, from the experience of browsing on the grid. This is one of the design goals of $Projectname: to increase privacy, and freedom on the web, while reducing the complexity and tedium brought by the need to enter new passwords and login names for every different sight that someone might visit online. You login only once on your home hub (or any nomadic backup hub you have chosen). This allows you to access any authenticated services provided anywhere in the grid - such as shopping, blogs, forums, and access to private information. Your password isn't stored on a thousand different sites; it is stored on servers that you control or that you have chosen to trust. - -You cannot be silenced. You cannot be removed from the grid unless you yourself choose to exit it. - -[h4] Access Control[/h4] -Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the grid. This is like having one super huge website made up of an army of small individual websites - and where each channel in the grid can completely control their privacy and sharing preferences for any web resources they create. - -Currently, $Projectname supports access control for many types of data, including post/comment discussion threads, photo albums, events, cloud files, web pages, wikis, and more. Every object and how it is shared and with whom is completely under your control. - -This type of control is trivial on large corporate providers because they own the user database. Within the grid, there is no need for a huge user database on your machine - because the grid [b]is[/b] your user database. It has what is essentially infinite capacity (limited by the total number of hubs online across the internet), and is spread amongst hundreds, and potentially millions of computers. - -Access can be granted or denied for any resource, to any channel, or any group of channels; anywhere within the grid. Others can access your content if you permit them to do so, and they do not even need to have an account on your hub. - -[h3]Technical Introduction[/h3] -Zot is a JSON-based web framework for implementing secure decentralised communications and services. In order to provide this functionality, Zot creates a decentralised globally unique identifier for each hub on the network. This global identifier is not linked inextricably to DNS, providing the requisite mobility. Many existing decentralised communications frameworks provide the communication aspect, but do not provide remote access control and authentication. Additionally most of these are based on 'webfinger', which still binds identity to domain names and cannot support nomadic identity. - -The primary issues Zot addresses are - -[list] -[*] completely decentralised communications -[*] independence from DNS-based identity -[*] node mobility -[*] seamless remote authentication -[*] high performance -[/list] -We will rely on DNS-based user@host addresses as a "user-friendly" mechanism to let people know where you are, specifically on a named host with a given username, and communication will be carried out to DNS entities using TCP and the web. - -But the underlying protocol will provide an abstraction layer on top of this, so that a communications node (e.g. "identity") can move to an alternate DNS location and (to the best of our ability) gracefully recover from site re-locations and/or maintain pre-existing communication relationships. A side effect of this requirement is the ability to communicate from alternate/multiple DNS locations and service providers and yet maintain a single online identity. - -We will call this overlay network the "grid". Servers attached to this network are known as "hubs" and may support any number of individual identities. - -An identity does not necessarily correspond to a person. It is just something which requires the ability to communicate within the grid. - -The ability to recover will be accomplished by communication to the original location when creating a new or replacement identity, or as a fallback from a stored file describing the identity and their contacts in the case where the old location no longer responds. - -At least on the short term, the mobility of existing content is not a top priority. This may or may not take place at a later stage. The most important things we want to keep are your identity and your friends. - -Addresses which are shared amongst people are user@host, and which describe the [b]current[/b] local account credentials for a given identity. These are DNS based addresses and used as a seed to locate a given identity within the grid. The machine communications will bind this address to a globally unique ID. A single globally unique ID may be attached or bound to any number of DNS locations. Once an identity has been mapped or bound to a DNS location, communications will consist of just knowing the globally unique address, and what DNS (url) is being used currently (in order to call back and verify/complete the current communication). These concepts will be specified in better detail. - -In order for an identity to persist across locations, one must be able to provide or recover - -[list] -[*] the globally unique ID for that identity -[*] the private key assigned to that identity -[*] (if the original server no longer exists) an address book of contacts for that identity. -[/list] -This information will be exportable from the original server via API, and/or downloadable to disk or thumb-drive. - -We may also attempt to recover with even less information, but doing so is prone to account hijacking and will require that your contacts confirm the change. - -In order to implement high performance communications, the data transfer format for all aspects of Zot is JSON. XML communications require way too much overhead. - -Bi-directional encryption is based on RSA 4096-bit keys expressed in DER/ASN.1 format using the PKCS#8 encoding variant, with AES encryption of variable length or large items. The precise encryption algorithms are negotiable between sites. - -Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. $Projectname project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. - -In order to create a globally unique ID, we will base it on a whirlpool hash of the identity URL of the origination node and a psuedo-random number, which should provide us with a 256 bit ID with an extremely low probability of collision (256 bits represents approximately 115 quattuorviginitillion or 1.16 X 10^77 unique numbers). This will be represented in communications as a base64url-encoded string. We will not depend on probabilities however and the ID must also be attached to a public key with public key cryptography used to provide an assurance of identity which has not been copied or somehow collided in whirlpool hash space. - -Basing this ID on DNS provides a globally unique seed, which would not be the case if it was based completely on psuedo-random number generation. - -We will refer to the encoded globally unique uid string as zot_uid - -As there may be more than one DNS location attached/bound to a given zot_uid identity, delivery processes should deliver to all of them - as we do not know for sure which hub instance may be accessed at any given time. However we will designate one DNS location as "primary" and which will be the preferred location to view web profile information. - -We must also provide the ability to change the primary to a new location. A look-up of information on the current primary location may provide a "forwarding pointer" which will tell us to update our records and move everything to the new location. There is also the possibility that the primary location is defunct and no longer responding. In that case, a location which has already been mapped to this zot_uid can seize control, and declare itself to be primary. In both cases the primary designation is automatically approved and moved. A request can also be made from a primary location which requests that another location be removed. - -In order to map a zot_uid to a second (or tertiary) location, we require a secure exchange which verifies that the new location is in possession of the private key for this zot_uid. Security of the private key is thus essential to avoid hijacking of identities. - -Communications will then require -[list] -[*] zot_uid (string) -[*] uid_sig -[*] callback (current location Zot endpoint url) -[*] callback_sig -[*] spec (int) -[/list] -passed with every communique. The spec is a revision number of the applicable Zot spec so that communications can be maintained with hubs using older and perhaps incompatible protocol specifications. Communications are verified using a stored public key which was copied when the connection to this zot_uid was first established. - -Key revocation and replacement must take place from the primary hub. The exact form for this is still being worked out, but will likely be a notification to all other bound hubs to "phone home" (to the primary hub) and request a copy of the new key. This communique should be verified using a site or hub key; as the original identity key may have been compromised and cannot be trusted. - -In order to eliminate confusion, there should be exactly one canonical url for any hub, so that these can be indexed and referenced without ambiguity. - -So as to avoid ambiguity of scheme, it is strongly encouraged that all addresses to be https with a "browser valid" cert and a single valid host component (either www.domain.ext or domain.ext, but not both), which is used in all communications. Multiple URLs may be provided locally, but only one unique URL should be used for all Zot communications within the grid. - -Test installation which do not connect to the public grid may use non-SSL, but all traffic flowing over public networks should be safe from session-hijacking, preferably with a "browser recognised" cert. - -Where possible, Zot encourages the use of "batching" to minimise network traffic between two hubs. This means that site 'A' can send multiple messages to site 'B' in a single transaction, and also consolidate deliveries of identical messages to multiple recipients on the same hub. - -Messages themselves may or may not be encrypted in transit, depending on the private nature of the messages. SSL (strongly encouraged) provides unconditional encryption of the data stream, however there is little point in encrypting public communications which have been designated as having unrestricted visibility. The encryption of data storage and so-called "end-to-end encryption" is outside the scope of zot. It is presumed that hub operators will take adequate safeguards to ensure the security of their data stores and these are functions of application and site integrity as opposed to protocol integrity. - - -[h4]Messages[/h4] - -Given the constraints listed previously, a Zot communique should therefore be a json array of individual messages. These can be mixed and combined within the same transmission. - -Each message then requires: -[list] -[*] type -[*] (optional) recipient list -[/list] -Lack of a recipient list would indicate an unencrypted public or site level message. The recipient list would contain an array of zot_uid with an individual decryption key, and a common iv. The decryption key is encoded with the recipient identity's public key. The iv is encrypted with the sender's private key. - -All messages should be digitally signed by the sender. - -The type can be one of (this list is extensible): -[list] -[*] post (or activity) -[*] mail -[*] identity -[*] authenticate -[/list] -Identity messages have no recipients and notify the system social graph of an identity update, which could be a new or deleted identity, a new or deleted location, or a change in primary hub. The signature for these messages uses system keys as opposed to identity-specific keys. - -Posts include many different types of activities, such as top-level posts, likes/dislikes, comments, tagging activities, etc. These types are indicated within the message sturcture. - -authenticate messages result in mutual authentication and browser redirect to protected resources on the remote hub such as the ability to post wall-to-wall messages and view private photo albums and events, etc. - -[h4]Discovery[/h4] - -A well-known url is used to probe a hub for Zot capabilities and identity lookups, including the discovery of public keys, profile locations, profile photos, and primary hub location. - -The location for this service is /.well-known/zot-info - and must be available at the root of the chosen domain. - -To perform a lookup, a POST request is made to the discovery location with the following parameters: - -Required: - -address => an address on the target system such as "john" - -Optional - -target => the Zot "guid" of the observer for evaluating permissions - -target_sig => an RSA signature (base64url encoded) of the guid - -key => The public key needed to verify the signature - -token => a string (possibly random) chosen by the requesting service. If provided, an entry in the discovered packet will be provided called 'signed_token' which consists of the base64url_encoded RSA signature of the concatenation of the string 'token.' and the provided token using the private key of the discovered channel. This can be verified using the provided 'key' entry, and provides assurance that the server is in possession of the private key for the discovered identity. After 2017-01-01 it is [b]required[/b] that a server provide a signed_token [i]if[/i] a token was provided in the request. - -With no target provided, the permissions returned will be generic permissions -for unknown or unauthenticated observers - -Example of discovery packet for 'mike@zothub.com' -[code nowrap] - { - - "success": true, - "signed_token": "KBJrKTq1qrctNuxF3GwVh3GAGRqmgkirlXANPcJZAeWlvSt_9TMV097slR4AYnYCBEushbVqHEJ9Rb5wHTa0HzMbfRo8cRdl2yAirvvv5d98dtwHddQgX1jB0xEypXtmIYMdPGDLvhI1RNdIBhHkkrRcNreRzoy4xD--HM6m1W0-A8PJJJ9BcNxmGPcBtLzW08wzoP9trJ3M7DQ6Gkk6j7iwVsyApw1ZBaDvabGTdc_SFV-Iegtqw3rjzT_xXWsfzMlKBy-019MYn_KS-gu23YzjvGu5tS_zDfkQb8DMUlPLz5yyxM0yOMlUDtG2qQgIJAU2O0X6T5xDdJ6mtolNyhepg845PvFDEqBQGMIH1nc47CNumeudDi8IWymEALhjG_U8KAK7JVlQTJj2EKUb0au1g6fpiBFab5mmxCMtZEX3Jreyak5GOcFFz-WpxuXJD9TdSoIvaBfBFOoJnXkg2zE4RHXeQzZ2FotmrbBG5dm8B-_6byYGoHBc08ZsWze1K96JIeRnLpBaj6ifUDcVHxZMPcGHHT27dvU2PNbgLiBjlAsxhYqkhN5qOHN8XBcg2KRjcMBaI3V0YMxlzXz5MztmZq3fcB1p-ccIoIyMPMzSj3yMB7J9CEU2LYPSTHMdPkIeDE6GaCkQKviaQQJQde346tK_YjA2k7_SOBmvPYE", - "guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg", - "guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4", - "key": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n", - "name": "Mike Macgirvin", - "name_updated": "2012-12-06 04:59:13", - "address": "mike@zothub.com", - "photo_mimetype": "image/jpeg", - "photo": "https://zothub.com/photo/profile/l/1", - "photo_updated": "2012-12-06 05:06:11", - "url": "https://zothub.com/channel/mike", - "connections_url": "https://zothub.com/poco/mike", - "target": "", - "target_sig": "", - "searchable": false, - "permissions": { - "view_stream": true, - "view_profile": true, - "view_photos": true, - "view_contacts": true, - "view_storage": true, - "view_pages": true, - "send_stream": false, - "post_wall": false, - "post_comments": false, - "post_mail": false, - "post_photos": false, - "tag_deliver": false, - "chat": false, - "write_storage": false, - "write_pages": false, - "delegate": false - }, - "profile": { - "description": "Freedom Fighter", - "birthday": "0000-05-14", - "next_birthday": "2013-05-14 00:00:00", - "gender": "Male", - "marital": "It's complicated", - "sexual": "Females", - "locale": "", - "region": "", - "postcode": "", - "country": "Australia" - }, - "locations": [ - { - "host": "zothub.com", - "address": "mike@zothub.com", - "primary": true, - "url": "https://zothub.com", - "url_sig": "eqkB_9Z8nduBYyyhaSQPPDN1AhSm5I4R0yfcFxPeFpuu17SYk7jKD7QzvmsyahM5Kq7vDW6VE8nx8kdFYpcNaurqw0_IKI2SWg15pGrhkZfrCnM-g6A6qbCv_gKCYqXvwpSMO8SMIO2mjQItbBrramSbWClUd2yO0ZAceq3Z_zhirCK1gNm6mGRJaDOCuuTQNb6D66TF80G8kGLklv0o8gBfxQTE12Gd0ThpUb5g6_1L3eDHcsArW_RWM2XnNPi_atGNyl9bS_eLI2TYq0fuxkEdcjjYx9Ka0-Ws-lXMGpTnynQNCaSFqy-Fe1aYF7X1JJVJIO01LX6cCs-kfSoz29ywnntj1I8ueYldLB6bUtu4t7eeo__4t2CUWd2PCZkY3PKcoOrrnm3TJP5_yVFV_VpjkcBCRj3skjoCwISPcGYrXDufJxfp6bayGKwgaCO6QoLPtqqjPGLFm-fbn8sVv3fYUDGilaR3sFNxdo9mQ3utxM291XE2Pd0jGgeUtpxZSRzBuhYeOybu9DPusID320QbgNcbEbEImO8DuGIxuVRartzEXQF4WSYRdraZzbOqCzmU0O55P836JAfrWjgxTQkXlYCic-DBk-iE75JeT72smCtZ4AOtoFWCjZAABCw42J7JELY9APixZXWriKtjy6JI0G9d3fs6r7SrXr1JMy0", - "callback": "https://zothub.com/post", - "sitekey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1IWXwd/BZuevq8jzNFoR\n3VkenduQH2RpR3Wy9n4+ZDpbrUKGJddUGm/zUeWEdKMVkgyllVA/xHdB7jdyKs1X\nuIet9mIdnzvhdLO/JFD5hgbNG2wpSBIUY6aSNeCFTzszqXmuSXMW5U0Ef5pCbzEA\nnhoCoGL1KAgPqyxnGKUlj7q2aDwC9IRNtAqNyFQL67oT91vOQxuMThjlDhbR/29Q\ncYR4i1RzyahgEPCnHCPkT2GbRrkAPjNZAdlnk9UesgP16o8QB3tE2j50TVrbVc/d\nYRbzC56QMPP9UgUsapNeSJBHji75Ip/E5Eg/kfJC/HEQgyCqjCGfb7XeUaeQ7lLO\nqc7CGuMP+Jqr/cE54/aSHg8boTwxkMp11Ykb+ng17fl57MHTM2RJ99qZ1KBkXezR\nuH1lyvjzeJPxEFr9rkUqc4GH74/AgfbgaFvQc8TS7ovEa5I/7Pg04m7vLSEYc6UF\nYJYxXKrzmZT2TDoKeJzaBBx5MFLhW19l68h9dQ8hJXIpTP0hJrpI+Sr6VUAEfFQC\ndIDRiFcgjz6j7T/x8anqh63/hpsyf2PMYph1+4/fxtSCWJdvf+9jCRM8F1IDfluX\n87gm+88KBNaklYpchmGIohbjivJyru41CsSLe0uinQFvA741W00w6JrcrOAX+hkS\nRQuK1dDVwGKoIY85KtTUiMcCAwEAAQ==\n-----END PUBLIC KEY-----\n" - } - ], - "site": { - "url": "https://zothub.com", - "directory_mode": "primary", - "directory_url": "https://zothub.com/dirsearch" - } - - } -[/code] - - -Discovery returns a JSON array with the following components: - -'success' => (true or false) Operation was successful if true. Otherwise an optional 'message' may be present indicating the source of error. - -'signed_token' => If a token parameter was provided in the request, it is prepended with the text 'token.' and then RSA signed with the channel private key and base64url encoded and returned as 'signed_token'. - -'guid' => the guid of the address on the target system - -'guid_sig' => the base64url encoded RSA signature of the guid, signed with the private key associated with that guid. - -'key' => the public key associated with that guid - -'name' => channel name - -'name_updated' => MySQL style timestamp '2012-01-01 00:00:00' when the name was last changed (UTC) - -'address' => "webbie" or user@host address associated with this channel - -'photo' => URL of a profile photo for this channel (ideally 175x175) - -'photo_mimetype' => content-type of the profile photo - -'photo_updated' => MySQL style timestamp when photo was last updated (UTC) - -'url' => location of channel homepage - -'connections_url' => location of Portable Contacts (extended for zot) URL for this channel - -'target' => if a permissions target was specified, it is mirrored - -'target_sig' => if a permissions target was specified, the signature is mirrored. - -'searchable' => (true or false) true indicates this entry can be searched in a directory - -[h5]Permissions[/h5] - -'permissions' => extensible array of permissions appropriate to this target, values are true or false - - Permissions may include: -[list] -[*] view_stream -[*] view_profile -[*] view_photos -[*] view_contacts -[*] view_storage -[*] view_pages -[*] send_stream -[*] post_wall -[*] post_comments -[*] post_mail -[*] post_photos -[*] tag_deliver -[*] chat -[*] write_storage -[*] write_pages -[*] delegate -[/list] - - -[h5]Profile[/h5] - - -'profile' => array of important profile fields -[list] -[*] description -[*] birthday YYYY-MM-DD , all fields are optional, any field (such as year) may be zero -[*] next_birthday => MySQL datetime string representing the next upcoming birthday, converted from the channel's default timezone to UTC. -[*] gender (free form) -[*] marital (marital status) -[*] sexual (preference) -[*] locale (city) -[*] region (state) -[*] postcode -[*] country -[/list] - -[h5]Locations[/h5] - - -'locations' => array of registered locations (DNS locations) this channel may be visible or may be posting from - -Each location is an array of - -'host' => DNS hostname, e.g. example.com - -'address' => the webbie or user@host identifier associated with this location - -'primary' => (true or false) whether or not this is the primary location for this channel where files and web pages are generally found - -'url' => url of the root of this DNS location e.g. https://example.com - -'url_sig' => base64url encoded RSA signature of the URL, signed with the channel private key - -'callback' => Zot communications endpoint on this site, usually https://example.com/post - -'sitekey' => public key of this site/host - - -[h5]Site[/h5] - - -'site' => array providing the directory role of the site responding to this request - -'url' => url of this site e.g. https://example.com - -'directory_mode' => one of 'primary', 'secondary', 'normal', or 'standalone' - -'directory_url' => if this is a directory server or standalone, the URL for the directory search module - - - -[h3]Magic Auth[/h3] - -So-called "magic auth" takes place by a special exchange. On the remote computer, a redirection is made to the Zot endpoint with special GET parameters. - -Endpoint: https://example.com/post/name - -where 'name' is the left hand side of the channel webbie, for instance 'mike' where the webbie is 'mike@zothub.com' - -Additionally four parameters are supplied: -[list] -[*] auth => the webbie of the person requesting access -[*] dest => the desired destination URL (urlencoded) -[*] sec => a random string which is also stored locally for use during the verification phase. -[*] version => the Zot revision -[/list] -When this packet is received, a Zot message is initiated to the auth identity: - -[code nowrap] - { - "type":"auth_check", - "sender":{ - "guid":"kgVFf_1_SSbyqH-BNWjWuhAvJ2EhQBTUdw-Q1LwwssAntr8KTBgBSzNVzUm9_RwuDpxI6X8me_QQhZMf7RfjdA", - "guid_sig":"PT9-TApzpm7QtMxC63MjtdK2nUyxNI0tUoWlOYTFGke3kNdtxSzSvDV4uzq_7SSBtlrNnVMAFx2_1FDgyKawmqVtRPmT7QSXrKOL2oPzL8Hu_nnVVTs_0YOLQJJ0GYACOOK-R5874WuXLEept5-KYg0uShifsvhHnxnPIlDM9lWuZ1hSJTrk3NN9Ds6AKpyNRqf3DUdz81-Xvs8I2kj6y5vfFtm-FPKAqu77XP05r74vGaWbqb1r8zpWC7zxXakVVOHHC4plG6rLINjQzvdSFKCQb5R_xtGsPPfvuE24bv4fvN4ZG2ILvb6X4Dly37WW_HXBqBnUs24mngoTxFaPgNmz1nDQNYQu91-ekX4-BNaovjDx4tP379qIG3-NygHTjFoOMDVUvs-pOPi1kfaoMjmYF2mdZAmVYS2nNLWxbeUymkHXF8lT_iVsJSzyaRFJS1Iqn7zbvwH1iUBjD_pB9EmtNmnUraKrCU9eHES27xTwD-yaaH_GHNc1XwXNbhWJaPFAm35U8ki1Le4WbUVRluFx0qwVqlEF3ieGO84PMidrp51FPm83B_oGt80xpvf6P8Ht5WvVpytjMU8UG7-js8hAzWQeYiK05YTXk-78xg0AO6NoNe_RSRk05zYpF6KlA2yQ_My79rZBv9GFt4kUfIxNjd9OiV1wXdidO7Iaq_Q", - "url":"http:\/\/podunk.edu", - "url_sig":"T8Bp7j5DHHhQDCFcAHXfuhUfGk2P3inPbImwaXXF1xJd3TGgluoXyyKDx6WDm07x0hqbupoAoZB1qBP3_WfvWiJVAK4N1FD77EOYttUEHZ7L43xy5PCpojJQmkppGbPJc2jnTIc_F1vvGvw5fv8gBWZvPqTdb6LWF6FLrzwesZpi7j2rsioZ3wyUkqb5TDZaNNeWQrIEYXrEnWkRI_qTSOzx0dRTsGO6SpU1fPWuOOYMZG8Nh18nay0kLpxReuHCiCdxjXRVvk5k9rkcMbDBJcBovhiSioPKv_yJxcZVBATw3z3TTE95kGi4wxCEenxwhSpvouwa5b0hT7NS4Ay70QaxoKiLb3ZjhZaUUn4igCyZM0h6fllR5I6J_sAQxiMYD0v5ouIlb0u8YVMni93j3zlqMWdDUZ4WgTI7NNbo8ug9NQDHd92TPmSE1TytPTgya3tsFMzwyq0LZ0b-g-zSXWIES__jKQ7vAtIs9EwlPxqJXEDDniZ2AJ6biXRYgE2Kd6W_nmI7w31igwQTms3ecXe5ENI3ckEPUAq__llNnND7mxp5ZrdXzd5HHU9slXwDShYcW3yDeQLEwAVomTGSFpBrCX8W77n9hF3JClkWaeS4QcZ3xUtsSS81yLrp__ifFfQqx9_Be89WVyIOoF4oydr08EkZ8zwlAsbZLG7eLXY" - }, - "recipients":{ - { - "guid":"ZHSqb3yGar3TYV_o9S-JkD-6o_V4DhUcxtv0VeyX8Kj_ENHPI_M3SyAUucU835-mIayGMmTpqJz3ujPkcavVhA", - "guid_sig":"JsAAXigNghTkkbq8beGMJjj9LBKZn28hZ-pHSsoQuwYWvBJ2lSnfc4r9l--WgO6sucH-SR6RiBo78eWn1cZrh_cRMu3x3LLx4y-tjixg-oOOgtZakkBg4vmOhkKPkci0mFtzvUrpY4YHySqsWTuPwRx_vOlIYIGEY5bRXpnkNCoC8J4EJnRucDrgSARJvA8QQeQQL0H4mWEdGL7wlsZp_2VTC6nEMQ48Piu6Czu5ThvLggGPDbr7PEMUD2cZ0jE4SeaC040REYASq8IdXIEDMm6btSlGPuskNh3cD0AGzH2dMciFtWSjmMVuxBU59U1I6gHwcxYEV6BubWt_jQSfmA3EBiPhKLyu02cBMMiOvYIdJ3xmpGoMY1Cn__vhHnx_vEofFOIErb6nRzbD-pY49C28AOdBA5ffzLW3ss99d0A-6GxZmjsyYhgJu4tFUAa7JUl84tMbq28Tib0HW6qYo6QWw8K1HffxcTpHtwSL5Ifx0PAoGMJsGDZDD1y_r9a4vH5pjqmGrjL3RXJJUy-m4eLV5r7xMWXsxjqu3D8r04_dcw4hwwexpMT1Nwf8CTB0TKb8ElgeOpDFjYVgrqMYWP0XdhatcFtAJI7gsS-JtzsIwON9Kij66-VAkqy_z1IXI0ziyqV1yapSVYoUV1vMScRZ_nMqwiB5rEDx-XLfzko" - } - } - "callback":"\/post", - "version":1, - "secret":"1eaa6613699be6ebb2adcefa5379c61a3678aa0df89025470fac871431b70467", - "secret_sig":"eKV968b1sDkOVdSMi0tLRtOhQw4otA8yFKaVg6cA4I46_zlAQGbFptS-ODiZlSAqR7RiiZQv4E2uXCKar52dHo0vvNKbpOp_ezWYcwKRu1shvAlYytsflH5acnDWL-FKOOgz5zqLLZ6cKXFMoR1VJGG_Od-DKjSwajyV9uVzTry58Hz_w0W2pjxwQ-Xv11rab5R2O4kKSW77YzPG2R5E6Q7HN38FrLtyWD_ai3K9wlsFOpwdYC064dk66X7BZtcIbKtM6zKwMywcfJzvS5_0U5yc5GGbIY_lY6SViSfx9shOKyxkEKHfS29Ynk9ATYGnwO-jnlMqkJC7t149H-sI9hYWMkLuCzaeLP56k2B2TmtnYvE_vHNQjzVhTwuHCIRVr-p6nplQn_P3SkOpYqPi3k_tnnOLa2d3Wtga8ClEY90oLWFJC3j2UkBf_VEOBNcg-t5XO3T-j9O4Sbk96k1Qoalc-QlznbGx4bOVsGkRBBMiH4YUqiiWB_OkFHtdqv7dqGeC-u-B4u9IxzYst46vvmyA3O-Q4APSZ1RY8ITUH0jLTbh6EAV7Oki8pIbOg0t56p-8RlanOZqmFvR-grVSc7Ak1ZcD8NACmvidUpa1B7WEvRcOeffx9lype0bt5XenDnMyx6szevwxZIiM8qGM2lsSk4fu8HI9cW0mLywzZT0" - } -[/code] - -auth_check messages MUST be encrypted. This message is sent to the origination site, which checks the 'secret' to see if it is the same as the 'sec' which it passed originally. It also checks the secret_sig which is the secret signed by the destination channel's private key and base64url encoded. If everything checks out, a json packet is returned: -[code nowrap] - { - "success":1, - "confirm":"q0Ysovd1uQRsur2xG9Tg6bC23ynzw0191SkVd7CJcYoaePy6e_v0vnmPg2xBUtIaHpx_aSuhgAkd3aVjPeaVBmts6aakT6a_yAEy7l2rBydntu2tvrHhoVqRNOmw0Q1tI6hwobk1BgK9Pm0lwOeAo8Q98BqIJxf47yO9pATa0wktOg6a7LMogC2zkkhwOV5oEqjJfeHeo27TiHr1e2WaphfCusjmk27V_FAYTzw05HvW4SPCx55EeeTJYIwDfQwjLfP4aKV-I8HQCINt-2yxJvzH7Izy9AW-7rYU0Il_gW5hrhIS5MTM12GBXLVs2Ij1CCLXIs4cO0x6e8KEIKwIjf7iAu60JPmnb_fx4QgBlF2HLw9vXMwZokor8yktESoGl1nvf5VV5GHWSIKAur3KPS2Tb0ekNh-tIk9u-xob4d9eIf6tge_d3aq1LcAtrDBDLk8AD0bho5zrVuTmZ9k-lBVPr_DRHSV_dlpu088j3ThaBsuV1olHK3vLFRhYCDIO0CqqK5IuhqtRNnRaqhlNN6fQUHpXk2SwHiJ2W36RCYMTnno6ezFk_tN-RA2ly-FomNZoC5FPA9gFwoJR7ZmVFDmUeK3bW-zYTA5vu15lpBPnt7Up_5rZKkr0WQVbhWJmylqOuwuNWbn3SrMQ8rYFZ23Tv300cOfKVgRBaePWQb4" - } -[/code] -'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the base64url encoded whirlpool hash of the source guid and guid_sig; signed with the source channel private key. This prevents a man-in-the-middle from inserting a rogue success packet. Upon receipt and successful verification of this packet, the destination site will redirect to the original destination URL and indicate a successful remote login. - -[h3]Zot Structures[/h3] -[h4]Zot Signatures[/h4] -All signed data in Zot is accomplished by performing an RSA sign operation using the private key of the initiator. The binary result is then base64url encoded for transport. -[h4]Zot Encryption[/h4] -Encryption is currently provided by AES256CTR. Additional algorithms MAY be supported. A 32-octet key and 16-octet initialisation vector are randomly generated. The desired data is then encrypted using these generated strings and the result base64url encoded. Then we build an array: - -[dl terms="b"] -[*= data]The base64url encoded encrypted data -[*= alg]The chosen algorithm, in this case the string 'aes256ctr'. -[*= key]The randomly generated key, RSA encrypted using the recipients public key, and the result base64url encoded -[*= iv]The randomly generated initialization vector, RSA encrypted using the recipient's public key, and the result base64url encoded -[/dl] - -[h4]Basic Zot Packet[/h4] -Used for initiating a dialogue with another Zot site. This packet MAY be encrypted. The presence of an array element 'iv' indicates encryption has been applied. When sending an 'auth_check' packet type, this packet MUST be encrypted, using the public key of the destination site (the site key, as opposed to a sender key). - -[code nowrap] - { - "type":"notify", - "sender":{ - "guid":"kgVFf_1_SSbyqH-BNWjWuhAvJ2EhQBTUdw-Q1LwwssAntr8KTBgBSzNVzUm9_RwuDpxI6X8me_QQhZMf7RfjdA", - "guid_sig":"PT9-TApzpm7QtMxC63MjtdK2nUyxNI0tUoWlOYTFGke3kNdtxSzSvDV4uzq_7SSBtlrNnVMAFx2_1FDgyKawmqVtRPmT7QSXrKOL2oPzL8Hu_nnVVTs_0YOLQJJ0GYACOOK-R5874WuXLEept5-KYg0uShifsvhHnxnPIlDM9lWuZ1hSJTrk3NN9Ds6AKpyNRqf3DUdz81-Xvs8I2kj6y5vfFtm-FPKAqu77XP05r74vGaWbqb1r8zpWC7zxXakVVOHHC4plG6rLINjQzvdSFKCQb5R_xtGsPPfvuE24bv4fvN4ZG2ILvb6X4Dly37WW_HXBqBnUs24mngoTxFaPgNmz1nDQNYQu91-ekX4-BNaovjDx4tP379qIG3-NygHTjFoOMDVUvs-pOPi1kfaoMjmYF2mdZAmVYS2nNLWxbeUymkHXF8lT_iVsJSzyaRFJS1Iqn7zbvwH1iUBjD_pB9EmtNmnUraKrCU9eHES27xTwD-yaaH_GHNc1XwXNbhWJaPFAm35U8ki1Le4WbUVRluFx0qwVqlEF3ieGO84PMidrp51FPm83B_oGt80xpvf6P8Ht5WvVpytjMU8UG7-js8hAzWQeYiK05YTXk-78xg0AO6NoNe_RSRk05zYpF6KlA2yQ_My79rZBv9GFt4kUfIxNjd9OiV1wXdidO7Iaq_Q", - "url":"http:\/\/podunk.edu", - "url_sig":"T8Bp7j5DHHhQDCFcAHXfuhUfGk2P3inPbImwaXXF1xJd3TGgluoXyyKDx6WDm07x0hqbupoAoZB1qBP3_WfvWiJVAK4N1FD77EOYttUEHZ7L43xy5PCpojJQmkppGbPJc2jnTIc_F1vvGvw5fv8gBWZvPqTdb6LWF6FLrzwesZpi7j2rsioZ3wyUkqb5TDZaNNeWQrIEYXrEnWkRI_qTSOzx0dRTsGO6SpU1fPWuOOYMZG8Nh18nay0kLpxReuHCiCdxjXRVvk5k9rkcMbDBJcBovhiSioPKv_yJxcZVBATw3z3TTE95kGi4wxCEenxwhSpvouwa5b0hT7NS4Ay70QaxoKiLb3ZjhZaUUn4igCyZM0h6fllR5I6J_sAQxiMYD0v5ouIlb0u8YVMni93j3zlqMWdDUZ4WgTI7NNbo8ug9NQDHd92TPmSE1TytPTgya3tsFMzwyq0LZ0b-g-zSXWIES__jKQ7vAtIs9EwlPxqJXEDDniZ2AJ6biXRYgE2Kd6W_nmI7w31igwQTms3ecXe5ENI3ckEPUAq__llNnND7mxp5ZrdXzd5HHU9slXwDShYcW3yDeQLEwAVomTGSFpBrCX8W77n9hF3JClkWaeS4QcZ3xUtsSS81yLrp__ifFfQqx9_Be89WVyIOoF4oydr08EkZ8zwlAsbZLG7eLXY" - "sitekey":"-----BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxTeIwXZWrw/S+Ju6gewh -LgkKnNNe2uCUqCqMZoYgJar3T5sHCDhvXc4dDCbDkxVIaA/+V1mURtBV60a3IGjn -OAO0W0XGGLe2ED7G5o9U8T9mVGq8Mauv0v1oQ5wIR1gEAhBavkQ2OUGuF/YKn2nj -HlKsv9HzUAHpcDMUe3Uklc2RhQbMcnJxEgkyjCkDyrTtCZzISkTAocHvpCG1KSog -njUZdiz9UWxvM4rCFkCJvQU4RwRZJb7GA9ul+9JrF7NvUQTx8csRP2weBk1E9yyj -wbe187E0eVj9RXX2Mx3mYhgrTdodxLOVMSXZLg1/SMpeFFl7QBhuM0SiOPg8a7Et -e2iNA/RD4WiUFqCDfafasRa1TOozOm7LA+08lkAh5PeQPJsJbrX0wVVft++Y+5/z -BvcUOP73vcbz7j5hJ7HLsbQtye/UUCfODBFybuDqRM84Aet8rjZohX7vukXdMD4I -2HuB7pjR4uIfyYr0J63ANkvbsn8LR+RnirmHrK5H/OgxxjXcfYbGEQgFxvxhF6lA -FpMu6Do4dx3CIb6pRmZ8bjSImXexJ0BSo9n3gtrz0XYLecsYFlQ9+QQjm83qxyLb -M23in0xqMVsyQvzjNkpImrO/QdbEFRIIMee83IHq+adbyjQR49Z2hNEIZhkLPc3U -2cJJ2HkzkOoF2K37qwIzk68CAwEAAQ== ------END PUBLIC KEY----- -" - }, - "recipients":{ - { - "guid":"lql-1VnxtiO4-WF0h72wLX1Fu8szzHDOXgQaTbELwXW77k8AKFfh-hYr70vqMrc3SSvWN-Flrc5HFhRTWB7ICw", - "guid_sig":"PafvEL0VpKfxATxlCqDjfOeSIMdmpr3iU7X-Sysa1h5LzDpjSXsjO37tYZL-accb1M5itLlfnW5epkTa5I4flsW21zSY1A2jCuBQUTLLGV7rNyyBy7lgqJUFvAMRx0TfXzP9lcaPqlM9T1tA6jfWOsOmkdzwofGeXBnsjGfjsO2xdGYe6vwjOU0DSavukvzDMnOayB9DekpvDnaNBTxeGLM45Skzr7ZEMcNF7TeXMbnvpfLaALYEKeQs9bGH-UgAG8fBWgzVAzeBfx_XSR1rdixjyiZGP0kq0h35SlmMPcEjliodOBFwMXqpXFB7Ibp4F6o6te2p2ErViJccQVG8VNKB6SbKNXY6bhP5zVcVsJ-vR-p4xXoYJJvzTN7yTDsGAXHOLF4ZrXbo5yi5gFAlIrTLAF2EdWQwxSGyLRWKxG8PrDkzEzX6cJJ0VRcLh5z6OI5QqQNdeghPZbshMFMJSc_ApCPi9_hI4ZfctCIOi3T6bdgTNKryLm5fhy_eqjwLAZTGP-aUBgLZpb1mf2UojBn6Ey9cCyq-0T2RWyk-FcIcbV4qJ-p_8oODqw13Qs5FYkjLr1bGBq82SuolkYrXEwQClxnrfKa4KYc2_eHAXPL01iS9zVnI1ySOCNJshB97Odpooc4wk7Nb2Fo-Q6THU9zuu0uK_-JbK7IIl6go2qA" - }, - }, - "callback":"\/post", - "version":"1.2", - "encryption":{ - "aes256ctr" - }, - "secret":"1eaa6613699be6ebb2adcefa5379c61a3678aa0df89025470fac871431b70467", - "secret_sig":"0uShifsvhHnxnPIlDM9lWuZ1hSJTrk3NN9Ds6AKpyNRqf3DUdz81-Xvs8I2kj6y5vfFtm-FPKAqu77XP05r74vGaWbqb1r8zpWC7zxXakVVOHHC4plG6rLINjQzvdSFKCQb5R_xtGsPPfvuE24bv4fvN4ZG2ILvb6X4Dly37WW_HXBqBnUs24mngoTxFaPgNmz1nDQNYQu91-ekX4-BNaovjDx4tP379qIG3-NygHTjFoOMDVUvs-pOPi1kfaoMjmYF2mdZAmVYS2nNLWxbeUymkHXF8lT_iVsJSzyaRFJS1Iqn7zbvwH1iUBjD_pB9EmtNmnUraKrCU9eHES27xTwD-yaaH_GHNc1XwXNbhWJaPFAm35U8ki1Le4WbUVRluFx0qwVqlEF3ieGO84PMidrp51FPm83B_oGt80xpvf6P8Ht5WvVpytjMU8UG7-js8hAzWQeYiK05YTXk-78xg0AO6NoNe_RSRk05zYpF6KlA2yQ_My79rZBv9GFt4kUfIxNjd9OiV1wXdidO7Iaq_Q" - } -[/code] - -[dl terms="b"] -[*= type] The message type: [b]notify, purge, refresh, force_refresh, auth_check, ping[/b] or [b]pickup[/b]. The packet contents vary by message type. Here we will describe the [b]notify[/b] packet. -[*= callback]A string to be appended onto the url which identifies the Zot communications endpoint on this system. It is typically the string "/post". -[*= version]The Zot protocol identifier, to allow future protocol revisions to co-exist. -[*= encryption] array of supported encryption algorithms, order by decreasing preference. If no compatible encryption methods are provided, applications MUST use 'aes256cbc'. -[*= secret]A 64-char string which is randomly generated by the sending site. -[*= secret_sig]The RSA signature of the secret, signed with the sender's private key. -[*= sender] An array of four components that provide a portable identity. We can contact the URL provided and download a Zot info packet to obtain the public key of the sender, and use that to verify the sender guid and the posting URL signatures. - [dl terms="b"] - [*= guid]Typically a 64 character base64url encoded string. This is generated when an identity is created and an attempt is made that it be unique; though this isn't required. - [*= guid_sig]The RSA signature of the guid, signed by the sender's private key and base64url encoded. - [*= url]The base url of the location this post is originating from. - [*= url_sig]The RSA signature of url, signed by the sender's private key and base64url encoded. - [*= sitekey]The public key of the website specified in the url - [/dl] -[*= recipients] Only used for private messages. An array of envelope recipients. Each recipient is represented by an array of guid and guid_sig. When recipients are specified, the entire packet is also encapsulated using a negotiated cryptographic algorithm or 'aes256cbc' if none could be negotiated. - [dl terms="b"] - [*= guid]The guid of a private recipient. - [*= guid_sig]The RSA signature of the guid, signed by the recipient's private key and base64url encoded - [/dl] -[/dl] diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb deleted file mode 100644 index f39954d73..000000000 --- a/doc/developer_function_primer.bb +++ /dev/null @@ -1,47 +0,0 @@ -[b]$Projectname development - some useful basic functions[/b] - -[b]get_account_id()[/b] - -Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. - -[b]local_channel()[/b] - -Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. - -[b]remote_channel()[/b] - -Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. - -[b]App::get_observer()[/b] - -returns an xchan structure representing the current viewer if authenticated (locally or remotely). - -[b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b] - -Returns the config setting for $family and $key or false if unset. - -Deprecated: Use Zotlabs\Lib\Config::Get instead. - -[b] set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b] - -Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). The xconfig version get/sets the value for a specific xchan hash - generally used for remote users. - -Deprecated: Use Zotlabs\Lib\Config::Set instead. - -[b]dbesc()[/b] - -Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() - -[b]q($sql,$var1...)[/b] - -Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. - -[b]t($string)[/b] - -Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist. - -[b]x($var), $x($array,$key)[/b] - -Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; - -#include doc/macros/main_footer.bb; diff --git a/doc/developers.bb b/doc/developers.bb deleted file mode 100644 index 22dc82d7e..000000000 --- a/doc/developers.bb +++ /dev/null @@ -1,71 +0,0 @@ -[b]$Projectname Developer Guide[/b] - -We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/contributor/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. - -[b]Here is how you can join us.[/b] - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -You may fork/clone the project repository from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] - -Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] -to create and use your own tracking fork on framagit - -Then go to your framagit page and create a "Pull request" when you are ready -to notify us to merge your work. - -[b]Translations[/b] - -Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/hubzilla/]https://www.transifex.com/projects/p/hubzilla/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'hmessages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. - -[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl] - -[b]Important[/b] - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. - -Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. - - -[b]Licensing[/b] - -All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. - -[b]Concensus Building[/b] - -Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature. - -We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to the [url=https://project.hubzilla.org/channel/hubzilla]Hubzilla Development[/url] forum. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. - -There are places where opposition cannot be resolved. In these cases, please consider making your feature [b]optional[/b] or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off. - -If a feature uses other networks or websites and or is only seen as desirable by a small minority of the community, consider making the functionality available via an addon or plugin. Once again, those who don't desire the feature won't need to install it. Plugins are relatively easy to create and "hooks" can be easily added or modified if the current hooks do not do what is needed to allow your plugin to work. - - -[b]Coding Style[/b] - -In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. - -[li] All comments should be in English.[/li] - -[li] We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged.[/li] - -[li] Indentation is accomplished primarily with tabs using a tab-width of 4.[/li] - -[li] String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';"[/li] - -[li] Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes.[/li] - -[li] Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability.[/li] - -[li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li] - -[li] Some functions take arguments in argc/argv style like main() in C or function args in bash or Perl. Urls are broken up within a module. e.g, given "http://example.com/module/arg1/arg2", then $this->argc will be 3 (integer) and $this->argv will contain: [0] => 'module', [1] => 'arg1', [2] => 'arg2'. There will always be one argument. If provided a naked domain URL, $this->argv[0] is set to "home".[/li] - -[b]See Also[/b] -[zrl=[baseurl]/help/sql_conventions]SQL Conventions[/zrl] - -#include doc/macros/main_footer.bb; diff --git a/doc/diaspora_compat.bb b/doc/diaspora_compat.bb deleted file mode 100644 index f27a63b9d..000000000 --- a/doc/diaspora_compat.bb +++ /dev/null @@ -1,68 +0,0 @@ -[h3]Diaspora Compatibility[/h3] - -The Diaspora Protocol addon allows a site to communicate using the Diaspora protocol, which allows communications and connections to be made with Diaspora members (and also Friendica members, since that network also provides the Diaspora Protocol). - -This addon is available in the 'basic' and 'standard' server configurations. It is not available with and the plugin is disabled completely when you are using the 'pro' server configuration. The reason for this is that the Diaspora protocol is not very sophisticated and many $projectname features do not work well with it. - -Members will have to be aware of limitations of the protocol or limit their own activities to those which are compatible with Diaspora. The 'pro' server configuration is free from these limitations and you may use all of the project features and abilities without regard for how they translate to other networks. Many features are unique to $Projectname and are supported by the "Zot" protocol, which is our native communications language between servers/hubs. - -If you are using a configuration which allows direct Diaspora communications you should be aware of the limitations presented here. - -[ul] -[*]Private mail retraction (unsend) is not possible for Diaspora connections. - -[*]Private posts and their associated comments are sent in plaintext email notifications in Diaspora and Friendica. This is a major privacy issue and affects any private communications you have where *any* member of the conversation is on another network. Be aware of it. - -[*]Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled hubzilla objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media and provides an illusion of photo privacy by using obscured URLs rather than protecting the photo from snooping by unauthorised viewers. - -There is no workaround except to make your media resources public (to everybody on the internet). - - -[*]Edited posts will not be delivered. Diaspora members will see the original post/comment without edits. There is no mechanism in the protocol to update an existing post. We cannot delete it and submit another invisibly because the message-id will change and we need to keep the same message-id on our own network. The only workaround is to delete the post/comment and do it over. (If this is a post, this will delete any existing likes/comments). We may eventually provide a way to delete the out of date copy only from Diaspora and keep it intact on networks that can handle edits. - -[*]Nomadic identity ($projectname 'standard' only) will not work with Diaspora. We may eventually provide an **option** which will allow you to "start sharing" from all of your clones when you make the first connection. The Diaspora person does not have to accept this, but it will allow your communications to continue if they accept this connection. Without this option, if you go to another server from where you made the connection originally or you make the connection before creating the clone, you will need to connect with them again from the new location. - -[*]Post expiration is not supported on Diaspora. We may provide you an option to not send expiring posts to that network. In the future this may be provided with a remote delete request. - -[*]End-to-end encryption is not supported. We will translate these posts into a lock icon, which can never be unlocked from the Diaspora side. - -[*]Message verification will eventually be supported. - -[*]Multiple profiles are not supported. Diaspora members can only see your default profile. - -[*]Birthday events will not appear in Diaspora. Other events will be translated and sent as a post, but all times will either be in the origination channel's timezone or in GMT. We do not know the recipient's timezone because Diaspora doesn't have this concept. - -[*]We currently allow tags to be hijacked by default. An option is provided to allow you to prevent the other end of the network from hijacking your tags and point them at its own resources. - -[*]Community tags will not work. We will send a tagging activity as a comment. It won't do anything. - -[*]Privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues. - -[*]Plus-tagged hubzilla forums should work from Diaspora. - - -[*]You cannot use Diaspora channels as channel sources. - - -[*]Dislikes of posts will be converted to comments and you will have the option to send these as comments or not send them to Diaspora (which does not provide dislike). Currently they are not sent. - -[*]We will do the same for both likes and dislikes of [b][i]comments[/i][/b]. They can either be sent as comments or you will have the ability to prevent them from being transmitted to Diaspora. Currently they are not sent. - -[*]Emojis are currently untranslated. - -[*]"observer tags" will be converted to empty text. - - -[*]Embedded apps will be translated into links. - - -[*]Embedded page design elements (work in progress) will be either stripped or converted to an error message. - -[*]Diaspora members will not appear in the directory. - - -[*]There are differences in oembed compatibility between the networks. Some embedded resources will turn into a link on one side or the other. - -[/ul] - -#include doc/macros/main_footer.bb; diff --git a/doc/directories.bb b/doc/directories.bb deleted file mode 100644 index 60a0b624d..000000000 --- a/doc/directories.bb +++ /dev/null @@ -1,95 +0,0 @@ -[h3]Directory Configuration[/h3] - -Directories in $Projectname serve the purpose of searching and locating members anywhere in the network. They are also used to store and query "ratings" of members and sites. The directory services are distributed and mirrored so that a failure of one will not take down or disrupt the entire network. - -[b]Standard Configuration[/b] - -New sites operating as directory clients will automatically select from a hard-coded list of directory servers during their first directory access. You may examine or over-ride this decision using - -[code] -util/config system directory_server -[/code] - -To set a different server, - -[code] -util/config system directory_server https://newdirectory.something -[/code] - - -[b]Standalone configuration[/b] - -Some sites may wish to operate in 'standalone' mode and not connect to any external directory services. This is useful for isolated sites ("off the gird") and test sites, but can also be useful for small organisations who do not wish to connect with other sites in the network. - -To configure this, please look in your .htconfig.php file for the following text and set the configuration accordingly. - -[code] -// Configure how we communicate with directory servers. -// DIRECTORY_MODE_NORMAL = directory client, we will find a directory -// DIRECTORY_MODE_SECONDARY = caching directory or mirror -// DIRECTORY_MODE_PRIMARY = main directory server -// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services - -App::$config['system']['directory_mode'] = DIRECTORY_MODE_STANDALONE; -[/code] - - -[b]Secondary server configuration[/b] - -You may also configure your site as a secondary server. This operates as a mirror of the primary directory and allows disitribution of the load amongst available servers. There is very little functional difference between a primary and secondary sever, however there may only be *one* primary directory server per realm (realms are discussed later in this document). - -Before choosing to be a directory server, please be advised that you should be an active member of the network and have the resources and time available to manage these services. They don't typically require management, but the requirement is more for stability as losing a directory server can cause issues to directory clients which are reliant on it. - - -[b]Changing the directory server[/b] - -If a directory server indicates that it is no longer a directory server, this should be detected by the software and the configuration for that server will be removed (blanked). If it goes offline permanently without warning, you will only know if site members report that directory services are unavailable. Currently this can only be repaired manually by the site administrator by selecting a new directory and performing: - -[code] -util/config system directory_server https://newdirectory.something -[/code] - -Eventually we hope to make this a selectable box from the site admin panel. - - -[h2]Directory realms[/h2] - -Large organisations may wish to use directory 'realms' rather than a single standalone directory. The standard and default realm is known as RED_GLOBAL. By creating a new realm, your organisation has the ability to create its own hierarchy of primary and secondary servers and clients. - -[code] -util/config system directory_realm MY_REALM -[/code] - -Your realm *must* have a primary directory. Create this first. Then set the realm the same on all sites within your directory realm (servers and clients). - -You may also provide a "sub-realm" that operates indepently from the RED_GLOBAL realm (or any other realm) but allows cross membership and some ability to lookup members of the entire directory space. This has only undergone light testing so be prepared to help out and fix any issues that may arise. A sub-realm contains its parent realm within the realm name. - - -[code] -util/config system directory_realm RED_GLOBAL:MY_REALM -[/code] - - -[b]Realm access[/b] - -You may wish that your directory servers and services are only used by members of your realm. To do this a token or password must be supplied to access the realm directory services. This token is not encrypted during transit, but is sufficient to prevent casual access to your directory servers. The following must be configured for all sites (clients and directory servers) within the realm: - -[code] -util/config system realm_token my-secret-realm-password -[/code] - - - -[h2]Directory mirrors[/h2] - -Mirroring occurs with a daily transaction log of activities which are shared between directory servers. In the case of directory and profile updates, the channel address performing the update is transmitted, and the other directory servers probe that channel at its source for changes. We do not and should not trust any information given us by other directory servers. We always check the information at the source. - -Ratings are handled slightly differently - an encrypted packet (signed by the channel that created the rating) is passed between the servers. This signature needs to be verified before the rating is accepted. Ratings are always published to the primary directory server and propagated to all other directory servers from there. For this reason there can only be one primary server in a realm. If a misconfigured site claims to be a primary directory, it is ignored in the RED_GLOBAL realm. For other realms there is currently no such protection. Be aware of this when working with alternate realms. - -Newly created directory servers are not provided a "full dump", but for performance reasons and minimal disruption to the other servers in the network, they are brought online slowly. It may take up to a month for a new secondary directory server to provide a full view of the network. Please do not add any secondary servers to the hard-coded list of fallback directory servers until it has been operating as a directory for at least a month. - -All channels are configured to "ping" their directory server once a month, at somewhat random times during the month. This gives the ability for the directory to discover dead channels and sites (they stop pinging). Subsequently they are marked dead or unreachable and over time will be removed from the directory results. - -Channels may be configured to be "hidden" from the directory. These channels may still exist in the directory but will be un-searchable and some "sensitive" personal information will not be stored at all. - - \ No newline at end of file diff --git a/doc/dnt-policy.txt b/doc/dnt-policy.txt deleted file mode 100644 index ad946d1f8..000000000 --- a/doc/dnt-policy.txt +++ /dev/null @@ -1,218 +0,0 @@ -Do Not Track Compliance Policy - -Version 1.0 - -This domain complies with user opt-outs from tracking via the "Do Not Track" -or "DNT" header [http://www.w3.org/TR/tracking-dnt/]. This file will always -be posted via HTTPS at https://example-domain.com/.well-known/dnt-policy.txt -to indicate this fact. - -SCOPE - -This policy document allows an operator of a Fully Qualified Domain Name -("domain") to declare that it respects Do Not Track as a meaningful privacy -opt-out of tracking, so that privacy-protecting software can better determine -whether to block or anonymize communications with this domain. This policy is -intended first and foremost to be posted on domains that publish ads, widgets, -images, scripts and other third-party embedded hypertext (for instance on -widgets.example.com), but it can be posted on any domain, including those users -visit directly (such as www.example.com). The policy may be applied to some -domains used by a company, site, or service, and not to others. Do Not Track -may be sent by any client that uses the HTTP protocol, including websites, -mobile apps, and smart devices like TVs. Do Not Track also works with all -protocols able to read HTTP headers, including SPDY. - -NOTE: This policy contains both Requirements and Exceptions. Where possible -terms are defined in the text, but a few additional definitions are included -at the end. - -REQUIREMENTS - -When this domain receives Web requests from a user who enables DNT by actively -choosing an opt-out setting in their browser or by installing software that is -primarily designed to protect privacy ("DNT User"), we will take the following -measures with respect to those users' data, subject to the Exceptions, also -listed below: - -1. END USER IDENTIFIERS: - - a. If a DNT User has logged in to our service, all user identifiers, such as - unique or nearly unique cookies, "supercookies" and fingerprints are - discarded as soon as the HTTP(S) response is issued. - - Data structures which associate user identifiers with accounts may be - employed to recognize logged in users per Exception 4 below, but may not - be associated with records of the user's activities unless otherwise - excepted. - - b. If a DNT User is not logged in to our service, we will take steps to ensure - that no user identifiers are transmitted to us at all. - -2. LOG RETENTION: - - a. Logs with DNT Users' identifiers removed (but including IP addresses and - User Agent strings) may be retained for a period of 10 days or less, - unless an Exception (below) applies. This period of time balances privacy - concerns with the need to ensure that log processing systems have time to - operate; that operations engineers have time to monitor and fix technical - and performance problems; and that security and data aggregation systems - have time to operate. - - b. These logs will not be used for any other purposes. - -3. OTHER DOMAINS: - - a. If this domain transfers identifiable user data about DNT Users to - contractors, affiliates or other parties, or embeds from or posts data to - other domains, we will either: - - b. ensure that the operators of those domains abide by this policy overall - by posting it at /.well-known/dnt-policy.txt via HTTPS on the domains in - question, - - OR - - ensure that the recipient's policies and practices require the recipient - to respect the policy for our DNT Users' data. - - OR - - obtain a contractual commitment from the recipient to respect this policy - for our DNT Users' data. - - NOTE: if an “Other Domain” does not receive identifiable user information - from the domain because such information has been removed, because the - Other Domain does not log that information, or for some other reason, these - requirements do not apply. - - c. "Identifiable" means any records which are not Anonymized or otherwise - covered by the Exceptions below. - -4. PERIODIC REASSERTION OF COMPLIANCE: - - At least once every 12 months, we will take reasonable steps commensurate - with the size of our organization and the nature of our service to confirm - our ongoing compliance with this document, and we will publicly reassert our - compliance. - -5. USER NOTIFICATION: - - a. If we are required by law to retain or disclose user identifiers, we will - attempt to provide the users with notice (unless we are prohibited or it - would be futile) that a request for their information has been made in - order to give the users an opportunity to object to the retention or - disclosure. - - b. We will attempt to provide this notice by email, if the users have given - us an email address, and by postal mail if the users have provided a - postal address. - - c. If the users do not challenge the disclosure request, we may be legally - required to turn over their information. - - d. We may delay notice if we, in good faith, believe that an emergency - involving danger of death or serious physical injury to any person - requires disclosure without delay of information relating to the - emergency. - -EXCEPTIONS - -Data from DNT Users collected by this domain may be logged or retained only in -the following specific situations: - -1. CONSENT / "OPT BACK IN" - - a. DNT Users are opting out from tracking across the Web. It is possible - that for some feature or functionality, we will need to ask a DNT User to - "opt back in" to be tracked by us across the entire Web. - - b. If we do that, we will take reasonable steps to verify that the users who - select this option have genuinely intended to opt back in to tracking. - One way to do this is by performing scientifically reasonable user - studies with a representative sample of our users, but smaller - organizations can satisfy this requirement by other means. - - c. Where we believe that we have opt back in consent, our server will - send a tracking value status header "Tk: C" as described in section 6.2 - of the W3C Tracking Preference Expression draft: - - http://www.w3.org/TR/tracking-dnt/#tracking-status-value - -2. TRANSACTIONS - - If a DNT User actively and knowingly enters a transaction with our - services (for instance, clicking on a clearly-labeled advertisement, - posting content to a widget, or purchasing an item), we will retain - necessary data for as long as required to perform the transaction. This - may for example include keeping auditing information for clicks on - advertising links; keeping a copy of posted content and the name of the - posting user; keeping server-side session IDs to recognize logged in - users; or keeping a copy of the physical address to which a purchased - item will be shipped. By their nature, some transactions will require data - to be retained indefinitely. - -3. TECHNICAL AND SECURITY LOGGING: - - a. If, during the processing of the initial request (for unique identifiers) - or during the subsequent 10 days (for IP addresses and User Agent strings), - we obtain specific information that causes our employees or systems to - believe that a request is, or is likely to be, part of a security attack, - spam submission, or fraudulent transaction, then logs of those requests - are not subject to this policy. - - b. If we encounter technical problems with our site, then, in rare - circumstances, we may retain logs for longer than 10 days, if that is - necessary to diagnose and fix those problems, but this practice will not be - routinized and we will strive to delete such logs as soon as possible. - -4. AGGREGATION: - - a. We may retain and share anonymized datasets, such as aggregate records of - readership patterns; statistical models of user behavior; graphs of system - variables; data structures to count active users on monthly or yearly - bases; database tables mapping authentication cookies to logged in - accounts; non-unique data structures constructed within browsers for tasks - such as ad frequency capping or conversion tracking; or logs with truncated - and/or encrypted IP addresses and simplified User Agent strings. - - b. "Anonymized" means we have conducted risk mitigation to ensure - that the dataset, plus any additional information that is in our - possession or likely to be available to us, does not allow the - reconstruction of reading habits, online or offline activity of groups of - fewer than 5000 individuals or devices. - - c. If we generate anonymized datasets under this exception we will publicly - document our anonymization methods in sufficient detail to allow outside - experts to evaluate the effectiveness of those methods. - -5. ERRORS: - -From time to time, there may be errors by which user data is temporarily -logged or retained in violation of this policy. If such errors are -inadvertent, rare, and made in good faith, they do not constitute a breach -of this policy. We will delete such data as soon as practicable after we -become aware of any error and take steps to ensure that it is deleted by any -third-party who may have had access to the data. - -ADDITIONAL DEFINITIONS - -"Fully Qualified Domain Name" means a domain name that addresses a computer -connected to the Internet. For instance, example1.com; www.example1.com; -ads.example1.com; and widgets.example2.com are all distinct FQDNs. - -"Supercookie" means any technology other than an HTTP Cookie which can be used -by a server to associate identifiers with the clients that visit it. Examples -of supercookies include Flash LSO cookies, DOM storage, HTML5 storage, or -tricks to store information in caches or etags. - -"Risk mitigation" means an engineering process that evaluates the possibility -and likelihood of various adverse outcomes, considers the available methods of -making those adverse outcomes less likely, and deploys sufficient mitigations -to bring the probability and harm from adverse outcomes below an acceptable -threshold. - -"Reading habits" includes amongst other things lists of visited DNS names, if -those domains pertain to specific topics or activities, but records of visited -DNS names are not reading habits if those domain names serve content of a very -diverse and general nature, thereby revealing minimal information about the -opinions, interests or activities of the user. diff --git a/doc/doco.bb b/doc/doco.bb deleted file mode 100644 index 7ca64cfea..000000000 --- a/doc/doco.bb +++ /dev/null @@ -1,33 +0,0 @@ -[b]Creating Documentation[/b] - -To contribute documentation, simply put some words in a cunning order, and make their existence known to a developer. You can do this literally anywhere as long as a developer can see it. Once made aware, somebody will check it in for you. You should try to avoid proprietary formats, or locations that require authentication with methods other than Zot in order to make it easy for a developer to access, but even this is not a strict requirement. - -If you wish to contribute directly, that's fine too. To contribute directly, documentation should be in one of the following formats: - -[li]Markdown[/li] -[li]BBCode[/li] -[li]HTML[/li] -[li]Plain Text[/li] - -Other formats are also allowed, but support for the format must be added to mod/help.php first. - -If editing a plain text file, please keep column width to 80. This is because plain text is used in instances where we may not have a working installation - the installation documentation, for example - and it should be easy to read these from a CLI text editor. - -The advantage of Markdown is that it is human readable. - -The advantage of BBCode is that it is identity aware. - -Therefore, if using BBCode, try to make the most of it: -[li]Use ZRL links where appropriate to ensure a link to another site retains authentication and keeps identity based documentation working[/li] -[li]Use baseurl or observer.baseurl tags where appropriate instead of example.com for authenticated viewers.[/li] -[li]Support non-authenticated users with observer=0 tags. We presently do not do this due to historical oversights. This needs adding everywhere[/li] - -[b]Translations[/b] - -To translate documentation, or provided documentation in languages other than English: -[li]Create a directory in doc/ with your two letter country code if it doesn't already exist (eg, doc/de/ for German or doc/fr/ for French)[/li] -[li]Create a document with the same filename as the English version, but with content in your own language. This allows us to fallback to the English if the translation for a particular page is not provided[/li] - -To create documentation that has no equivalent file in English, you can create a new file with a name of your choosing - but you'll also need to provide a localised version of the index page (main.bb in English) to make it accessible from the menu. - -#include doc/macros/main_footer.bb; diff --git a/doc/en/AdvancedSearch.md b/doc/en/AdvancedSearch.md new file mode 100644 index 000000000..a67c1fc1f --- /dev/null +++ b/doc/en/AdvancedSearch.md @@ -0,0 +1,53 @@ +Advanced Directory Search +========================= + + +Advanced Directory Search is enabled in "Expert Mode" from your Settings => Additional features page. + +On the Directory page an option named "Advanced" will apear in the "Find Channels" widget (typically in the sidebar). Clicking "Advanced" will open another search box for entering advanced search requests. + +Advanced requests include + +* name=xxx +[Channel name contains xxx] + +* address=xxx +[Channel address (webbie) contains xxx] + +* locale=xxx +[Locale (typically 'city') contains xxx] + +* region=xxx +[Region (state/territory) contains xxx] + +* postcode=xxx +[Postcode or zip code contains xxx] + +* country=xxx +[Country name contains xxx] + +* gender=xxx +[Gender contains xxx] + +* marital=xxx +[Marital status contains xxx] + +* sexual=xxx +[Sexual preference contains xxx] + +* keywords=xxx +[Keywords contain xxx] + +There are many reasons why a match may not return what you're looking for, as many channels do not provide detailed information in their default (public) profile, and many of these fields allow free-text input in several languages - and this may be difficult to match precisely. For instance you may have better results finding somebody in the USA with 'country=u' (along with some odd channels from Deutschland and Bulgaria and Australia) because this could be represented in a profile as US, U.S.A, USA, United States, etc... + +Future revisions of this tool may try to smooth over some of these difficulties. + +Requests may be joined together with 'and', 'or', and 'and not'. + +Terms containing spaces must be quoted. + +Example: + + name="charlie brown" and country=canada and not gender=female + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Comparison-of-activity-stream-networks.md b/doc/en/Comparison-of-activity-stream-networks.md new file mode 100644 index 000000000..d76ae1006 --- /dev/null +++ b/doc/en/Comparison-of-activity-stream-networks.md @@ -0,0 +1,23 @@ +Comparison of different server-client networks providing activity streams to users +==================================== +The goal of this table was to provide an overview of the security and privacy provided by server-client networks providing activity-streams. + +| project | license | distributed | supports node isolation | server-to-server encryption | 1-click E2EE* | database encryption sceme | supports cloning[^5] | encryption of private messages | PFS chat | wall-to-wall interaction | supports post editing and unsend private message | other | +|-----------+---------------+-------------+-------------------------+-------------------------------------------+------------------------------------------+-----------------------------------------------------+-------------------------+-------------------------------------------------------------------------------------------------+-----------------------------------------------+--------------------------------------------------------------+--------------------------------------------------+------------------------------------------------------------------------------| +| hubzilla | ISC aka MIT | yes | yes | Zot (PKI) + TLS | yes (via JavaScript, AES-256) | content obfuscation, private keys hidden in the DB. | yes, partly implemented | impossible to message privately in plaintext | no | yes, multiple separated channels possible within one account | yes | privacy built in, run your own @ home, nodes are called hubs | +| diaspora | AGPLv3orlater | yes | no[^1] | PKI + SSL/TLS[^1] | no[^2] | mostly plaintext | no | ? | no | yes, no naming policy | no | nodes are called pods | +| facebook | proprietary | no | no | planned, probably not implemented yet[^3] | implemented but not offered to users[^4] | unknown | no, walled garden | no, 3-d party plugin Cryptocat and pidgin is availiable but the user is not informed about this | no, with Cryptocat: yes, with pidgin+OTR: yes | only one wall allowed | only post editing | "real name"-policy enforced, advertising-driven, for profit company US-based | +| twitter | proprietary | no | no | unknown | no | unknown, probably none | no, walled garden | no | no | yes | only post editing | advertising-driven, for profit company US-based | +| | | | | | | | | | | | | | + +This table was edited with emacs using org-mode. + +[^1]: https://wiki.diasporafoundation.org/Federation_protocol_overview + +[^2]: forks providing this exists + +[^3]: http://news.softpedia.com/news/Facebook-Aims-to-Encrypt-Everything-Between-Data-Centers-433091.shtml + +[^4]: http://www.computerworld.com/article/2488773/cybercrime-hacking/facebook-holds-back-on-end-to-end-encryption.html + +[^5]: see the hubzilla help files for details about this feature. diff --git a/doc/en/Creating-Templates.md b/doc/en/Creating-Templates.md new file mode 100644 index 000000000..fc3f18dd3 --- /dev/null +++ b/doc/en/Creating-Templates.md @@ -0,0 +1,93 @@ +Creating Page Templates +======================= + + +A page template for use with Comanche requires two files - a PHP template and a CSS file. Page templates will need to be installed by the system administrator of your site. + + +First choose a name. Here we'll create a template and call it "demo". + +You will need to create the files "view/php/demo.php" and "view/css/demo.css" to hold the PHP template and CSS respectively. + +To get a better idea of this process, let's look at an existing template - the "default" template. This is used by default throughout the application. + +view/php/default.php +==================== + + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + + + +
      +
      +
      +
      + +
      + + + + +Here's is the corresponding CSS file + +view/php/default.css +==================== + + + aside#region_1 { + display: block; + width: 210px; + position: absolute; + top: 65px; + left: 0; + margin-left: 10px; + } + + aside input[type='text'] { + width: 174px; + } + + + section { + position: absolute; + top: 65px; + left: 250px; + display: block; + right: 15px; + padding-bottom: 350px; + } + + +Some things you may notice when looking at these definitions: + +* We have not specified any CSS for the "nav", "right_aside", or "footer" regions. In this template "nav" and "footer" will be the full page width and we will let the size and placement of these elements be controlled by the theme. "right_aside" is not currently used. + +* There are elements on the page such as "page-footer" and "pause" for which there is no apparent content. This content will come from Javascript elements. + +* Our default template uses absolute positioning. Modern web design often uses "float" div containers so that scrollbars aren't typically needed when viewing on small-screen devices. + +To design a new template, it is best to start with an existing template, and modify it as desired. That is what we will do here. + +The way that Comanche provides content inside a specific region is by using a region tag. + + [region=aside][widget=profile][/widget][/region] + +This example will place a "profile" widget in the "aside" region. But what it actually does is place the HTML for the widget into a code variable **$page['aside']**. Our default page template defines a region on the page (the CSS positions this as an absolute sidebar) and then inserts the contents of $page['aside'] (if it exists). + +So if you wanted to create a template with a region named "foo", you would provide a place for it on the page, then include the contents of $page['foo'] wherever you wanted to use it, and then using Comanche, you could specify + + [region=foo][widget=profile][/widget][/region] + +and this would place a profile widget into the "foo" region you created. + +Use the CSS file to position the region on the page where desired and optionally control its size. + +[To be continued] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/DerivedTheme1.md b/doc/en/DerivedTheme1.md new file mode 100644 index 000000000..b120c628c --- /dev/null +++ b/doc/en/DerivedTheme1.md @@ -0,0 +1,101 @@ +Creating a Derived Theme +======================== + +**Lesson 1** + +A derived theme takes most of the settings from its "parent" theme and lets you change a few things to your liking without creating an entire theme package. + + +To create a derived theme, first choose a name. For our example we'll call our theme 'mytheme'. Hopefully you'll be a bit more creative. But throughout this document, wherever you see 'mytheme', replace that with the name you chose. + +**Directory Structure** + +First you need to create a theme directory structure. We'll keep it simple. We need a php directory and a css directory. Here are the Unix/Linux commands to do this. Assume that 'mywebsite' is your top level $Projectname folder. + + + cd mywebsite + mkdir view/theme/mytheme + mkdir view/theme/mytheme/css + mkdir view/theme/mytheme/php + + +Great. Now we need a couple of files. The first one is your theme info file, which describes the theme. + +It will be called view/theme/mytheme/php/theme.php (clever name huh?) + +Inside it, put the following information - edit as needed + + Display Settings as their default theme. + +**Lesson 2** + +If you want to use the redbasic schemas for your derived theme, you have to do a bit more. + +Do everything as above, but don't create view/theme/mytheme/php/style.php, but copy instead view/theme/redbasic/php/style.php to view/theme/mytheme/php/style.php. Modify that file and remove (or comment out) these two lines: + + if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') + set_pconfig(local_channel(), 'redbasic', 'schema', '---'); + +Also add this line at the bottom: + + echo @file_get_contents('view/theme/mytheme/css/style.css'); + +To show the schema selector you have to copy view/theme/redbasic/tpl/theme_settings.tpl to view/theme/mytheme/tpl/theme_settings.tpl. Modify that file and replace the lines: + + {{if $theme == redbasic}} + {{include file="field_select.tpl" field=$schema}} + {{/if}} + +with: + + {{include file="field_select.tpl" field=$schema}} + + + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Developers.md b/doc/en/Developers.md new file mode 100644 index 000000000..624c058d2 --- /dev/null +++ b/doc/en/Developers.md @@ -0,0 +1,54 @@ +Developer Guide +=================== + +**Here is how you can join us.** + +First, get yourself a working git package on the system where you will be +doing development. + +Create your own github account. + +You may fork/clone the $Projectname repository from [https://framagit.org/hubzilla/core.git](https://framagit.org/hubzilla/core.git). + +Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) +to create and use your own tracking fork on framagit + +Then go to your framagit page and create a "Pull request" when you are ready +to notify us to merge your work. + +**Translations** + +Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/hubzilla/](https://www.transifex.com/projects/p/hubzilla/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. + +[Translations - More Info](help/Translations) + +**Important** + +Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. + +Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. + + +**Licensing** + +All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. + +**Coding Style** + +In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. + +* All comments should be in English. + +* We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged. + +* Indentation is accomplished primarily with tabs using a tab-width of 4. + +* String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';" + +* Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes. + +* Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability. + +* Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Features.md b/doc/en/Features.md new file mode 100644 index 000000000..a43fd73fa --- /dev/null +++ b/doc/en/Features.md @@ -0,0 +1,108 @@ +Extra Features +============== + +The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page. + +**Content Expiration** + +Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed. + +**Multiple Profiles** + +The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. + +**Web Pages** + +Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks. + +**Private Notes** + +On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. + +**Enhanced Photo Albums** + +Provides a photo album viewer that is a bit prettier than the normal interface. + +**Extended Identity Sharing** + +By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix. + +**Expert Mode** + +This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking. + +**Premium Channel** + +This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect. + + +**Richtext Editor** + +The status post editor is plaintext, but the matrix allows a wide range of markup using BBcode. The visual editor provides "what you see is what you get" for many of the most frequently used markup tags. + +**Post Preview** + +Allows previewing posts and comments exactly as they would look on the page before publishing them. + +**Channel Sources** + +Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel. + +**Even More Encryption** + +Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog". + + +**Search by Date** + +This provides the ability to select posts by date ranges + +**Privacy Group Filter** + +Enable widget to display stream posts only from selected groups of connection. This also toggles the outbound permissions while you are viewing a privacy group. This is analogous to Google "circles" or Disapora "aspects". + +**Saved Searches** + +Provides a search widget on your matrix page which can save selected search terms for re-use. + +**Personal Tab** + +Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. + +**New Tab** + +Enables a tab to display all new matrix activity as a firehose or timeline. + +**Affinity Tool** + +Filter matrix stream activity by the depth of your relationships + +**Edit Sent Posts** + +Edit and correct posts and comments after sending + +**Tagging** + +Ability to tag existing posts, including those written by others. + +**Post Categories** + +Add categories to your channel posts + +**Saved Folders** + +Ability to file posts under folders or tags for later recall + +**Dislike Posts** + +Ability to dislike posts/comments + +**Star Posts** + +Ability to mark special posts with a star indicator + +**Tag Cloud** + +Provide a personal tag cloud on your channel page + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Hubzilla_on_OpenShift.bb b/doc/en/Hubzilla_on_OpenShift.bb new file mode 100644 index 000000000..7bdd70955 --- /dev/null +++ b/doc/en/Hubzilla_on_OpenShift.bb @@ -0,0 +1,105 @@ +[b]$Projectname on OpenShift[/b] +You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes. + +As of this writing, 2015-10-28, you do not have to pay for OpenShift on the Free plan, which gives you three gears at no cost. The Bronze plan gives you three gears at no cost too, but you can expand to 16 gears by paying, and this requires you to register your payment card. The three gears can give three instances of Hubzilla with one gear each, or you can combine two gears into one high-availability Hubzilla instance and one extra gear. The main difference to be aware of is this: gears on the Free plan will go into hibernation if left idle for too long, this does not happen on the Bronze plan. + +Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so. See for example https://developers.openshift.com/en/getting-started-debian-ubuntu.html on how to do this on Debian GNU/Linux, or in the menu on that page for other GNU/Linux distributions or other operating systems. + +[code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://framagit.org/hubzilla/core.git -l your@email.address -p your_account_password +[/code] + +Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup. You MUST change server address from 127.0.0.1 to localhost. + +NOTE: PostgreSQL is NOT supported by the deploy script yet, see [zrl=https://zot-mor.rhcloud.com/display/3c7035f2a6febf87057d84ea0ae511223e9b38dc27913177bc0df053edecac7c@zot-mor.rhcloud.com?zid=haakon%40zot-mor.rhcloud.com]this thread[/zrl]. + +[b]Update[/b] +To update, consider your own workflow first. I have forked Hubzilla code into my GitHub account to be able to try things out, this remote repo is called origin. Here is how I fetch new code from upstream, merge into my local repo, then push the updated code both into origin and the remote repo called openshift. + +[code]git fetch upstream;git checkout master;git merge upstream/master;git push origin;git push openshift HEAD +[/code] + +[b]Administration[/b] +Symptoms of need for MySQL database administration are: +[list] +[*] you can visit your domain and see the Hubzilla frontpage, but trying to login throws you back to login. This can mean your session table is marked as crashed. +[*] you can login, but your channel posts are not visible. This can mean your item table is marked as crashed. +[*] you can login and you can see your channel posts, but apparently nobody is getting your posts, comments, likes and so on. This can mean your outq table is marked as crashed. +[/list] + +You can check your OpenShift logs by doing + +[code] +rhc tail -a your_app_name -n your_domain -l your@email.address -p your_account_password +[/code] + +and you might be able to confirm the above suspicions about crashed tables, or other problems you need to fix. + +[b]How to fix crashed tables in MySQL[/b] +Using MySQL and the MyISAM database engine can result in table indexes coming out of sync, and you have at least two options for fixing tables marked as crashed. +[list] +[*] Use the database username and password OpenShift creates for your instance at [url=https://your_app_name-your_domain.rhcloud.com/phpmyadmin/]https://your_app_name-your_domain.rhcloud.com/phpmyadmin/[/url] to login via the web into your phpMyAdmin web interface, click your database in the left column, in the right column scroll down to the bottom of the list of tables and click the checkbox for marking all tables, then select Check tables from the drop down menu. This will check the tables for problems, and you can then checkmark only those tables with problems, and select Repair table from the same drop down menu at the bottom. +[*] You can port-forward the MySQL database service to your own machine and use the MySQL client called mysqlcheck to check, repair and optimize your database or individual database tables without stopping the MySQL service on OpenShift. Run the following in two separate console windows. + +To port-forward do + +[code]rhc port-forward -a your_app_name -n your_domain -l your@email.address -p your_password[/code] + +in one console window, then do either -o for optimize, -c for check or -r for repair, like this + +[code]mysqlcheck -h 127.0.0.1 -r your_app_name -u your_app_admin_name -p[/code] + +and give the app's password at the prompt. If all goes well you should see a number of table names with an OK behind them. + +You can now +[code]Press CTRL-C to terminate port forwarding[/code] +[*] You can do + +[code]rhc cartridge stop mysql-5.5 -a your_app_name[/code] + +to stop the MySQL service running in your app on OpenShift before running myisamchk - which should only be run when MySQL is stopped, and then +login to your instance with SSH - see OpenShift for details - and do + +[code]cd mysql/data/your_database +myisamchk -r *.MYI[/code] + +or if you get + +[code]Can't create new tempfile[/code] + +check your OpenShift's gear quota with + +[code]quota -gus[/code] + +and if you are short on space, then locally (not SSH) do + +[code]rhc app-tidy your_app_name -l your_login -p your_password[/code] + +to have rhc delete temporary files and OpenShift logs to free space first, then check the size of your local repo dir and execute + +[code]git gc[/code] + +against it and check the size again, and then to minimize your remote repo connect via SSH to your application gear and execute the same command against it by changing to the remote repo directory - your repo should be in + +[code]~/git/your_app_name.git[/code] + +(if not, do find -size +1M to find it), then do + +[code] +cd +cd mysql/data/yourdatabase +myisamchk -r -v -f*.MYI[/code] + +and hopefully your database tables are now okay. +You can now start the MySQL service on OpenShift by locally doing + +[code]rhc cartridge start mysql-5.5 -a your_app_name[/code] +[/list] + +[b]Notes[/b] +[list] +[*] definitely DO turn off feeds and discovery by default and limit delivery reports from 30 days to 3 days if you are on the Free or Bronze plan on OpenShift with a single 1Gb gear by visiting [observer.baseurl]/admin/site when logged in as administrator of your Hubzilla site. +[*] The above defaults have been added into the deploy script. +[*] DO add git gc to the deploy script +[*] MAYBE DO add myisamchk - only checking? to the end of the deploy script. +[*] mysqlcheck is similar in function to myisamchk, but works differently. The main operational difference is that mysqlcheck must be used when the mysqld server is running, whereas myisamchk should be used when it is not. The benefit of using mysqlcheck is that you do not have to stop the server to perform table maintenance - this means this documenation should be fixed. +[/list] diff --git a/doc/en/Plugins.md b/doc/en/Plugins.md new file mode 100644 index 000000000..88b42185b --- /dev/null +++ b/doc/en/Plugins.md @@ -0,0 +1,263 @@ + +Creating Plugins/Addons for $Projectname +========================================== + + +So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. + + +In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. + + + mkdir addon + +Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. + +Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. + + mkdir addon/randplace + +Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file + + addon/randplace/randplace.php + +The very first line of this file needs to be + + + * + */ + +These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. + +The typical plugin will have at least the following functions: + +* pluginname_load() +* pluginname_unload() + +In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named + +* pluginname_install() +* pluginname_uninstall() + + +Next we'll talk about **hooks**. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. + +We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. + + + function randplace_load() { + register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + register_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + register_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + + } + + +So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. + +Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. + + function randplace_unload() { + unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + unregister_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + unregister_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + + } + + +Hooks are called with two arguments. The first is always $a, which is our global App structure and contains a huge amount of information about the state of the web request we are processing; as well as who the viewer is, and what our login state is, and the current contents of the web page we're probably constructing. + +The second argument is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the second argument is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. + +Let's go ahead and add some code to implement our post_local hook handler. + + function randplace_post_hook($a, &$item) { + + /** + * + * An item was posted on the local system. + * We are going to look for specific items: + * - A status post by a profile owner + * - The profile owner must have allowed our plugin + * + */ + + logger('randplace invoked'); + + if(! local_channel()) /* non-zero if this is a logged in user of this system */ + return; + + if(local_channel() != $item['uid']) /* Does this person own the post? */ + return; + + if(($item['parent']) || (! is_item_normal($item))) { + /* If the item has a parent, or isn't "normal", this is a comment or something else, not a status post. */ + return; + } + + /* Retrieve our personal config setting */ + + $active = get_pconfig(local_channel(), 'randplace', 'enable'); + + if(! $active) + return; + /** + * + * OK, we're allowed to do our stuff. + * Here's what we are going to do: + * load the list of timezone names, and use that to generate a list of world cities. + * Then we'll pick one of those at random and put it in the "location" field for the post. + * + */ + + $cities = array(); + $zones = timezone_identifiers_list(); + foreach($zones as $zone) { + if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) + $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); + } + + if(! count($cities)) + return; + $city = array_rand($cities,1); + $item['location'] = $cities[$city]; + + return; + } + + +Now let's add our functions to create and store preference settings. + + /** + * + * Callback from the settings post function. + * $post contains the global $_POST array. + * We will make sure we've got a valid user account + * and that only our own submit button was clicked + * and if so set our configuration setting for this person. + * + */ + + function randplace_settings_post($a,$post) { + if(! local_channel()) + return; + if($_POST['randplace-submit']) + set_pconfig(local_channel(),'randplace','enable',intval($_POST['randplace'])); + } + + + + /** + * + * Called from the Feature Setting form. + * The second argument is a string in this case, the HTML content region of the page. + * Add our own settings info to the string. + * + * For uniformity of settings pages, we use the following convention + *
      + *

      title

      + * .... settings html - many elements will be floated... + *
      + * + *
      + */ + + + + function randplace_settings(&$a,&$s) { + + if(! local_channel()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + head_add_css('/addon/randplace/randplace.css'); + + /* Get the current state of our config variable */ + + $enabled = get_pconfig(local_channel(),'randplace','enable'); + + $checked = (($enabled) ? ' checked="checked" ' : ''); + + /* Add some HTML to the existing form */ + + $s .= '
      '; + $s .= '

      ' . t('Randplace Settings') . '

      '; + $s .= '
      '; + $s .= ''; + $s .= ''; + $s .= '
      '; + + /* provide a submit button */ + + $s .= '
      '; + + } + + + + + +***Advanced Plugins*** + +Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. + +The key to this is to create a simple function named pluginname_module() which does nothing. + + function randplace_module() { return; } + +Once this function exists, the URL https://yoursite/randplace will access your plugin as a module. Then you can define functions which are called at various points to build a webpage just like the modules in the mod/ directory. The typical functions and the order which they are called is + + modulename_init($a) // (e.g. randplace_init($a);) called first - if you wish to emit json or xml, + // you should do it here, followed by killme() which will avoid the default action of building a webpage + modulename_aside($a) // Often used to create sidebar content + modulename_post($a) // Called whenever the page is accessed via the "post" method + modulename_content($a) // called to generate the central page content. This function should return a string + // consisting of the central page content. + +Your module functions have access to the URL path as if they were standalone programs in the Unix operating system. For instance if you visit the page + + https://yoursite/randplace/something/somewhere/whatever + +we will create an argc/argv list for use by your module functions + + $x = argc(); $x will be 4, the number of path arguments after the sitename + + for($x = 0; $x < argc(); $x ++) + echo $x . ' ' . argv($x); + + + 0 randplace + 1 something + 2 somewhere + 3 whatever + + +***Porting Friendica Plugins*** + +$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica plugins can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: + +* Friendica's pluginname_install() is pluginname_load() + +* Friendica's pluginname_uninstall() is pluginname_unload() + +$Projectname has _install and _uninstall functions but these are used differently. + +* Friendica's "plugin_settings" hook is called "feature_settings" + +* Friendica's "plugin_settings_post" hook is called "feature_settings_post" + +Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Primary-Directory.md b/doc/en/Primary-Directory.md new file mode 100644 index 000000000..92460c346 --- /dev/null +++ b/doc/en/Primary-Directory.md @@ -0,0 +1,47 @@ +#Primary Directory# + +By default, $Projectname will use available Directories on the web, which show you channels available around the world. + +There are certain scenarios where you might want your own directory-server that you can connect multiple hubs to. This will limit the channels that appear in all of your hubs to only channels on hubs connected to your directory-server. + + + +##Instuctions on how to set up one hub as the Primary Directory for a series of private hubs.## +*** + + +* On the hub that will be the Directory Server, open the .htconfig.php file and set: + + `App::$config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;` + + + By default it should already be set as **DIRECTORY_MODE_NORMAL**, so just edit that line to say **DIRECTORY_MODE_PRIMARY** + +* Next, for each hub (including the Directory Server), from a terminal, cd into the folder where it is installed and run this : + + `util/config system directory_realm YOURREALMNAME` + + (**YOURREALMNAME** can be whatever you want your realm-name to be) + + then: + + `util/config system realm_token THEPASSWORD` + + (**THEPASSWORD** is whatever password you want for your realm) + + **NOTE:** Use the same realm-name and password for each hub + +* Lastly, for each "client" hub, (from a terminal) run: + + `util/config system directory_server https://theaddressofyourdirectoryserver.com` + +*** +Now when you view the directory of each hub, it should only show the channels that exist on the hubs in your realm. I have tested with two hubs so far, and it seems to be working fine. +Channels created in each hub are reflected in the Primary Directory, and subsequently in the directory of all client hubs + +##Issues## +*** + +When I created the first hub,it was up and running for an hour or so before I changed it to PRIMARY_MODE, and after changing it, there were a few channels from across the matrix still present in the directory. I deleted them from the xchan table and that seems to have fixed the issue. + + diff --git a/doc/en/Remove-Account.md b/doc/en/Remove-Account.md new file mode 100644 index 000000000..a8ef733a6 --- /dev/null +++ b/doc/en/Remove-Account.md @@ -0,0 +1,26 @@ +// this page is out of date... +Remove Account +============== + +It is presently not possible to remove an account without asking your site administrator for assistance. +We'll have better doco when somebody finishes that bit. + + +Remove Channel +============== + +Visit the URL + + https://yoursite/removeme + +(replace 'yoursite' with the domain name of your $Projectname site). + +You will need to confirm your password and the channel you are currently logged into will be removed. + +This is irreversible. + +If you have identity clones on other sites this only removes the channel instance which exists +on this site. + + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Schema-development.md b/doc/en/Schema-development.md new file mode 100644 index 000000000..e811bb8c3 --- /dev/null +++ b/doc/en/Schema-development.md @@ -0,0 +1,81 @@ +Red development - a guide to the schema system +============================================== + + +A schema, in a nutshell, is a collection of settings for a bunch of variables to define +certain elements of a theme. A schema is loaded as though it were part of config.php +and has access to all the same information. Importantly, this means it is identity aware, +and can be used to do some interesting things. One could, for example, restrict options +by service class, or present different options to different members. + +By default, we filter only by whether or not expert mode is enabled. If expert mode is +enabled, all options are presented to the member. If it is not, only scheme, background +image, font face, and iconset are available as choices. + +A schema is loaded *after* the member's personal settings. Therefore, to allow a member +to overwrite a particular aspect of a schema you would use the following syntax: + + if (! $foo) + $foo = 'bar'; + +However, there are circumstances - particularly with positional elements - where it +may be desirable (or necessary) to override a member's settings. In this case, the syntax +is even simpler: + + $foo = 'bar'; + +Members will not thank you for this, however, so only use it when it is required. + +If no personal options are set, and no schema is selected, we will first try to load a schema +with the file name "default.php". This file should never be included with a theme. If it +is, merge conflicts will occur as people update their code. Rather, this should be defined +by administrators on a site by site basis. +default.php and default.css MUST be symlinks to existing scheme files. + +You schema does not need to - and should not - contain all of these values. Only the values +that differ from the defaults should be listed. This gives you some very powerful options +with very few lines of code. + +Note the options available differ with each theme. The options available with the Redbasic +theme are as follows: + +* nav_colour + The colour of the navigation bar. Options are red, black and silver. Alternatively, + one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and + hover effects. +* banner_colour + The font colour of the banner element. Accepts an RGB or Hex value. +* bgcolour + Set the body background colour. Accepts an RGB or Hex value. +* background_image + Sets a background image. Accepts a URL or path. +* item_colour + Set the background colour of items. Accepts an RGB or Hex value. +* item_opacity + Set the opacity of items. Accepts a value from 0.01 to 1 +* toolicon_colour + Set the colour of tool icons. Accepts an RGB or Hex value. +* toolicon_activecolour + Set the colour of active or hovered icon tools. +* font_size + Set the size of fonts in items and posts. Accepts px or em. +* body_font_size + Sets the size of fonts at the body level. Accepts px or em. +* font_colour + Sets the font colour. Accepts an RGB or Hex value. +* radius + Set the radius of corners. Accepts a numeral, and is always in px. +* shadow + Set the size of shadows shown with inline images. Accepts a numerical + value. Note shadows are not applied to smileys. +* converse_width + Set the maximum width of the content region in px. +* nav_min_opacity +* top_photo +* reply_photo + +If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. +This gives the schem developer the possiblity to override any style component. + + +#include doc/macros/main_footer.bb; diff --git a/doc/en/TermsOfService.md b/doc/en/TermsOfService.md new file mode 100644 index 000000000..1e085559e --- /dev/null +++ b/doc/en/TermsOfService.md @@ -0,0 +1,11 @@ +Privacy Policy +============== + +#include doc/gdpr1.md; + + +Terms of Service +================ + +#include doc/SiteTOS.md; + diff --git a/doc/en/Translations.md b/doc/en/Translations.md new file mode 100644 index 000000000..6106e43b1 --- /dev/null +++ b/doc/en/Translations.md @@ -0,0 +1,93 @@ +Translating $Projectname +========================== + +Translation Process +------------------- + +The strings used in the UI of $Projectname is translated at [Transifex][1] and then +included in the git repository at github. If you want to help with translation +for any language, be it correcting terms or translating $Projectname to a +currently not supported language, please register an account at transifex.com +and contact the Redmatrix translation team there. + +Translating $Projectname is simple. Just use the online tool at transifex. If you +don't want to deal with git & co. that is fine, we check the status of the +translations regularly and import them into the source tree at github so that +others can use them. + +We do not include every translation from transifex in the source tree to avoid +a scattered and disturbed overall experience. As an uneducated guess we have a +lower limit of 50% translated strings before we include the language. This +limit is judging only by the amount of translated strings under the assumption +that the most prominent strings for the UI will be translated first by a +translation team. If you feel your translation useable before this limit, +please contact us and we will probably include your teams work in the source +tree. + +If you want to get your work into the source tree yourself, feel free to do so +and contact us with and question that arises. The process is simple and +$Projectname ships with all the tools necessary. + +The location of the translated files in the source tree is + /view/LNG-CODE/ +where LNG-CODE is the language code used, e.g. de for German or fr for French. +For the email templates (the *.tpl files) just place them into the directory +and you are done. The translated strings come as a "hmessages.po" file from +transifex which needs to be translated into the PHP file $Projectname uses. To do +so, place the file in the directory mentioned above and use the "po2php" +utility from the util directory of your $Projectname installation. + +Assuming you want to convert the German localization which is placed in +view/de/hmessages.po you would do the following. + +1. Navigate at the command prompt to the base directory of your + $Projectname installation + +2. Execute the po2php script, which will place the translation + in the hstrings.php file that is used by $Projectname. + + $> php util/po2php.php view/de/hmessages.po + + The output of the script will be placed at view/de/hstrings.php where + froemdoca os expecting it, so you can test your translation mmediately. + +3. Visit your $Projectname page to check if it still works in the language you + just translated. If not try to find the error, most likely PHP will give + you a hint in the log/warnings.about the error. + + For debugging you can also try to "run" the file with PHP. This should + not give any output if the file is ok but might give a hint for + searching the bug in the file. + + $> php view/de/hstrings.php + +4. commit the two files with a meaningful commit message to your git + repository, push it to your fork of the $Projectname repository at github and + issue a pull request for that commit. + +Utilities +--------- + +Additional to the po2php script there are some more utilities for translation +in the "util" directory of the $Projectname source tree. If you only want to +translate $Projectname into another language you wont need any of these tools most +likely but it gives you an idea how the translation process of $Projectname +works. + +For further information see the utils/README file. + +Known Problems +-------------- + +* $Projectname uses the language setting of the visitors browser to determain the + language for the UI. Most of the time this works, but there are some known + quirks. +* the early translations are based on the friendica translations, if you + some rough translations please let us know or fix them at Transifex. + +Links +------ +[1]: http://www.transifex.com/projects/p/hubzilla/ + + +#include doc/macros/main_footer.bb; diff --git a/doc/en/Widgets.md b/doc/en/Widgets.md new file mode 100644 index 000000000..6779d7ffd --- /dev/null +++ b/doc/en/Widgets.md @@ -0,0 +1,174 @@ +Core Widgets +============ + +Some/many of these widgets have restrictions which may restrict the type of page where they may appear or may require login + + +* clock - displays the current time + * args: military (1 or 0) - use 24 hour time as opposed to AM/PM +
       
      + +* profile - displays a profile sidebar on pages which load profiles (pages with nickname in the URL) + +* tagcloud - display a tagcloud of webpage items + + * args: count - number of items to return (default 24) +
       
      + +* collections - privacy group selector for the current logged in channel + + * args: mode - one of "conversation", "group", "abook" depending on module +
       
      + +* suggestions - friend suggestions for the current logged on channel + +* follow - presents a text box for following another channel + +* notes - private notes area for the current logged in channel if private_notes feature is enabled + +* savedsearch - network/matrix search with save - must be logged in and savedsearch feature enabled + +* filer - select filed items from network/matrix stream - must be logged in + +* archive - date range selector for network and channel pages + * args: 'wall' - 1 or 0, limit to wall posts or network/matrix posts (default) +
       
      + +* fullprofile - same as profile currently + +* categories - categories filter (channel page) + +* tagcloud_wall - tagcloud for channel page only + * args: 'limit' - number of tags to return (default 50) +
       
      + +* catcloud_wall - tagcloud for channel page categories + * args: 'limit' - number of categories to return (default 50) +
       
      + +* affinity - affinity slider for network page - must be logged in + +* settings_menu - sidebar menu for settings page, must be logged in + +* mailmenu - sidebar menu for private message page - must be logged in + +* design_tools - design tools menu for webpage building pages, must be logged in + +* findpeople - tools to find other channels + +* photo_albums - list photo albums of the current page owner with a selector menu + +* vcard - mini profile sidebar for the person of interest (page owner, whatever) + +* dirsafemode - directory selection tool - only on directory pages + +* dirsort - directory selection tool - only on directory pages + +* dirtags - directory tool - only on directory pages + +* menu_preview - preview a menu - only on menu edit pages + +* chatroom_list - list of chatrooms for the page owner + +* bookmarkedchats - list of bookmarked chatrooms collected on this site for the current observer + +* suggestedchats - "interesting" chatrooms chosen for the current observer + +* item - displays a single webpage item by mid or page title + * args: + * channel_id - channel that owns the content, defualt is the profile_uid + * mid - message_id of webpage to display (must be webpage, not a conversation item) + * title - URL page title of webpage (must provide one of either title or mid) +
       
      + +* photo - display a single photo + * args: + * src - URL of photo, must be http or https + * zrl - use zid authenticated link + * style - CSS style string +
       
      + +* cover_photo - display the cover photo for the selected channel + * args: + * channel_id - channel to use, default is the profile_uid + * style - CSS style string (default is dynamically resized to width of region) +
       
      + + +* photo_rand - display a random photo from one of your photo albums. Photo permissions are honoured + * args: + * album - album name (very strongly recommended if you have lots of photos) + * scale - typically 0 (original size), 1 (1024px), 2, (640px), or 3 (320px) + * style - CSS style string + * channel_id - if not your own +
       
      + +* random_block - display a random block element from your webpage design tools collection. Permissions are honoured. + * args: + * contains - only return blocks which include the contains string in the block name + * channel_id - if not your own +
       
      + +* tasklist - provide a task or to-do list for the currently logged-in channel. + * args: + * all - display completed tasks if all is non-zero. +
       
      + +* forums - provide a list of connected public forums with unseen counts for the current logged-in channel. +
       
      + +* activity - provide a list of authors of unread network content for the current logged-in channel. + +* album - provides a widget containing a complete photo album from albums belonging to the page owner; this may be too large to present in a sidebar region as is best implemented as a content region widget. + * args: + * album - album name + * title - optional title, album name is used if not present +
       
      + + +Creating New Widgets +==================== + +### Class Widgets + +To create a class-based widget named 'slugfish' create a file with the following contents: + +```` + 3 ] + + } + +```` + +The resultant file may be placed in widget/Slugfish/Slugfish.php , or Zotlabs/SiteWidgets/Slugfish.php . It also may be linked from a git repository using util/add_widget_repo. + + + +Traditional function based widget: + +If you want a widget named 'slugfish', create widget/widget_slugfish.php containing + + + + +

      Post Permissions

      + +

      The permissions dialog lets you select which channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "Show" the Friends group but "Don't show" that one person.

      + +
      +
      Tip! +
      The border color of each channel indicates whether that channel — or one of the groups it's a member of — will have access to the post. The border color will also indicate when a channel, or group it belongs to, has been explicitly set to "Don't show".
      +
      + +

      Why can't I edit a post's permissions after I saved it?

      + +

      You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it.

      +

      If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.

      \ No newline at end of file diff --git a/doc/en/addons.bb b/doc/en/addons.bb new file mode 100644 index 000000000..4bfa7a9fd --- /dev/null +++ b/doc/en/addons.bb @@ -0,0 +1,117 @@ +[h3]Plugins/Addons[/h3] +[list=1] +[*] abcjsplugin - Create musical scores in your posts +[*] adultphotoflag - prevents nsfw photos from being displayed in public albums +[*] authchoose - only send identity assertions to sites of friends +[*] b2tbtn - provide button to go directly to top of page if you are scrolled a long way down +[*] bbmath - use complex math expressions in your posts +[*] bookmarker - replace #^ with bookmark link in posts +[*] buglink - provide a bug reporting icon in the lower-left corner of every page +[*] calc - a scientific calculator +[*] chess - cross domain identity aware interactive chess games +[*] chords - generate fingering charts and alternatives for every known guitar chord +[*] custom_home - set a custom page as the hub start page +[*] diaspora - Diaspora protocol emulator +[*] dirstats - show some interesting statistics generated by the directory server +[*] docs - alternate documentation pages +[*] donate - provides a project donation page +[*] dreamhost - provide a more reliable service on Dreamhost shared hosting +[*] dwpost - crosspost to Dreamwidth +[*] emojione - allow emojis as emoticons +[*] extcron - use an external cron service to run your hub's scheduled tasks +[*] firefox - provide a link to install the Firefox Sharing API +[*] flattrwidget - provides a "Flattr Us" button +[*] flip - create upside down text +[*] fortunate - displays random quote (fortune cookie). Requires setting up a fortune server. +[*] friendica - Friendica (DFRN) protocol. Under development. +[*] frphotos - import photo albums from Friendica +[*] gnusoc - GNU-Social (OStatus) protocol. Under development. +[*] hexit - hexadecimal conversion tool +[*] hilite - allow language-specific highlighted code blocks in posts +[*] hubwall - send an admin email to all hub accounts +[*] ijpost - crosspost to Insanejournal +[*] irc - connect to IRC chatrooms +[*] jappixmini - XMPP chat +[*] js_upload - upload multiple photos to photo albums at once. +[*] keepout - prevents nearly all use of site when not logged in, more restrictive than 'block public' setting +[*] ldapauth - login via account on LDAP or Windows Active Directory domain +[*] libertree - crosspost to Libertree +[*] likebanner - create a "like us on red#matrix" banner image +[*] ljpost - crosspost to LiveJournal +[*] logrot - logfile rotation utility +[*] mahjongg - Chinese puzzle game +[*] mailhost - when using multiple channel clones, select one to receive email notifications +[*] mailtest - interface for testing mail delivery system +[*] metatag - provide SEO friendly pages +[*] mayan_places - set location field to a random city in the Mayan world +[*] morechoice - additional gender/sexual-preference choices for profiles (not safe for work) +[*] moremoods - Additional mood options +[*] morepokes - additional poke options (not safe for work) +[*] msgfooter - provide legal or other text on each outgoing post +[*] noembed - use noembed.com as an addition to $Projectname native oembed functionality (currently broken) +[*] nofed - prevent "federation" of channel posts, maintains all interaction on your site +[*] nsabait - add random terrorism related hashtags to your posts +[*] nsfw - Highly recommended plugin to collpase posts with inappropriate content +[*] openclipatar - choose a profile photo from hundreds of royalty free images +[*] openid - OpenID authentication and OpenID server. Your OpenID URL is [observer.baseurl]/id/[observer.webname] +[*] opensearch - allow your site to become a browser search provider +[*] openstreetmap - render locations and maps using OpenStreetMap +[*] pageheader - display text at the top of every page on the site +[*] phpmailer - alternate mail delivery system with more configurability +[*] piwik - open source website analytics +[*] planets - set location field to a random planet from Star Wars +[*] pong - classic pong game +[*] pubcrawl - ActivityPub protocol emulator +[*] pubsubhubbub - PuSH protocol for optimised delivery to feed subscribers (required by GNU-Social protocol) +[*] pumpio - crosspost to Pump.io +[*] qrator - generate QR code images +[*] rainbowtag - display your tag and category clouds in colours +[*] randpost - post/reply bot based on and requires fortunate +[*] redfiles - import file storage from redmatrix +[*] redphotos - import photo albums from redmatrix +[*] redred - Crosspost to another Red Matrix or Hubzilla channel +[*] rendezvous - group location tracking +[*] rtof - Crosspost to Friendica +[*] sendzid - add 'zid' auth parmaters to all outbound links, not just in-network links +[*] skeleton - sample addon/plugin to demonstrate plugin development +[*] smiley_pack - extend the built-in smilie (emoticon) support +[*] smileybutton - provides a smiley selector on the post window +[*] startpage - set a personal preferred page to redirect after logging in. +[*] statistics - Diaspora statistics generator +[*] statusnet - GNU-social and StatusNet crosspost [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl] +[*] std_embeds - allow unfiltered embeds for popular providers like youtube, vimeo and soundcloud +[*] superblock - Highly recommended - completely block an offensive channel from your stream +[*] testdrive - Turns your hub into a test drive site with accounts that expire after a trail period. +[*] tictac - 3D tic-tac-toe +[*] torch - flashlight app +[*] tour - feature tour for new members +[*] tripleaes - demo plugin for providing custom encryption algorithms +[*] twitter - crosspost to Twitter +[*] twitter_api - Twitter/Statusnet compatible API +[*] upload_limits - discover what server setting (there are a few) may be causing large photo uploads to fail +[*] visage - show visitors to your channel +[*] webmention - process webmentions +[*] wholikesme - provides a page to display what connections have 'liked' your posts the most +[*] webRTC - use an external server (mayfirst.org) to negotiate webRTC hookups +[*] wppost - crosspost to WordPress (or other wordpress XMLRPC service) +[*] xmpp - XMPP chat based on converse.js +[/list] + +[h3]Addon Repositories[/h3] + +We [b]strongly recommend[/b] that authors of addons publish/submit them to the project addon repository. This has several advantages. Project developers can easily fix security flaws and make changes to comply with recent changes in core code. Addons provided in third-party repositories are considered untrusted. If the project core code changes in an incompatible way, there may be no alternative but to physically remove or rename the addon files in order to get your site working again. Often only the plugin/addon author can help you regain control of your website, and project developers are unable to assist you; because by definition your site configuration has been modified in ways that we cannot easily test or verify. + +For these reasons we [b]strongly recommend[/b] that you do NOT install addons from third-party repositories. + +We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. + + +[url=https://framagit.org/hubzilla/addons]https://framagit.org/hubzilla/addons[/url] Main project addon repository + +[url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip) + + + +#include doc/macros/main_footer.bb; + + diff --git a/doc/en/addons_gnusocial.bb b/doc/en/addons_gnusocial.bb new file mode 100644 index 000000000..fbb387476 --- /dev/null +++ b/doc/en/addons_gnusocial.bb @@ -0,0 +1,65 @@ +[b]How to cross-post to a GNUsocial instance[/b] + +Start on the GNUSocial instance where you have your account. + +In the GNUSocial instance, go to Settings > Connections. In the right column under "Developers," click the link to "Register an OAuth client application to use with this instance of StatusNet." This link may be found at your instance here: + +https://yourgnusocialinstance.org/settings/oauthapps + +Next, click the link to Register a new application. That brings up the new application form. Here's what to do on each field. + +Icon. I uploaded $Projectname icon located at this link, after saving it to my computer: + +https://framagit.org/hubzilla/core/blob/master/images/rm-32.png + +Name. Give the application an appropriate name. I called mine hubzilla. You might prefer r2g. + +Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from $Projectname to GNUsocial. + + +Source URL. Put the main domain name of the Red site you're using. Don't forget to put the "s" in https://yourhubzillasite.com. If your Red installation is a subdomain, that would probably be called for. + +Organization. Since $Projectname is unorganized, I put that. If you use your installation for a group or business, that might be a good option. + +Homepage. If your group is using a subdomain, you probably want to put your main domain URI here. Since I'm on a hosted site, I put redmatrix.me. + +Callback URL. Leave blank. + +Type of application: select "desktop." + +Default access: select "Read-write." + +All fields except the callback URL must be filled in. + +Click on the save button. + +Then click on the icon or the name of the application for the information you'll need to insert over on $Projectname. + +***** + +Now open up a new tab or window and go to your $Projectname account, to Settings > Feature settings. Find the StatusNet Posting Settings. + +Insert the strings of numbers given on the GNUsocial site into $Projectname fields for Consumer Key and Consumer Secret. + +The Base API Path (remember the trailing /) will be your instance domain, plus the /api/ following. It will probably look like this: + +https://yourgnusocialinstance.org/api/ + +In case of doubt check on your GNUsocial instance site in order to find the domain URLs of the Request token, Access token, and Authorization. It will be the first part of the domains, minus the /oauth/.... + +StatusNet application name: Insert the name you gave to the application over on the GNUsocial site. + +Click Submit. + +A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to $Projectname app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit. + +If successful, your information from the GNUsocial instance should appear in $Projectname app. + +You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your $Projectname account to your GNUsocial instance. + +If you don't choose this option, you will have an option to send a post to your GNUsocial instance by first opening the post (by clicking in the post text area) and clicking on the lock icon next to the Share button. Select the GNUsocial icon made up of three colored dialog baloons. Close that window, then make your post. + +If all goes well, you have just cross-posted your $Projectname post to your account on a GNUsocial instance. + +#include doc/macros/addons_footer.bb; + diff --git a/doc/en/admin/administrator_guide.md b/doc/en/admin/administrator_guide.md new file mode 100644 index 000000000..bf4dc7355 --- /dev/null +++ b/doc/en/admin/administrator_guide.md @@ -0,0 +1,464 @@ +### Overview + +$Projectname is more than a simple web application. It is a +complex communications system which more closely resembles an email server +than a web server. For reliability and performance, messages are delivered in +the background and are queued for later delivery when sites are down. This +kind of functionality requires a bit more of the host system than the typical +blog. Not every PHP/MySQL hosting provider will be able to support +$Projectname. Many will but please review the requirements and confirm these +with your hosting provider prior to installation. + +We've tried very hard to ensure that $Projectname will run on commodity +hosting platforms such as those used to host Wordpress blogs and Drupal +websites. It will run on most any Linux VPS system. Windows LAMP platforms +such as XAMPP and WAMP are not officially supported at this time however +we welcome patches if you manage to get it working. + +### Where to find more help +If you encounter problems or have issues not addressed in this documentation, +please let us know via the [Github issue +tracker](https://framagit.org/hubzilla/core/issues). Please be as clear as you +can about your operating environment and provide as much detail as possible +about any error messages you may see, so that we can prevent it from happening +in the future. Due to the large variety of operating systems and PHP platforms +in existence we may have only limited ability to debug your PHP installation or +acquire any missing modules, but we will do our best to solve any general code +issues. + +### Before you begin + +#### Choose a domain name or subdomain name for your server + +$Projectname can only be installed into the root of a domain or sub-domain, and can +not be installed using alternate TCP ports. + +#### Decide if you will use SSL and obtain an SSL certificate before software installation + +You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate. +*You MUST NOT use self-signed certificates!* + +Please test your certificate prior to installation. A web tool for testing your +certificate is available at "http://www.digicert.com/help/". When visiting your +site for the first time, please use the SSL ("https://") URL if SSL is available. +This will avoid problems later. The installation routine will not allow you to +use a non browser-valid certificate. + +This restriction is incorporated because public posts from you may contain +references to images on your own hub. Other members viewing their stream on +other hubs will get warnings if your certificate is not trusted by their web +browser. This will confuse many people because this is a decentralised network +and they will get the warning about your hub while viewing their own hub and may +think their own hub has an issue. These warnings are very technical and scary to +some folks, many of whom will not know how to proceed except to follow the browser +advice. This is disruptive to the community. That said, we recognise the issues +surrounding the current certificate infrastructure and agree there are many +problems, but that doesn't change the requirement. + +Free "browser-valid" certificates are available from providers such as StartSSL +and LetsEncrypt. + +If you do NOT use SSL, there may be a delay of up to a minute for the initial +install script - while we check the SSL port to see if anything responds there. +When communicating with new sites, $Projectname always attempts connection on the +SSL port first, before falling back to a less secure connection. If you do not +use SSL, your webserver MUST NOT listen on port 443 at all. + +If you use LetsEncrypt to provide certificates and create a file under +.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership, +please remove or rename the .well-known directory as soon as the certificate is +generated. $Projectname will provide its own handler for ".well-known" services when +it is installed, and an existing directory in this location may prevent some of +these services from working correctly. This should not be a problem with Apache, +but may be an issue with nginx or other web server platforms. + +### Deployment +There are several ways to deploy a new hub. + +* Manual installation on an existing server +* Automated installation on an existing server using a shell script +* Automated deployment using an OpenShift virtual private server (VPS) + +### Requirements +* Apache with mod-rewrite enabled and "AllowOverride All" so you can use a + local .htaccess file. Some folks have successfully used nginx and lighttpd. + Example config scripts are available for these platforms in doc/install. + Apache and nginx have the most support. + +* PHP 8.1 or later. + Note that on some shared hosting environments, the _command line_ + version of PHP might differ from the _webserver_ version + +* PHP *command line* access with register_argc_argv set to true in the + php.ini file, and with no hosting provider restrictions on the use of + exec() and proc_open(). + +* curl, gd (with at least jpeg and png support), pdo-mysql (or pdo-postgres), mbstring, zip, + and openssl extensions. The imagick extension is not required, but recommended. + +* xml extension is required if you want webdav to work. + +* some form of email server or email gateway such that PHP mail() works. + +* A supported database server. The supported databases are: + - Mysql version 8.0.22 or later + - MariaDB version 10.4 or later + - PostgreSQL version 12 or later + +* ability to schedule jobs with cron. + +* Installation into a top-level domain or sub-domain (without a + directory/path component in the URL) is REQUIRED. + +### Manual Installation + +#### Unpack the $Projectname files into the root of your web server document area +If you copy the directory tree to your webserver, make sure that you include the +hidden files like .htaccess. + +If you are able to do so, we recommend using git to clone the source +repository rather than to use a packaged tar or zip file. This makes the +software much easier to update. The Linux command to clone the repository +into a directory "mywebsite" would be: + + git clone https://framagit.org/hubzilla/core.git mywebsite + +and then you can pick up the latest changes at any time with: + + git pull + +make sure folders ``store/[data]/smarty3`` and ``store`` exist and are +writable by the webserver: + + mkdir -p "store/[data]/smarty3" + chmod -R 777 store + + This permission (777) is very dangerous and if you have sufficient + privilege and knowledge you should make these directories writeable + only by the webserver and, if different, the user that will run the + cron job (see below). In many shared hosting environments this may be + difficult without opening a trouble ticket with your provider. The + above permissions will allow the software to work, but are not + optimal. + +The following directories also need to be writable by the webserver in order for certain +web-based administrative tools to function: + +* `addon` +* `extend` +* `view/theme` +* `widget` + +#### Official addons +##### Installation +Navigate to your website. Then you should clone the addon repository (separately). We'll give this repository a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by giving them different nicknames: + + cd mywebsite + util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons + +##### Updating +For keeping the addon tree updated, you should be on your top level website directory and issue an update command for that repository:: + + cd mywebsite + util/update_addon_repo hzaddons + +Create searchable representations of the online documentation. You may do this +any time that the documentation is updated : + + cd mywebsite + util/importdoc + +### Automated installation via the .homeinstall shell script +There is a shell script in (``.homeinstall/hubzilla-setup.sh``) that will install $Projectname and its dependencies on a fresh installation of Debian 9 stable (Stetch). It should work on similar Linux systems but your results may vary. + +#### Requirements +The installation script was originally designed for a small hardware server behind your home router. However, it has been tested on several systems running Debian 9: + +* Home-PC (Debian-9.2-amd64) and Rapberry-Pi 3 (Rasbian = Debian 9.3) + + * Internet connection and router at home + * Mini-PC / Raspi connected to your router + * USB drive for backups + * Fresh installation of Debian on your mini-pc + * Router with open ports 80 and 443 for your Debian + +#### Overview of installation steps +1. `apt-get install git` +1. `mkdir -p /var/www/html` +1. `cd /var/www/html` +1. `git clone https://framagit.org/hubzilla/core.git .` +1. `nano .homeinstall/hubzilla-config.txt` +1. `cd .homeinstall/` +1. `./hubzilla-setup.sh` +1. `service apache2 reload` +1. Open your domain with a browser and step throught the initial configuration of $Projectname. + +### Recommended Addons + +We recommend the following addons be installed on all public sites: + + nsfw - hide inappropriate posts/comments + superblock - block content from offensive channels + +### Federation Addons + +Several web communities have begun to converge using common protocols. The protocols involved are somewhat limited in their abilities. The GNU-Social protocol for instance offers no privacy modes, and the Diaspora protocol is somewhat restrictive in what kinds of communications are allowed. All comments must be signed in a very unique manner by the original author. The ActivityPub protocol is also being considered and may be supported at a future date. No other existing protocol supports nomadic location as used by this project. This presents some support challenges as some features work with some networks and don't work with others. Nevertheless the federation protocols allow connections to be made to a much larger community of people worldwide. They are provided as addons. + +* diaspora - The Diaspora Protocol used by Diaspora and Friendica. You should enable 'Diaspora Statistics' (statistics) first to enable all the available features. + +* gnusoc - The GNU-Social Protocol, used by GNU-Social, Mastodon and several other communities. This addon requires you first install the 'pubsubhubbub' service (also an addon). + +Each member of your site must choose whether or not to allow these protocols individually as they may conflict with several desirable core features and abilities of this software (such as channel migration and cloning). They do this from their 'Settings -> Feature/Addon Settings' page. The administrator may also set the following: + + util/config system.diaspora_allowed 1 + util/config system.gnusoc_allowed 1 + +and enable these protocols automatically for all newly created channels. + +### Service Classes + +Service classes allow you to set limits on system resources by limiting what individual +accounts can do, including file storage and top-level post limits. Define custom service +classes according to your needs in the `.htconfig.php` file. For example, create +a _standard_ and _premium_ class using the following lines: + + // Service classes + + App::$config['system']['default_service_class']='standard'; // this is the default service class that is attached to every new account + + // configuration for standard service class + App::$config['service_class']['standard'] = + array('photo_upload_limit'=>2097152, // total photo storage limit per channel (here 2MB) + 'total_identities' =>1, // number of channels an account can create + 'total_items' =>0, // number of top level posts a channel can create. Applies only to top level posts of the channel user, other posts and comments are unaffected + 'total_pages' =>100, // number of pages a channel can create + 'total_channels' =>100, // number of channels the user can add, other users can still add this channel, even if the limit is reached + 'attach_upload_limit' =>2097152, // total attachment storage limit per channel (here 2MB) + 'chatters_inroom' =>20); + + // configuration for premium service class + App::$config['service_class']['premium'] = + array('photo_upload_limit'=>20000000000, // total photo storage limit per channel (here 20GB) + 'total_identities' =>20, // number of channels an account can create + 'total_items' =>20000, // number of top level posts a channel can create. Applies only to top level posts of the channel user, other posts and comments are unaffected + 'total_pages' =>400, // number of pages a channel can create + 'total_channels' =>2000, // number of channels the user can add, other users can still add this channel, even if the limit is reached + 'attach_upload_limit' =>20000000000, // total attachment storage limit per channel (here 20GB) + 'chatters_inroom' =>100); + +To apply a service class to an existing account, use the command line utility from the +web root: + +`util/service_class` +list service classes + +`util/config system default_service_class firstclass` +set the default service class to 'firstclass' + +`util/service_class firstclass` +list the services that are part of 'firstclass' service class + +`util/service_class firstclass photo_upload_limit 10000000` +set firstclass total photo disk usage to 10 million bytes + +`util/service_class --account=5 firstclass` +set account id 5 to service class 'firstclass' (with confirmation) + +`util/service_class --channel=blogchan firstclass` +set the account that owns channel 'blogchan' to service class 'firstclass' (with confirmation) + +**Service class limit options** + +* photo_upload_limit - maximum total bytes for photos +* total_items - maximum total toplevel posts +* total_pages - maximum comanche pages +* total_identities - maximum number of channels owned by account +* total_channels - maximum number of connections +* total_feeds - maximum number of rss feed connections +* attach_upload_limit - maximum file upload storage (bytes) +* minimum_feedcheck_minutes - lowest setting allowed for polling rss feeds +* chatrooms - maximum chatrooms +* chatters_inroom - maximum chatters per room +* access_tokens - maximum number of Guest Access Tokens per channel + +### Theme management +#### Repo management example +1. Navigate to your hub web root + + ``` + root@hub:/root# cd /var/www + ``` +2. Add the theme repo and give it a name + + ``` + root@hub:/var/www# util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHero + ``` +3. Update the repo by using + + ``` + root@hub:/var/www# util/update_theme_repo DeadSuperHero + ``` + +### Channel Directory + +#### Keywords + +There is a "tag cloud" of keywords that can appear on the channel directory page. +If you wish to hide these keywords, which are drawn from the directory server, you +can use the *config* tool: + + util/config system disable_directory_keywords 1 + +If your hub is in the standalone mode because you do not wish to connect to the +global grid, you may instead ensure the the _directory_server_ system option is +empty: + + util/config system directory_server "" + +### Administration + +#### Site Administration + +Administration of the website is commonly done through the admin webpage located at /admin on your website. In order to access this page you must have administration rights to the server. Administration rights are granted to the first account to register on your site, **provided** the email address of that account exactly matches the email address you provided as the administrator's email address during setup. + +There are several ways that this can fail and leave the system without an administrator account, for instance if the first account that was created provided a different email address than the administrator email address that was supplied during setup. + +For security reasons there is no web page or interface on the system which will give you administrator access. If you need to correct a situation where a system has no administrator account it **must** be done by editing the account table in the database. There is no other way. To do this, you will need to locate the entry in the account table which belongs to the desired administrator, and set 'account_roles' for that entry to 4096. You will then be able to access the admin page from your system's profile menu or directly via /admin . + +A hub can have multiple admins and there is no limit to how administrators you can have. Repeat the above process for every account you wish to provide with administration rights. + +### Troubleshooting + +#### Log files + +The system logfile is an extremely useful resource for tracking down +things that go wrong. This can be enabled in the admin/log +configuration page. A loglevel setting of `LOGGER_DEBUG` is preferred +for stable production sites. Most things that go wrong with +communications or storage are listed here. A setting of LOGGER_DATA +provides *much* more detail, but may fill your disk. In either +case we recommend the use of logrotate on your operating system to +cycle logs and discard older entries. + +At the bottom of your .htconfig.php file are several lines (commented +out) which enable PHP error logging. This reports issues with code +syntax and executing the code and is the first place you should look +for issues which result in a "white screen" or blank page. This is +typically the result of code/syntax problems. Database errors are +reported to the system logfile, but we've found it useful to have a +file in your top-level directory called dbfail.out which *only* +collects database related issues. If the file exists and is writable, +database errors will be logged to it as well as to the system logfile. + +In the case of "500" errors, the issues may often be logged in your +webserver logs, often /var/log/apache2/error.log or something +similar. Consult your operating system documentation. + +There are three different log facilities. + +**The first is the database failure log**. This is only used if you + create a file called specifically `dbfail.out` in the root folder of + your website and make it write-able by the web server. If we have + any database failed queries, they are all reported here. They + generally indicate typos in our queries, but also occur if the + database server disconnects or tables get corrupted. On rare + occasions we'll see race conditions in here where two processes + tried to create an xchan or cache entry with the same ID. Any other + errors (especially persistent errors) should be investigated. + +**The second is the PHP error log**. This is created by the language + processor and only reports issues in the language environment. Again + these can be syntax errors or programming errors, but these + generally are fatal and result in a "white screen of death"; + e.g. PHP terminates. You should probably look at this file if + something goes wrong that doesn't result in a white screen of death, + but it isn't uncommon for this file to be empty for days on end. + + There are some lines at the bottom of the supplied `.htconfig.php` + file; which if uncommented will enable a PHP error log (*extremely* + useful for finding the source of white screen failures). This isn't + done by default due to potential issues with logfile ownership and + write permissions and the fact that there is no logfile rotation by + default. + +**The third is the "application log"**. This is used by $Projectname + to report what is going on in the program and usually reports any + difficulties or unexpected data we received. It also occasionally + reports "heartbeat" status messages to indicate that we reached a + certain point in a script. **This** is the most important log file + to us, as we create it ourself for the sole purpose of reporting the + status of background tasks and anything that seems weird or out of + place. It may not be fatal, but maybe just unexpected. If you're + performing a task and there's a problem, let us know what is in this + file when the problem occurred. (Please don't send me 100M dumps + you'll only piss me off). Just a few relevant lines so I can rule + out a few hundred thousand lines of code and concentrate on where + the problem starts showing up. + +These are your site logs, not mine. We report serious issues at any +log level. I highly recommend `DEBUG` log level for most sites - which +provides a bit of additional info and doesn't create huge +logfiles. When there's a problem which defies all attempts to track, +you might wish to use `DATA` log level for a short period of time to +capture all the detail of what structures we were dealing with at the +time. This log level will use a lot of space so is recommended only +for brief periods or for developer test sites. + +I recommend configuring logrotate for both the php log and the +application log. I usually have a look at dbfail.out every week or +two, fix any issues reported and then starting over with a fresh +file. Likewise with the PHP logfile. I refer to it once in a while to +see if there's something that needs fixing. + +If something goes wrong, and it's not a fatal error, I look at the +application logfile. Often I will + +``` +tail -f logfile.out +``` + +While repeating an operation that has problems. Often I'll insert +extra logging statements in the code if there isn't any hint what's +going wrong. Even something as simple as "got here" or printing out +the value of a variable that might be suspect. You can do this too - +in fact I encourage you to do so. Once you've found what you need to +find, you can + +``` +git checkout file.php +``` + +To immediately clear out all the extra logging stuff you added. Use +the information from this log and any detail you can provide from your +investigation of the problem to file your bug report - unless your +analysis points to the source of the problem. In that case, just fix +it. + +##### Rotating log files + +1. Enable the **logrot** addon in the official [hubzilla-addons](https://framagit.org/hubzilla/addons) repo +1. Create a directory in your web root called `log` with webserver write permissions +1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files. + +#### Reporting issues + +When reporting issues, please try to provide as much detail as may be +necessary for developers to reproduce the issue and provide the +complete text of all error messages. + +We encourage you to try to the best of your abilities to use these +logs combined with the source code in your possession to troubleshoot +issues and find their cause. The community is often able to help, but +only you have access to your site logfiles and it is considered a +security risk to share them. + +If a code issue has been uncovered, please report it on the project +bugtracker (https://framagit.org/hubzilla/core/issues). Again provide +as much detail as possible to avoid us going back and forth asking +questions about your configuration or how to duplicate the problem, so +that we can get right to the problem and figure out what to do about +it. You are also welcome to offer your own solutions and submit +patches. In fact we encourage this as we are all volunteers and have +little spare time available. The more people that help, the easier the +workload for everybody. It's OK if your solution isn't perfect. Every +little bit helps and perhaps we can improve on it. diff --git a/doc/en/admin/hub_snapshots.md b/doc/en/admin/hub_snapshots.md new file mode 100644 index 000000000..ab0948aa8 --- /dev/null +++ b/doc/en/admin/hub_snapshots.md @@ -0,0 +1,127 @@ +### Hub Snapshot Tools + +Hubzilla developers frequently need to switch between branches that might have +incompatible database schemas or content. The following two scripts create and +restore complete snapshots of a Hubzilla instance, including both the hub web +root and the entire database state. Each script requires a config file called +`hub-snapshot.conf` residing in the same folder and containing the specific +directories and database details of your hub. + +### Config + +The format of the config file is very strict. There must be no spaces between the +variable name and the value. Replace only the content inside the quotes with your +configuration. Save this file as `hub-snapshot.conf` alongside the scripts. + + # Location of hub root. Typically this is the location of the Hubzilla repo clone. + HUBROOT="/var/www/" + # MySQL database name + DBNAME="hubzilla" + # MySQL database user + DBUSER="hubzilla" + # MySQL database password + DBPWD="akeufajeuwfb" + # The target snapshot folder where the git repo will be initialized + SNAPSHOTROOT="/root/snapshots/hubzilla/" + +### Snapshot + +Example usage: + + sh hub-snapshot.sh my-hub.conf "Commit message for the snapshot" + +**hub-snapshot.sh**: + + #!/bin/bash + + if ! [ -f "$1" ]; then + echo "$1 is not a valid file. Aborting..." + exit 1 + fi + source "$1" + #echo "$DBNAME" + #echo "$DBUSER" + #echo "$DBPWD" + #echo "$HUBROOT" + #echo "$SNAPSHOTROOT" + MESSAGE="snapshot: $2" + + if [ "$DBPWD" == "" -o "$SNAPSHOTROOT" == "" -o "$DBNAME" == "" -o "$DBUSER" == "" -o "$HUBROOT" == "" ]; then + echo "Required variable is not set. Aborting..." + exit 1 + fi + + if [ ! -d "$SNAPSHOTROOT"/db/ ]; then + mkdir -p "$SNAPSHOTROOT"/db/ + fi + if [ ! -d "$SNAPSHOTROOT"/www/ ]; then + mkdir -p "$SNAPSHOTROOT"/www/ + fi + + if [ ! -d "$SNAPSHOTROOT"/www/ ] || [ ! -d "$SNAPSHOTROOT"/db/ ]; then + echo "Error creating snapshot directories. Aborting..." + exit 1 + fi + + echo "Export database..." + mysqldump -u "$DBUSER" -p"$DBPWD" "$DBNAME" > "$SNAPSHOTROOT"/db/"$DBNAME".sql + echo "Copy hub root files..." + rsync -va --delete --exclude=.git* "$HUBROOT"/ "$SNAPSHOTROOT"/www/ + + cd "$SNAPSHOTROOT" + + if [ ! -d ".git" ]; then + git init + fi + if [ ! -d ".git" ]; then + echo "Cannot initialize git repo. Aborting..." + exit 1 + fi + + git add -A + echo "Commit hub snapshot..." + git commit -a -m "$MESSAGE" + + exit 0 + +### Restore + + #!/bin/bash + # Restore hub to a previous state. Input hub config and commit hash + + if ! [ -f "$1" ]; then + echo "$1 is not a valid file. Aborting..." + exit 1 + fi + source "$1" + COMMIT=$2 + + if [ "$DBPWD" == "" -o "$SNAPSHOTROOT" == "" -o "$DBNAME" == "" -o "$DBUSER" == "" -o "$HUBROOT" == "" ]; then + echo "Required variable is not set. Aborting..." + exit 1 + fi + RESTOREDIR="$(mktemp -d)/" + + if [ ! -d "$RESTOREDIR" ]; then + echo "Cannot create restore directory. Aborting..." + exit 1 + fi + echo "Cloning the snapshot repo..." + git clone "$SNAPSHOTROOT" "$RESTOREDIR" + cd "$RESTOREDIR" + echo "Checkout requested snapshot..." + git checkout "$COMMIT" + echo "Restore hub root files..." + rsync -a --delete --exclude=.git* "$RESTOREDIR"/www/ "$HUBROOT"/ + echo "Restore hub database..." + mysql -u "$DBUSER" -p"$DBPWD" "$DBNAME" < "$RESTOREDIR"/db/"$DBNAME".sql + + chown -R www-data:www-data "$HUBROOT"/{store,extend,addon,.htlog,.htconfig.php} + + echo "Restored hub to snapshot $COMMIT" + echo "Removing temporary files..." + + rm -rf "$RESTOREDIR" + + exit 0 + diff --git a/doc/en/admin/zarlog_msgs.md b/doc/en/admin/zarlog_msgs.md new file mode 100644 index 000000000..0fe16a1e2 --- /dev/null +++ b/doc/en/admin/zarlog_msgs.md @@ -0,0 +1,112 @@ +~~~ +L regate ZAR1131E dId2 mistaken +L ZAR1132E Identity unknown + ZAR1133A Sorry for any inconvience. Thank you for your response. +L ZAR1134S email verfication denied {did2} +L ZAR1135E not awaited url parameter received + +L regate ZAR1230S Unexpected registration verification request for +L ZAR1231E dId2 mistaken +L ZAR1232E Identity unknown +L ZAR1234W Request not inside time frame +L ZAR1235E Token verification failed + ZAR1236I Verify successfull +L ZAR1236E Verify failed +L ZAR1237D unexpected + (reason may be caused by new account flags implemented still not known) + ZAR1238I Email resent + ZAR1238E Resent failed +L ZAR1239I Account successfull created +L ZAR1239E Account creation error + + register ZAR0130E Registration on this hub is disabled. + ZAR0131I Registration on this hub is by approval only. + Register at another affiliated hub in case when prefered + ZAR0132I Registration on this hub is by invitation only. + Register at another affiliated hub + ZAR0133I If the registation was already submitted with your data once ago, + enter your identity (like email) here and submit + ZAR0134I I have an invite code + ZAR0135I This site requires verification. After completing this form, + please check the notice or your email for further instructions. + ZAR0136I Your email address (or leave blank to register without email) + +L register ZAR0230S Unexpected registration request + ZAR0231E Email address mistake + ZAR0231E Passwords do not match. + ZAR0231E Please indicate acceptance of the Terms of Service. Registration failed. + ZAR0232E Invitations are not available +L ZAR0233E Registration on this hub is by invitation only +L ZAR0234S Invitation code failed +L ZAR0235S Invitation email failed + ZAR0236E Invitation not in time or too late + ZAR0237I Invitation code succesfully applied +L ZAR0238E Email address already in use +L ZAR0239D Error creating dId A + ZAR0239I Your didital id is {did2} and your pin for is {pin} + Keep these infos and your entered password safe + Valid from ... nd expire ... +L ZAR0239S Exceeding same ip register request of + + ui:admin:site + ZAR0810C Register text + Will be displayed prominently on the registration page. + ZAR0820C register_policy + Does this site allow new member registration? + ZAR0830C Registration office on duty + The weekdays and hours the register office is open for registrations + ZAR0831I Testmode duties + (interactive) + ZAR0840C Account registrations max per day + How many registration requests the site accepts during one day. Unlimited if zero or no value. + ZAR0850C Account registrations from same ip + How many pending registration requests the site accepts from a same ip address. + ZAR0860C Account registration delay + How long a registration request has to wait before validation can perform + ZAR0862C Account registration expiration + How long a registration to confirm remains valid. Not expire if zero or no value + ZAR0870C Auto channel create + Auto create a channel when register a new account. When On, the register form will show + additional fields for the channel-name and the nickname. + ZAR0880C Invitation only + Only allow new member registrations with an invitation code. + Above register policy must be set to Yes. + ZAR0881C Invitation also + Also allow new member registrations with an invitation code. + Above register policy must be set to Yes. + ZAR0890C Verify Email Addresses + Check to verify email addresses used in account registration (recommended). + + invite ZAI0100E All users invitation limit exceeded + ZAI0101E Permission denied. + ZAI0102E Invite App (Not Installed) + ZAI0103E Invites not proposed by configuration. Contact the site admin + ZAI0104E Invites by users not enabled + ZAI0105W You have no more invitations available + ZAI0106I Invitations I am using + ZAI0107I Invitations we are using + ZAI0109E Not on xchan + ZAI0110I § Note, the email(s) sent will be recorded in the system logs + (see ZAI0208I @ L) + ZAI0111I Enter email addresses, one per line + ZAI0112I Your message + Here you may enter personal notes to the recipient(s) + ZAI0113I Invite template + ZAI0114I Note, the invitation code is valid up to ... + + invite ZAI0201E Permission denied. + ZAI0202E Invite App (Not Installed) + ZAI0203E Not a valid email address + ZAI0204E Not a real email address + ZAI0205E Not allowed email address + ZAI0206E mail address already in use + ZAI0207I Note, the invitation code is valid up to + ZAI0208E Message delivery failed. + ZAI0208I Message delivery success. +L ZAI0208I to {email} Message delivery success. ({account#}, {channel#}, from:{email}}) + ZAI0209I Accepted email address + ZAI0210E Too many recipients for one invitation (max n) + ZAI0211E No recipients for this invitation + ZAI0212I n mail(s) sent, n mail error(s) + ZAI0213E Register is closed +~~~ diff --git a/doc/en/admins.bb b/doc/en/admins.bb new file mode 100644 index 000000000..6c78ce999 --- /dev/null +++ b/doc/en/admins.bb @@ -0,0 +1,15 @@ +[h2]Documentation for Hub Administrators[/h2] +[h3]Deploying your hub[/h3] +[zrl=[baseurl]/help/install]Install[/zrl] +[zrl=[baseurl]/help/red2pi]Installing $Projectname on the Raspberry Pi[/zrl] +[zrl=[baseurl]/help/Hubzilla_on_OpenShift]$Projectname on OpenShift[/zrl] +[h3]Taking care of your hub[/h3] +[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl] +[zrl=[baseurl]/help/theme_management]Theme Management[/zrl] +[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl] +[zrl=[baseurl]/help/service_classes]Service Classes[/zrl] +[zrl=[baseurl]/help/directories]Working with and configuring Directories[/zrl] +[h3]Frequently asked questions[/h3] +[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/api/api_albums.md b/doc/en/api/api_albums.md new file mode 100644 index 000000000..230daae3c --- /dev/null +++ b/doc/en/api/api_albums.md @@ -0,0 +1,66 @@ +API albums +========== + +Description: list photo albums + +GET /api/z/1.0/albums + + +Output: + + text - textual name + + total - number of photos in this album + + url - web URL + + urlencode - textual name, urlencoded + + bin2hex - textual name using bin2hex (which is used in the web URL link) + + +Example: + + + { + + "success": true, + "albums": [ + { + "text": "/", + "total": "2", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/", + "urlencode": "", + "bin2hex": "" + }, + { + "text": "2016-01", + "total": "6", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3031", + "urlencode": "2016-01", + "bin2hex": "323031362d3031" + }, + { + "text": "2016-02", + "total": "7", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3032", + "urlencode": "2016-02", + "bin2hex": "323031362d3032" + }, + { + "text": "Cover Photos", + "total": "5", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/436f7665722050686f746f73", + "urlencode": "Cover+Photos", + "bin2hex": "436f7665722050686f746f73" + }, + { + "text": "Profile Photos", + "total": "26", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/50726f66696c652050686f746f73", + "urlencode": "Profile+Photos", + "bin2hex": "50726f66696c652050686f746f73" + } + ] + + } diff --git a/doc/en/api/api_filedata.md b/doc/en/api/api_filedata.md new file mode 100644 index 000000000..1d46a495c --- /dev/null +++ b/doc/en/api/api_filedata.md @@ -0,0 +1,66 @@ +API filedata +============= + +Provides the ability to download a file from cloud storage in chunks + +GET /api/z/1.0/filedata + + +Required: + + - file_id + attach.hash of desired file ('begins with' match) + + +Optional: + + - start + starting byte of returned data in file (counting from 0) + + - length + length (prior to base64 encoding) of chunk to download + + +Returns: + + attach (DB) structure with base64 encoded 'content' comprised of the desired chunk + + + +Example: + + https://xyz.macgirvin.com/api/z/1.0/filedata?f=&file_id=9f5217770fd&start=0&length=48 + +Returns: + + { + + "attach": { + "id": "107", + "aid": "1", + "uid": "2", + "hash": "9f5217770fd55d563bd77f84d534d8e119a187514bbd391714626cd9c0e60207", + "creator": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "filename": "pcxtopbm.c", + "filetype": "application/octet-stream", + "filesize": "3934", + "revision": "0", + "folder": "", + "flags": "0", + "is_dir": "0", + "is_photo": "0", + "os_storage": "1", + "os_path": "", + "display_path": "", + "content": "LyogcGN4dG9wYm0uYyAtIGNvbnZlcnQgUEMgcGFpbnRicnVzaCAoLnBjeCkgZmls", + "created": "2016-07-24 23:13:01", + "edited": "2016-07-24 23:13:01", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "", + "start": 0, + "length": 48 + } + + } \ No newline at end of file diff --git a/doc/en/api/api_files.md b/doc/en/api/api_files.md new file mode 100644 index 000000000..c2a10fce5 --- /dev/null +++ b/doc/en/api/api_files.md @@ -0,0 +1,103 @@ +API files +========= + +List file storage (attach DB) + +GET /api/z/1.0/files + + +Options: + + - hash + return only entries matching hash (exactly) + + - filename + return only entries matching filename (substring) + + - filetype + return only entries matching filetype/mimetype (substring) + + - start + start at record (default 0) + + - records + number of records to return or 0 for unlimited + + + +Example: + +curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/files -d filetype=multipart/mixed + + +Returns: + + { + + "success": true, + "results": [ + { + "id": "1", + "aid": "1", + "uid": "2", + "hash": "44ee8b2a1a7f36dea07b93b7747a2383a1bc0fdd08339e8928bfcbe45f65d939", + "filename": "Profile Photos", + "filetype": "multipart/mixed", + "filesize": "0", + "revision": "0", + "folder": "", + "os_storage": "1", + "is_dir": "1", + "is_photo": "0", + "flags": "0", + "created": "2016-01-02 21:51:17", + "edited": "2016-01-02 21:51:17", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "" + }, + { + "id": "12", + "aid": "1", + "uid": "2", + "hash": "71883f1fc64af33889229cbc79c5a056deeec5fc277d765f182f19073e1b2998", + "filename": "Cover Photos", + "filetype": "multipart/mixed", + "filesize": "0", + "revision": "0", + "folder": "", + "os_storage": "1", + "is_dir": "1", + "is_photo": "0", + "flags": "0", + "created": "2016-01-15 00:24:33", + "edited": "2016-01-15 00:24:33", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "" + }, + { + "id": "16", + "aid": "1", + "uid": "2", + "hash": "f48f7ec3278499d1dd86b72c3207beaaf4717b07df5cc9b373f14d7aad2e1bcd", + "filename": "2016-01", + "filetype": "multipart/mixed", + "filesize": "0", + "revision": "0", + "folder": "", + "os_storage": "1", + "is_dir": "1", + "is_photo": "0", + "flags": "0", + "created": "2016-01-22 03:24:55", + "edited": "2016-01-22 03:26:57", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "" + } + ] + } diff --git a/doc/en/api/api_functions.bb b/doc/en/api/api_functions.bb new file mode 100644 index 000000000..fe7cb11ba --- /dev/null +++ b/doc/en/api/api_functions.bb @@ -0,0 +1,133 @@ +[b]Red Twitter API[/b] + +The "basic" Red web API is based on the Twitter API, as this provides instant compatibility with a huge number of third-party clients and applications without requiring any code changes on their part. It is also a super-set of the StatusNet version of the Twitter API, as this also has existing wide support. + +Red has a lot more capability that isn't exposed in the Twitter interfaces or where we are forced to "dumb-down" the API functions to work with the primitive Twitter/StatusNet communications and privacy model. So we plan to extend the Twitter API in ways that will allow Red-specific clients to make full use of Red features without being crippled. + +A dedicated Red API is also being developed to work with native data structures and permissions and which do not require translating to different privacy and permission models and storage formats. This will be described in other documents. The prefix for all of the native endpoints is 'api/red'. + +Red provides multiple channels accesible via the same login account. With Red, any API function which requires authentication will accept a parameter &channel={channel_nickname} - and will select that channel and make it current before executing the API command. By default, the default channel associated with an account is selected. + +Red also provides an extended permission model. In the absence of any Red specific API calls to set permissions, they will be set to the default permissions settings which are associated with the current channel. + +Red will probably never be able to support the Twitter 'api/friendships' functions fully because Red is not a social network and has no concept of "friendships" - it only recognises permissions to do stuff (or not do stuff as the case may be). + +Legend: T= Twitter, S= StatusNet, F= Friendica, R= Red, ()=Not yet working, J= JSON only (XML formats deprecated) + +Twitter API compatible functions: + + api/account/verify_credentials T,S,F,R + api/statuses/update T,S,F,R + api/users/show T,S,F,R + api/statuses/home_timeline T,S,F,R + api/statuses/friends_timeline T,S,F,R + api/statuses/public_timeline T,S,F,R + api/statuses/show T,S,F,R + api/statuses/retweet T,S,F,R + api/statuses/destroy T,S,F,(R) + api/statuses/mentions T,S,F,(R) + api/statuses/replies T,S,F,(R) + api/statuses/user_timeline T,S,F,(R) + api/favorites T,S,F,R + api/account/rate_limit_status T,S,F,R + api/help/test T,S,F,R + api/statuses/friends T,S,F,R + api/statuses/followers T,S,F,R + api/friends/ids T,S,F,R + api/followers/ids T,S,F,R + api/direct_messages/new T,S,F,R + api/direct_messages/conversation T,S,F,R + api/direct_messages/all T,S,F,R + api/direct_messages/sent T,S,F,R + api/direct_messages T,S,F,R + api/oauth/request_token T,S,F,R + api/oauth/access_token T,S,F,R + api/favorites T,S,R + api/favorites/create T,S,R + api/favorites/destroy T,S,R + +Twitter API functions supported by StatusNet but not currently by Friendica or Red + + api/statuses/retweets_of_me T,S + api/friendships/create T,S + api/friendships/destroy T,S + api/friendships/exists T,S + api/friendships/show T,S + api/account/update_location T,S + api/account/update_profile_background_image T,S + api/account/update_profile_image T,S + api/blocks/create T,S + api/blocks/destroy T,S + +Twitter API functions not currently supported by StatusNet + + api/statuses/retweeted_to_me T + api/statuses/retweeted_by_me T + api/direct_messages/destroy T + api/account/end_session T,(R) + api/account/update_delivery_device T + api/notifications/follow T + api/notifications/leave T + api/blocks/exists T + api/blocks/blocking T + api/lists T + +Statusnet compatible extensions to the Twitter API supported in both Friendica and Red + + api/statusnet/version S,F,R + api/statusnet/config S,F,R + +Friendica API extensions to the Twitter API supported in both Friendica and Red + + api/statuses/mediap F,R + +Red specific API extensions to the Twitter API not supported in Friendica + + api/account/logout R + api/export/basic R,J + api/friendica/config R + api/red/config R + api/friendica/version R + + api/red/version R + + api/red/channel/export/basic R,J + api/red/channel/stream R,J (currently post only) + api/red/albums R,J + api/red/photos R,J (option album=xxxx) + +Red proposed API extensions to the Twitter API + + api/statuses/edit (R),J + api/statuses/permissions (R),J + api/statuses/permissions/update (R),J + api/statuses/ids (R),J # search for existing message_id before importing a foreign post + api/files/show (R),J + api/files/destroy (R),J + api/files/update (R),J + api/files/permissions (R),J + api/files/permissions/update (R),J + api/pages/show (R),J + api/pages/destroy (R),J + api/pages/update (R),J + api/pages/permissions (R),J + api/pages/permissions/update (R),J + api/events/show (R),J + api/events/update (R),J + api/events/permissions (R),J + api/events/permissions/update (R),J + api/events/destroy (R),J + api/photos/show (R),J + api/photos/update (R),J + api/photos/permissions (R),J + api/photos/permissions/update (R),J + api/albums/destroy (R),J + api/albums/show (R),J + api/albums/update (R),J + api/albums/permissions (R),J + api/albums/permissions/update (R),J + api/albums/destroy (R),J + api/friends/permissions (R),J + +#include doc/macros/main_footer.bb; + diff --git a/doc/en/api/api_group_members.md b/doc/en/api/api_group_members.md new file mode 100644 index 000000000..497e0aac6 --- /dev/null +++ b/doc/en/api/api_group_members.md @@ -0,0 +1,133 @@ +API group_members +================= + +GET /api/z/1.0/group_members + + + +Required: + + group_id or group_name + + +Returns: + + group_member+abook+xchan (DB join) for each member of the privacy group + + + [ + + { + "id": "1", + "uid": "2", + "gid": "1", + "xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "abook_id": "2", + "abook_account": "1", + "abook_channel": "2", + "abook_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "abook_my_perms": "218555", + "abook_their_perms": "0", + "abook_closeness": "0", + "abook_created": "2016-01-02 21:16:26", + "abook_updated": "2016-01-02 21:16:26", + "abook_connected": "0000-00-00 00:00:00", + "abook_dob": "0000-00-00 00:00:00", + "abook_flags": "0", + "abook_blocked": "0", + "abook_ignored": "0", + "abook_hidden": "0", + "abook_archived": "0", + "abook_pending": "0", + "abook_unconnected": "0", + "abook_self": "1", + "abook_feed": "0", + "abook_profile": "", + "abook_incl": "", + "abook_excl": "", + "abook_instance": "", + "xchan_hash": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "xchan_guid": "lql-1VnxtiO4-WF0h72wLX1Fu8szzHDOXgQaTbELwXW77k8AKFfh-hYr70vqMrc3SSvWN-Flrc5HFhRTWB7ICw", + "xchan_guid_sig": "PafvEL0VpKfxATxlCqDjfOeSIMdmpr3iU7X-Sysa1h5LzDpjSXsjO37tYZL-accb1M5itLlfnW5epkTa5I4flsW21zSY1A2jCuBQUTLLGV7rNyyBy7lgqJUFvAMRx0TfXzP9lcaPqlM9T1tA6jfWOsOmkdzwofGeXBnsjGfjsO2xdGYe6vwjOU0DSavukvzDMnOayB9DekpvDnaNBTxeGLM45Skzr7ZEMcNF7TeXMbnvpfLaALYEKeQs9bGH-UgAG8fBWgzVAzeBfx_XSR1rdixjyiZGP0kq0h35SlmMPcEjliodOBFwMXqpXFB7Ibp4F6o6te2p2ErViJccQVG8VNKB6SbKNXY6bhP5zVcVsJ-vR-p4xXoYJJvzTN7yTDsGAXHOLF4ZrXbo5yi5gFAlIrTLAF2EdWQwxSGyLRWKxG8PrDkzEzX6cJJ0VRcLh5z6OI5QqQNdeghPZbshMFMJSc_ApCPi9_hI4ZfctCIOi3T6bdgTNKryLm5fhy_eqjwLAZTGP-aUBgLZpb1mf2UojBn6Ey9cCyq-0T2RWyk-FcIcbV4qJ-p_8oODqw13Qs5FYkjLr1bGBq82SuolkYrXEwQClxnrfKa4KYc2_eHAXPL01iS9zVnI1ySOCNJshB97Odpooc4wk7Nb2Fo-Q6THU9zuu0uK_-JbK7IIl6go2qA", + "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA18JB76lyP4zzL/y7BCej\neJnfZIWZNtM3MZvI1zEVMWmmwOS+u/yH8oPwyaDk4Y/tnj8GzMPj1lCGVRcd8EJa\nNrCMd50HODA5EsJtxpsOzRcILYjOcTtIAG1K4LtKqELi9ICAaFp0fNfa+Jf0eCek\nvPusx2/ORhy+o23hFoSMhL86o2gmaiRnmnA3Vz4ZMG92ieJEDMXt9IA1EkIqS4y5\nBPZfVPLD1pv8iivj+dtN1XjwplgjUbtxmU0/Ej808nHppscRIqx/XJ0XZU90oNGw\n/wYoK2EzJlPbRsAkwNqoFrAYlr5HPpn4BJ2ebFYQgWBUraD7HwS5atsQEaxGfO21\nlUP0+lDg9t3CXvudDj0UG1jiEKbVIGA+4aG0GN2DSC5AyRq/GRxqyay5W2vQbAZH\nyvxPGrZFO24I65g3pjhpjEsLqZ4ilTLQoLMs0drCIcRm5RxMUo4s/LMg16lT4cEk\n1qRtk2X0Sb1AMQQ2uRXiVtWz77QHMONEYkf6OW4SHbwcv5umvlv69NYEGfCcbgq0\nAV7U4/BWztUz/SWj4r194CG43I9I8dmaEx9CFA/XMePIAXQUuABfe1QMOR6IxLpq\nTHG1peZgHQKeGz4aSGrhQkZNNoOVNaZoIfcvopxcHDTZLigseEIaPPha4WFYoKPi\nUPbZ5o8gTLc750uzrnb2jwcCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "xchan_photo_mimetype": "image/png", + "xchan_photo_l": "https://xyz.macgirvin.com/photo/profile/l/2", + "xchan_photo_m": "https://xyz.macgirvin.com/photo/profile/m/2", + "xchan_photo_s": "https://xyz.macgirvin.com/photo/profile/s/2", + "xchan_addr": "teller@xyz.macgirvin.com", + "xchan_url": "https://xyz.macgirvin.com/channel/teller", + "xchan_connurl": "https://xyz.macgirvin.com/poco/teller", + "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", + "xchan_connpage": "", + "xchan_name": "Teller", + "xchan_network": "zot", + "xchan_instance_url": "", + "xchan_flags": "0", + "xchan_photo_date": "2016-10-19 01:26:50", + "xchan_name_date": "2016-01-02 21:16:26", + "xchan_hidden": "0", + "xchan_orphan": "0", + "xchan_censored": "0", + "xchan_selfcensored": "0", + "xchan_system": "0", + "xchan_pubforum": "0", + "xchan_deleted": "0" + }, + { + "id": "12", + "uid": "2", + "gid": "1", + "xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", + "abook_id": "24", + "abook_account": "1", + "abook_channel": "2", + "abook_xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", + "abook_my_perms": "218555", + "abook_their_perms": "218555", + "abook_closeness": "80", + "abook_created": "2016-01-27 00:48:43", + "abook_updated": "2016-12-04 17:16:58", + "abook_connected": "2016-12-04 17:16:58", + "abook_dob": "0001-01-01 00:00:00", + "abook_flags": "0", + "abook_blocked": "0", + "abook_ignored": "0", + "abook_hidden": "0", + "abook_archived": "0", + "abook_pending": "0", + "abook_unconnected": "0", + "abook_self": "0", + "abook_feed": "0", + "abook_profile": "debb5236efb1626cfbad33ccb49892801e5f844aa04bf81f580cfa7d13204819", + "abook_incl": "", + "abook_excl": "", + "abook_instance": "", + "xchan_hash": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", + "xchan_guid": "d5EMLlt1tHHZ0dANoA7B5Wq9UgXoWcFS9-gXOkL_AAejcPApoQRyxfHTuu8DoTbUaO-bYmX5HPuWuK9PHyqNmA", + "xchan_guid_sig": "CVWEMRPtzI1YcHfnnWHTuv3H964OAmSElgUfxMoX6RdQdxNpqb_POirpVuyP8s3W17mVCfO5V9IAjkg5iKcqCk6YcvOD_egmMy-AnM9TC1kKndQHw55CunD82Q8K_xBNSXkSROizcNkKh9DVLjJPFjW1AqtI4njkZ3EMgrWqnbFRM1qPToUoCY9zM3tEMHoAD9YX1zP90wl40LzfN-dtcNWpSBbiz9owou62uzLbN7mrCwKOMlXLjwwGswRnxIsEnb3O-FXOs8hs0mArKe9snq1-BKeD16LyzxgwlpVLElzIJZGEZGtMdIJgeRzKuBvPjsOIpQ1yAkuOpFJ3nGCM-IPOIIjAmyVl5zD3xPVcxxpZlJRn5fG1Y-gnqTgsrEQCA7M6XPWQdrdHU4akZfyUyFJDhv3uM-jon9VzrYTBw68R0WA-1Z8WafEHA4qh5OWAj85lUarwhr7iTiEckH51ypPCPs6VbT6Pw7yMaxfjFOcipashQagx0tfOlDhE5dQANOXKASFtH1J9-CZY2MQdLPQ6u54d5whuHKMGaJ0V68pnmZ2rOn7g344Ah2WCJrm17jj60QsRMorqRFj7GMdPIA1XB8Wrk88MuYOe3Dhyuu6ZWKI7YTWJS690ZVkKUqAiNHqj0W86DtaiPUc_mmGR0fHl4Gksnko3WmCFv9q2X2E", + "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoj2xCJktBA8Ww7Hp+ZNL\nrNuQpo8UB/bfvRkIy+yua3xpF1TuXcnAH61kyRz8vXgOu/l2CyxQbIoaGslCV5Sy\n8JKeNXe+IilUdSSEjMIwCPfSPsYnMHsSnHWmPmclvJwEtQUKOZmW5mMuVBvXy7D2\njomFwc69AYphdyys6eQ7Dcn6+FRBiQbyMprZ5lxyVW+O4DuXVNa3ej2ebx0gCJZ4\ntTIlBoKwEey91dY+FyKVFjdwfNczpmL7LgmZXqcVx+MG3mYgibwdVMiXVj5X06cs\nV9hJ5Xi+Aklsv/UWJtjw9FVt7y9TLptnhh4Ra6T/MDmnBBIAkOR7P/X8cRv078MT\nl0IMsP0RJcDEtTLtwHFVtDs6p52KDFqclKWbqmxmxqV3OTPVYtArRGIzgnJi/5ur\nHRr5G6Cif7QY3UowsIOf78Qvy28LwSbdymgBAWwPPKIviXWxGO+9kMWdmPSUQrWy\nK0+7YA9P9fBUFfn9Hc+p8SJQmQ6OAqLwrDGiPSOlGaNrbEqwqLGgIpXwK+lEFcFJ\n3SPOjJRWdR2whlMxvpwX+39+H7dWN3vSa3Al4/Sq7qW8yW2rYwf+eGyp4Z0lRR+8\nJxFMCwZkSw5g14YdlikAPojv5V1c6KuA5ieg8G1hwyONV7A4JHPyEdPt0W0TZi6C\nCOVkPaC3xGrguETZpJfVpwUCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "xchan_photo_mimetype": "image/png", + "xchan_photo_l": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-4", + "xchan_photo_m": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-5", + "xchan_photo_s": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-6", + "xchan_addr": "cloner@xyz.macgirvin.com", + "xchan_url": "http://abc.macgirvin.com/channel/cloner", + "xchan_connurl": "http://abc.macgirvin.com/poco/cloner", + "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", + "xchan_connpage": "", + "xchan_name": "Karen", + "xchan_network": "zot", + "xchan_instance_url": "", + "xchan_flags": "0", + "xchan_photo_date": "2016-03-31 19:59:20", + "xchan_name_date": "2016-01-26 23:23:42", + "xchan_hidden": "0", + "xchan_orphan": "0", + "xchan_censored": "0", + "xchan_selfcensored": "0", + "xchan_system": "0", + "xchan_pubforum": "0", + "xchan_deleted": "0" + } + + ] \ No newline at end of file diff --git a/doc/en/api/api_item_update.md b/doc/en/api/api_item_update.md new file mode 100644 index 000000000..cf1a28044 --- /dev/null +++ b/doc/en/api/api_item_update.md @@ -0,0 +1,225 @@ +API item/update +=============== + + +Usage: POST /api/z/1.0/item/update + +Description: item/update posts an item (typically a conversation item or post, but can be any item) using form input. + + +Required: + +- body + + text/bbcode contents by default. + + +Optional: + +- $_FILES['media'] + + uploaded media file to include with post + +- title + + title of post/item + +- contact_allow + + array of xchan.xchan_hash allowed to view this item + +- group_allow + + array of group.hash allowed to view this item + +- contact_deny + + array of xchan.xchan_hash not allowed to view this item + +- group_deny + + array of group.hash not allowed to view this item + +- coord + + geographic coordinates + +- location + + freefrom location + +- expire + + datetime this post will expire or be removed + +- mimetype + + mimetype if not text/bbcode + +- parent + + item.id of parent to this post (makes it a comment) + +- parent_mid + + alternate form of parent using message_id + +- remote_xchan + + xchan.xchan_hash of this message author if not the channel owner + +- consensus + + boolean set to true if this is a consensus or voting item (default false) + +- nocomment + + boolean set to true if comments are to be disabled (default false) + +- origin + + do not use this without reading the code + +- namespace + + persistent identity for a remote network or service + +- remote_id + + message_id of this resource on a remote network or service + +- message_id + + message_id of this item (leave unset to generate one) + +- created + + datetime of message creation + +- post_id + + existing item.id if this is an edit operation + +- app + + application or network name to display with item + +- categories + + comma separated categories for this item + +- webpage + + item.page_type if not 0 + +- pagetitle + + for webpage and design elements, the 'page name' + +- layout_mid + + item.mid of layout for this design element + +- plink + + permalink for this item if different than the default + +- verb + + activitystream verb for this item/activity + +- obj_type + + activitystream object type for this item/activity + + + +Example: + +curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/item/update -d body="hello world" + + +Returns: + + + { + + "success": true, + "item_id": "2245", + "item": { + "id": "2245", + "mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "aid": "1", + "uid": "2", + "parent": "2245", + "parent_mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "thr_parent": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "created": "2016-12-03 20:00:12", + "edited": "2016-12-03 20:00:12", + "expires": "0001-01-01 00:00:00", + "commented": "2016-12-03 20:00:12", + "received": "2016-12-03 20:00:12", + "changed": "2016-12-03 20:00:12", + "comments_closed": "0001-01-01 00:00:00", + "owner_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "author_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "source_xchan": "", + "mimetype": "text/bbcode", + "title": "", + "body": "hello world", + "html": "", + "app": "", + "lang": "", + "revision": "0", + "verb": "http://activitystrea.ms/schema/1.0/post", + "obj_type": "http://activitystrea.ms/schema/1.0/note", + "obj": "", + "tgt_type": "", + "target": "", + "layout_mid": "", + "postopts": "", + "route": "", + "llink": "https://xyz.macgirvin.com/display/14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "plink": "https://xyz.macgirvin.com/channel/mychannel/?f=&mid=14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "resource_id": "", + "resource_type": "", + "attach": "", + "sig": "sa4TOQNfHtV13HDZ1tuQGWNBpZp-nWhT2GMrZEmelXxa_IvEepD2SEsCTWOBqM8OKPJLfNy8_i-ORXjrOIIgAa_aT8cw5vka7Q0C8L9eEb_LegwQ_BtH0CXO5uT30e_8uowkwzh6kmlVg1ntD8QqrGgD5jTET_fMQOIw4gQUBh40GDG9RB4QnPp_MKsgemGrADnRk2vHO7-bR32yQ0JI-8G-eyeqGaaJmIwkHoi0vXsfjZtU7ijSLuKEBWboNjKEDU89-vQ1c5Kh1r0pmjiDk-a5JzZTYShpuhVA-vQgEcADA7wkf4lJZCYNwu3FRwHTvhSMdF0nmyv3aPFglQDky38-SAXZyQSvd7qlABHGCVVDmYrYaiq7Dh4rRENbAUf-UJFHPCVB7NRg34R8HIqmOKq1Su99bIWaoI2zuAQEVma9wLqMoFsluFhxX58KeVtlCZlro7tZ6z619-dthS_fwt0cL_2dZ3QwjG1P36Q4Y4KrCTpntn9ot5osh-HjVQ01h1I9yNCj6XPgYJ8Im3KT_G4hmMDFM7H9RUrYLl2o9XYyiS2nRrf4aJHa0UweBlAY4zcQG34bw2AMGCY53mwsSArf4Hs3rKu5GrGphuwYX0lHa7XEKMglwBWPWHI49q7-oNWr7aWwn1FnfaMfl4cQppCMtKESMNRKm_nb9Dsh5e0", + "diaspora_meta": "", + "location": "", + "coord": "", + "public_policy": "", + "comment_policy": "contacts", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "", + "item_restrict": "0", + "item_flags": "0", + "item_private": "0", + "item_origin": "1", + "item_unseen": "0", + "item_starred": "0", + "item_uplink": "0", + "item_consensus": "0", + "item_wall": "1", + "item_thread_top": "1", + "item_notshown": "0", + "item_nsfw": "0", + "item_relay": "0", + "item_mentionsme": "0", + "item_nocomment": "0", + "item_obscured": "0", + "item_verified": "1", + "item_retained": "0", + "item_rss": "0", + "item_deleted": "0", + "item_type": "0", + "item_hidden": "0", + "item_unpublished": "0", + "item_delayed": "0", + "item_pending_remove": "0", + "item_blocked": "0" + } + + } \ No newline at end of file diff --git a/doc/en/api/api_posting.bb b/doc/en/api/api_posting.bb new file mode 100644 index 000000000..c708ad143 --- /dev/null +++ b/doc/en/api/api_posting.bb @@ -0,0 +1,24 @@ +[b][size=xx-large]Posting to the Matrix via the API[/size][/b] + +The API allows you to post to the red# by HTTP POST request. Below you see an example using the command line tool cURL: + +[code]curl -ssl -u [color=blue]$E-Mail[/color]:[color=blue]$Password[/color] -d "[color=blue]$Parameters[/color]" [url][observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update +[/url][/code] +[table][tr][td]$E-Mail:[/td][td]The E-Mail Address you use to login, or the channel nickname (without the hostname)[/td][/tr] +[tr][td]$Password:[/td][td]The Password you use to login[/td][/tr] +[tr][td]$Parameters:[/td][td]That's the interesting part, here you insert the content you want to send using the following parameters:[/td][/tr][/table] + +[ul] +[*]title: the title of the posting +[*]channel: the channel you want to post to (do not use this parameter with HTTP Basic auth) +[*]category: a comma-seperated list of categories for the posting +[*]status: the content of the posting, formatted with BBCode + OR +[*]htmlstatus:the content of the posting, formatted in HTML. +[/ul] + +To post to a specific channel, replace the email address with the channel nickname. If you supply the channel parameter, it has to match the "email", but is superfluous anyway. + +Instead of calling [observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update which returns a json (you could also add .json on the end to clarify) output, you can use [observer.baseurl]/api/statuses/update.xml to get an xml formatted return. + +Instead of Basic HTTP Authentification you could also use oAuth. diff --git a/doc/en/api/api_xchan.md b/doc/en/api/api_xchan.md new file mode 100644 index 000000000..d2b15e04c --- /dev/null +++ b/doc/en/api/api_xchan.md @@ -0,0 +1,44 @@ +API xchan +========= + +An xchan is a global location independent channel and is the primary record for a network +identity. It may refer to channels on other websites, networks, or services. + +GET /api/z/1.0/xchan + +Required: one of [ address, hash, guid ] as GET parameters + +Returns a portable xchan structure + +Example: https://xyz.macgirvin.com/api/z/1.0/xchan?f=&address=mike@macgirvin.com + +Returns: + + { + "hash": "jr54M_y2l5NgHX5wBvP0KqWcAHuW23p1ld-6Vn63_pGTZklrI36LF8vUHMSKJMD8xzzkz7s2xxCx4-BOLNPaVA", + "guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg", + "guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4", + "pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "photo_mimetype": "image/jpeg", + "photo_l": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-4", + "photo_m": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-5", + "photo_s": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-6", + "address": "mike@macgirvin.com", + "url": "https://macgirvin.com/channel/mike", + "connurl": "https://macgirvin.com/poco/mike", + "follow": "https://macgirvin.com/follow?f=&url=%s", + "connpage": "https://macgirvin.com/connect/mike", + "name": "Mike Macgirvin", + "network": "zot", + "instance_url": "", + "flags": "0", + "photo_date": "2012-12-06 05:06:11", + "name_date": "2012-12-06 04:59:13", + "hidden": "1", + "orphan": "0", + "censored": "0", + "selfcensored": "0", + "system": "0", + "pubforum": "0", + "deleted": "0" + } \ No newline at end of file diff --git a/doc/en/api/group.md b/doc/en/api/group.md new file mode 100644 index 000000000..8829ff416 --- /dev/null +++ b/doc/en/api/group.md @@ -0,0 +1,41 @@ +API group +========= + +GET /api/z/1.0/group + + +Description: list privacy groups + + +Returns: DB tables of all privacy groups. + +To use with API group_members, provide either 'group_id' from the id element returned in this call, or 'group_name' from the gname returned in this call. + + + [ + + { + "id": "1", + "hash": "966c946394f3e2627bbb8a55026b5725e582407098415c02f85232de3f3fde76Friends", + "uid": "2", + "visible": "0", + "deleted": "0", + "gname": "Friends" + }, + { + "id": "2", + "hash": "852ebc17f8c3ed4866f2162e384ded0f9b9d1048f93822c0c84196745f6eec66Family", + "uid": "2", + "visible": "1", + "deleted": "0", + "gname": "Family" + }, + { + "id": "3", + "hash": "cc3cb5a7f9818effd7c7c80a58b09a189b62efa698a74319117babe33ee30ab9Co-workers", + "uid": "2", + "visible": "0", + "deleted": "0", + "gname": "Co-workers" + } + ] \ No newline at end of file diff --git a/doc/en/api/statuses_update.bb b/doc/en/api/statuses_update.bb new file mode 100644 index 000000000..acad440de --- /dev/null +++ b/doc/en/api/statuses_update.bb @@ -0,0 +1,23 @@ +[h2]statuses/update[/h2] +Parameters + + title: Title of the status + status: Status in text [or bbcode] format + htmlstatus: Status in HTML format + in_reply_to_status_id + lat: latitude + long: longitude + media: image data + source: Application name + group_allow + contact_allow + group_deny + contact_deny + + +Example + +[code] +curl -u theUsername:thePassword http://mywebsite/api/statuses/update.xml -d status='Hello world' +[/code] + diff --git a/doc/en/bugs.bb b/doc/en/bugs.bb new file mode 100644 index 000000000..3bf2a0e29 --- /dev/null +++ b/doc/en/bugs.bb @@ -0,0 +1,32 @@ +[h2]Bugs, Issues, and things that go bump in the night...[/h2] +[h3]Something went wrong! Who is in charge of fixing it?[/h3] + +[b]$Projectname Community Server[/b] + +$Projectname Community Server is open source software which is maintained by "the community" - essentially unpaid volunteers. Nobody is in charge of fixing bugs. We work together to keep the software and network running smoothly and error free. You are a member of this community, so we also require your help to provide quality software. There are no mythical "developers" who magically fix everything. It's up to all of us to pitch in and help. + +The first thing you need to do is talk to your hub administrator - the person who runs and manages your site. They are in the unique position of having access to the internal software and database and [b]logfiles[/b] and will need to be involved in fixing your problem. Other people "on the net" can't really help with this. The first thing the hub administrator needs to do is look at their logs and/or try to reproduce the problem. So try to be as helpful and courteous as possible in helping them look into the problem. + +To find your hub administrator (if you don't know who they are) please look at [url=[baseurl]/siteinfo]this page[/url]. If they have not provided any contact info on that page or provided an "Impressum" there, see [url=[baseurl]/siteinfo.json]this site info summary[/url] under the heading "admin:". + +It is highly recommended that bug reports be filed by hub administrators so that they can include the relevant logfile and database information relevant to the issue and be available to try workarounds and followup tests. Without this level of cooperation it may not be possible to fix the problem. + +[h3]I'm a hub administrator; what do I do?[/h3] + +The software instructions which provide this web service are open source and are available for your inspection. We encourage everybody to read it and see how everything works and verify that we aren't doing anything evil or negligent with your personal communications. If an error message was reported, often one can do a search on the source files for that error message and find out what triggered it. With this information and the site logfiles it may be possible to figure out the sequence of events leading to the error. There could also be other sites involved, and the problem may not even be on your site but elsewhere in the network. Try to pin down the communication endpoints (hubs or sites) involved in the problem and contact the administrator of that site or those sites. Please try and provide an event time of when things went wrong so it can be found in the logs. Work with the other administrator(s) to try and find the cause of the problem. Logfiles are your friend. When something happens in the software that we didn't expect, it is nearly always logged. + +[h3]The white screen of death[/h3] + +If you get a blank white screen when doing something, this is almost always a code or syntax error. There are instructions in the site .htconfig.php file which will allow the site administrator to enabling syntax logging. We recommend all sites use this. With syntax logging enabled repeat the sequence which led to the error and it should log the offending line of code. Hopefully you will be able to fix the problem with this information. When you do, please submit the fix "upstream" so that we can share the fix with the rest of the project members and other communities. This is a key benefit of using open source software - we share with each other and everybody benefits. + +[h3]I'm stumped. I can't figure out what is wrong.[/h3] + +At this point it might be worthwhile discussing the issue on one of the online forums. There may be several of these and some may be more suited to your spoken language. At this time, the 'Hubzilla Support' channel (support@zotadel.net) is the recommended forum for discussing bugs. + +If community members with software engineering training/expertise can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on framagit.org to do this. So register, and then visit https://framagit.org/hubzilla/core/issues . Create an issue here and provide all the same information that you provided online. Don't leave out anything. + +Then you wait. If it's a high profile issue, it may get fixed quickly. But nobody is in charge of fixing bugs. If it lingers without resolution, please spend some more time investigating the problem. Ask about anything you don't understand related to the behaviour. You will learn more about how the software works and quite possibly figure out why it isn't working now. Ultimately it is somebody in the community who is going to fix this and you are a member of the community; and this is how the open source process works. + + +Other people working to fix the problem may need to find out more, so do your homework and document what is happening and everything you've tried. Don't say "I did xyz and it didn't work." That doesn't tell us anything. Tell us precisely what steps you took and what you expected the result to be, and precisely what happened as a result. What page/URL were you looking at or what form were you filling in? If there were any error messages, don't say "there was an error message". Tell us exactly what the message said. Also tell us what hub you are using, what software version you're running and any other details that may be unique about your site configuration. It is understood that you might wish to keep some information and your connections private, however if you aren't willing to share the information other people need to reproduce/fix the problem, it may not get fixed. + diff --git a/doc/en/campaign.bb b/doc/en/campaign.bb new file mode 100644 index 000000000..dddc614f9 --- /dev/null +++ b/doc/en/campaign.bb @@ -0,0 +1,237 @@ +[b]Initial Indiegg pitch[/b] + +[b][color= grey][size=20]What have we done, and what we hope to achieve[/size][/color][/b] + +[b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b] + +We started $Projectname project by asking ourselves a few questions: + +- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site. Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites. +Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online. + +We liked this idea and went ahead with coding it immediately. Today, single-click sign is in alpha state. It needs more love, which means a solid three months of full-time development efforts. + +- Think of your Facebook, Twitter, WordPress, or any other website where you currently have an account. Now imagine being able to clone your account, to make an exact duplicate of it (with all of your friends, posts and settings), then export your cloned account into another server that is part of this communication network. After you're done, both of your accounts are synced from the time they were cloned. It doesn't matter where you log in (at your original location, or where you imported your clone). You see the same content, the same friends, posts, and account settings. +At that point, it is more appropriate to call your account an identity that is nomadic (it is not tied to one home, unless you choose to do so!). +It's 2013, our online presence no longer has to be tied to a single server, domain name or IP address. We should be able to clone and import our identities to other servers. In such a network, it should only matter who you are, not where you are. + +We're very intrigued by the possibilities nomadic identities open up for freedom, censorship-resistance, and identity resilience. Consider the following scenarios: + + -- Should a repressive government or corporation decide to delete your account, your cloned identity lives on, because it is located on another server, across the world, which is part of the same communication network. You can't be silenced! + + -- What if there is a server meltdown, and your identity goes off line. No problem, you log into your clone and all is good. + + -- Your server administrator can no longer afford to keep paying to support a free service (a labor love and principle, which all of us have participating in as system administrators of Friendica sites!). She notifies you that you must clone your account before the shutoff date. Rather than loose all your friends, and start from scratch by creating a new identity somewhere, you clone and move to another server. +We feel this is especially helpful for the free web, where administrators of FOSS community sites are often faced with difficult financial decisions. Since many of them rely on donations, sometimes servers have to be taken offline, when costs become prohibitive for the brave DIY souls running those server. Nomadic identities should relieve some of the pressures associated with such situations. + +At the same time, we are also thinking of solutions that would make it possible for people running Red hubs to be financially sustainable. To that end, we're starting to implement service classes in our code, which would allow administrators to structure paid levels of service, if they choose to do so. + +Today, nomadic identity is currently in alpha state. It also needs more love, which means a solid three months of full-time development efforts. + +- Imagine a social network that is censorship-resistant, and privacy-respecting by design. It is not controlled by one mega-corporation, and where users cannot be easily censored by oppressive governments. So, in addition to nomadic identities, we are talking about decentralization, open source, freely software, that can run on any hardware that supports a database and a modern web browser. And we mean "any hardware", from a self-hosted $35 Raspberry Pi, to the very latest Intel Xeon and AMD Bulldozer-powered server behemoths. + +We've realized that privacy requires full control over content. We should be able to delete, backup and download all of our content, as well as associated account/identity information. To this end, we have already implemented the initial version of account export and backup. + +Concerned about pages and pages of posts from months and years past? The solution should be simple: visit your settings page, specify that all content older than 7 days, with the exception of starred posts, should be automatically deleted. Done, the clutter is gone! (Consider also the privacy and anti-mass surveillance implications of this feature. PRISM disclosures have hinted that three-letter spying agencies around the world are recording all internet traffic and storing it for a few days at a time. We feel that automatic post expiration becomes a rather useful feature in this context, and implementing it is one of our near future priorities.) + +[b][color= grey][size=18]The Affinity Slider and Access Control Lists[/size][/color][/b] + +- What if the permissions and access control lists that help secure modern operating systems were extended into a communication network that lived on the internet? This means somebody could log into this network from their home site, and with the simple click of a few buttons dynamically sort who can have access to their online content on a very fine level: from restricting others from seeing your latest blog post, to sharing your bookmarks with the world. + +We've coded the initial version of such a new feature. It is called the "Affinity Slider", and in our very-alpha user interface it looks like this. +[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img] + +{INSERT SCREENSHOT OF A MATRIX PAGE} + +Think of it as an easy way to filter content that you see, based on the degree of "closeness" to you. Move the slider to Friends, and only content coming from contacts you've tagged as friends is displayed on your home page. Uncluttering thousands of contacts, friends, RSS feeds, and other content should be a basic feature of modern communication on the web, but not at the expense of ease of use. + +In addition to the Affinity Slider, we also have the ACL (Access Control List). Say you want to share something with only 5 of your contacts (a blog, two friends from college, and two forums). You click on the padlock, choose the recipients, and that's it. Only those identities will recieve their posts. Furthermore, the post will be encrypted via PKI (pulic key encryption) to help maintain privacy. In the age of PRISM, we don't know all the details on what's safe out there, but we still think that privacy by design should be automatically present, invisible to the user, and easy to use. +Attaching permissions to any data that lives on this network, potentially solves a great many headaches, while achieving simplicity in communication. + +Think of it this way: the internet is nothing, but a bunch of permissions and a folder of data. You, the user controls the permissions and thus the data that is relevant to you. + +[b][color= grey][size=20]The Matrix is Born![/size][/color][/b] + +After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy. + +It's a lot of work, for anyone. So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot. We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication. + +We need your help to finish it and release it to the world! + +[b][color= grey][size=20]What have we written so far[/size][/color][/b] + +As of the today, $Projectname is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include: + +- Zot, the protocol powering the matrix +- Single-signon logins. +- Nomadic identities +- Basic content manipulation: creation, deletion, rudimentary handling of photos, and media files +- A bare-bones outline of the API and user documentation. + + +[b][color= grey][size=20]Our TO-DO List[/size][/color][/b] + +However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make $Projectname ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: + +- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git. + +- Comanche, our new markup language, similar to BBCode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. You can read more about it on our github wiki: https://github.com/friendica/red/wiki/Comanche + +- A unique help system that lives in the matrix, but is not based on the principles of a search engine. We have some interesting ideas about decentralizing help documentation, without going down the road of distributed search engines. Here's a hint: We shouldn't be searching at all, we should just be filtering what's already there in new, and cunning ways. + +- An appropriate logo, along with professionally done documentation system, both for our API, as well as users. + +- WordPress-like single button software upgrades + +- A built-in development environment, using an integrated web-based code editor such as Ace9 + +[b][color= grey][size=20]What will the money be used for[/size][/color][/b] + +If we raise our targeted amount of funds, we plan to use it as follows: + +1) Fund 6 months {OR WHATEVER} of full time work for our current core developers, Mike, Thomas, and Tobias {ANYONE ELSE?] + +2) Pay a professional web developer to design an kick ass reference theme, along with a project logo. + +3) {WHAT ELSE?} + +[b][color= grey][size=20]Deadlines[/size][/color][/b] + +[b]March, 2014: $Projectname Beta with the following features[/b] + +- {LIST FEATURES} + +[b][color= grey][size=20]Who We Are[/size][/color][/b] + +Mike: {FILL IN BIO, reference Friendica, etc.} + +Thomas: {bio blurb} + +Tobias: {bio blurb} + +Arto: {documentation, etc.} + +{WHO ELSE? WE NEED A TEAM, AT LEAST 3-4 PEOPLE} + +[b][color= grey][size=20]What Do I Get as a Supporter?[/size][/color][/b] + +Our ability to reach 1.0 stable release depends on your generosity and support. We appreciate your help, regardless of the amount! Here's what we're thinking as far as different contribution levels go: + +[b]$1: {CATCHY TAGLINE}[/b] + +We'll list your name on our initial supporters list, a Hall of Fame of the matrix! + +[b]$5:[/b] + +[b]$10: [/b] + +[b]$16: [/b] + +You get one of your $Projectname t-shirts, as well as our undying gratitude. + +[b]$32: [/b] + +[b]$64 [/b] + +[b]128 [/b] + +[b]$256: [/b] + +[b]$512: [/b] + +[b]$1024 [/b] + +[b]$2048[/b] + +Each contributor at this level gets their own $Projectname virtual private server, installed, hosted and supported by us for a period of 1 year. + +[b][color= grey][size=20]Why are we so excited about $Projectname?[/size][/color][/b] + +{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC> + +[b][color= grey][size=20]Other Ways to Help[/size][/color][/b] + +We're a handful of volunteers, and we understand that not everyone can contribute by donating money. There are many other ways you can in getting the Matrix to version 1.0! + +First, you can checkout our source code on github: https://framagit.org/hubzilla/core/ + +Maybe you can dive in and help us out with some development. + +Second, you can install the current developer preview on a server and start compiling bug reports. + +Third, register at one of the public alpha Red hubs, and get a feel for what Red is trying to do! + +Perhaps you're good at writing and documenting stuff. Grab an account at one of the public alphas and give us a hand. + +[b][color= grey][size=20]Frequently Asked Questions[/size][/color][/b] + +[b]1. Is Red a social network?[/b] + +$Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix. + +[b]2. What is the difference between Red and Friendica?[/b] + +What's the difference between a passport, and a postcard? + +Friendica is really, really good at sending postcards. It can do all sorts of things with postcards. It can send them to your friends. It can send them to people you don't know. It can put them in an envelope and send them privately. It can run them through a photocopier and plaster them all over the internet. It can even take postcards in one language and convert them to many others so your friends who speak a different language can read them. + +What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are. Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity. + +$Projectname offers a passport. + +You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity. No longer do you need to register at every single site you use. You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead. + +Once you've proven your identity, a Red hub lets you use our services, as though you'd registered with directly, and we'd verified your credentials as would have happened in the olden days. These resources can, of course, be anything at all. + +[b]2. Why did you choose PHP, instead of Ruby or Python?[/b] + +The reference implementation is in PHP. We chose PHP, because it is available everywhere, and is easily configurable. We understand the debates between proponents and opponents of PHP, Ruby and Python. Nothing prevents implementations of Zot and the matrix in those languages. In fact, people on the matrix have already started developing a version of Red in Python [SOURCE?], and there is talk about future implementations in C (aiming for blazing native performance) and Java. It's free and open source, so we feel it's only a matter of time, once Red is initially completed. + +[b]4. Other than PHP, what other technology does Red use?[/b] + +We use MySQL as our database (this include any forks such as, MariaDB or Percona), and any modern webserver (Apache, nginx, etc.). + +[b]5. How is the Affinity Slider different from Mozilla's Persona?[/b] +{COMPLETE} + +[b]6. Does $Projectname use encryption? Details please![/b] + +Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance. + +Communication between web browsers and Red hubs is encrypted using SSL certificates. + +Private communication on the matrix is protected by AES symmetric encryption, which is itself protected by RSA PKI (public key encryption). By default, we use AES-256-CBC, and our RSA keys are set to 4096-bits. + +For more info on our initial implementation of encrypted communication, check out our source code at Github: https://github.com/friendica/red/blob/master/include/crypto.php + +[b]7. What do you mean by decentralization? [/b] + + +[b]8. Can I build my own website with in $Projectname?[/b] + +Yes. The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix. The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix. + +The longer explanation: Comanche is a markup language, similar to bbcode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Description Language file (".pdl", pronounced "puddle") to create these pages. Bbcode is not a requirement; an XML PDL file could also be used. The tag delimiters would be different. Usage is the same. + +Additional information is available on our Github project wiki: https://github.com/friendica/red/wiki/Comanche + +Comanche is another one of our priorities for the next six months. + +[b]9. Where can I see some technical description of Zot?[/b] + +Our github wiki contains a number of high-level and technical descriptions of Zot, Comanche, and Red in general: https://github.com/friendica/red/wiki + +[b]10. What happens if you raise more than {TARGETED NUMBER}?[/b] + +Raising more than our initial goal of funds, will speed up our development efforts. More developers will be able to take time off from other jobs, and concentrate efforts on finishing Red. + +[b]11 Can I make a contribution via Bitcoin?[/b] + +{YES/NO} + +[b]12. I have additional Questions[/] + +Awesome. We'd be more than happy to chat. You can find us {HERE} + +#include doc/macros/main_footer.bb; + diff --git a/doc/en/checking_account_quota_usage.bb b/doc/en/checking_account_quota_usage.bb new file mode 100644 index 000000000..7612d03d8 --- /dev/null +++ b/doc/en/checking_account_quota_usage.bb @@ -0,0 +1,20 @@ +[b]Checking your account quota usage (service limits usage)[/b] + +Your hub might implement service class limits, assigning limits to the total size of file, photo, channels, top-level posts, etc., that can be created by an account holder for a specific service level. + +Here's how you can quickly check how much of your assigned quota you're currently using: + +[b]Check file storage quota levels[/b] +Visit the following URL in your browser: +[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] +[observer=0]example.com/filestorage/username[/observer] + +[b]Check uploaded photos storage quota levels[/b] +[observer=1][observer.baseurl]/photos/[observer.webname][/observer] +[observer=0]example.com/photos/username[/observer] + +Example: +[observer=1][observer.baseurl]/filestorage/[observer.webname][/observer] +[observer=0]example.com/filestorage/username[/observer] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/comanche.bb b/doc/en/comanche.bb new file mode 100644 index 000000000..faf7e695e --- /dev/null +++ b/doc/en/comanche.bb @@ -0,0 +1,261 @@ +[b]Comanche Page Description Language[/b] + +Comanche is a markup language similar to bbcode with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages. + +Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose. + +[b]Page Templates[/b] +Currently there are five layout templates, unless your site provides additional layouts. + +[code] + [b]default[/b] + The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, + "content" for the main content region, and "footer" for a page footer. + + + [b]full[/b] + The full template defines the same as the default template with the exception that there is no "aside" region. + + + [b]choklet[/b] + The choklet template provides a number of fluid layout styles which can be specified by flavour: + + (default flavour) - a two column layout similar to the "default" template, but more fluid + bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays + three - three column layout (adds a "right_aside" region to the default template) + edgestwo - two column layout with fixed side margins + edgesthree - three column layout with fixed side margins + full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar + + [b]redable[/b] (sic) + A template for reading longer texts full screen (so without navigation bar). Three columns: aside, content and right_aside. + For maximum readability it is advised to only use the middle content column. + + [b]zen[/b] + Gives you the freedom to do everything yourself. Just a blank page with a content region. + +[/code] + +To choose a layout template, use the 'template' tag. + +[code] + [template]full[/template] + +[/code] + +To choose the "choklet" template with the "three" flavour: + +[code] + [template=three]choklet[/template] + +[/code] + +The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions. + +Three "macros" have been defined for your use. +[code] + $htmlhead - replaced with the site head content. + $nav - replaced with the site navigation bar content. + $content - replaced with the main page content. + +[/code] + +By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions. + + +To select a theme for your page, use the 'theme' tag. +[code] + [theme]suckerberg[/theme] + +[/code] +This will select the theme named "suckerberg". By default your channel's preferred theme will be used. + +[code] + [theme=passion]suckerberg[/theme] + +[/code] +This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. + +[code] + [theme]suckerberg:passion[/theme] + +[/code] + +The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier. + +[b]Regions[/b] +Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag. + +[code] + [region=htmlhead]....content goes here....[/region] + [region=aside]....content goes here....[/region] + [region=nav]....content goes here....[/region] + [region=content]....content goes here....[/region] + +[/code] + +[b]CSS and Javascript[/b] +We have the possibility to include javascript and css libraries in the htmlhead region. At present we make use of jquery (js), bootstrap (css/js) and foundation (css/js). +This will overwrite the selected themes htmlhead. + +[code] + [region=htmlhead] + [css]bootstrap[/css] + [js]jquery[/js] + [js]bootstrap[/js] + [/region] + +[/code] + +[b]Menus and Blocks[/b] +Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created. + +[code] + [menu]mymenu[/menu] + +[/code] +This places the menu called "mymenu" at this location on the page, which must be inside a region. + +[code] + [menu=horizontal]mymenu[/menu] + +[/code] +This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. + +[code] + [menu][var=wrap]none[/var]mymenu[/menu] + +[/code] +The variable [var=wrap]none[/var] in a block removes the wrapping div element from the menu. + +[code] + [block]contributors[/block] +[/code] +This places a block named "contributors" in this region. + +[code] + [block=someclass]contributors[/block] + +[/code] +This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget". + +[code] + [block][var=wrap]none[/var]contributors[/block] + +[/code] +The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block. + +[b]Widgets[/b] +Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. (TODO: list available widgets and arguments). The base system provides + +[code] + profile - widget which duplicates the profile sidebar of your channel page. This widget takes no arguments + tagcloud - provides a tag cloud of categories + count - maximum number of category tags to list + +[/code] + +Widgets and arguments are specified with the 'widget' and 'var' tags. +[code] + [widget=recent_visitors][var=count]24[/var][/widget] + +[/code] + +This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". + +[b]Comments[/b] +The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page. + +[code] + [comment]This is a comment[/comment] + +[/code] + +[b]Conditional Execution[/b] +You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer. + +[code] + [if $config.system.foo] + ... the configuration variable system.foo evaluates to 'true'. + [else] + ... the configuration variable system.foo evaluates to 'false'. + [/if] + + [if $observer] + ... this content will only be show to authenticated viewers + [/if] + +[/code] + + The 'else' clause is optional. + + Several tests are supported besides boolean evaluation. + +[code] + [if $config.system.foo == bar] + ... the configuration variable system.foo is equal to the string 'bar' + [/if] + [if $config.system.foo != bar] + ... the configuration variable system.foo is not equal to the string 'bar' + [/if] + [if $config.system.foo {} bar ] + ... the configuration variable system.foo is a simple array containing a value 'bar' + [/if] + [if $config.system.foo {*} bar] + ... the configuration variable system.foo is a simple array containing a key named 'bar' + [/if] +[/code] + +[b]Complex Example[/b] +[code] + [comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment] + + [template]3-column-with-header[/template] + + [comment]Use the "darknight" theme[/comment] + + [theme]darkknight[/theme] + + [comment]Use the existing site navigation menu[/comment] + + [region=nav]$nav[/region] + + [region=side] + + [comment]Use my chosen menu and a couple of widgets[/comment] + + [menu]myfavouritemenu[/menu] + + [widget=recent_visitors] + [var=count]24[/var] + [var=names_only]1[/var] + [/widget] + + [widget=tagcloud][/widget] + [block]donate[/block] + + [/region] + + + + [region=middle] + + [comment]Show the normal page content[/comment] + + $content + + [/region] + + + + [region=right] + + [comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment] + + [widget]channel[/widget] + + [/region] + +[/code] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/context/de/admin/logs/help.html b/doc/en/context/de/admin/logs/help.html new file mode 100644 index 000000000..1441d9075 --- /dev/null +++ b/doc/en/context/de/admin/logs/help.html @@ -0,0 +1,8 @@ +
      +
      Allgemein
      +
      Auf dieser Seite können die Einstellungen zur Protokollierung angepasst und vorhandene Protokolle angezeigt werden.
      +
      Protokoll Einstellungen
      +
      Bei aktivierter Debugging-Option werden System-Log Informationen an die Datei in der Protokolldatei im EIngabefeld hinzugefügt. Der Pfad ist relativ zum Hub-Wurzelverzeichnis. Daauf achten, dass diese Datei vom Webserver geschrieben werden kann.
      +
      Protokollstufe
      +
      Die Protokollstufe bestimmt, wie viele Informationen an die Protokolldatei angefügt werden. Warnung: Eine hohe Protokollstufe kann sehr schnell die Größe der Protokolldatei anwachsen lassen, vor allem, wenn der Hub viele Mitglieder hat.
      +
      diff --git a/doc/en/context/de/admin/queue/help.html b/doc/en/context/de/admin/queue/help.html new file mode 100644 index 000000000..e59fdcaee --- /dev/null +++ b/doc/en/context/de/admin/queue/help.html @@ -0,0 +1,4 @@ +
      +
      Allgemein
      +
      Die Warteschlangenstatistik zeigt, wie viele Nachrichten zur Auslieferung an andere Hubs noch in der Warteschlange stehen. Die Priorität steht in Beziehung mit der Anzahl fehlgeschlagener Auslieferungsversuche.
      +
      diff --git a/doc/en/context/de/admin/security/help.html b/doc/en/context/de/admin/security/help.html new file mode 100644 index 000000000..6465e8f0e --- /dev/null +++ b/doc/en/context/de/admin/security/help.html @@ -0,0 +1,4 @@ +
      +
      Allgemein
      +
      Auf dieser Seite können verschiedene Sicherheitseinstellungen vorgenommen werden. Um geänderte Einstellungen zu speichern, muss der Knopf "Bestätigen" gedrückt werden.
      +
      diff --git a/doc/en/context/de/appman/help.html b/doc/en/context/de/appman/help.html new file mode 100644 index 000000000..888ee6206 --- /dev/null +++ b/doc/en/context/de/appman/help.html @@ -0,0 +1,4 @@ +
      +
      Allgemein
      +
      Ändere die individuellen Eigenschaften der ausgewählten App. Kategorien erlauben dir das Einsortieren der Apps um sie in der Liste leichter zu finden. Kundenspezifische Apps, die du oder dein Administrator erstellt haben, können weitere Felder enthalten wie "Preis der App" oder "Ort (URL), um die App zu kaufen". Dies gilt nicht für Hubzilla Core Apps.
      +
      \ No newline at end of file diff --git a/doc/en/context/de/channel/help.html b/doc/en/context/de/channel/help.html new file mode 100644 index 000000000..fbfcac3c1 --- /dev/null +++ b/doc/en/context/de/channel/help.html @@ -0,0 +1,8 @@ +
      +
      Allgemein
      +
      Auf dieser Seite wird der eigene aktuelle Kanal angezeigt. Dies entspricht ungefähr den Profilseiten in anderen sozialen Netzwerken. Im Kanal veröffentliche Beiträge werden gemäß den Anzeige-Berechtigungen des Betrachters angezeigt.
      +
      Beitrag anlegen
      +
      Falls der Betrachter/Besucher die Berechtigung zum Anlegen von Beiträgen besitzt, wird im oberen Bereich der Beitragseditor angezeigt.
      +
      Kanal-Inhalte-Tabs
      +
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      +
      diff --git a/doc/en/context/de/chat/help.html b/doc/en/context/de/chat/help.html new file mode 100644 index 000000000..ba355365f --- /dev/null +++ b/doc/en/context/de/chat/help.html @@ -0,0 +1,8 @@ +
      +
      Allgemein
      +
      Chaträume können angelegt und für die Echtzeit-Kommunikation verwendet werden. Die Zugriffskontrolle verwendet dabei das Hubzilla-Berechtigungssystem.
      +
      Chatraum anlegen
      +
      Über den Knopf "Neu anlegen" wird ein neuer Chatraum eröffnet. Hierfür einen Namen und angeben, wie lange Nachrichten aufbewahrt werden sollen.
      +
      Chatten
      +
      Die Nachricht in der der Nachrichtenbox eingeben und "Bestätigen" drücken. Über den Menüknopf neben "Bestätigen" kann ein Anwesenheitsstatus gesetzt werden. Andere Teilnehmer am Chatraum werden im Seitenpanel unter "Chatmitglieder" angezeigt.
      +
      diff --git a/doc/en/context/de/cloud/help.html b/doc/en/context/de/cloud/help.html new file mode 100644 index 000000000..e72ad1743 --- /dev/null +++ b/doc/en/context/de/cloud/help.html @@ -0,0 +1,6 @@ +
      +
      Allgemein
      +
      Diese Seite zeigt die veröffentlichten und geteilten Dateien des Kanals an. Welche Dateien ein Besucher sehen kann, wird über die individuellen Dateiberechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Dateien vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
      +
      Kanal-Inhalte-Tabs
      +
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      +
      diff --git a/doc/en/context/de/connections/help.html b/doc/en/context/de/connections/help.html new file mode 100644 index 000000000..61789ea38 --- /dev/null +++ b/doc/en/context/de/connections/help.html @@ -0,0 +1,8 @@ +
      +
      Allgemein
      +
      Auf dieser Seite werden die Verbindungen des Kanals angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
      +
      Verbindungsdetails
      +
      Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
      +
      Verbindungsstatus
      +
      Eine Verbindung kann sich in verschiedenen Stati befinden:
      • Archiviert
      • Ignoriert
      • Blockiert
      • Versteckt
      +
      diff --git a/doc/en/context/de/connections/ifpending/help.html b/doc/en/context/de/connections/ifpending/help.html new file mode 100644 index 000000000..3e55b34c3 --- /dev/null +++ b/doc/en/context/de/connections/ifpending/help.html @@ -0,0 +1,8 @@ +
      +
      Allgemein
      +
      Auf dieser Seite werden Verbindungswünsche von anderen Kanälen an diesen Kanal angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
      +
      Verbindungsdetails
      +
      Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
      +
      Verbindungsstatus
      +
      Eine Verbindung kann sich in verschiedenen Stati befinden:
      • Archiviert
      • Ignoriert
      • Blockiert
      • Versteckt
      +
      diff --git a/doc/en/context/de/events/help.html b/doc/en/context/de/events/help.html new file mode 100644 index 000000000..b0dc95b3e --- /dev/null +++ b/doc/en/context/de/events/help.html @@ -0,0 +1,8 @@ +
      +
      Allgemein
      +
      Auf dieser Seite wird ein Kalender mit eigenen und von anderen verbundenen Kanälen geteilte Ereignisse angezeigt.
      +
      Kalenderanzeige
      +
      Die Monats-, Wochen- und Tagesansicht des Kalenders kann im Panel ausgewählt werden.
      +
      Export/Import
      +
      Kalendereinträge können Eim Standard-Format iCalendar (.ics) exportiert oder importiert werden.
      +
      diff --git a/doc/en/context/de/mail/help.html b/doc/en/context/de/mail/help.html new file mode 100644 index 000000000..b89135d8c --- /dev/null +++ b/doc/en/context/de/mail/help.html @@ -0,0 +1,12 @@ +
      +
      Allgemein
      +
      Die Privaten Nachrichten sind nur für den Kanal-Besitzer und den Empfänger sichtbar.
      +
      Konversationen
      +
      Über Konversationen kann eine vollständige fortlaufene Ansicht einer Konversation angezeigt werden. Verfügbare Konversationen werden unter dem Punkt Konversationen im Panel angezeigt.
      +
      Eingang/Ausgang
      +
      Einzelne versandte Nachrichten kännen über den Punkt Ausgang und empfangene Nachrichten über Eingang gefiltert dargestellt werden.
      +
      Neue Nachricht
      +
      Über Neue Nachricht kann eine neue Nachricht erstellt werden.
      +
      Sonstiges
      +
      Über das Menü einzelner Nachrichten können besondere Funktionen ausgelöst werden: Zustellungsbericht kann abgerufen werden, Nachrichten (die noch nicht angesehen wurden!) können widerrufen und gelöscht werden.
      +
      diff --git a/doc/en/context/de/network/help.html b/doc/en/context/de/network/help.html new file mode 100644 index 000000000..6590f597d --- /dev/null +++ b/doc/en/context/de/network/help.html @@ -0,0 +1,10 @@ +
      +
      Allgemein
      +
      Auf der Netzwerkseite wird der Strom von Beiträgen und Konversationen angezeigt. Typischerweise wird nach kürzlich aktualisierten Beiträgen sortiert. Diese Seite kann sehr weitgehend angepasst werden.
      +
      Beitrag anlegen
      +
      Im oberen Bereich der Seite wird eine Textbox "Teilen" angezeigt. Nach Klick in diese Box wird der Beitragseditor angezeigt. Der Beitragseditor kann angepasst werden; in den Basiseinstellungen stehen Felder für Inhalt und einem optionalen Titel bereit. Knöpfe unterhalb des Inhaltes erleichtern die Eingabe von Formatierungen, Links, Bildern und anderen Daten im Beitrag. Über die Knöpfe im rechten Bereich kann eine Vorschau aktiviert, Berechtigungen gesetzt und der Beitrag abgesendet werden.
      +
      Gruppen
      +
      Die erstellten Gruppen werden im Panel angezeigt. Über die Gruppen kann nach Beiträgen von Gruppenmitgliedern gefiltert werden.
      +
      Beitragsberechtigungen
      +
      Die Zugriffskontrollliste (Access Control List; ACL) steuert, wer den Beitrag sehen darf. Nach Klick auf das Schloß neben dem Knopf "Teilen" öffnet sich ein Dialog, in dem Kanäle oder Gruppen ausgewählt werdenkönnen, die diesen Beitrag sehen dürfen. s kann auch gezielt verboten werden, dass ein Kanal oder eine Gruppe den Artikel sehen darf (nützlich beispielsweise für die Planung einer Überraschungsparty in einer Gruppe, in der der Überraschte Mitglied ist).
      +
      diff --git a/doc/en/context/de/photos/help.html b/doc/en/context/de/photos/help.html new file mode 100644 index 000000000..437d2c369 --- /dev/null +++ b/doc/en/context/de/photos/help.html @@ -0,0 +1,6 @@ +
      +
      Allgemein
      +
      Diese Seite zeigt die veröffentlichten und geteilten Fotos des Kanals an. Welche Fotos ein Besucher sehen kann, wird über die individuellen Berechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Bildern vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
      +
      Kanal-Inhalte-Tabs
      +
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      +
      diff --git a/doc/en/context/de/profile/help.html b/doc/en/context/de/profile/help.html new file mode 100644 index 000000000..ece33457d --- /dev/null +++ b/doc/en/context/de/profile/help.html @@ -0,0 +1,6 @@ +
      +
      Allgemein
      +
      Dies ist die Profilseite eines Kanals. Hier werden typischerweise Informationen angezeigt, die den Kanal beschreiben. Wenn der Kanal beispielsweise eine Person in einem sozialen Netzwerk repräsentiert, könnten Kontaktinformationen und andere persönliche Details hier veröffentlicht werden. Kanäle können mehrere Profile besitzen, die abhängig vom Betrachter/Besucher angezeigt werden.
      +
      Kanal-Inhalte-Tabs
      +
      Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
      +
      diff --git a/doc/en/context/de/register/help.html b/doc/en/context/de/register/help.html new file mode 100644 index 000000000..9ee062ee8 --- /dev/null +++ b/doc/en/context/de/register/help.html @@ -0,0 +1,12 @@ +
      +
      Allgemein
      +
      Auf dieser Seite können sich Besucher registrieren, um mit einer Anmeldungskennung Zugang zum Portal zu erhalten. Angemeldeten Benutzern sehen nicht nur die öffentlichen Inhalte, sondern können selber Inhalte veröffentlichen und Soziale Netzwerk Kommunikationen durchführen, und sehr viel mehr.
      +
      Arten der Registrierung
      +
      Eine Registrierung ist mit einer eMail Adresse möglich, oder auch anonym (dann das eMail Feld nicht ausfüllen). Vielleicht haben Sie auch einen Einladungscode erhalten, der dann mit der eMail Adresse angegeben werden kann. Der Link oberhalb des Feldes eMail ermöglich die Eingabe des Einladungscodes.
      +
      Ablauf der Registrierung
      +
      Für Anmeldungen nach einer erfolgreichen Registrierung ist ein eigenes Kennwort festzulegen. Es ist sicherheitshalber zweimal mit identischen Werten einzugeben, weil es nicht angezeigt wird. Das Kennwort ist geheim zu halten und nur für den eigenen Gebrauch bestimmt. Anonym registrierte Benutzer erhalten eine automatisch zugewiesene Kennung, und sollten das eigene Kennwort nicht vergessen, weil es im Gegensatz zur eMail Registrierung zunächst keine Rücksetzfunktion gibt. Je nach Konfiguration der Hub-Instanz kann eine Bestätigungsfunktion erforderlich sein. Benutzer der eMail Registrierung erhalten eine entsprechende Nachricht. Bei anonymen Registrierungen wird ein weiterer Dialog angezeigt, der die Zugangskennung und eine Pin zeigt. Jene Dialogseite sollte unbedingt sicher und langfristig aufbewahrt werden (z.B. durch Ausdruck, Screenshot, Foto), weil die Daten zu einem späten Zeitpunkt noch einmal zu bestätigen sind.
      +
      Die Digitale Identität
      +
      Je nach Konfiguration der Hub-Instanz kann bereits bei der Registrierung (alternativ auch bei der ersten Anmeldung) ein anzeigbarer Name und ein Spitzname ("nickname") eingegeben werden. Der Nickname hat eine sehr weitreichende Bedeutung und läßt sich nachträglich nicht mehr ändern. Es handelt sich dabei um eine eindeutige Digitale Identität (DID), die mit allen eigenen Aktivitäten verknüft ist, sein wird, und bleibt. Diese DID eignet sich nicht nur zur Anmeldung in dieser Hub-Instanz, sondern auch in allen verbundenen Instanzen des Federalen Netzwerkes. Im Sprachgebrauch der Federalen Netze ist diese digitale Identität ein "Kanal". Das ist vergleichbar etwa mit einer Rufnummer im Telefonnetz. Die DID hat das Format kanal@instanz.tld = nickname@instanz.tld und ist, wie gesagt, nachträglich nicht mehr änderbar. Obwohl sich das Format wie eine eMail Adresse darstellt, handelt es sich nicht um eine solche.
      +
      Bevor die Registrierung begonnen wird ...
      +
      sollte (oben rechts im Hamburger Menü ) die bevorzugte Sprache (Englisch, Spanisch, Deutsch z.B.) gewählt werden. Die aktuelle Sprache wird in den Folgeschritten und auch bei und nach der Anmeldung verwendet. Das läßt sich aber jederzeit und je nach Bedarf ändern. Auch sei darauf hingewiesen, dass diese Hub-Instanz nicht die einzige ist. Eine Übersicht über andere Hub-Instanzen ist hier zu finden.
      +
      diff --git a/doc/en/context/de/settings/account/help.html b/doc/en/context/de/settings/account/help.html new file mode 100644 index 000000000..03fc0cc14 --- /dev/null +++ b/doc/en/context/de/settings/account/help.html @@ -0,0 +1,19 @@ +
      +
      Allgemein
      +
      + Wenn du dich registriert und dir damit einen Zugang zum Grid verschafft hast, hast du ein Profil und einen Kanal erzeugt. +
      +
      Zugang
      +
      + Du hast einen Zugang, der sich aus deiner Emailadresse mit deinem Passwort zusammen setzt. Damit greifst du auf dein Profil und deinen Kanal zu. + Du authetifizierst dich also einmal auf einem Hub von Hubzilla, und es erlaubt dir beliebig Profile und Kanäle anzulegen und dich mit anderen Leuten zu verbinden. +
      +
      Profil
      +
      + Du bist sicherlich bei anderen Services im Internet registriert, wie irgendwelchen Foren oder anderen Online Communities. Überall hinterläßt du Informationen über dich wie deinen Geburtstag, dein Alter, dein Land und Ähnliches. Im Gegensatz zu anderen Services erlaubt dir Hubzilla das Anlegen vieler verschiedener Profile. So kannst du ein öffentliches Profil anlegen, das zur allgemeinen Verwendung gedacht ist, ein Profil für deine Arbeitskollegen, deine Familie oder deinen Lebenspartner. Deine Profile sind die grundlegende Information, die du anderen Leuten je nach Beziehung zur Verfügung stellen willst. +
      +
      Kanal
      +
      + Während der Registrierung hast du deinen ersten Kanal erzeugt. In der Tat, neben verschiedenen Profilen kannst du auch verschiedene Kanäle haben. Das könnte etwas verwirrend sein am Anfang, aber lass uns die Dinge besser verstehen. Du hast also bereits einen Kanal erstellt, den du zum Beispiel für die breite Öffentlichkeit und für den Alltag verwenden kannst. Aber vielleicht bist du ein Bücherwurm, und viele deiner Leser langweilt das. Also eröffnest Du einen zweiten Kanal für Bücherfreunde, in dem ihr euch ungezwungen über Bücher austauschen könnt. Offensichtlich ergibt sich daraus ein neuer Stream von Beiträgen, womöglich mit einem neuen Profil oder neuen Profilen und komplett eigenen Verbindungen oder Kontakten. Einige finden sich in beiden Kanälen, aber die meisten werden wohl nur in einem der Kanäle mitlesen. Du wechselst zwischen den Kanälen wie im richtigen Leben je nachdem, ob du dich auf der Straße mit Leuten triffst oder mit Bücherfreunden sprichst. Im Prinzip können sich deine Kanäle auch untereinander verbinden, du also mit dir selbst sprechen, wenn du das möchtest. Deine Kanäle sind also wie Räume für unterschiedliche Themen, in denen du auf verschiedene Leute triffst. +
      +
      \ No newline at end of file diff --git a/doc/en/context/de/settings/channel/help.html b/doc/en/context/de/settings/channel/help.html new file mode 100644 index 000000000..98a388f77 --- /dev/null +++ b/doc/en/context/de/settings/channel/help.html @@ -0,0 +1,19 @@ +
      +
      Allgemein
      +
      + Wenn du dich registriert und dir damit einen Zugang zum Grid verschafft hast, hast du ein Profil und einen Kanal erzeugt. +
      +
      Zugang
      +
      + Du hast einen Zugang, der sich aus deiner Emailadresse mit deinem Passwort zusammensetzt. Damit greifst du auf dein Profil und deinen Kanal zu. + Du authetifizierst dich also einmal auf einem Hub von Hubzilla, und es erlaubt dir beliebig Profile und Kanäle anzulegen und dich mit anderen Leuten zu verbinden. +
      +
      Profil
      +
      + Du bist sicherlich bei anderen Services im Internet registriert, wie irgendwelchen Foren oder anderen Online Communities. Überall hinterläßt du Informationen über dich wie deinen Geburtstag, dein Alter, dein Land und Ähnliches. Im Gegensatz zu anderen Services erlaubt dir Hubzilla das Anlegen vieler verschiedener Profile. So kannst du ein öffentliches Profil anlegen, das zur allgemeinen Verwendung gedacht ist, ein Profil für deine Arbeitskollegen, deine Familie oder deinen Lebenspartner. Deine Profile sind die grundlegende Information, die du anderen Leuten je nach Beziehung zur Verfügung stellen willst. +
      +
      Kanal
      +
      + Während der Registrierung hast du deinen ersten Kanal erzeugt. In der Tat, neben verschiedenen Profilen kannst du auch verschiedene Kanäle haben. Das könnte etwas verwirrend sein am Anfang, aber lass uns die Dinge besser verstehen. Du hast also bereits einen Kanal erstellt, den du zum Beispiel für die breite Öffentlichkeit und für den Alltag verwenden kannst. Aber vielleicht bist du ein Bücherwurm und viele deiner Leser langweilt das. Also eröffnest Du einen zweiten Kanal für Bücherfreunde, in dem ihr euch ungezwungen über Bücher austauschen könnt. Offensichtlich ergibt sich daraus ein neuer Stream von Beiträgen, womöglich mit einem neuen Profil oder neuen Profilen und komplett eigenen Verbindungen oder Kontakten. Einige finden sich in beiden Kanälen, aber die meisten werden wohl nur in einem der Kanäle mitlesen. Du wechselst zwischen den Kanälen wie im richtigen Leben je nachdem, ob du dich auf der Straße mit Leuten triffst oder mit Bücherfreunden sprichst. Im Prinzip können sich deine Kanäle auch untereinander verbinden, du also mit dir selbst sprechen, wenn du das möchtest. Deine Kanäle sind also wie Räume für unterschiedliche Themen, in denen du auf verschiedene Leute triffst. +
      +
      \ No newline at end of file diff --git a/doc/en/context/de/settings/features/help.html b/doc/en/context/de/settings/features/help.html new file mode 100644 index 000000000..a019d2d60 --- /dev/null +++ b/doc/en/context/de/settings/features/help.html @@ -0,0 +1,12 @@ +
      +
      Allgemein
      +
      Diese Seite ermöglicht dir viele zusätzliche Funktionen von Hubzilla einzustellen.
      +
      Allgemeine Funktionen
      +
      Die Einstellungen für allgemeine Funktionen beinhalten Optionen, die relevant sind für deinen Kanal, zum Beispiel bei Webseiten oder Wikis.
      +
      Funktionen für die Beitragserstellung
      +
      Diese Funktionen bieten weitere Optionen und Möglichkeiten für die Erstellung neuer Beiträge.
      +
      Filterung von Streams
      +
      Diese Einstellungen verändern Funktionen, die mit der Filterung und der Ansichtskontrolle enkommender Beiträge verbunden sind.
      +
      Werkzeuge für Beiträge und Kommentare
      +
      Hier findest du zusätzliche Werkzeuge um Beiträge zu kategorisieren, und erweiterte Methoden der Kommentierung wie Emojis und Community Tagging.
      +
      \ No newline at end of file diff --git a/doc/en/context/de/settings/tokens/help.html b/doc/en/context/de/settings/tokens/help.html new file mode 100644 index 000000000..4a7776109 --- /dev/null +++ b/doc/en/context/de/settings/tokens/help.html @@ -0,0 +1,20 @@ +
      +
      Gastzugangs-Token
      +
      + Hubzilla verwendet befristete "Wegwerf"-Logins oder "Zot Access Tokens", um das Teilen privater Informationen mit Nichtmitgliedern oder Mitgliedern im Fediverse zu ermöglichen, deren Knoten nur eingeschränkte Möglichkeiten zur Identifizierung bieten. Diese Token können zur Authentifizierung an einem Hub für den Zweck verwendet werden privilegierte oder zugangskontrollierte Ressourcen (Dateien, Fotos, Beiträge, Webseiten, Chaträume, usw.) zugänglich zu machen. +
      +
      Einen Token erzeugen
      +
      + Das Formular zur Erzeugung von Token benötigt drei Parameter: einen lesbaren Zugangsnamen, ein Passwort oder Zugangs-Token, und optional ein Verfallsdatum. Ein verfallenes Token kann nicht länger verwendet werden und wird von der Liste befristeter Zugänge entfernt. Hinweis Das Passwort-Feld zeigt das Token oder Passwort im Klartext. +
      +
      Einen Token teilen
      +
      + Wir geben keine Mechanismen für das Teilen der Zugangs-Token vor, jede Kommunikationsmethode ist recht. Alle Token, die du erzeugt hast, werden zu den Listen für die Zugangskontrolle hinzugefügt und können von überall verwendet werden, wo anhand dieser Listen authentifiziert werden kann. + + Ein Beispiel: Ein Besucher trifft auf deine Seite. Er hat ein von dir zur Verfügung gestelltes Zugangs-Token für eines Deiner Fotoalben, das nur von Dir und eben diesem befristeten Zugangsnamen betrachtet werden darf. Der Besucher erhält zunächst keinen Zugang. + + Nun wählt er "Login" aus der Navigation und erhält die Loginseite angezeigt, in die er seine Zugangsdaten eingibt. Ab sofort erhält er Zugang zum Fotoalbum. + + Alternativ kannst du einen Link mit deinem Besucher teilen, dessen URL um den Parameter "&zat=abc123" erweitert ist, wobei "abc123" das Zugangs-Token oder das Passwort für den befristeten Login ist. Mit dieser Erweiterung ist kein Login erforderlich, der Besucher erhält sofort den Zugang. +
      +
      diff --git a/doc/en/context/de/wiki/help.html b/doc/en/context/de/wiki/help.html new file mode 100644 index 000000000..e203ee221 --- /dev/null +++ b/doc/en/context/de/wiki/help.html @@ -0,0 +1,10 @@ +
      +
      Allgemein
      +
      Jedes Wiki ist eine Sammlung aus mit Markdown formatierten Seiten.
      +
      Wiki Liste
      +
      Wikis die dem eigenen Kanal gehören und mit der Berechtigung zum Anschauen, sind in der Seitenleiste gelistet.
      +
      Seiten Versionen
      +
      Jede Änderung einer Seite wird gespeichert, um eine schnelle Berichtigung zu ermöglichen. Klick auf das Versionsgeschichte Tab um den Verlauf der Seitenbearbeitung zu sehen, einschließlich Datum und Autor. Der Zurück-Knopf lädt die ausgewählte Änderung, aber ohne die Seite automatisch zu spreichern.
      +
      Seiten
      +
      Die Seiten des Wikis werden in Wiki Seiten gelistet. Vor dem Speichern einer Seite über das Seiten Dropdown Menu, hast Du die Möglichkeit eine Zusammenfassung der Änderungen einzutragen. Dieser Text wird anschließend unter Seiten Versionen in der Versionsgeschichte angezeigt.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/admin/addons/assets/addon_repo_gui_1.png b/doc/en/context/en/admin/addons/assets/addon_repo_gui_1.png new file mode 100644 index 000000000..37139b345 Binary files /dev/null and b/doc/en/context/en/admin/addons/assets/addon_repo_gui_1.png differ diff --git a/doc/en/context/en/admin/addons/help.html b/doc/en/context/en/admin/addons/help.html new file mode 100644 index 000000000..bfb5e416a --- /dev/null +++ b/doc/en/context/en/admin/addons/help.html @@ -0,0 +1,14 @@ +
      +
      General
      +
      This page manages which addons (also known as plugins) are installed.
      +
      Manage Repos
      +
      If your webserver has the necessary write permissions, you will see a button labeled Manage Repos, + which opens a control panel for managing what plugin repositories are installed. These repos are + stored in extend/addon/[repo name]/. The official Hubzilla + addon repo can be added by entering the repo URL + https://framagit.org/hubzilla/addons.git + and choosing a name for the repo such as official. You should see this repo in the list similar + to the following: +
      +
      +
      diff --git a/doc/en/context/en/admin/logs/help.html b/doc/en/context/en/admin/logs/help.html new file mode 100644 index 000000000..708ec9bde --- /dev/null +++ b/doc/en/context/en/admin/logs/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      This page allows you to adjust log settings and to view and existing log.
      +
      Log Settings
      +
      When you enable the Debugging option, system log information will begin appending to the file specified in the "Log File" box (path is relative to the hub root, for example /var/www). Note that this file must be writable by the web server.
      +
      Log Level
      +
      The log level option allows you to set how much information is appended to the log file. Warning: Increasing this level can quickly inflate the size of the log file to >100MB, especially on hubs with more than a few members.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/admin/queue/help.html b/doc/en/context/en/admin/queue/help.html new file mode 100644 index 000000000..28885a154 --- /dev/null +++ b/doc/en/context/en/admin/queue/help.html @@ -0,0 +1,4 @@ +
      +
      General
      +
      The queue statistics display how many posts are in the queue for delivery to other hubs. The priority is related to how many times the delivery has been unsuccessfully attempted.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/admin/security/help.html b/doc/en/context/en/admin/security/help.html new file mode 100644 index 000000000..bfe81b132 --- /dev/null +++ b/doc/en/context/en/admin/security/help.html @@ -0,0 +1,4 @@ +
      +
      General
      +
      This page contains various administrator settings related to security. To save any changes you make to these settings, you must press the Submit button.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/appman/help.html b/doc/en/context/en/appman/help.html new file mode 100644 index 000000000..27cb03624 --- /dev/null +++ b/doc/en/context/en/appman/help.html @@ -0,0 +1,4 @@ +
      +
      General
      +
      Edit individual properties of the app you selected. Categories allow you to sort your apps to help you find them in the list more easily. Support for custom apps you or your administrator may choose to create includes fields such as "Price of app" and "Location for purchase" that are not applicable to core Hubzilla apps.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/cards/help.html b/doc/en/context/en/cards/help.html new file mode 100644 index 000000000..9dbed3f97 --- /dev/null +++ b/doc/en/context/en/cards/help.html @@ -0,0 +1,20 @@ +
      +
      General
      +
      Cards represent a persistent area for collaboration that is separate from the social stream. They are somewhat more lightweight than webpages and wikis for quick organisation of information and have the advantage of allowing collaboration and commentary. They are well suited for helping to organise complex tasks where there are frequent updates and feedback. +
      +
      Add Card
      +
      + Creating a new card is very similar to composing a new post.

      +
        +
      • + Page link name: The page link name is the name of the card for the static URL +
        • +
      • + Title: The title is displayed at the top of the card +
        • +
      • + Categories: If you have the Post Categories feature enabled for your channel, then you can add categories to the card. These categories populate the Categories list on the left panel and allow filtering your collection of cards. +
        • +
      +
      +
      diff --git a/doc/en/context/en/channel/help.html b/doc/en/context/en/channel/help.html new file mode 100644 index 000000000..0c5b99754 --- /dev/null +++ b/doc/en/context/en/channel/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      This is the home page of a channel. It is similar to someone's profile "wall" in a social network context. Posts created by the channel are displayed according to the observer's viewing permissions.
      +
      Create a Post
      +
      If you have permission to create posts on the channel page, then you will see the post editor at the top.
      +
      diff --git a/doc/en/context/en/chat/help.html b/doc/en/context/en/chat/help.html new file mode 100644 index 000000000..cc71686d8 --- /dev/null +++ b/doc/en/context/en/chat/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      Create and use chat rooms to communicate in real-time, using the standard Hubzilla permissions system for chat room access control.
      +
      Create new chat room
      +
      Use the "Create New" button to create a new chat room. Enter a name and how long messages should be retained.
      +
      Chatting
      +
      Enter your message in the message box and press Submit. You can set a status by selecting the chat room menu button beside the Submit button. Other people "in the room" are visible in the side panel in the "Chat Members" panel.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/cloud/help.html b/doc/en/context/en/cloud/help.html new file mode 100644 index 000000000..a8f193223 --- /dev/null +++ b/doc/en/context/en/cloud/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      This page displays a channel's "cloud" files. The files visible to the observer depend on the individual file permissions set by the channel owner. If you have permission to create/upload files you will see control buttons above the file list.
      +
      Channel Content Tabs
      +
      The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/connections/help.html b/doc/en/context/en/connections/help.html new file mode 100644 index 000000000..0f95fde63 --- /dev/null +++ b/doc/en/context/en/connections/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
      +
      Connection Details
      +
      Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
      +
      Connection Status
      +
      A connection can be in different states:
      • Archived
      • Ignored
      • Blocked
      • Hidden
      +
      \ No newline at end of file diff --git a/doc/en/context/en/connections/ifpending/help.html b/doc/en/context/en/connections/ifpending/help.html new file mode 100644 index 000000000..0f95fde63 --- /dev/null +++ b/doc/en/context/en/connections/ifpending/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
      +
      Connection Details
      +
      Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
      +
      Connection Status
      +
      A connection can be in different states:
      • Archived
      • Ignored
      • Blocked
      • Hidden
      +
      \ No newline at end of file diff --git a/doc/en/context/en/connedit/help.html b/doc/en/context/en/connedit/help.html new file mode 100644 index 000000000..9eb62ecc7 --- /dev/null +++ b/doc/en/context/en/connedit/help.html @@ -0,0 +1,12 @@ +
      +
      General
      +
      This page allows you to change or edit any individual settings for a particular connection or delete a connection completely. You may have arrived at this page after creating or approving a new connection. If so, you are not required to do anything. Your connection has already been established. You may wish to add them to a group or adjust special permissions, and this page is presented so that you may do this while the opportunity is fresh.
      +
      Connection Tools
      +
      The Connection Tools menu access several settings. View Profile, View Recent Activity, Refresh Permissions, set or reset flags (Block, Ignore, Archive, Hide) and Delete the connection.
      +
      Privacy Groups
      +
      Each connection may be assigned to one or more Privacy Groups for grouping collections of friends with access to specific posts, media and other content. You may add them to an existing privacy group here, or create a new privacy group. When you add them to an existing group the action is immediate and you are not required to submit a form.
      +
      Individual Permissions
      +
      Granting of permissions is usually automatic and require no action on your part. However you may wish to adjust specific permsisions for this connection which are different than for others.
      +
      Feature Specific Settings
      +
      A number of individual settings are controlled through additional features which may or may not be activated on your hub or for your channel. Several optional features have settings for each connection, and those may be set on this page through additional form tabs which may be present.
      +
      diff --git a/doc/en/context/en/events/help.html b/doc/en/context/en/events/help.html new file mode 100644 index 000000000..8c0b1d4ab --- /dev/null +++ b/doc/en/context/en/events/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      This page displays a calendar of events both owned by you and shared with you from other channels.
      +
      Calendar View
      +
      The calendar can be displayed in month, week, or day mode using the options in the side panel.
      +
      Export/Import
      +
      Export or import calendar events using standard iCalendar format (.ics) files.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/mail/help.html b/doc/en/context/en/mail/help.html new file mode 100644 index 000000000..a2361a135 --- /dev/null +++ b/doc/en/context/en/mail/help.html @@ -0,0 +1,10 @@ +
      +
      General
      +
      The messages displayed in private mail are visible only to you and the single recipient.
      +
      Combined View
      +
      Complete conversations can be viewed in a continuous thread by selecting Combined View. Available conversations are displayed beneath the menu in the side panel.
      +
      Inbox/Outbox
      +
      Individual sent messages are viewed by selecting Outbox, and incoming messages are viewed using the Inbox filter.
      +
      New Message
      +
      Individual messages have delivery reports that can be viewed using the drop-down menu. Messages can also be recalled from the same menu, which can prevent the recipient from viewing the message if they have not already read it.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/network/help.html b/doc/en/context/en/network/help.html new file mode 100644 index 000000000..53e993b69 --- /dev/null +++ b/doc/en/context/en/network/help.html @@ -0,0 +1,10 @@ +
      +
      General
      +
      The network page displays a stream of posts and conversations, typically ordered by the most recently updated. This page is highly customizable.
      +
      Create a Post
      +
      At the top of the page there is a text box that says "Share". Clicking this box opens a new post editor. The post editor is customizable, but the basic editor provides fields for a post body and an optional post Title. Buttons below the text area to the left provide shortcuts to text formatting and inserting links, images, and other data into the post. The buttons to the right provide a post preview, the post permissions setting, and a Submit button to send the post.
      +
      Privacy Groups
      +
      The privacy groups you have created are displayed in the side panel. Selecting them filters posts to those created by channels in the chosen group.
      +
      Post Permissions
      +
      The access control list (ACL) is what you use to set who can see your new post. Pressing the ACL button beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "show" the Friends group but "don't show" that one person.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/photos/help.html b/doc/en/context/en/photos/help.html new file mode 100644 index 000000000..78b442bb4 --- /dev/null +++ b/doc/en/context/en/photos/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      This page displays a channel's photo albums. The images visible to the observer depend on the individual image permissions.
      +
      Channel Content Tabs
      +
      The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/profile/help.html b/doc/en/context/en/profile/help.html new file mode 100644 index 000000000..563e0df99 --- /dev/null +++ b/doc/en/context/en/profile/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      This is the profile page of a channel. It typically displays information describing the channel. If the channel represents a person in a social network, for example, then the profile might provide contact information and other personal details about the person. Channels can have multiple profiles, where the displayed profile depends on the observer.
      +
      Channel Content Tabs
      +
      The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/profiles/help.html b/doc/en/context/en/profiles/help.html new file mode 100644 index 000000000..41f00fe64 --- /dev/null +++ b/doc/en/context/en/profiles/help.html @@ -0,0 +1,35 @@ +
      +
      General
      +
      + Once you have registered an account at the matrix you have also created a profile and a channel. +
      +
      Account
      +
      + You have one account. This consists of your email account and your password. With your account you access your + profile and your channel.Think of your account as the way you authenticate at one Hubzilla site. It lets you + do things, such as creating profiles and channels with which you can connect to other people. +
      +
      Profile
      +
      + You have surely registered with some other internet services, such as forums or online communities. For all of them + you provided some information about yourself, such as date of birth, country, age and the likes. Unlike other + services Hubzilla offers you the advantage of creating + many more profiles. That way you are able to distinguish between profiles targeted specially at everyone + (your public profile), your work mates, your family and your partner.Think of your profile as the basic + information about yourself you tell other people. +
      +
      Channel
      +
      + During the registration you created your first channel. Yes, besides several profiles you are able to have + several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have + created one channel. You can use this one for the public, to communicate with people about every day life. But + perhaps you are an avid book reader and many people are bored by that. So you open a second channel just + for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of + posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections + might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just + switch between both of them just like you would in real life switch when talking to people you meet on the street + or people you meet specially to talk about books. You can even connect to yourself, or better: to your other + channel. :)Think of a channel as different spaces dedicated to different topics where you meet with different + people. +
      +
      \ No newline at end of file diff --git a/doc/en/context/en/register/help.html b/doc/en/context/en/register/help.html new file mode 100644 index 000000000..9e94ab762 --- /dev/null +++ b/doc/en/context/en/register/help.html @@ -0,0 +1,12 @@ +
      +
      General
      +
      On this page visitors can register to get access to the portal with a login ID. Logged in users not only see the public content, but can publish content themselves and perform social network communications, and much more.
      +
      Modes of registration
      +
      Registration is possible with an eMail address, or anonymously (then do not fill in the eMail field). You may also have received an invitation code, which can then be entered with the eMail address. The link above the eMail field allows you to enter the invitation code.
      +
      Registration procedure
      +
      For logins after a successful registration, a separate password must be set. To be on the safe side, enter it twice with identical values, because it will not be displayed. The password is to be kept secret and is only intended for the user's own use. Anonymously registered users receive an automatically assigned ID, and should not forget their own password because, unlike eMail registration, there is initially no reset function. Depending on the configuration of the hub instance, a confirmation function may be required. Users of the eMail registration will receive a corresponding message. For anonymous registrations, another dialog will be displayed showing the access ID and a pin. This dialog page should be stored securely and for a long time (e.g. by printout, screenshot, photo), because the data must be confirmed again at a later point in time.
      +
      The Digital Identity
      +
      Depending on the configuration of the hub instance, a displayable name and a nickname can already be entered during registration (alternatively also during the first login). The nickname has a very extensive meaning and cannot be changed later. It is a unique Digital Identity (DID) that is, will be, and remains linked to all of one's activities. This DID is not only suitable for logging into this hub instance, but also into all connected instances of the federal network. In federal network parlance, this digital identity is a "channel". This is comparable to a telephone number in the telephone network. The DID has the format channel@instance.tld = nickname@instance.tld and, as mentioned, cannot be changed afterwards. Although the format looks like an eMail address, it is not.
      +
      Before starting the registration ...
      +
      ... the preferred language (English, Spanish, German, for example) should be selected (top right in the hamburger menu ). The current language is used in the subsequent steps and also during and after login. However, this can be changed at any time and as needed. It should also be noted that this Hub instance is not the only one. An overview of other Hub instances can be found here .
      +
      diff --git a/doc/en/context/en/settings/account/help.html b/doc/en/context/en/settings/account/help.html new file mode 100644 index 000000000..41f00fe64 --- /dev/null +++ b/doc/en/context/en/settings/account/help.html @@ -0,0 +1,35 @@ +
      +
      General
      +
      + Once you have registered an account at the matrix you have also created a profile and a channel. +
      +
      Account
      +
      + You have one account. This consists of your email account and your password. With your account you access your + profile and your channel.Think of your account as the way you authenticate at one Hubzilla site. It lets you + do things, such as creating profiles and channels with which you can connect to other people. +
      +
      Profile
      +
      + You have surely registered with some other internet services, such as forums or online communities. For all of them + you provided some information about yourself, such as date of birth, country, age and the likes. Unlike other + services Hubzilla offers you the advantage of creating + many more profiles. That way you are able to distinguish between profiles targeted specially at everyone + (your public profile), your work mates, your family and your partner.Think of your profile as the basic + information about yourself you tell other people. +
      +
      Channel
      +
      + During the registration you created your first channel. Yes, besides several profiles you are able to have + several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have + created one channel. You can use this one for the public, to communicate with people about every day life. But + perhaps you are an avid book reader and many people are bored by that. So you open a second channel just + for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of + posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections + might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just + switch between both of them just like you would in real life switch when talking to people you meet on the street + or people you meet specially to talk about books. You can even connect to yourself, or better: to your other + channel. :)Think of a channel as different spaces dedicated to different topics where you meet with different + people. +
      +
      \ No newline at end of file diff --git a/doc/en/context/en/settings/channel/help.html b/doc/en/context/en/settings/channel/help.html new file mode 100644 index 000000000..41f00fe64 --- /dev/null +++ b/doc/en/context/en/settings/channel/help.html @@ -0,0 +1,35 @@ +
      +
      General
      +
      + Once you have registered an account at the matrix you have also created a profile and a channel. +
      +
      Account
      +
      + You have one account. This consists of your email account and your password. With your account you access your + profile and your channel.Think of your account as the way you authenticate at one Hubzilla site. It lets you + do things, such as creating profiles and channels with which you can connect to other people. +
      +
      Profile
      +
      + You have surely registered with some other internet services, such as forums or online communities. For all of them + you provided some information about yourself, such as date of birth, country, age and the likes. Unlike other + services Hubzilla offers you the advantage of creating + many more profiles. That way you are able to distinguish between profiles targeted specially at everyone + (your public profile), your work mates, your family and your partner.Think of your profile as the basic + information about yourself you tell other people. +
      +
      Channel
      +
      + During the registration you created your first channel. Yes, besides several profiles you are able to have + several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have + created one channel. You can use this one for the public, to communicate with people about every day life. But + perhaps you are an avid book reader and many people are bored by that. So you open a second channel just + for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of + posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections + might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just + switch between both of them just like you would in real life switch when talking to people you meet on the street + or people you meet specially to talk about books. You can even connect to yourself, or better: to your other + channel. :)Think of a channel as different spaces dedicated to different topics where you meet with different + people. +
      +
      \ No newline at end of file diff --git a/doc/en/context/en/settings/features/help.html b/doc/en/context/en/settings/features/help.html new file mode 100644 index 000000000..86e4f5dae --- /dev/null +++ b/doc/en/context/en/settings/features/help.html @@ -0,0 +1,12 @@ +
      +
      General
      +
      This page allows you to configure settings for the many additional features of Hubzilla.
      +
      General Features
      +
      General feature settings include options relevant to your channel, such as webpage and wiki hosting.
      +
      Post Composition Features
      +
      The post composition features provide extra options and capabilities when composing new posts.
      +
      Network and Stream Filtering
      +
      These settings modify features associated with filtering and controlling your view of incoming posts.
      +
      Post/Comment Tools
      +
      These provide additional tools for categorizing posts and allowing additional commenting methods such as emoji or community tagging.
      +
      \ No newline at end of file diff --git a/doc/en/context/en/settings/tokens/help.html b/doc/en/context/en/settings/tokens/help.html new file mode 100644 index 000000000..6d7e6b98d --- /dev/null +++ b/doc/en/context/en/settings/tokens/help.html @@ -0,0 +1,23 @@ +
      +
      Guest Access Tokens
      +
      + In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). +
      +
      Create a token
      +
      + The form to create/edit accepts three parameters, a human readable name, a password or access token, and an + optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be + automatically purged from the list of temporary accounts. The password field in the create/edit forms + displays the text of the access token and not an obscured password. +
      +
      Share a token
      +
      + We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided. + + Example: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied. + + The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album. + + Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented. +
      +
      \ No newline at end of file diff --git a/doc/en/context/en/webpages/help.html b/doc/en/context/en/webpages/help.html new file mode 100644 index 000000000..a4817e4bf --- /dev/null +++ b/doc/en/context/en/webpages/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      You can create modular, identity-aware websites composed of shareable elements.
      +
      Pages
      +
      This page lists your "pages", which are assigned URLs where people can visit your site. The structure of pages are typically described by an associated layout, and their content is constructed from a collection of blocks.
      +
      Website portation tools
      +
      The website portation tools allows you import/export multiple webpage elements (pages, layouts, blocks). You can import either from an uploaded zip file or from an existing cloud files folder. You can export to either a zip file containing a select group of webpage elements in a form compatible with the import tool, or you can export directly to a cloud files folder. Read more...
      +
      \ No newline at end of file diff --git a/doc/en/context/en/wiki/help.html b/doc/en/context/en/wiki/help.html new file mode 100644 index 000000000..5dee85375 --- /dev/null +++ b/doc/en/context/en/wiki/help.html @@ -0,0 +1,10 @@ +
      +
      General
      +
      Each wiki is a collection of pages, composed as Markdown-formatted text files.
      +
      Wiki List
      +
      Wikis owned by the channel that you have permission to view are listed in the side panel.
      +
      Page History
      +
      Every revision of a page is saved to allow quick reversion. Click the History tab to view a history of page revisions, including the date and author of each. The revert button will load the selected revision but will not automatically save the page.
      +
      Pages
      +
      The list of pages in the wiki are listed in the Wiki Pages panel. Prior to saving page edits using the Page control dropdown menu, you may enter a custom message to be displayed in the Page History viewer along with the revision.
      +
      diff --git a/doc/en/context/es b/doc/en/context/es new file mode 120000 index 000000000..c8ba7666b --- /dev/null +++ b/doc/en/context/es @@ -0,0 +1 @@ +es-es \ No newline at end of file diff --git a/doc/en/context/es-es/admin/addons/assets/addon_repo_gui_1.png b/doc/en/context/es-es/admin/addons/assets/addon_repo_gui_1.png new file mode 100644 index 000000000..37139b345 Binary files /dev/null and b/doc/en/context/es-es/admin/addons/assets/addon_repo_gui_1.png differ diff --git a/doc/en/context/es-es/admin/addons/help.html b/doc/en/context/es-es/admin/addons/help.html new file mode 100644 index 000000000..49a047f5e --- /dev/null +++ b/doc/en/context/es-es/admin/addons/help.html @@ -0,0 +1,14 @@ +
      +
      General
      +
      Esta página gestiona qué addons (también llamados plugins o complementos) están instalados.
      +
      Gestión de los repositorios
      +
      Si su servidor web tiene los permisos de escritura necesarios, verá un botón etiquetado como Gestión de repositorios, + que abre un panel de control para administrar qué repositorios de addons están instalados. Estos repositorios están + almacenados en extend/addon/[nombre del repositorio]/. El repositorio de addons oficial de Hubzilla + se puede añadir escribiendo la URL del repositorio + https://framagit.org/hubzilla/addons.git + y eligiendo un nombre para el repositorio como oficial. Debería ver este repositorio en una lista parecida + a esta: +
      +
      +
      diff --git a/doc/en/context/es-es/admin/logs/help.html b/doc/en/context/es-es/admin/logs/help.html new file mode 100644 index 000000000..3a2ec413d --- /dev/null +++ b/doc/en/context/es-es/admin/logs/help.html @@ -0,0 +1,9 @@ +
      +
      General
      +
      Esta página le permite ajustar los parámetros de los informes del sistema (logs) y para ver uno existente.
      +
      Ajustes de los informes (logs)
      +
      Cuando se habilita la opción de depuración, el sistema de información comenzará a añadir los informes (logs) en el archivo especificado en el cuadro "Fichero de informes" + (la ruta es relativa al directorio raíz del servidor, por ejemplo, /var /www). Tenga en cuenta que este archivo tiene que ser modificable por el servidor web.
      +
      Nivel de depuración
      +
      La opción de nivel de depuración le permite establecer la cantidad de información que se anexa al fichero de informes (logs). Advertencia: El aumento de este nivel puede aumentar rápidamente el tamaño de este fichero hasta en más de 100 MB, especialmente en los hubs con más que unos pocos miembros.
      +
      diff --git a/doc/en/context/es-es/admin/queue/help.html b/doc/en/context/es-es/admin/queue/help.html new file mode 100644 index 000000000..de9e6cdbb --- /dev/null +++ b/doc/en/context/es-es/admin/queue/help.html @@ -0,0 +1,4 @@ +
      +
      General
      +
      Las estadísticas de la cola muestran cuántos mensajes están en la cola para su entrega a otros hubs. La prioridad está relacionada con la cantidad de veces que la entrega se ha intentado, sin éxito.
      +
      diff --git a/doc/en/context/es-es/admin/security/help.html b/doc/en/context/es-es/admin/security/help.html new file mode 100644 index 000000000..229a91561 --- /dev/null +++ b/doc/en/context/es-es/admin/security/help.html @@ -0,0 +1,4 @@ +
      +
      General
      +
      Esta página contiene varios ajustes para el administrador relacionados con la seguridad. Para guardar los cambios que realice en estos ajustes, debe pulsar el botón "Enviar".
      +
      diff --git a/doc/en/context/es-es/appman/help.html b/doc/en/context/es-es/appman/help.html new file mode 100644 index 000000000..1b799a52b --- /dev/null +++ b/doc/en/context/es-es/appman/help.html @@ -0,0 +1,4 @@ +
      +
      General
      +
      Editar las propiedades individuales de la aplicación seleccionada. Las categorías le permiten ordenar sus aplicaciones para ayudarle a encontrarlas más fácilmente en la lista. El soporte para aplicaciones personalizadas que usted o su administrador puedan elegir para crear incluye campos como "Precio de la aplicación" y "Ubicación para la compra" que no son aplicables a las aplicaciones principales de Hubzilla.
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/articles/help.html b/doc/en/context/es-es/articles/help.html new file mode 100644 index 000000000..0bf176fdd --- /dev/null +++ b/doc/en/context/es-es/articles/help.html @@ -0,0 +1,20 @@ +
      +
      General
      +
      El artículo es un tipo de documento de una naturaleza un poco especial, a mitad de camino entre las fichas de organización de trabajo ("cards") y las entradas normales, pero que está separado del stream social. Son muy adecuados para ayudar a escribir y organizar textos, con un formateo básico, pero completo, sobre cualquier tema, especialmente sobre documentación seriada, de forma más amplia que un wiki pero menos que un página web. Al no formar parte del stream social, para acceder a él hace falta conocer su dirección: [URL del sitio]/articles/[nombre del usuario, sin dominio]. Ahí estarán disponibles los distintas artículos que escriba, por orden de publicación.
      +
      Crear un artículo
      +
      + Crear un artículo nuevo es muy parecido a componer un nuevo post.

      +
        +
      • + Nombre del enlace de la página: Este nombre es el del nombre del artículo para una URL estática +
        • +
      • + Título: El título se muestra en la parte de arriba del artículo +
        • +
      • + Temas o Categorías: Si tiene activada la opción Temas de las entradas en su canal, entonces puede añadirlos al artículo. Estas categorías o temas se despliegan en la lista Temas en el panel de la izquierda y permiten filtrar su colección de artículos. +
        • +
      • Sumario: Es el espacio, entre las etiquetas predefinidas [summary][/summary], reservado para redactar un resumen del artículo, que aparecerá en su encabezado. El espacio disponible a continuación del sumario, en la ventana de composición, es el adecuado para la redacción del artículo en sí. +
      +
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/cards/help.html b/doc/en/context/es-es/cards/help.html new file mode 100644 index 000000000..34889cd25 --- /dev/null +++ b/doc/en/context/es-es/cards/help.html @@ -0,0 +1,19 @@ +
      +
      General
      +
      Las fichas representan un área persistente para la colaboración que está separada del stream social. Son algo más ligeras que las páginas web y los wikis para una rápida organización de la información y tienen la ventaja de permitir la colaboración y los comentarios. Son muy adecuados para ayudar a organizar tareas complejas en las que hay actualizaciones y retroalimentación frecuentes.
      +
      Añadir una ficha
      +
      + Crear una ficha nueva es muy parecido a componer un nuevo post.

      +
        +
      • + Nombre del enlace de la página: Este nombre es el de la ficha para una URL estática +
        • +
      • + Título: El título se muestra en la parte de arriba de la ficha +
        • +
      • + Categorías: Si tiene activada la opción Temas de las entradas en su canal, entonces puede añadirlas a la ficha. Estas categorías o temas se despliegan en la lista Temas en el panel de la izquierda y permiten filtrar su colección de fichas. +
        • +
      +
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/channel/help.html b/doc/en/context/es-es/channel/help.html new file mode 100644 index 000000000..682125e27 --- /dev/null +++ b/doc/en/context/es-es/channel/help.html @@ -0,0 +1,8 @@ +
      General
      +
      Esta es la página principal de un canal. Es similar al "muro" del perfil de una persona en un contexto de red social. Las entradas creadas por el canal se muestran de acuerdo con los permisos de visualización +del observador.
      +
      Crear una entrada
      +
      Si tiene permiso para crear entradas en la página del canal, a continuación, podrá ver el editor de entradas en la parte superior.
      +
      Pestañas de los contenidos del canal
      +
      Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerías +de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
      \ No newline at end of file diff --git a/doc/en/context/es-es/chat/help.html b/doc/en/context/es-es/chat/help.html new file mode 100644 index 000000000..94df6a1d2 --- /dev/null +++ b/doc/en/context/es-es/chat/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      Creación y uso de salas de chat para comunicarse en tiempo real, utilizando el sistema de permisos estándar de Hubzilla para el control de acceso a la sala de chat.
      +
      Crear una nueva sala de chat
      +
      Utilice el botón "Crear" para crear una nueva sala de chat. Introduzca un nombre y cuánto tiempo se deben conservar los mensajes.
      +
      Chatear
      +
      Introduzca su mensaje en el cuadro de mensaje y pulse "Enviar". Se puede establecer un estado seleccionando el botón de menú sala de chat junto al botón "Enviar". Si hay otras personas en la sala, serán visibles en el panel lateral, en "Miembros del chat".
      +
      diff --git a/doc/en/context/es-es/cloud/help.html b/doc/en/context/es-es/cloud/help.html new file mode 100644 index 000000000..af891da17 --- /dev/null +++ b/doc/en/context/es-es/cloud/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      Esta página muestra los archivos "cloud" de un canal. Los archivos visibles para el observador dependen de los permisos de fichero individuales establecidos por el propietario del canal. Si tiene permiso para crear o cargar archivos verá botones de control encima de la lista de ficheros.
      +
      Pestañas de contenidos del canal
      +
      Las pestañas de contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña Mi canal enlaza con el perfil del canal. La pestaña Fotos enlaza con las galerías de fotos del canal. La pestaña Ficheros enlaza con los ficheros compartidos publicados por el canal.
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/connections/help.html b/doc/en/context/es-es/connections/help.html new file mode 100644 index 000000000..a0aa9cf32 --- /dev/null +++ b/doc/en/context/es-es/connections/help.html @@ -0,0 +1,15 @@ +
      +
      General
      +
      Esta página muestra una lista de todas las conexiones de este canal. La lista se puede ordenar y filtrar usando el botón de menú al lado del botón de búsqueda.
      +
      Detalles de la conexión
      +
      Cada entrada de la lista muestra los detalles de una conexión específica. Una imagen de avatar translúcida indica una conexión archivada.
      +
      Estado de la conexión
      +
      Una conexión puede estar en diferentes estados: +
        +
      • Archivada
        • +
      • Ignorada
        • +
      • Bloqueada
        • +
      • Oculta
        • +
      +
      +
      diff --git a/doc/en/context/es-es/connections/ifpending/help.html b/doc/en/context/es-es/connections/ifpending/help.html new file mode 100644 index 000000000..84e547851 --- /dev/null +++ b/doc/en/context/es-es/connections/ifpending/help.html @@ -0,0 +1,15 @@ +
      +
      General
      +
      Esta página muestra una lista de todas las conexiones de este canal. La lista se puede ordenar y filtrar usando el botón de menú al lado del botón de búsqueda.
      +
      Detalles de la conexión
      +
      Cada entrada de la lista muestra los detalles de una conexión específica. Una imagen de avatar translúcida indica una conexión archivada.
      +
      Estado de la conexión
      +
      Una conexión puede estar en diferentes estados: +
        +
      • Archivada
        • +
      • Ignorada
        • +
      • Bloqueada
        • +
      • Oculta
        • +
      +
      +
      diff --git a/doc/en/context/es-es/connedit/help.html b/doc/en/context/es-es/connedit/help.html new file mode 100644 index 000000000..e8c92ca28 --- /dev/null +++ b/doc/en/context/es-es/connedit/help.html @@ -0,0 +1,12 @@ +
      +
      General
      +
      Esta página le permite cambiar o modificar cualquier ajuste individual para una conexión en concreto o eliminar una conexión completamente. Ha podido llegar a esta página tras crear o aprobar una conexión nueva. Si es así, no tiene por qué hacer nada. Su conexión ya se ha establecido. Es posible que desee añadirla a un grupo o ajustar para ella permisos especiales; si es así, esta página se presenta de modo que usted pueda hacerlo mientras todo el proceso es aún reciente.
      +
      Conexiones
      +
      El menú Conexiones le da acceso a varios ajustes: "Ver el perfil", "Ver la actividad reciente", "Recargar los permisos", añadir o quitar estados ("flags") ("Bloquear", "Ignorar", "Archivar", "Ocultar") y eliminar la conexión.
      +
      Grupos de canales
      +
      Todas las conexiones se pueden incluir en uno o varios grupos de canales para formar conjuntos de amigos con acceso a publicaciones concretas, ficheros multimedia y otros tipos de contenido. Puede añadirla aquí a un grupo de canales ya existente o crear un grupo nuevo. Cuando añade la conexión a un grupo que ya existe, el efecto es inmediato y no será requerido para confirmarlo.
      +
      Permisos individuales
      +
      La concesión de permisos es, generalmente, automática y no requiere ninguna acción por su parte. Sin embargo, puede, si lo desea, ajustar permisos especiales, diferentes de los permisos concedidos a otros, para una conexión concreta.
      +
      Ajustes de funcionalidades concretas
      +
      Una serie de ajustes individuales se controlan mediante funcionalidades adicionales que pueden, o no, estar activadas en un hub o para su canal en concreto. Varias funcionalidades adicionales tienen ajustes para cada conexión, Estas funcionalidades se pueden configurar en esta página, de forma adicional, mediante pestañas que pueden estar presentes.
      +
      diff --git a/doc/en/context/es-es/events/help.html b/doc/en/context/es-es/events/help.html new file mode 100644 index 000000000..b0ac1f9ea --- /dev/null +++ b/doc/en/context/es-es/events/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      Esta página muestra un calendario de eventos tanto de su propiedad como compartido con usted desde otros canales.
      +
      Vistas del calendario
      +
      El calendario se puede mostrar en modo mensual, semanal o diario usando las opciones del panel lateral.
      +
      Exportar/Importar
      +
      Exportar o importar eventos del calendario usando el formato estándar de los ficheros de iCalendar (.ics).
      +
      diff --git a/doc/en/context/es-es/mail/help.html b/doc/en/context/es-es/mail/help.html new file mode 100644 index 000000000..794af38a9 --- /dev/null +++ b/doc/en/context/es-es/mail/help.html @@ -0,0 +1,10 @@ +
      +
      General
      +
      Los mensajes que aparecen en el correo privado son visibles sólo para usted y un único destinatario.
      +
      Vista combinada
      +
      Las conversaciones completas se pueden ver en un hilo continuo seleccionando "Vista combinada". Las conversaciones disponibles se muestran debajo del menú en el panel lateral.
      +
      Bandeja de entrada/Bandeja de salida
      +
      Los mensajes individuales enviados son visibles seleccionando la Bandeja de salida y los mensajes recibidos se pueden ver usando el filtro de la Bandeja de entrada.
      +
      Mensaje nuevo
      +
      Los mensajes individuales tienen informes de entrega que se pueden ver usando el menú desplegable. Los mensajes también se pueden revocar desde el mismo menú, lo que puede evitar que el destinatario vea el mensaje, si aún no lo ha leído.
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/network/help.html b/doc/en/context/es-es/network/help.html new file mode 100644 index 000000000..082f52a49 --- /dev/null +++ b/doc/en/context/es-es/network/help.html @@ -0,0 +1,12 @@ +
      +
      General
      +
      La página de "Mi red" muestra un flujo de entradas y conversaciones, normalmente ordenadas según la actualización más reciente. Esta página es altamente personalizable.
      +
      Crear una entrada
      +
      En la parte superior de la página hay un cuadro de texto que dice "Compartir". Al hacer clic en esta casilla se abre un nuevo editor de entradas. El editor de entradas es personalizable, pero el editor básico proporciona campos para el cuerpo de la publicación y un título opcional. Los botones que hay debajo de la zona de texto, a la izquierda, proporcionan + accesos directos para el Formato de texto y para  insertar enlaces, imágenes y otros datos en la entrada. Los botones a la derecha proporcionan una vista previa del mensaje, los ajustes de permisos de la entrada, y un botón Enviar para publicarla.
      +
      Grupos de canales
      +
      Los grupos de canales que ha creado se muestran en el panel lateral. Seleccionándolos, se filtran las entradas creadas por los canales incluidos en el grupo elegido.
      +
      Permisos de una entrada
      +
      La lista de control de acceso (ACL) es lo que se utiliza para establecer quién puede ver su nueva entrada. Al pulsar el botón ACL, al lado del botón Enviar, se mostrará un cuadro de diálogo en el que puede seleccionar qué canales y / o grupos de canales pueden ver el mensaje. También puede seleccionar a quién se le niega el acceso explícitamente. Por ejemplo,di gamos que usted está planeando una + fiesta sorpresa para un amigo. Puede enviar un mensaje de invitación a todos los miembros de su grupo de Amigos, excepto el amigo al que quiere sorprender. En este caso, "se mostrará" al grupo de amigos, pero "no se mostrará" a esa única persona.
      +
      diff --git a/doc/en/context/es-es/photos/help.html b/doc/en/context/es-es/photos/help.html new file mode 100644 index 000000000..6623456eb --- /dev/null +++ b/doc/en/context/es-es/photos/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      Esta página muestra los álbumes de fotos de un canal. Las imágenes visibles para el observador dependen de los permisos individuales de cada imagen.
      +
      Pestañas de los contenidos del canal
      +
      Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" enlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
      +
      diff --git a/doc/en/context/es-es/profile/help.html b/doc/en/context/es-es/profile/help.html new file mode 100644 index 000000000..28ff22499 --- /dev/null +++ b/doc/en/context/es-es/profile/help.html @@ -0,0 +1,6 @@ +
      +
      General
      +
      Esta es la página de perfil de un canal. Por lo general muestra la información que describe el canal. Si el canal representa a una persona en una red social, por ejemplo, el perfil podría proporcionar información de contacto y otros datos personales. Los canales pueden tener varios perfiles, en cuyo caso el perfil que se muestra depende del observador.
      +
      Pestañas de los contenidos del canal
      +
      Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" nlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.
      +
      diff --git a/doc/en/context/es-es/profiles/help.html b/doc/en/context/es-es/profiles/help.html new file mode 100644 index 000000000..9303e049c --- /dev/null +++ b/doc/en/context/es-es/profiles/help.html @@ -0,0 +1,35 @@ +
      +
      General
      +
      + Al registar cuenta en Hubzilla, también ha creado un perfil y un canal. +
      +
      Cuenta
      +
      + Tiene una cuenta. Esta consta de su correo electrónico y su contraseña. Mediante su cuenta, accede a su + perfil y su canal. Piense en su cuenta como la vía para identificarse en un sitio Hubzilla. Le permite + hacer cosas, como crear perfiles y canales a través de los cuelas podrá conectar con otra gente. +
      +
      Perfil
      +
      + Usted está registrado, seguramente, con algunos otros servicios de Internet, como foros o comunidades en línea. Para todos ellos + usted proporcionó algún tipo de información sobre usted mismo, tal como su fecha de nacimiento, país, edad y gustos o preferencias. Frente a otros + servicios, Hubzilla le ofrece la ventaja de crear + muchos más perfiles. De esa manera usted puede distinguir entre los perfiles dirigidos especialmente a todo el mundo + (su perfil público), Sus compañeros de trabajo, su familia y su pareja.Piense en su perfil como la información básica + básica que acerca de usted mismo muestra a otra gente, +
      +
      Canal
      +
      + Durante el registro, creó su primer canal. Sí, además de los varios perfiles, usted puede tener + varios canales. Esto podría ser un poco confuso al principio, pero vamos a aclarar las cosas. Usted ya ha creado + un canal. Puede usarlo para el público en general, para informar a los demás sobre su vida cotidiana. Pero + Tal vez usted es un ávido lector de libros y muchas personas se aburren con eso. Así que abre un segundo canal sólo + para los amantes de los libros, en el que todos ustedes pueden hablar de libros tanto como quieran. Obviamente, este es un nuevo flujo de + entradas, con un nuevo perfil (...o nuevos perfiles...) y contactos completamente diferentes. Algunas conexiones + pueden existir en ambos canales, pero habrá algunas que estén exclusivamente en uno de los dos. Usted mismo simplemente + cambie entre ambos como cambia de interlocutor en el mundo real cuando habla con varias personas en la calle + o personas con las que se reúne especialmente para hablar de libros. Incluso puede conectarse a sí mismo, o mejor: a su otro + canal. :) Piense en un canal como en diferentes espacios dedicados a diferentes temas en los que puede hablar con diferentes + personas. +
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/settings/account/help.html b/doc/en/context/es-es/settings/account/help.html new file mode 100644 index 000000000..9303e049c --- /dev/null +++ b/doc/en/context/es-es/settings/account/help.html @@ -0,0 +1,35 @@ +
      +
      General
      +
      + Al registar cuenta en Hubzilla, también ha creado un perfil y un canal. +
      +
      Cuenta
      +
      + Tiene una cuenta. Esta consta de su correo electrónico y su contraseña. Mediante su cuenta, accede a su + perfil y su canal. Piense en su cuenta como la vía para identificarse en un sitio Hubzilla. Le permite + hacer cosas, como crear perfiles y canales a través de los cuelas podrá conectar con otra gente. +
      +
      Perfil
      +
      + Usted está registrado, seguramente, con algunos otros servicios de Internet, como foros o comunidades en línea. Para todos ellos + usted proporcionó algún tipo de información sobre usted mismo, tal como su fecha de nacimiento, país, edad y gustos o preferencias. Frente a otros + servicios, Hubzilla le ofrece la ventaja de crear + muchos más perfiles. De esa manera usted puede distinguir entre los perfiles dirigidos especialmente a todo el mundo + (su perfil público), Sus compañeros de trabajo, su familia y su pareja.Piense en su perfil como la información básica + básica que acerca de usted mismo muestra a otra gente, +
      +
      Canal
      +
      + Durante el registro, creó su primer canal. Sí, además de los varios perfiles, usted puede tener + varios canales. Esto podría ser un poco confuso al principio, pero vamos a aclarar las cosas. Usted ya ha creado + un canal. Puede usarlo para el público en general, para informar a los demás sobre su vida cotidiana. Pero + Tal vez usted es un ávido lector de libros y muchas personas se aburren con eso. Así que abre un segundo canal sólo + para los amantes de los libros, en el que todos ustedes pueden hablar de libros tanto como quieran. Obviamente, este es un nuevo flujo de + entradas, con un nuevo perfil (...o nuevos perfiles...) y contactos completamente diferentes. Algunas conexiones + pueden existir en ambos canales, pero habrá algunas que estén exclusivamente en uno de los dos. Usted mismo simplemente + cambie entre ambos como cambia de interlocutor en el mundo real cuando habla con varias personas en la calle + o personas con las que se reúne especialmente para hablar de libros. Incluso puede conectarse a sí mismo, o mejor: a su otro + canal. :) Piense en un canal como en diferentes espacios dedicados a diferentes temas en los que puede hablar con diferentes + personas. +
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/settings/channel/help.html b/doc/en/context/es-es/settings/channel/help.html new file mode 100644 index 000000000..9303e049c --- /dev/null +++ b/doc/en/context/es-es/settings/channel/help.html @@ -0,0 +1,35 @@ +
      +
      General
      +
      + Al registar cuenta en Hubzilla, también ha creado un perfil y un canal. +
      +
      Cuenta
      +
      + Tiene una cuenta. Esta consta de su correo electrónico y su contraseña. Mediante su cuenta, accede a su + perfil y su canal. Piense en su cuenta como la vía para identificarse en un sitio Hubzilla. Le permite + hacer cosas, como crear perfiles y canales a través de los cuelas podrá conectar con otra gente. +
      +
      Perfil
      +
      + Usted está registrado, seguramente, con algunos otros servicios de Internet, como foros o comunidades en línea. Para todos ellos + usted proporcionó algún tipo de información sobre usted mismo, tal como su fecha de nacimiento, país, edad y gustos o preferencias. Frente a otros + servicios, Hubzilla le ofrece la ventaja de crear + muchos más perfiles. De esa manera usted puede distinguir entre los perfiles dirigidos especialmente a todo el mundo + (su perfil público), Sus compañeros de trabajo, su familia y su pareja.Piense en su perfil como la información básica + básica que acerca de usted mismo muestra a otra gente, +
      +
      Canal
      +
      + Durante el registro, creó su primer canal. Sí, además de los varios perfiles, usted puede tener + varios canales. Esto podría ser un poco confuso al principio, pero vamos a aclarar las cosas. Usted ya ha creado + un canal. Puede usarlo para el público en general, para informar a los demás sobre su vida cotidiana. Pero + Tal vez usted es un ávido lector de libros y muchas personas se aburren con eso. Así que abre un segundo canal sólo + para los amantes de los libros, en el que todos ustedes pueden hablar de libros tanto como quieran. Obviamente, este es un nuevo flujo de + entradas, con un nuevo perfil (...o nuevos perfiles...) y contactos completamente diferentes. Algunas conexiones + pueden existir en ambos canales, pero habrá algunas que estén exclusivamente en uno de los dos. Usted mismo simplemente + cambie entre ambos como cambia de interlocutor en el mundo real cuando habla con varias personas en la calle + o personas con las que se reúne especialmente para hablar de libros. Incluso puede conectarse a sí mismo, o mejor: a su otro + canal. :) Piense en un canal como en diferentes espacios dedicados a diferentes temas en los que puede hablar con diferentes + personas. +
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/settings/features/help.html b/doc/en/context/es-es/settings/features/help.html new file mode 100644 index 000000000..a9c3c2d6c --- /dev/null +++ b/doc/en/context/es-es/settings/features/help.html @@ -0,0 +1,12 @@ +
      +
      General
      +
      Esta página le permite configurar los ajustes para muchas funcionalidades adicionales de Hubzilla.
      +
      Funcionalidades básicas
      +
      Las ajustes de las funcionalidades básicas incluyen opciones importantes para su canal, tales como el hospedaje de páginas web y wikis.
      +
      Opciones para la redacción de entradas
      +
      Los ajustes de la redacción de entradas incluyen opciones adicionales para la composición de nuevas publicaciones.
      +
      Filtrado del contenido
      +
      Estos ajustes modifican funcionalidades asociadas al filtrado del contenido y a cómo ver las publicaciones nuevas.
      +
      Gestión de entradas y comentarios
      +
      Estos ajustes proporcionan herramientas adicionales para establecer el tema de las entradas y permiten métodos adicionales para los comentarios, tales como los emojis y el etiquetado de la comunidad.
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/settings/tokens/help.html b/doc/en/context/es-es/settings/tokens/help.html new file mode 100644 index 000000000..6d6a8d81f --- /dev/null +++ b/doc/en/context/es-es/settings/tokens/help.html @@ -0,0 +1,23 @@ +
      +
      Guest Access Tokens
      +
      + Para facilitar el intercambio de recursos privados con no miembros o miembros de otros nodos federados con una identificación limitada, Hubzilla debe proporcionar a los miembros un mecanismo para crear y administrar inicios de sesión temporales ("desechables"), también conocidos como "Zot Access Tokens". Estos tokens/credenciales se pueden utilizar para autenticarse en un sitio de hubzilla con el único propósito de acceder a recursos privilegiados o de acceso controlado (archivos, fotos, publicaciones, páginas web, salas de chat, etc.). +
      +
      Crear un token
      +
      + El formulario para crear / editar acepta tres parámetros, un nombre legible por el usuario, una contraseña o un token de acceso, y un + límite de caducidad opcional. Una vez que ha caducado, el acceso mediante el token deja de ser válido, ya no puede usarse, y será + purgado automáticamente de la lista de cuentas temporales. El campo de la contraseña, en los formularios para crear/editar, + muestra el texto del token de acceso y no una displays the text of the access token and not una contraseña oscurecida. +
      +
      Compartir un token
      +
      + No especificamos mecanismos para compartir estos tokens con otros. Se puede usar cualquier método de comunicación. Cualquier token que haya creado se añade al selector de la Lista de Control y puede ser usado por cualquiera que esté en esa lista. + + Ejemplo: Una visitante llega a su sitio. Tiene un token de acceso que usted le ha proporcionado e intenta ver uno de sus álbumes de fotos (que está restringido para que solo lo puedan ver usted mismo y una identidad temporal). El permiso es denegado. + + La visitante, ahora, selecciona "Iniciar sesión" del menú de la barra de navegación, que muestra la página de inicio de sesión. Ella escribe el nombre y contraseña que usted le ha proporcionado: ahora ya puede ver el álbum privado de fotos. + + De forma alternativa, puede compartir un enlace a un fichero protegido, añadiendo un parámetro del tipo "&zat=abc123" a la dirección URL, en el que la cadena "abc123" es el token de acceso o contraseña para el inicio de sesión temporal. No se requiere ninguna negociación posterior: el fichero será mostrado. +
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/webpages/help.html b/doc/en/context/es-es/webpages/help.html new file mode 100644 index 000000000..7cd7f7c11 --- /dev/null +++ b/doc/en/context/es-es/webpages/help.html @@ -0,0 +1,8 @@ +
      +
      General
      +
      Puede crear sitios web modulares, con identidad propia, compuestos de elementos compartibles.
      +
      Páginas
      +
      Esta página enumera sus "páginas", a las que se asignan URLs en las que la gente pueden visitar su sitio. La estructura de las páginas se describe típicamente mediante una plantilla de diseño asociada, y su contenido se construye a partir de una colección de bloques.
      +
      Herramientas de portabilidad de sitios web
      +
      Las herramientas de portabilidad de sitios web le permiten importar y exportar múltiples elementos de páginas web (páginas, plantillas, bloques). Puede importar tanto de un fichero zip como de una carpeta de ficheros existente en la nube. Puede exportar tanto a un fichero zip que contenga un grupo seleccionado de elementos de páginas web, o exportarlos directamente a una carpeta de ficheros en la nube. Leer más...
      +
      \ No newline at end of file diff --git a/doc/en/context/es-es/wiki/help.html b/doc/en/context/es-es/wiki/help.html new file mode 100644 index 000000000..fdae1f095 --- /dev/null +++ b/doc/en/context/es-es/wiki/help.html @@ -0,0 +1,10 @@ +
      +
      General
      +
      Cada wiki es una colección de páginas, compuestas como ficheros de texto formateados en Markdown.
      +
      Lista de wikis
      +
      Las páginas wiki propiedad del canal que esté autorizado a ver aparecen en el panel lateral.
      +
      Historial de la página
      +
      Cada revisión de una página se salva para permitir su rápida recuperación. Pulsar en la pestaña Historial para ver las revisiones de la página, incluyendo la fecha y el autor de cada una. El botón de reversión cargará la revisión seleccionada, pero no salvará automáticamente la página.
      +
      Páginas
      +
      La lista de páginas en el wiki aparece en el panel Páginas del wiki. Antes de salvar las páginas editadas usando el control Página en el menú desplegable, puede escribir un mensaje personalizado que se verá en el visor Historial de la página junto con la revisión.
      +
      diff --git a/doc/en/context/fr/admin/logs/help.html b/doc/en/context/fr/admin/logs/help.html new file mode 100644 index 000000000..53f8e65c3 --- /dev/null +++ b/doc/en/context/fr/admin/logs/help.html @@ -0,0 +1,8 @@ +
      +
      Informations de base
      +
      Cette page vous permet d'ajuster les paramètres du journal d'événements et d'afficher le journal existant.
      . +
      Réglages du journal
      +
      Lorsque vous activez l'option "Débogage", les informations du journal système commenceront à s'ajouter au fichier spécifié dans la boîte "Fichier du journal" (le chemin est relatif à la racine du hub, par exemple /var/www). Notez que ce fichier doit être inscriptible par le serveur web.
      . +
      Niveau de journalisation
      +
      L'option "Niveau de journalisation" vous permet de définir la quantité d'informations ajoutées au fichier journal. Attention : Augmenter ce niveau peut rapidement gonfler la taille du fichier journal à >100MB, en particulier sur les hubs avec plusieurs membres.
      . +
      diff --git a/doc/en/context/fr/admin/queue/help.html b/doc/en/context/fr/admin/queue/help.html new file mode 100644 index 000000000..836d81b92 --- /dev/null +++ b/doc/en/context/fr/admin/queue/help.html @@ -0,0 +1,4 @@ +
      +
      Informations de base
      +
      Les statistiques de file d'attente affichent le nombre de messages dans la file d'attente pour livraison à d'autres centres. La priorité est liée au nombre de fois où la livraison a été tentée sans succès.
      +
      diff --git a/doc/en/context/fr/appman/help.html b/doc/en/context/fr/appman/help.html new file mode 100644 index 000000000..d65f78378 --- /dev/null +++ b/doc/en/context/fr/appman/help.html @@ -0,0 +1,5 @@ +
      +
      Information de base
      +
      Modifiez les propriétés individuelles de l'application que vous avez sélectionnée. Les catégories vous permettent de trier vos applications pour vous aider à les trouver plus facilement dans la liste. La prise en charge des applications personnalisées que vous ou votre administrateur pouvez choisir de créer inclut des champs tels que «Prix de l'application» et «Lieu d'achat» qui ne sont pas applicables aux applications centrales Hubzilla. +
      +
      diff --git a/doc/en/context/fr/cards/help.html b/doc/en/context/fr/cards/help.html new file mode 100644 index 000000000..a58a9a73e --- /dev/null +++ b/doc/en/context/fr/cards/help.html @@ -0,0 +1,20 @@ +
      +
      Informations de base
      +
      Les cartes représentent un domaine persistant de collaboration qui est distinct du volet social. Ils sont un peu plus légers que les pages web et les wikis pour une organisation rapide de l'information et ont l'avantage de permettre la collaboration et le commentaire. Ils sont bien adaptés pour aider à organiser des tâches complexes où il y a des mises à jour et des retours d'information fréquents. +
      +
      Ajouter une carte
      +
      + La création d'une nouvelle carte est très similaire à la composition d'un nouveau message.

      +
        +
      • + Nom du lien de page : Le nom du lien de page est le nom de la carte pour l'URL statique. +
        • +
      • + Titre : Le titre est affiché en haut de la carte. +
        • +
      • + Catégories : Si la fonction catégories de messages est activée pour votre chaîne, vous pouvez ajouter des catégories à la carte. Ces catégories remplissent la liste des catégories sur le panneau de gauche et permettent de filtrer votre collection de cartes. +
        • +
      +
      +
      diff --git a/doc/en/context/fr/channel/help.html b/doc/en/context/fr/channel/help.html new file mode 100644 index 000000000..b2cf958b9 --- /dev/null +++ b/doc/en/context/fr/channel/help.html @@ -0,0 +1,6 @@ +
      +
      Informations de base
      +
      C'est la page d'accueil d'un canal. Il est similaire au "mur" de quelqu'un dans un contexte de réseau social. Les messages créés par le canal sont affichés en fonction des permissions de visualisation de l'observateur.
      +
      Créer un message
      +
      Si vous avez la permission de créer des messages sur la page du canal, alors vous verrez l'éditeur de messages en haut de la page.
      +
      diff --git a/doc/en/context/fr/chat/help.html b/doc/en/context/fr/chat/help.html new file mode 100644 index 000000000..5f354c3c6 --- /dev/null +++ b/doc/en/context/fr/chat/help.html @@ -0,0 +1,8 @@ +
      +
      Informations de base
      +
      Créez et utilisez des salons de discussion pour communiquer en temps réel, en utilisant le système standard de permissions Hubzilla pour le contrôle d'accès aux salons de discussion.
      +
      Créer un nouveau salon de discussion
      +
      Utilisez le bouton «Nouveau» pour créer un nouveau salon de discussion. Entrez un nom et la durée de conservation des messages.
      +
      Discussion
      +
      Entrez votre message dans la boîte de message et cliquez sur «Envoyer». Vous pouvez définir un statut en sélectionnant le bouton du menu de la salle de discussion à côté du bouton «Envoyer». D'autres personnes «dans la salon» sont visibles dans le panneau latéral du panneau «Membres du Salon».
      +
      diff --git a/doc/en/context/fr/cloud/help.html b/doc/en/context/fr/cloud/help.html new file mode 100644 index 000000000..c72e2ca1b --- /dev/null +++ b/doc/en/context/fr/cloud/help.html @@ -0,0 +1,7 @@ +
      +
      Informations de base
      +
      Cette page affiche les fichiers cloud d'un canal. Les fichiers visibles par l'observateur dépendent des permissions individuelles définies par le propriétaire du canal. Si vous avez l'autorisation de créer/télécharger des fichiers, vous verrez des boutons de contrôle au-dessus de la liste des fichiers. +
      +
      Onglets de contenu de la chaîne
      +
      Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil du canal. L'onglet Photos permet d'accéder aux galeries de photos de la chaîne. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
      +
      diff --git a/doc/en/context/fr/connections/help.html b/doc/en/context/fr/connections/help.html new file mode 100644 index 000000000..38e581866 --- /dev/null +++ b/doc/en/context/fr/connections/help.html @@ -0,0 +1,8 @@ +
      +
      Informations de base
      +
      Cette page affiche une liste de toutes les connexions de ce canal. La liste peut être triée et filtrée à l'aide du bouton de menu à côté du bouton de recherche.
      +
      Détails de connexion
      +
      Chaque entrée de liste affiche les détails d'une connexion spécifique. Une image d'avatar translucide indique une connexion archivée.
      +
      État de la connexion
      +
      Une connexion peut être dans différents états :
      • Archivé
      • Ignoré
      • Bloqué
      • Caché
      +
      diff --git a/doc/en/context/fr/connections/ifpending/help.html b/doc/en/context/fr/connections/ifpending/help.html new file mode 100644 index 000000000..38e581866 --- /dev/null +++ b/doc/en/context/fr/connections/ifpending/help.html @@ -0,0 +1,8 @@ +
      +
      Informations de base
      +
      Cette page affiche une liste de toutes les connexions de ce canal. La liste peut être triée et filtrée à l'aide du bouton de menu à côté du bouton de recherche.
      +
      Détails de connexion
      +
      Chaque entrée de liste affiche les détails d'une connexion spécifique. Une image d'avatar translucide indique une connexion archivée.
      +
      État de la connexion
      +
      Une connexion peut être dans différents états :
      • Archivé
      • Ignoré
      • Bloqué
      • Caché
      +
      diff --git a/doc/en/context/fr/connedit/help.html b/doc/en/context/fr/connedit/help.html new file mode 100644 index 000000000..c9b784d3e --- /dev/null +++ b/doc/en/context/fr/connedit/help.html @@ -0,0 +1,13 @@ +
      +
      Informations de base
      +
      Cette page vous permet de modifier ou d'éditer les paramètres individuels pour une connexion particulière ou de supprimer complètement une connexion. Vous êtes peut-être arrivé sur cette page après avoir créé ou approuvé une nouvelle connexion. Si c'est le cas, vous n'êtes pas tenu de faire quoi que ce soit. Votre connexion a déjà été établie. Vous pouvez les ajouter à un groupe ou ajuster des permissions spéciales, et cette page est présentée de façon à ce que vous puissiez le faire pendant que l'occasion se présente. +
      +
      Outils de connexion
      +
      Le menu Outils de connexion permet d'accéder à plusieurs paramètres. Afficher le profil, Afficher l'activité récente, Rafraîchir les autorisations, définir ou réinitialiser les indicateurs (Bloquer, Ignorer, Archiver, Cacher) et supprimer la connexion.
      +
      Groupes de protection de la vie privée
      +
      Chaque connexion peut être assignée à un ou plusieurs groupes de confidentialité pour regrouper des collections d'amis ayant accès à des messages, médias et autres contenus spécifiques. Vous pouvez les ajouter à un groupe de confidentialité existant ici, ou créer un nouveau groupe de confidentialité. Lorsque vous les ajoutez à un groupe existant, l'action est immédiate et vous n'avez pas besoin de soumettre un formulaire.
      +
      Permissions individuelles
      +
      L'octroi de permissions est généralement automatique et n'exige aucune action de votre part. Cependant, il se peut que vous souhaitiez ajuster des paramètres spécifiques pour cette connexion qui sont différents des autres.
      +
      Paramètres spécifiques aux fonctions
      +
      Un certain nombre de paramètres individuels sont contrôlés par des fonctions supplémentaires qui peuvent ou non être activées sur votre hub ou pour votre canal. Plusieurs fonctions optionnelles ont des paramètres pour chaque connexion, et ceux-ci peuvent être définis sur cette page par le biais d'onglets de formulaire supplémentaires qui peuvent être présents.
      +
      diff --git a/doc/en/context/fr/events/help.html b/doc/en/context/fr/events/help.html new file mode 100644 index 000000000..aafd49703 --- /dev/null +++ b/doc/en/context/fr/events/help.html @@ -0,0 +1,8 @@ +
      +
      Informations de base
      +
      Cette page affiche un calendrier des événements qui vous appartiennent et que vous partagez avec d'autres canaux.
      +
      Vue du calendrier
      +
      Le calendrier peut être affiché en mode mois, semaine ou jour en utilisant les options du panneau latéral.
      +
      Exportation/Importation
      +
      Exporter ou importer des événements de calendrier en utilisant des fichiers au format standard iCalendar (.ics).
      +
      diff --git a/doc/en/context/fr/mail/help.html b/doc/en/context/fr/mail/help.html new file mode 100644 index 000000000..fcf4eff21 --- /dev/null +++ b/doc/en/context/fr/mail/help.html @@ -0,0 +1,10 @@ +
      +
      Informations de base
      +
      Les messages affichés dans courrier privé ne sont visibles que pour vous et le destinataire unique.
      +
      Vue combinée
      +
      Les conversations complètes peuvent être visualisées dans un fil continu en sélectionnant Vue combinée . Les conversations disponibles sont affichées sous le menu dans le panneau latéral.
      +
      Boîte de réception/Boîte d'envoi
      +
      Les messages individuels envoyés sont visualisés en sélectionnant Boîte d'envoi, et les messages entrants sont visualisés en utilisant le filtre Boîte de réception.
      +
      Nouveau message.
      +
      Les messages individuels ont des rapports de livraison qui peuvent être visualisés à l'aide du menu déroulant. Les messages peuvent également être rappelés à partir du même menu, ce qui peut empêcher le destinataire de voir le message s'il ne l'a pas déjà lu.
      +
      diff --git a/doc/en/context/fr/photos/help.html b/doc/en/context/fr/photos/help.html new file mode 100644 index 000000000..8609e9849 --- /dev/null +++ b/doc/en/context/fr/photos/help.html @@ -0,0 +1,6 @@ +
      +
      Informations de base
      +
      Cette page affiche les albums photos du canal. Les images visibles pour l'observateur dépendent des permissions d'images individuelles.
      +
      Onglets de contenu du canal
      +
      Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil de canal. L'onglet Photos permet d'accéder aux galeries de photos des chaînes. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
      +
      diff --git a/doc/en/context/fr/profile/help.html b/doc/en/context/fr/profile/help.html new file mode 100644 index 000000000..26559db6f --- /dev/null +++ b/doc/en/context/fr/profile/help.html @@ -0,0 +1,6 @@ +
      +
      Informations de base
      +
      Ceci est la page de profil d'un canal. Il affiche typiquement des informations décrivant le canal. Si le canal représente une personne dans un réseau social, par exemple, le profil peut fournir des informations de contact et d'autres détails personnels sur la personne. Les canaux peuvent avoir plusieurs profils, où le profil affiché dépend de l'observateur.
      +
      Onglets de contenu du canal
      +
      Les onglets de contenu du canal sont des liens vers d'autres contenus publiés par le canal. L'onglet A propos permet d'accéder au profil de canal. L'onglet Photos permet d'accéder aux galeries de photos des chaînes. L'onglet Fichiers permet d'accéder aux fichiers généraux partagés publiés par le canal.
      +
      diff --git a/doc/en/context/fr/settings/account/help.html b/doc/en/context/fr/settings/account/help.html new file mode 100644 index 000000000..ed8e7f374 --- /dev/null +++ b/doc/en/context/fr/settings/account/help.html @@ -0,0 +1,18 @@ +
      +
      Informations de base
      +
      + Une fois que vous avez enregistré un compte dans la matrice, vous avez également créé un profil et un canal. +
      +
      Compte
      +
      + Vous avez un compte. Il contient votre compte de courriel et votre mot de passe. Avec votre compte, vous accédez à votre profil et votre canal. Pensez à votre compte comme la façon dont vous vous authentifiez sur un site Hubzilla. Il vous permet de faire des choses, comme créer des profils et des canaux avec lesquels vous pouvez vous connecter à d'autres personnes. +
      +
      Profile
      +
      + Vous vous êtes sûrement inscrit à d'autres services Internet, comme les forums ou les communautés en ligne. Pour chacun d'entre eux, vous avez fourni des informations sur vous-même, telles que la date de naissance, le pays, l'âge et autres. Contrairement à d'autres services, Hubzilla vous offre l'avantage de créer plus de profils. Vous pouvez ainsi faire la distinction entre les profils qui s'adressent à tous (votre profil public) et vos collègues de travail, votre famille et votre partenaire. Pensez à votre profil comme étant l'information de base sur vous-même que vous donnez aux autres. +
      +
      Channel
      +
      + Lors de l'enregistrement, vous avez créé votre premier canal. Oui, en plus de plusieurs profils, vous pouvez avoir plusieurs canaux. Cela pourrait être un peu confus au début, mais mettons les choses au clair. Vous avez déjà créé un canal. Vous pouvez utiliser celui-ci pour le public, pour communiquer avec les gens sur la vie de tous les jours. Mais vous êtes peut-être un lecteur de livres passionné et beaucoup de gens s'ennuient. Ainsi, vous ouvrez un second canal juste pour les amateurs de livres, où vous pouvez tous parler de livres autant que vous le souhaitez. Il s'agit évidemment d'un nouveau flux de messages, avec un nouveau profil (ou nouveaux profils) et des contacts complètement différents. Certaines connexions peuvent exister dans les deux canaux, mais il y en aura qui sont exclusives à l'un d'entre eux. Vous-même vous changez entre les deux comme vous le feriez dans la vie réelle lorsque vous parlez à des gens que vous rencontrez dans la rue ou à des gens que vous rencontrez pour parler de livres spécifiquement. Vous pouvez même vous connecter à vous-même, ou mieux : à votre autre canal .
      Penser un canal comme différents espaces dédiés à différents sujets où vous rencontrez différentes personnes.      . +
      +
      diff --git a/doc/en/context/fr/settings/channel/help.html b/doc/en/context/fr/settings/channel/help.html new file mode 100644 index 000000000..ed8e7f374 --- /dev/null +++ b/doc/en/context/fr/settings/channel/help.html @@ -0,0 +1,18 @@ +
      +
      Informations de base
      +
      + Une fois que vous avez enregistré un compte dans la matrice, vous avez également créé un profil et un canal. +
      +
      Compte
      +
      + Vous avez un compte. Il contient votre compte de courriel et votre mot de passe. Avec votre compte, vous accédez à votre profil et votre canal. Pensez à votre compte comme la façon dont vous vous authentifiez sur un site Hubzilla. Il vous permet de faire des choses, comme créer des profils et des canaux avec lesquels vous pouvez vous connecter à d'autres personnes. +
      +
      Profile
      +
      + Vous vous êtes sûrement inscrit à d'autres services Internet, comme les forums ou les communautés en ligne. Pour chacun d'entre eux, vous avez fourni des informations sur vous-même, telles que la date de naissance, le pays, l'âge et autres. Contrairement à d'autres services, Hubzilla vous offre l'avantage de créer plus de profils. Vous pouvez ainsi faire la distinction entre les profils qui s'adressent à tous (votre profil public) et vos collègues de travail, votre famille et votre partenaire. Pensez à votre profil comme étant l'information de base sur vous-même que vous donnez aux autres. +
      +
      Channel
      +
      + Lors de l'enregistrement, vous avez créé votre premier canal. Oui, en plus de plusieurs profils, vous pouvez avoir plusieurs canaux. Cela pourrait être un peu confus au début, mais mettons les choses au clair. Vous avez déjà créé un canal. Vous pouvez utiliser celui-ci pour le public, pour communiquer avec les gens sur la vie de tous les jours. Mais vous êtes peut-être un lecteur de livres passionné et beaucoup de gens s'ennuient. Ainsi, vous ouvrez un second canal juste pour les amateurs de livres, où vous pouvez tous parler de livres autant que vous le souhaitez. Il s'agit évidemment d'un nouveau flux de messages, avec un nouveau profil (ou nouveaux profils) et des contacts complètement différents. Certaines connexions peuvent exister dans les deux canaux, mais il y en aura qui sont exclusives à l'un d'entre eux. Vous-même vous changez entre les deux comme vous le feriez dans la vie réelle lorsque vous parlez à des gens que vous rencontrez dans la rue ou à des gens que vous rencontrez pour parler de livres spécifiquement. Vous pouvez même vous connecter à vous-même, ou mieux : à votre autre canal .
      Penser un canal comme différents espaces dédiés à différents sujets où vous rencontrez différentes personnes.      . +
      +
      diff --git a/doc/en/context/fr/settings/features/help.html b/doc/en/context/fr/settings/features/help.html new file mode 100644 index 000000000..2811c932e --- /dev/null +++ b/doc/en/context/fr/settings/features/help.html @@ -0,0 +1,12 @@ +
      +
      Informations de base
      +
      Cette page vous permet de configurer les paramètres pour les nombreuses fonctionnalités supplémentaires de Hubzilla.
      +
      Paramètres généraux
      +
      Les paramètres généraux des fonctionnalités incluent des options pertinentes pour votre canal, telles que la page web et l'hébergement wiki.
      +
      Fonctions de composition de messages
      +
      Les fonctions de composition de messages offrent des options et des capacités supplémentaires lors de la composition de nouveaux messages.
      +
      Filtrage des réseaux et des flux
      +
      Ces paramètres modifient les fonctions associées au filtrage et au contrôle de l'affichage des messages entrants.
      +
      Outils d'affichage et de commentaires
      +
      Ceux-ci fournissent des outils supplémentaires pour catégoriser les messages et permettre des méthodes de commentaires supplémentaires telles que l'emoji ou le balisage de la communauté.
      +
      diff --git a/doc/en/context/fr/settings/tokens b/doc/en/context/fr/settings/tokens new file mode 100644 index 000000000..6be17a615 --- /dev/null +++ b/doc/en/context/fr/settings/tokens @@ -0,0 +1,20 @@ +
      +
      Jetons d'accès invités
      +
      + Afin de faciliter le partage de ressources privées avec des non-membres ou des membres de nœuds de fédération à découverte d'identification limitée, Hubzilla devrait fournir aux membres un mécanisme pour créer et gérer des logins temporaires («jetables»), alias «Zot Access Tokens». Ces jetons/accréditations peuvent être utilisés pour s'authentifier sur un site hubzilla dans le seul but d'accéder à des ressources privilégiées ou contrôlées (fichiers, photos, posts, pages web, salons de discussion, etc. +
      +
      Créer un jeton
      +
      + Le formulaire à créer/éditer accepte trois paramètres, un nom lisible par l'homme, un mot de passe ou un jeton d'accès, et une expiration facultative. Une fois expiré, le jeton d'accès n'est plus valide, ne peut plus être utilisé et sera automatiquement supprimé de la liste des comptes temporaires. Le champ mot de passe dans les formulaires de création/édition affiche le texte du jeton d'accès et non un mot de passe masqué. +
      +
      Partager un jeton
      +
      + Nous ne spécifions pas de mécanismes pour partager ces jetons avec d'autres. Toute méthode de communication peut être utilisée. Tous les jetons que vous avez créés sont ajoutés au sélecteur de liste de contrôle d'accès et peuvent être utilisés partout où des listes de contrôle d'accès sont fournies. + + Exemple : Un visiteur arrive sur votre site. Elle a un jeton d'accès que vous lui avez fourni et tente de visiter l'un de vos albums photos (qui ne peut être visionné que par vous-même et une identité temporaire). La permission est refusée. + + Le visiteur sélectionne maintenant «Login» dans la barre de navigation du menu. Ceci présente une page de connexion. Elle entre le nom et le mot de passe que vous lui avez fournis, et elle peut maintenant voir l'album photo restreint. + + Alternativement, vous pouvez partager un lien vers un fichier protégé en ajoutant un paramètre «&zat=abc123» à l'URL, où la chaîne «abc123» est la clé d'accès ou le mot de passe pour la connexion temporaire. Aucune autre négociation n'est nécessaire et le dossier est présenté. +
      +
      diff --git a/doc/en/context/fr/webpages/help.html b/doc/en/context/fr/webpages/help.html new file mode 100644 index 000000000..c9d34c08f --- /dev/null +++ b/doc/en/context/fr/webpages/help.html @@ -0,0 +1,8 @@ +
      +
      Informations de base
      +
      Vous pouvez créer des sites Web modulaires, conscients de l'identité, composés d'éléments partageables.
      +
      Pages
      +
      Cette page énumère vos "pages", qui sont assignées des URLs où les gens peuvent visiter votre site. La structure des pages est généralement décrite par une mise en page associée , et leur contenu est construit à partir d'une collection de blocs.
      +
      Outils de portage de site Web
      +
      Les outils de portation de site Web vous permettent d'importer/exporter plusieurs éléments de pages Web (pages, mises en page, mises en page, blocs). Vous pouvez importer soit à partir d'un fichier zip téléchargé, soit à partir d'un dossier de fichiers cloud existant. Vous pouvez exporter vers un fichier zip contenant un groupe choisi d'éléments de page Web sous une forme compatible avec l'outil d'importation, ou vous pouvez exporter directement vers un dossier de fichiers dans le cloud. en savoir plus...
      +
      diff --git a/doc/en/context/fr/wiki/help.html b/doc/en/context/fr/wiki/help.html new file mode 100644 index 000000000..af46899e4 --- /dev/null +++ b/doc/en/context/fr/wiki/help.html @@ -0,0 +1,13 @@ +
      +
      Informations de base
      +
      Chaque wiki est une collection de pages, composée sous forme de fichiers texte au format Markdown.
      +
      Liste des wikis
      +
      Les wikis appartenant au canal que vous avez la permission de voir sont listés dans le panneau latéral.
      +
      Historique de la page
      +
      Chaque révision d'une page est sauvegardée pour permettre un retour rapide. Cliquez sur l'onglet History pour afficher l'historique des révisions de page, y compris la date et l'auteur de chacune d'entre elles. Le bouton Revenir chargera la révision sélectionnée mais n'enregistrera pas automatiquement la page.
      +
      Pages
      +
      La liste des pages du wiki est listée dans le panneau Pages Wiki. Avant d'enregistrer les modifications de page à l'aide du menu déroulant Page, vous pouvez entrer un message personnalisé à afficher dans le visualiseur d'historique de page avec la révision.
      +
      + + + diff --git a/doc/en/context/it/wiki/help.html b/doc/en/context/it/wiki/help.html new file mode 100644 index 000000000..e93e18eb4 --- /dev/null +++ b/doc/en/context/it/wiki/help.html @@ -0,0 +1,10 @@ +
      +
      General
      +
      Ogni wiki è una raccolta di pagine, composta di file di testo formattati con Markdown.
      +
      Elenco dei Wiki
      +
      I Wiki del canale che sei abilitato a vedere sono elencati nel pannello laterale.
      +
      Cronologia della pagina
      +
      Le revisioni di ogni pagina vengono salvate per rendere possibile un ripristino veloce. Fai click sulla tab Cronologia per vedere l'elenco delle revisioni, con autore e data delle stesse. Il bottone di ripristino riporterà alla revisione selezionata, senza salvare automaticamente la pagina.
      +
      Pagine
      +
      L'elenco delle pagine del wiki si trova nel pannello Pagine del wiki. Prima di salvare le modifiche con il menu a discela Pagina, puoi inserire un messaggio che verrà visualizzato nella visualizzazione della storia della pagina insieme alla revisione.
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/admin/addons/assets/addon_repo_gui_1.png b/doc/en/context/pl/admin/addons/assets/addon_repo_gui_1.png new file mode 100644 index 000000000..37139b345 Binary files /dev/null and b/doc/en/context/pl/admin/addons/assets/addon_repo_gui_1.png differ diff --git a/doc/en/context/pl/admin/addons/help.html b/doc/en/context/pl/admin/addons/help.html new file mode 100644 index 000000000..fe63718df --- /dev/null +++ b/doc/en/context/pl/admin/addons/help.html @@ -0,0 +1,14 @@ +
      +
      Ogólne
      +
      Ta strona zarządza instalacją dodatków (zwanych też wtyczkami).
      +
      Zarządzanie repozytorium
      +
      Jeśli serwer internetowy ma niezbędne uprawnienia do zapisu, zobaczysz przycisk Zarządzaj repozytoriami, + co otwiera panel sterowania do zarządzania zainstalowanymi repozytoriami wtyczek. Te repozytoria są + przechowywane w katalogu extension/addon/[nazwa repozytorium]/. + Oficjalne repozytorium dodatków Hubzilla można dodać, wprowadzając adres URL repozytorium + https://framagit.org/hubzilla/addons.git + i wybierając nazwę repozytorium, na przykład oficjalne. Powinieneś zobaczyć to repozytorium na liście + podobnej do tej: +
      +
      +
      diff --git a/doc/en/context/pl/admin/logs/help.html b/doc/en/context/pl/admin/logs/help.html new file mode 100644 index 000000000..1d79d6a8c --- /dev/null +++ b/doc/en/context/pl/admin/logs/help.html @@ -0,0 +1,20 @@ +
      +
      Ogólne
      +
      + Ta strona umożliwia dostosowanie ustawień dziennika oraz przeglądanie + istniejącego dziennika. +
      +
      Ustawienia dziennika
      +
      + Po włączeniu opcji debugowania informacje o zdarzeniach systemowych zaczną + być dołączane do pliku określonego w polu "Plik dziennika" (ścieżka jest + względna w stosunku do katalogu głównego huba, na przykład /var/www). + Zauważ, że ten plik musi być możliwy do zapisywania przez serwer WWW.
      +
      Pozion rejestracji
      +
      + Opcja poziomu dziennika umożliwia ustawienie ilości informacji dołączanych + do pliku dziennika. Ostrzeżenie: zwiększenie tego poziomu może szybko + zwiększyć rozmiar pliku dziennika do ponad 100 MB, szczególnie w hubach z + więcej niż kilkoma członkami. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/admin/queue/help.html b/doc/en/context/pl/admin/queue/help.html new file mode 100644 index 000000000..af5c06787 --- /dev/null +++ b/doc/en/context/pl/admin/queue/help.html @@ -0,0 +1,7 @@ +
      +
      Ogólne
      +
      + Statystyki kolejki pokazują, ile wpisów znajduje się w kolejce w celu dostarczenia + ich do innych portali. Priorytet jest związany z liczbą nieudanych prób dostawy. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/admin/security/help.html b/doc/en/context/pl/admin/security/help.html new file mode 100644 index 000000000..0e582e6b4 --- /dev/null +++ b/doc/en/context/pl/admin/security/help.html @@ -0,0 +1,8 @@ +
      +
      Ogólne
      +
      + Ta strona zawiera różne ustawienia administratora związane z bezpieczeństwem. + Aby zapisać zmiany wprowadzone w tych ustawieniach, musisz nacisnąć przycisk + "Prześlij". +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/appman/help.html b/doc/en/context/pl/appman/help.html new file mode 100644 index 000000000..867b5b482 --- /dev/null +++ b/doc/en/context/pl/appman/help.html @@ -0,0 +1,10 @@ +
      +
      Ogólne
      +
      + Edytowanie poszczególnych właściwości wybranej aplikacji. Kategorie umożliwiają + sortowanie aplikacji, aby ułatwić znajdowanie ich na liście. Wsparcie dla + niestandardowych aplikacji, które Ty lub Twój administrator możecie wybrać, + obejmuje pola, takie jak ""Cena aplikacji"" i "Lokalizacja zakupu"", które nie + są zastosowane w podstawowych aplikacjach Hubzilla. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/cards/help.html b/doc/en/context/pl/cards/help.html new file mode 100644 index 000000000..2e9886283 --- /dev/null +++ b/doc/en/context/pl/cards/help.html @@ -0,0 +1,31 @@ +
      +
      Ogólne
      +
      + Karty reprezentują trwały obszar współpracy, który jest niezależny od + strumienia społecznościowego. Są nieco lżejsze niż strony internetowe i wiki, + dzięki czemu zapewniają szybką organizację informacji i mają tę zaletę, że + umożliwiają współpracę i komentowanie. Są dobrze przystosowane do pomocy w + organizowaniu złożonych zadań, w przypadku których często pojawiają się + aktualizacje i informacje zwrotne. +
      +
      Dodanie karty
      +
      + Tworzenie nowej karty jest bardzo podobne do tworzenia nowego postaa.

      +
        +
      • + Nazwa linku do strony: nazwa linku do strony jest nazwą + karty dla statycznego adresu URL +
        • +
      • + Tytuł: Tytuł jest wyświetlany u góry karty +
        • +
      • + Kategorie: Jeśli na swoim kanale masz włączoną + funkcjonalność kategorii postów , + możesz dodawać kategorie do karty. Kategorie te zawarte są na liście + Kategorie, na lewym panelu i umożliwiają filtrowanie + kolekcji kart. +
        • +
      +
      +
      diff --git a/doc/en/context/pl/channel/help.html b/doc/en/context/pl/channel/help.html new file mode 100644 index 000000000..bd454c361 --- /dev/null +++ b/doc/en/context/pl/channel/help.html @@ -0,0 +1,13 @@ +
      +
      Ogólne
      +
      + To jest strona główna kanału. Jest ona podobna do "ściany" profilu w kontekście + sieci społecznościowej. Posty utworzone w kanale są wyświetlane zgodnie z + uprawnieniami obserwatora do oglądania treści. +
      +
      Tworzenie posta
      +
      + Jeśli masz uprawnienia do tworzenia postów na stronie kanału, u góry zobaczysz + edytor postów. +
      +
      diff --git a/doc/en/context/pl/chat/help.html b/doc/en/context/pl/chat/help.html new file mode 100644 index 000000000..0cf063aa8 --- /dev/null +++ b/doc/en/context/pl/chat/help.html @@ -0,0 +1,19 @@ +
      +
      Ogólne
      +
      + Twórz pokoje rozmów i wykorzystuj je do komunikacji w czasie rzeczywistym, + używając standardowego systemu uprawnień Hubzilla do kontroli dostępu do + pokojów rozmów. +
      +
      Tworzenie nowego pokoju rozmów
      +
      + Użyj przycisku "Utwórz nowy", aby utworzyć nowy pokój rozmów. Wpisz nazwę i + jak długo wiadomości mają być przechowywane. +
      +
      Czatowanie
      +
      + Wpisz wiadomość w polu wiadomości i naciśnij "Prześlij". Możesz ustawić status, + wybierając przycisk menu pokoju rozmów sieciowych obok przycisku "Wyślij". + Inne osoby "w pokoju" są widoczne w panelu bocznym w panelu "Członkowie czatu". +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/cloud/help.html b/doc/en/context/pl/cloud/help.html new file mode 100644 index 000000000..d629e6d41 --- /dev/null +++ b/doc/en/context/pl/cloud/help.html @@ -0,0 +1,17 @@ +
      +
      Ogólne
      +
      + Ta strona wyświetla pliki "w chmurze" kanału. To co widzi przeglądajacy zależy + od jego indywidualnych uprawnień do plików, które ustawia właściciel kanału. + Jeśli masz uprawnienia do tworzenia i przesyłania plików, zobaczysz przyciski + kontrolne nad listą plików. +
      +
      Karty zawartości kanału
      +
      + Karty zawarości kanału to linki do innych treści publikowanych przez kanał. + Karta Informacje prowadzi do profilu kanału. Karta Zdjęcia + prowadzi do galerii zdjęć kanału. Zakładka Pliki zawiera linki do + ogólnych plików udostępnionych do publikacji w kanale. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/connections/help.html b/doc/en/context/pl/connections/help.html new file mode 100644 index 000000000..837184334 --- /dev/null +++ b/doc/en/context/pl/connections/help.html @@ -0,0 +1,24 @@ +
      +
      Ogólne
      +
      + Ta strona wyświetla listę wszystkich połączeń tego kanału. Lista można + posortować i przefiltrować + za pomocą przycisku menu obok przycisku wyszukiwania . +
      +
      Szczegóły połączenia
      +
      + Każdy wpis na liście przedstawia szczegóły określonego połączenia. + Przezroczysty obraz awatara wskazuje na zarchiwizowane połączenie. +
      +
      Stan połączenie
      +
      + Połączenie może mieć różne stany: +
        +
      • Zarchiwizowane
        • +
      • Zignorowane
        • +
      • Zablokowane
        • +
      • Ukryte
        • +
      +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/connections/ifpending/help.html b/doc/en/context/pl/connections/ifpending/help.html new file mode 100644 index 000000000..b2d05947a --- /dev/null +++ b/doc/en/context/pl/connections/ifpending/help.html @@ -0,0 +1,24 @@ +
      +
      Ogólne
      +
      + Ta strona wyświetla listę wszystkich połączeń tego kanału. Lista można + posortować i przefiltrować + za pomocą przycisku menu obok przycisku wyszukiwania. +
      +
      Szczegóły połączenia
      +
      + Każdy wpis na liście przedstawia szczegóły określonego połączenia. + Przezroczysty obraz awatara wskazuje na zarchiwizowane połączenie. +
      +
      Stan połączenia
      +
      + Połączenie może mieć różne stany: +
        +
      • Zarchiwizowane
        • +
      • Zignorowane
        • +
      • Zablokowane
        • +
      • Ukryte
        • +
      +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/connedit/help.html b/doc/en/context/pl/connedit/help.html new file mode 100644 index 000000000..746908cf2 --- /dev/null +++ b/doc/en/context/pl/connedit/help.html @@ -0,0 +1,44 @@ +
      +
      Ogólne
      +
      + Ta strona umożliwia zmianę lub edycję dowolnych indywidualnych ustawień dla + określonego połączenia lub całkowite usunięcie połączenia. Być może dotarłeś + do tej strony po utworzeniu lub zatwierdzeniu nowego połączenia. Jeśli tak, + nie musisz nic robić. Twoje połączenie zostało już nawiązane. + Możesz chcieć dodać je do grupy lub dostosować specjalne + uprawnienia, a ta strona jest prezentowana, abyś mógł to zrobić przy okazji + ustanowienie nowego połączenia. +
      +
      Narzędzia do połączeń
      +
      + Menu naarzędzi połączeń + umożliwia dostęp do kilku ustawień. Wyświetl profil, wyświetl ostatnią aktywność, + odśwież uprawnienia, ustaw lub zresetuj flagi (blokuj, ignoruj, archiwizuj, ukryj) + i usuń połączenie. +
      +
      Grupy prywatności
      +
      + Każde połączenie może być przypisane do jednej lub więcej grup prywatności + w celu grupowania kolekcji znajomych z dostępem do określonych wpisów, + multimediów i innych treści. Możesz dodać je tutaj do istniejącej grupy + prywatności lub utworzyć nową grupę prywatności. Po dodaniu ich do istniejącej + grupy akcja jest natychmiastowa i nie musisz przesyłać formularza. +
      +
      Indywidualne uprawniena
      +
      + Udzielanie uprawnień jest zwykle automatyczne i nie wymaga żadnych działań + z Twojej strony. Możesz jednak chcieć dostosować określone uprawnienia dla + tego połączenia, które są inne niż dla innych. +
      +
      Ustawienia specyficznych funkcji
      +
      + Szereg indywidualnych ustawień jest kontrolowanych za pomocą dodatkowych + funkcji, które mogą, ale nie muszą być aktywowane na Twoim węźle lub na Twoim + kanale. Kilka opcjonalnych funkcji ma ustawienia dla każdego połączenia, + które można ustawić na tej stronie za pomocą dodatkowych zakładek formularza. +
      +
      diff --git a/doc/en/context/pl/events/help.html b/doc/en/context/pl/events/help.html new file mode 100644 index 000000000..542661fa5 --- /dev/null +++ b/doc/en/context/pl/events/help.html @@ -0,0 +1,18 @@ +
      +
      Ogólne
      +
      + Na tej stronie wyświetlany jest kalendarz wydarzeń, który należy do Ciebie + oraz kalendarze, które zostały Ci udostępnione z innych kanałów. + /dd> +
      Widok kalendarza
      +
      + Kalendarz może być wyświetlany w trybie miesiąca, tygodnia lub dnia, przy użyciu + opcji widocznych na panelu bocznym. +
      +
      Eksport/Import
      +
      + Eksportuj lub importuj wydarzenia kalendarza przy użyciu plików w standardowym + formacie iCalendar (.ics). +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/mail/help.html b/doc/en/context/pl/mail/help.html new file mode 100644 index 000000000..b077aa2c4 --- /dev/null +++ b/doc/en/context/pl/mail/help.html @@ -0,0 +1,25 @@ +
      +
      Ogólne
      +
      + Wiadomości wyświetlane w poczcie prywatnej są widoczne tylko dla Ciebie i + pojedynczego odbiorcy. +
      +
      Widok łączony
      +
      + Wybór opcji Widok łączony spowoduje wyświetlanie wszystkich rozmów w ciągłym + wątku. Dostępne rozmowy są wyświetlane poniżej menu w panelu bocznym. +
      +
      Skrzynka odbiorcza/nadawcza
      +
      + Poszczególne wysłane wiadomości można wyświetlić, wybierając opcję + Skrzynka nadawcza, a wiadomości przychodzące - za pomocą filtru + Skrzynka odbiorcza. +
      +
      Nowa wiadomość
      +
      + Poszczególne wiadomości mają raporty doręczenia, które można wyświetlić za + pomocą rozwijanego menu. Wysłane wiadomości można również odwołać, posługując + się tym samym menu, co może uniemożliwić odbiorcy przegląd takich wiadomości, + jeśli jeszcze ich nie przeczytał. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/network/help.html b/doc/en/context/pl/network/help.html new file mode 100644 index 000000000..f6ba75241 --- /dev/null +++ b/doc/en/context/pl/network/help.html @@ -0,0 +1,36 @@ +
      +
      Ogólne
      +
      + Strona strumienia sieciowego wyświetla strumień wpisów i rozmów, zwykle + uporządkowanych według ostatnio zaktualizowanych. Jest to strona wysoce konfigurowalna. +
      +
      Tworzenie wpisu
      +
      + U góry strony znajduje się pole tekstowe z napisem "Udostępnij". Kliknięcie + tego pola otwiera nowy edytor wpisów. Edytor wpisów można dostosowywać, ale + podstawowy edytor udostępnia pola dla treści wpisu i opcjonalnego tytułu. + Przyciski poniżej obszaru tekstowego po lewej stronie zapewniają skróty do + formatowania tekstu i wstawiania linków, obrazów i innych danych do wpisu. + Przyciski po prawej stronie zapewniają podgląd wpisu, ustawienia uprawnień do + publikowania oraz przycisk Prześlij do wysłania wpisu. +
      +
      Grupy prywatności
      +
      + Utworzone grupy prywatności są wyświetlane w panelu bocznym. Wybranie ich + powoduje filtrowanie wpisów do tych utworzonych przez kanały w wybranej grupie. +
      +
      Uprawnienia do wpisu
      +
      + Lista kontroli dostępu (ACL) służy do określania, kto może zobaczyć Twój nowy + wpis. Naciśnięcie przycisku ACL obok przycisku Prześlij spowoduje wyświetlenie + okna dialogowego, w którym możesz wybrać kanały albo grupy prywatności, które + będą widzieć wpis. Możesz także wybrać, komu wyraźnie odmówiono dostęp. + Załóżmy na przykład, że planujesz przyjęcie niespodziankę dla znajomego. + Możesz wysłać zaproszenie do wszystkich w swojej grupie Znajomi + oprócz znajomego, którego zaskakujesz. W tym przypadku "pokazujesz" + go grupie Znajomi, ale "nie pokazujesz" tej jednej osobie. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/photos/help.html b/doc/en/context/pl/photos/help.html new file mode 100644 index 000000000..e9ff7ee9d --- /dev/null +++ b/doc/en/context/pl/photos/help.html @@ -0,0 +1,15 @@ +
      +
      Ogólne
      +
      + Na tej stronie wyświetlane są albumy ze zdjęciami opublikowane w kanale. + Widoczność obrazów zależy od indywidualnych uprawnień odwiedzającego do tych zdjęć. +
      +
      Zakładki treści kanału
      +
      + Karty treści kanału to odnośniki do innych treści publikowanych przez kanał. + Karta Informacje prowadzi do profilu kanału. Karta Zdjęcia + prowadzi do galerii zdjęć kanału. Zakładka Pliki zawiera linki do + ogólnych plików udostępnionych w kanale. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/profile/help.html b/doc/en/context/pl/profile/help.html new file mode 100644 index 000000000..9ec5b0e73 --- /dev/null +++ b/doc/en/context/pl/profile/help.html @@ -0,0 +1,17 @@ +
      +
      Ogólne
      +
      + To jest strona profilu kanału. Zwykle wyświetla informacje opisujące kanał. + Jeśli na przykład kanał reprezentuje osobę w sieci społecznościowej, profil + może zawierać informacje kontaktowe i inne dane osobowe tej osoby. Kanały mogą + mieć wiele profili, przy czym wyświetlany profil zależy od obserwatora. +
      +
      Zakładki treści kanału
      +
      + Karty treści kanału to odnośniki do innych treści publikowanych przez kanał. + Karta Informacje prowadzi do profilu kanału. Karta Zdjęcia + prowadzi do galerii zdjęć kanału. Zakładka Pliki zawiera linki do ogólnych + plików opublikowanych i udostępnionych w kanale. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/profiles/help.html b/doc/en/context/pl/profiles/help.html new file mode 100644 index 000000000..874303908 --- /dev/null +++ b/doc/en/context/pl/profiles/help.html @@ -0,0 +1,49 @@ +
      +
      Ogólne
      +
      + Po zarejestrowaniu konta w matrycy, utworzony został również + profil i kanał. +
      +
      Konto
      +
      + Masz teraz jedno konto. Składa się z Twojego adresu e-mail i + hasła. Za pomocą swojego konta uzyskujesz dostęp do profili i kanałów. + Pomyśl o swoim koncie jak o sposobie uwierzytelniania w jednym + serwisie Hubzilla. To pozwala wykonywać różne czynności, takie jak + tworzenie profili i kanałów, za pomocą których można łączyć się z + innymi osobami. +
      +
      Profil
      +
      + Z pewnością już zarejestrowałeś/zarejestrowałaś się w innych usługach + internetowych, takich jak fora lub społeczności internetowe. W nich + wszystkich trzeba było podać pewne informacje o sobie, takie jak data + urodzenia, kraj, wiek i upodobania. W przeciwieństwie do nich + usługi Hubzilla daje Ci przewagę tworzenia wielu profili . + W ten sposób możesz rozróżniać profil przeznaczone specjalnie dla + wszystkich (Twój profil publiczny), od profili przeznaczonych dla + współpracowników, rodziny czy partnera. Potraktuj swój profil + jak pojemnik zawierający podstawowe informacje o Tobie, jakie + przekazujesz innym osobom. +
      +
      Kanał
      +
      + Podczas rejestracji utworzyłeś/utworzyłaś swój pierwszy kanał. + Tak, poza kilkoma profilami, również możesz mieć kilka kanałów. Na + początku może to być nieco zagmatwane, ale wyjaśnijmy to. Już masz + utworzony jeden kanał. Możesz używać go do publicznego komunikowania + się z osobami w życiu codziennym. Lecz być może jesteś zapalonym + czytelnikiem książek a wielu ludzi się tym nudzi. Otwierasz więc + drugi kanał dla miłośników książek, gdzie wszyscy mogą rozmawiać + o książkach tyle, ile zechcą. Oczywiście jest to nowy strumień wpisów, + z nowym profilem (... lub nowymi profilami) i zupełnie z innymi + kontaktami. Niektóre połączenia mogą istnieć w obu kanałach, ale będą + takie, które będą występować wyłącznie w jednym z nich. Ty po prostu + przełączaj się między nimi tak, jak w prawdziwym życiu, gdy rozmawiasz + z ludźmi, których spotykasz na ulicy lub z osobami, które spotykasz + specjalnie, aby porozmawiać o książkach. Możesz nawet połączyć się + ze sobą lub lepiej: ze swoim innym kanał. :) Pomyśl o kanałach + jak o różnych przestrzeniach poświęconych różnym tematom, w których + spotykasz się z różnymi osobami. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/register/help.html b/doc/en/context/pl/register/help.html new file mode 100644 index 000000000..c5c879e36 --- /dev/null +++ b/doc/en/context/pl/register/help.html @@ -0,0 +1,54 @@ +
      +
      Ogólne
      +
      + Na tej stronie odwiedzający mogą zarejestrować się, aby uzyskać dostęp do + portalu za pomocą identyfikatora logowania. Zalogowani użytkownicy nie tylko + widzą treści publiczne, ale mogą je sami publikować, komunikować się w sieciach + społecznościowych i nie tylko. +
      +
      Tryby rejestracji
      +
      + Rejestracja jest możliwa na adres e-mail lub anonimowo, jeśli regulamin portalu + to dopuszcza (wówczas nie wypełniaj pola e-mail). Możliwe, że masz również + kod zaproszenia, który trzeba wprowadzić wraz z adresem e-mail. Link nad polem + e-mail umożliwia wprowadzenie kodu zaproszenia. Ustaw też swoje hasło logowania. + Musisz podać go dwukrotnie. Nie jest ono jawnie wyświetlane w formularzu, więc + uważaj przy jego wprowadzaniu. +
      +
      Procedura rejestracji
      +
      + Aby zalogować się po udanej rejestracji, należy ustawić osobne hasło. + Ze względów bezpieczeństwa wprowadź je dwukrotnie z identycznymi wartościami. + Zarejestrowani anonimowo użytkownicy otrzymują automatycznie przypisywany identyfikator + i nie powinni zapomnieć własnego hasła, ponieważ w przeciwieństwie do rejestracji + adresem e-mail początkowo nie ma funkcji resetowania. W zależności od konfiguracji + portalu może być wymagana funkcja potwierdzenia. Użytkownicy rejestracji + przy użyciu adresu e-mail otrzymają odpowiednią wiadomość. W przypadku rejestracji + anonimowych zostanie wyświetlone inne okno dialogowe zawierające identyfikator + dostępu i kod PIN. Dane z tej strony powinny być przechowywana bezpiecznie i przez + długi czas (np. przez wydruk, zrzut ekranu, zdjęcie), ponieważ dane muszą zostać + ponownie potwierdzone w późniejszym czasie. +
      +
      Tożsamość cyfrowa
      +
      + W zależności od portalu, wyświetlaną nazwę (imię i nazwisko) oraz pseudonim można + wprowadzić już podczas rejestracji (alternatywnie również podczas pierwszego logowania). + Pseudonim ma bardzo ważne znaczenie i nie można go później zmienić. Jest to unikalna + tożsamość cyfrowa (Digital Identity, DID), która jest, będzie i pozostanie powiązana + ze wszystkimi naszymi działaniami. Ten DID nadaje się nie tylko do logowania na + tym portalu, ale także do wszystkich połączonych portali sieci federacyjnej. + W języku sieci federacyjnych ta tożsamość cyfrowa jest "kanałem". + Jest to porównywalne z numerem telefonu w sieci telefonicznej. DID ma format + kanał@portal.tld = pseudonim@portal.tld i jak wspomniano, nie można go później + zmienić. Chociaż format wygląda jak adres e-mail, tak nie jest. +
      +
      Nim rozpoczniesz rejestrację ...
      +
      + ... należy wybrać preferowany język (na przykład polski, angielski, hiszpański, + niemiecki) (w prawym górnym rogu menu hamburgera ). + Aktualny język jest używany w kolejnych krokach, a także podczas logowania i po + zalogowaniu. Można to jednak zmienić w dowolnym momencie i w razie potrzeby. + Należy również zauważyć, że ten portal nie jest jedyny. Przegląd innych portali + można znaleźć tutaj . +
      +
      diff --git a/doc/en/context/pl/settings/account/help.html b/doc/en/context/pl/settings/account/help.html new file mode 100644 index 000000000..dfe82f025 --- /dev/null +++ b/doc/en/context/pl/settings/account/help.html @@ -0,0 +1,49 @@ +
      +
      Ogólne
      +
      + Po zarejestrowaniu konta w matrycy, utworzony został również + profil i kanał. +
      +
      Konto
      +
      + Masz teraz jedno konto. Składa się z Twojego adresu e-mail i + hasła. Za pomocą swojego konta uzyskujesz dostęp do profili i kanałów. + Pomyśl o swoim koncie jak o sposobie uwierzytelniania w jednym + serwisie Hubzilla. To pozwala wykonywać różne czynności, takie jak + tworzenie profili i kanałów, za pomocą których można łączyć się z + innymi osobami. +
      +
      Profil
      +
      + Z pewnością już zarejestrowałeś/zarejestrowałaś się w innych usługach + internetowych, takich jak fora lub społeczności internetowe. W nich + wszystkich trzeba było podać pewne informacje o sobie, takie jak data + urodzenia, kraj, wiek i upodobania. W przeciwieństwie do nich + usługi Hubzilla daje Ci przewagę tworzenia wielu profili . + W ten sposób możesz rozróżniać profil przeznaczone specjalnie dla + wszystkich (Twój profil publiczny), od profili przeznaczonych dla + współpracowników, rodziny czy partnera. Potraktuj swój profil + jak pojemnik zawierający podstawowe informacje o Tobie, jakie + przekazujesz innym osobom. +
      +
      Kanał
      +
      + Podczas rejestracji utworzyłeś/utworzyłaś swój pierwszy kanał. + Tak, poza kilkoma profilami, również możesz mieć kilka kanałów. Na + początku może to być nieco zagmatwane, ale wyjaśnijmy to. Już masz + utworzony jeden kanał. Możesz używać go do publicznego komunikowania + się z osobami w życiu codziennym. Lecz być może jesteś zapalonym + czytelnikiem książek a wielu ludzi się tym nudzi. Otwierasz więc + drugi kanał dla miłośników książek, gdzie wszyscy mogą rozmawiać + o książkach tyle, ile zechcą. Oczywiście jest to nowy strumień wpisów, + z nowym profilem (... lub nowymi profilami) i zupełnie z innymi + kontaktami. Niektóre połączenia mogą istnieć w obu kanałach, ale będą + takie, które będą występować wyłącznie w jednym z nich. Ty po prostu + przełączaj się między nimi tak, jak w prawdziwym życiu, gdy rozmawiasz + z ludźmi, których spotykasz na ulicy lub z osobami, które spotykasz + specjalnie, aby porozmawiać o książkach. Możesz nawet połączyć się + ze sobą lub lepiej: ze swoim innym kanał. :) Pomyśl o kanałach + jak o różnych przestrzeniach poświęconych różnym tematom, w których + spotykasz się z różnymi osobami. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/settings/channel/help.html b/doc/en/context/pl/settings/channel/help.html new file mode 100644 index 000000000..dfe82f025 --- /dev/null +++ b/doc/en/context/pl/settings/channel/help.html @@ -0,0 +1,49 @@ +
      +
      Ogólne
      +
      + Po zarejestrowaniu konta w matrycy, utworzony został również + profil i kanał. +
      +
      Konto
      +
      + Masz teraz jedno konto. Składa się z Twojego adresu e-mail i + hasła. Za pomocą swojego konta uzyskujesz dostęp do profili i kanałów. + Pomyśl o swoim koncie jak o sposobie uwierzytelniania w jednym + serwisie Hubzilla. To pozwala wykonywać różne czynności, takie jak + tworzenie profili i kanałów, za pomocą których można łączyć się z + innymi osobami. +
      +
      Profil
      +
      + Z pewnością już zarejestrowałeś/zarejestrowałaś się w innych usługach + internetowych, takich jak fora lub społeczności internetowe. W nich + wszystkich trzeba było podać pewne informacje o sobie, takie jak data + urodzenia, kraj, wiek i upodobania. W przeciwieństwie do nich + usługi Hubzilla daje Ci przewagę tworzenia wielu profili . + W ten sposób możesz rozróżniać profil przeznaczone specjalnie dla + wszystkich (Twój profil publiczny), od profili przeznaczonych dla + współpracowników, rodziny czy partnera. Potraktuj swój profil + jak pojemnik zawierający podstawowe informacje o Tobie, jakie + przekazujesz innym osobom. +
      +
      Kanał
      +
      + Podczas rejestracji utworzyłeś/utworzyłaś swój pierwszy kanał. + Tak, poza kilkoma profilami, również możesz mieć kilka kanałów. Na + początku może to być nieco zagmatwane, ale wyjaśnijmy to. Już masz + utworzony jeden kanał. Możesz używać go do publicznego komunikowania + się z osobami w życiu codziennym. Lecz być może jesteś zapalonym + czytelnikiem książek a wielu ludzi się tym nudzi. Otwierasz więc + drugi kanał dla miłośników książek, gdzie wszyscy mogą rozmawiać + o książkach tyle, ile zechcą. Oczywiście jest to nowy strumień wpisów, + z nowym profilem (... lub nowymi profilami) i zupełnie z innymi + kontaktami. Niektóre połączenia mogą istnieć w obu kanałach, ale będą + takie, które będą występować wyłącznie w jednym z nich. Ty po prostu + przełączaj się między nimi tak, jak w prawdziwym życiu, gdy rozmawiasz + z ludźmi, których spotykasz na ulicy lub z osobami, które spotykasz + specjalnie, aby porozmawiać o książkach. Możesz nawet połączyć się + ze sobą lub lepiej: ze swoim innym kanał. :) Pomyśl o kanałach + jak o różnych przestrzeniach poświęconych różnym tematom, w których + spotykasz się z różnymi osobami. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/settings/features/help.html b/doc/en/context/pl/settings/features/help.html new file mode 100644 index 000000000..fc5a62363 --- /dev/null +++ b/doc/en/context/pl/settings/features/help.html @@ -0,0 +1,50 @@ +
      +
      Informacje ogólne
      +
      + Ta strona umożliwia skonfigurowanie ustawień dla wielu dodatkowych funkcji Hubzilli, które możesz włączyć na swoim koncie. +
      +
      Kalendarz
      +
      + Są to dodatkowe opcje, które możesz włączyć dla wszystkich swoich kalendarzy. + Można to zmienić indywidualnie w każdym kalendarzu.
      +
      +
      Strona główna kanału
      +
      + Kilka dodatkowych możliwości związanych ze stroną główną kanału. +
      +
      Połączenia
      +
      + Obecnie jest tu tylko ustawienie opcji umożliwiającej filtrowanie strumienia wg + słów kluczowych lub treści (fraz). +
      +
      Rozmowa
      +
      + Kilka dodatkowych opcji rozszerzających obsługę rozmów i dyskusji. +
      +
      Katalog
      +
      + Dostępna tu opcja zaawansowanego przeszukiawania katalogu może być bardzo użyteczna + dla osób chcących dotrzeć do konkretnych informacji publikowanych w sieci Hubzilla. +
      +
      Zarządzanie
      +
      + Dostępna tu opcja włącza funkcję zmiany kanału bezpośrednio z rozwijanego menu nawigacji. +
      +
      Sieć
      +
      + Znajduje się tu szereg opcji włączających funkcje związane z siecią i strumieniem + sieciowym. Przede wszystkim dostępnych jest tu kilka dodatkowych filtrów i inne + użyteczne funkcje. Szczegóły można znaleźć dokumentacji. +
      +
      Zdjęcia
      +
      + Tutaj można włączyć funkcję wyświetlania na mapie lokalizacji zdjęcia, jeśli + polik zdjęcia zawiera potrzebne metadane. +
      +
      Profile
      +
      + W tej sekcji zawarte są opcje włączające dodatkowe funkcje dotyczące profilu. + Jeśli chcesz i możesz zakładać na swoim koncie wiele profili (i tożsamości), + włącz tu opcję "wiele profili". +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/settings/tokens/help.html b/doc/en/context/pl/settings/tokens/help.html new file mode 100644 index 000000000..4c79841d6 --- /dev/null +++ b/doc/en/context/pl/settings/tokens/help.html @@ -0,0 +1,43 @@ +
      +
      Tokeny dostępu gościa
      +
      + Aby ułatwić udostępnianie prywatnych zasobów osobom niebędących członkami + tego portalu lub sfederyzowanych portali (hubów) i zapewnić zabezpieczone + wykrywaniem danych identyfikacyjnych, Hubzilla posiada mechanizm tworzenia + i zarządzania tymczasowymi ("jednorazowymi") loginami, zwanymi "tokenami + dostępu Zot”. Tokeny te, będące swojego rodzaju danymi uwierzytelniającymi, + mogą być używane do uwierzytelniania w serwisie Hubzilla wyłącznie w celu + uzyskania dostępu do uprzywilejowanych lub kontrolowanych zasobów (pliki, + zdjęcia, wpisy, strony internetowe, pokoje rozmów itp.). +
      +
      Utworzenie tokenu
      +
      + Formularz do tworzenia i edycji akceptuje trzy parametry: czytelną dla + człowieka nazwę, hasło lub token dostępu oraz opconalną okres ważności. + Po wygaśnięciu token dostępu nie jest już ważny, nie może być już używany + i będzie automatycznie usunięte z listy kont tymczasowych. Pole hasła + w formularzach tworzenia i edycji wyświetla tekst tokenu dostępu, a nie + zasłonięte hasło. +
      +
      Udostępnienie tokenu
      +
      + Nie jest narzucony sposób udostępniania tych tokenów innym osobom. Można + użyć dowolnej metody komunikacji. Wszystkie utworzone tokeny są dodawane + do selektora listy kontroli dostępu i mogą być używane wszędzie tam, gdzie + są dostępne listy kontroli dostępu. + + Przykład: Odwiedzający nawiguje w przeglądarce do Twojąej witryny. + Ma podany przez Ciebie token dostępu i próbuje odwiedzić jeden z Twoich + albumów ze zdjęciami (który jest ograniczony do przeglądania tylko przez + Ciebie i jedną tymczasową tożsamość). Odmowa dostępu. + + Odwiedzający wybiera teraz opcję „Zaloguj się” z paska nawigacji menu. + To wyświetli stronę logowania. Wpisuje tam nazwę i hasło, które podałeś + i może teraz przeglądać zabezpieczony album ze zdjęciami. + + Alternatywnie możesz udostępnić łącze do chronionego pliku, dodając parametr + "&zat=abc123" do adresu URL, gdzie ciąg "abc123" to token dostępu lub + hasło do tymczasowego logowania. Nie są wymagane dalsze negocjacje + a żądany zasób zostanie wyświetlony. +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/webpages/help.html b/doc/en/context/pl/webpages/help.html new file mode 100644 index 000000000..64858fcf6 --- /dev/null +++ b/doc/en/context/pl/webpages/help.html @@ -0,0 +1,24 @@ +
      +
      Ogólne
      +
      + Możesz tworzyć modułowe, rozpoznające tożsamość witryny internetowe, składające + się z elementów, które można udostępniać. +
      +
      Strony
      +
      + Tutaj znajduje się lista Twoich "stron" z przypisanymi adresami URL, + pod którymi osoby mogą je odwiedzać. Struktura stron jest zwykle opisywana + przez powiązany układ, a ich zawartość jest tworzona ze zbioru bloków. +
      +
      Narzędzia do przenoszenia stron internetowych
      +
      + Narzędzia do przenoszenia witryn umożliwiają importowanie i eksportowanie wielu + elementów strony internetowej (stron, układów, bloków). Możesz zaimportować + te alementy albo z przesłanego pliku ZIP, albo z istniejącego folderu plików + w chmurze. Możesz je wyeksportować do pliku zip zawierającego wybraną + grupę elementów strony internetowej w formie zgodnej z narzędziem do importowania + lub możesz wyeksportować bezpośrednio do folderu plików w chmurze. + Czytaj więcej ... +
      +
      \ No newline at end of file diff --git a/doc/en/context/pl/wiki/help.html b/doc/en/context/pl/wiki/help.html new file mode 100644 index 000000000..6aa6a7192 --- /dev/null +++ b/doc/en/context/pl/wiki/help.html @@ -0,0 +1,29 @@ +
      +
      Ogólne
      +
      + Każda wiki to zbiór stron utworzonych jako pliki tekstowe w formacie Markdown. +
      +
      Wykaz Wiki
      +
      + Strony wiki należące do kanału, do przeglądania którego masz uprawnienia, + są wymienione w panelu bocznym. +
      +
      Historia strony
      +
      + Zapisywana jest każda wersja strony, aby umożliwić szybkie przywrócenie. + Kliknij kartę Historia, aby wyświetlić historię zmian strony, w tym + datę i autora każdej z nich. Przycisk przywróć załaduje wybraną wersję, ale + nie zapisze automatycznie strony. +
      +
      Strony
      +
      + Lista stron wiki znajduje się w panelu Strony Wiki. Przed zapisaniem + zmian na stronie za pomocą rozwijanego menu Strona można + wprowadzić + własny komunikat, który będzie wyświetlany w + Historii + strony przeglądarki wraz z wersją. +
      +
      diff --git a/doc/en/context/ru/cards/help.html b/doc/en/context/ru/cards/help.html new file mode 100644 index 000000000..ccdf9d6d9 --- /dev/null +++ b/doc/en/context/ru/cards/help.html @@ -0,0 +1,16 @@ +
      Резюме
      +
      Карточки используются для командной работы в виртуальном пространстве дополнительно к ленте сообщений. Карточки являются болле компактными по сравнению с веб-страницами и вики и предназначены для быстрой организации работы. Преимущество карточек в возможности совместной работы и комментирования. Карточки могут помочь организовать и упростить работу, связанную с частыми изменениями и с обсуждением в проекте. +
      +
      Добавить карточку
      +
      + Создание новой карточки подобно написанию нового поста.

      • + Имя ссылки для веб-страницы: Имя ссылки для веб-страницы - это имя карточки для статической URL +
        • +
      • + Заголовок: Текст заголовка карточки +
        • +
      • + Категории: Если Инструмент "Категории сообщения" в вашем канале разрешён, то вы можете присвоить карточке определённую категорию. Эта категория появится в списке Категорий в левой колонке и разрешает быстрый выбор записей определённой категории из картотеки одним щёлчком мышки. +
        • +
      +
      diff --git a/doc/en/context/ru/connections/help.html b/doc/en/context/ru/connections/help.html new file mode 100644 index 000000000..6c9b9a0e9 --- /dev/null +++ b/doc/en/context/ru/connections/help.html @@ -0,0 +1,7 @@ +
      +
      На этой странице отображается список всех подключений этого канала. Список можно отсортировать и отфильтровать с помощью кнопки рядом с кнопкой поиска.
      +
      Сведения о контакте
      +
      Каждая запись в списке показывает информацию о конкретном контакте. Полупрозрачное изображение профиля указывает на заархивированное соединение.
      +
      Статус контакта
      +
      Контакт может находиться в разных состояниях:
      • Заархивирован
      • Игнорируется
      • Заблокирован
      • Скрыт
      +
      \ No newline at end of file diff --git a/doc/en/context/ru/network/help.html b/doc/en/context/ru/network/help.html new file mode 100644 index 000000000..19b5452e2 --- /dev/null +++ b/doc/en/context/ru/network/help.html @@ -0,0 +1,9 @@ +
      +
      Здесь отображается поток сообщений и бесед, обычно упорядоченных по последнему обновлению. Данная страница имеет гибкие настройки.
      +
      Создать заметку
      +
      В верхней части страницы есть текстовое поле с надписью "Поделиться". Нажатие на это поле открывает редактор сообщений. Внешний ид редактора сообщений настраивается, однако по умолчанию редактор имеет поля для текста заметки и необязательного поля "Заголовок". Кнопки под полем для ввода текста слева служат для форматирования текста, вставки ссылок, изображений и других данных. Кнопки справа обеспечивают предварительный просмотр сообщения, настройку разрешений для публикации и кнопку для её отправки.
      +
      Группы конфиденциальности
      +
      Созданные вами группы конфиденциальности отображаются на боковой панели. Их выбор фильтрует сообщения по публикациям, которые созданы каналами в выбранной группе.
      +
      Разрешения публикации
      +
      Список контроля доступа (ACL) используется для того, чтобы указать, кто будет видеть вашу новую публикацию. При нажатии кнопки ACL рядом с кнопкой появится диалоговое окно, в котором вы можете выбрать, какие каналы и / или группы конфиденциальности могут видеть сообщение. Вы также можете выбрать, кому явно отказано в доступе. Например, вы планируете сюрприз для друга. Вы можете отправить сообщение с приглашением всем в вашей группе "Друзья" кроме друга, которого вы хотите поздравить. В этом случае публикацию увидят все члены группы "Друзья", кроме этого человека.
      +
      diff --git a/doc/en/database.bb b/doc/en/database.bb new file mode 100644 index 000000000..a0c1e8841 --- /dev/null +++ b/doc/en/database.bb @@ -0,0 +1,71 @@ +[h2]Database updates[/h2] + +In the [observer.baseurl]/admin/dbsync page the administrator can check if any update was not successful and, if so, retry it. + +If an update has failed but doesn't register as failed for some reason, the administrator can attempt to re-execute the update. For example for DB update #1999, by visiting the webpage: + +https://hubzilla.com.bradmin/dbsync/1999 + + +[h2]Database Tables[/h2][table border=1][tr][th]Table[/th][th]Description[/th][/tr] +[tr][td][zrl=[baseurl]/help/database/db_abconfig]abconfig[/zrl][/td][td]arbitrary storage for connections of local channels[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_abook]abook[/zrl][/td][td]connections of local channels[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_account]account[/zrl][/td][td]service provider account[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_addon]addon[/zrl][/td][td]registered plugins[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_app]app[/zrl][/td][td]personal app data[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_attach]attach[/zrl][/td][td]file attachments[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_auth_codes]auth_codes[/zrl][/td][td]OAuth usage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_cache]cache[/zrl][/td][td]OEmbed cache[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_cal]cal[/zrl][/td][td]CalDAV containers for events[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_channel]channel[/zrl][/td][td]local channels[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_chat]chat[/zrl][/td][td]chat room content[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_chatpresence]chatpresence[/zrl][/td][td]channel presence information for chat[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_chatroom]chatroom[/zrl][/td][td]data for the actual chat room[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_clients]clients[/zrl][/td][td]OAuth usage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp_member]pgrp_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp]pgrp[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_issue]issue[/zrl][/td][td]future bug/issue database[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_item]item[/zrl][/td][td]all posts and webpages[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td](deprecated by iconfig) other identifiers on other services for posts[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_likes]likes[/zrl][/td][td]likes of 'things'[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_mail]mail[/zrl][/td][td]private messages[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_menu]menu[/zrl][/td][td]webpage menu data[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_menu_item]menu_item[/zrl][/td][td]entries for webpage menus[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_notify]notify[/zrl][/td][td]notifications[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_obj]obj[/zrl][/td][td]object data for things (x has y)[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_outq]outq[/zrl][/td][td]output queue[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pconfig]pconfig[/zrl][/td][td]personal (per channel) configuration storage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_photo]photo[/zrl][/td][td]photo storage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_poll]poll[/zrl][/td][td]data for polls[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_poll_elm]poll_elm[/zrl][/td][td]data for poll elements[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_profdef]profdef[/zrl][/td][td]custom profile field definitions[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_profext]profext[/zrl][/td][td]custom profile field data[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_profile]profile[/zrl][/td][td]channel profiles[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_profile_check]profile_check[/zrl][/td][td]DFRN remote auth use, may be obsolete[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_register]register[/zrl][/td][td]registrations requiring admin approval[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_session]session[/zrl][/td][td]web session storage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_shares]shares[/zrl][/td][td]shared item information[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_sign]sign[/zrl][/td][td]Diaspora signatures. To be phased out.[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_site]site[/zrl][/td][td]site table to find directory peers[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_source]source[/zrl][/td][td]channel sources data[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_sys_perms]sys_perms[/zrl][/td][td]extensible permissions for OAuth[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_term]term[/zrl][/td][td]item taxonomy (categories, tags, etc.) table[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_tokens]tokens[/zrl][/td][td]OAuth usage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_updates]updates[/zrl][/td][td]directory sync updates[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_verify]verify[/zrl][/td][td]general purpose verification structure[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_vote]vote[/zrl][/td][td]vote data for polls[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xchan]xchan[/zrl][/td][td]list of known channels in the universe[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xchat]xchat[/zrl][/td][td]bookmarked chat rooms[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xconfig]xconfig[/zrl][/td][td]as pconfig but for channels with no local account[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xign]xign[/zrl][/td][td]channels ignored by friend suggestions[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xlink]xlink[/zrl][/td][td]"friends of friends" linkages derived from poco, also ratings storage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xperm]xperm[/zrl][/td][td]OAuth/OpenID-Connect extensible permissions permissions storage[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xprof]xprof[/zrl][/td][td]if this hub is a directory server, contains basic public profile info of everybody in the network[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_xtag]xtag[/zrl][/td][td]if this hub is a directory server, contains tags or interests of everybody in the network[/td][/tr] +[/table] diff --git a/doc/en/database/db_abook.bb b/doc/en/database/db_abook.bb new file mode 100644 index 000000000..a346480d7 --- /dev/null +++ b/doc/en/database/db_abook.bb @@ -0,0 +1,55 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]abook_id[/td][td]Sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]abook_account[/td][td]account.account_id of the channel which owns this record[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]abook_channel[/td][td]channel.channel_id of the channel which owns this record[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]abook_xchan[/td][td]xchan.xchan_hash of the target identity (this channel's connection)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]abook_my_perms[/td][td]bitfield of all specific permissions granted this connection[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_their_perms[/td][td]bitfield of all permissions granted to you by this connection[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_closeness[/td][td]"closeness" value for optional affinity tool, 0-99[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]99[/td][td] +[/td][/tr] +[tr][td]abook_created[/td][td]Datetime this record was created[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]abook_updated[/td][td]Datetime this record was modified[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]abook_connected[/td][td]datetime of last successful "poll" for this connection[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]abook_dob[/td][td]Datetime of connection's birthday converted from *their* timezone to UTC[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]abook_flags[/td][td]No longer used[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_profile[/td][td]profile.guid of profile to display to this connection if authenticated[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]abook_blocked[/td][td]Bi-directional communications with this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_ignored[/td][td]Incoming communications from this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_hidden[/td][td]This connection will not be shown as a connection to anybody but the channel owner[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_archived[/td][td]This connection is likely non-functioning and the entry and conversations are preserved, but further polled communications will not be attempted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_pending[/td][td]A connection request was received from this channel but has not been approved by the channel owner, public communications may still be visible but no additional permissions have been granted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_account.bb b/doc/en/database/db_account.bb new file mode 100644 index 000000000..35d7a9eb3 --- /dev/null +++ b/doc/en/database/db_account.bb @@ -0,0 +1,66 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]account_id[/td][td]table index[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]account_parent[/td][td]for hierarchical accounts, the account_id of the parent to this one, if account_parent = account_id, this is the top level account[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]account_default_channel[/td][td]channel_id of channel to connect on login[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]account_salt[/td][td]complexity token for account_password[/td][td]char(32)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]account_password[/td][td]hashed password for this account[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]account_email[/td][td]essentially the login ID, although it is usually possible to login with a channel address[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]account_external[/td][td]Currently unused[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]account_language[/td][td]default language (closest available browser-accept language when account was created)[/td][td]char(16)[/td][td]NO[/td][td][/td][td]en[/td][td] +[/td][/tr] +[tr][td]account_created[/td][td]timestamp of account creation[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]account_lastlog[/td][td]timestamp of last login (or daily update if "remember me" is in effect)[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]account_flags[/td][td]see notes[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]account_roles[/td][td]see notes[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]account_reset[/td][td]verification token for password reset[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]account_expires[/td][td]timestamp when account expires and will be deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]account_expire_notified[/td][td]timestamp of last warning of account expiration[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]account_service_class[/td][td]service class for this account, determines what if any limits/restrictions are in place[/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]account_level[/td][td]future use[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]account_password_changed[/td][td]timestamp of last password change - to limit account deletion for 48 hours to prevent malicious activity[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Notes: + + + +/** + * Account Flags + */ + +define ( 'ACCOUNT_OK', 0x0000 ); +define ( 'ACCOUNT_UNVERIFIED', 0x0001 ); +define ( 'ACCOUNT_BLOCKED', 0x0002 ); +define ( 'ACCOUNT_EXPIRED', 0x0004 ); +define ( 'ACCOUNT_REMOVED', 0x0008 ); +define ( 'ACCOUNT_PENDING', 0x0010 ); + +/** + * Account roles + */ + +define ( 'ACCOUNT_ROLE_SYSTEM', 0x0002 ); // 2 - this is the special system account +define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 ); +define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 ); // 4096 - this account is an administrator + + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_addon.bb b/doc/en/database/db_addon.bb new file mode 100644 index 000000000..bccd295f5 --- /dev/null +++ b/doc/en/database/db_addon.bb @@ -0,0 +1,24 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td]generated index[td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]aname[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]version[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]installed[/td][td]currently always 1[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]hidden[/td][td]currently unused[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]tstamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[tr][td]plugin_admin[/td][td]1 = has admin config, 0 = has no admin config[/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[/table] + +Notes: + +These are addons which have been enabled by the site administrator on the admin/plugin page + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_app.bb b/doc/en/database/db_app.bb new file mode 100644 index 000000000..09df473ee --- /dev/null +++ b/doc/en/database/db_app.bb @@ -0,0 +1,48 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]generated index[/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]app_id[/td][td]hash identifying this app[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]app_sig[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_author[/td][td]xchan_hash of app creator[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_name[/td][td]name of app[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]app_desc[/td][td]optional description of app[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]app_url[/td][td]target_url[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]app_photo[/td][td]app icon[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]app_version[/td][td]version of app[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]app_channel[/td][td]channel_id owning this instance of the app[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]app_addr[/td][td]reddress/webbie of app creator[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_price[/td][td]free-form price field[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]app_page[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_requires[/td][td]access rules[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] + +[tr][td]app_created[/td][td]datetime of app creation[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_edited[/td][td]datetime of last app edit[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] + +[tr][td]app_deleted[/td][td]1 = deleted, 0 = normal[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_system[/td][td]1 = imported system app, 0 = member created app[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] + + +[/table] + +Storage for personal apps + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_attach.bb b/doc/en/database/db_attach.bb new file mode 100644 index 000000000..5098401de --- /dev/null +++ b/doc/en/database/db_attach.bb @@ -0,0 +1,54 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]generated index[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]aid[/td][td]account_id of owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel_id of owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]hash[/td][td]hash for cross-site identification[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]creator[/td][td]xchan_hash of author/creator[/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]filename[/td][td]filename of original[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]filetype[/td][td]mimetype[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]filesize[/td][td]size in bytes[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]revision[/td][td]for version control (partially implemented)[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]folder[/td][td]attach.hash of parent folder[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]flags[/td][td]no longer used[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]is_dir[/td][td]0 (file) or 1 to indicate a directory[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]is_photo[/td][td]if 1, a photo is linked to this resource[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]os_storage[/td][td]if 0, data contains content; if 1 data contains path to content (always 1 in hubzilla)[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]os_path[/td][td]under construction, store the system path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]display_path[/td][td]under construction, store the human readable path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]content[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td]creation time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]edited[/td][td]last edit time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td]permissions[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +permissions are xchan_hash or group_hash surrounded by angle chars. e.g. '' + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_auth_codes.bb b/doc/en/database/db_auth_codes.bb new file mode 100644 index 000000000..c60f064a4 --- /dev/null +++ b/doc/en/database/db_auth_codes.bb @@ -0,0 +1,19 @@ + +OAuth2 authorisation register - currently implemented but unused + +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]varchar(40)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]client_id[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]expires[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]scope[/td][td][/td][td]varchar(250)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_cache.bb b/doc/en/database/db_cache.bb new file mode 100644 index 000000000..02c292f20 --- /dev/null +++ b/doc/en/database/db_cache.bb @@ -0,0 +1,15 @@ + +OEmbed information cache + +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]k[/td][td]horizontal width + url or resource[/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]v[/td][td]OEmbed response from site[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]updated[/td][td]datetime of cache insertion[/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_channel.bb b/doc/en/database/db_channel.bb new file mode 100644 index 000000000..518ff0978 --- /dev/null +++ b/doc/en/database/db_channel.bb @@ -0,0 +1,104 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]channel_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]channel_account_id[/td][td]account.id of the account owning this channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]channel_primary[/td][td]1 = this is the primary instance of this channel[/td][td]tinyint(1) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]channel_name[/td][td]Name that this channel is known by[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_address[/td][td]"username" or URL-and-email safe nickname[/td][td]char(255)[/td][td]NO[/td][td]UNI[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_guid[/td][td]Long hash representing a psuedo-unique ID, does not have ot be globally unique[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_guid_sig[/td][td]channel.gui signed with channel.prvkey and base64url_encoded[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_hash[/td][td]base64url_encode of a 64-char whirlpool hash of channel.guid and channel_guid_sig concatenated, synonymous with xchan_hash.[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_timezone[/td][td]PHP-legal timezone[/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]UTC[/td][td] +[/td][/tr] +[tr][td]channel_location[/td][td]Default for item.location[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_theme[/td][td]channel theme preference[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_startpage[/td]relative site URL to visit after logging in[td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]channel_pubkey[/td][td]RSA public key 4096 bit[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_prvkey[/td][td]RSA private key 4096 bit[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_notifyflags[/td][td]bifield representing what notification types are active[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]65535[/td][td] +[/td][/tr] +[tr][td]channel_pageflags[/td][td]bitfield of special channel uses[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]channel_dirdate[/td][td]time when directory was last pinged. Must do this once a month[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]channel_lastpost[/td][td]date of last post for this channel. May not be fully implemented[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]channel_deleted[/td][td]time when channel was deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]channel_max_anon_mail[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td] +[/td][/tr] +[tr][td]channel_max_friend_req[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td] +[/td][/tr] +[tr][td]channel_expire_days[/td][td]expire imported content that hasn't been otherwise protected after this many days, 0 is no expiration[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]channel_passwd_reset[/td][td]password reset token[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]channel_default_group[/td][td]put all new connections into the group with this name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]channel_allow_cid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_allow_gid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_deny_cid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_deny_gid[/td][td]Default permissions for this channel[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channel_r_stream[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_r_profile[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_r_photos[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_r_abook[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_stream[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_wall[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_tagwall[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_comment[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_mail[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_photos[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_chat[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_a_delegate[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]channel_r_storage[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_storage[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_r_pages[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_pages[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_a_republish[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_w_like[/td][td]specific permission bitfield[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_removed[/td][td]if 1, this channel has been deleted[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_system[/td][td]if 1, this is the special system channel on this site[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] +[/td][/tr] +[tr][td]channel_moved[/td][td]URL of relocated channel, making this instance abandoned if set[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] diff --git a/doc/en/database/db_chat.bb b/doc/en/database/db_chat.bb new file mode 100644 index 000000000..1aac2bd15 --- /dev/null +++ b/doc/en/database/db_chat.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]chat_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]chat_room[/td][td]chatroom.cr_id for this chat[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]chat_xchan[/td][td]author xchan_hash[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]chat_text[/td][td]the text of the chat message[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td]timestamp of this message[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_chatpresence.bb b/doc/en/database/db_chatpresence.bb new file mode 100644 index 000000000..0a7f666c9 --- /dev/null +++ b/doc/en/database/db_chatpresence.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]cp_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]cp_room[/td][td]chatroom.cr_id of the chatroom[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]cp_xchan[/td][td]xchan_hash of the chatroom participant[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]cp_last[/td][td]datetime last ping[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]cp_status[/td][td]text status description e.g. "online"[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cp_client[/td][td]IP address of this client[/td][td]char(128)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_chatroom.bb b/doc/en/database/db_chatroom.bb new file mode 100644 index 000000000..1d316288d --- /dev/null +++ b/doc/en/database/db_chatroom.bb @@ -0,0 +1,28 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]cr_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]cr_aid[/td][td]account.id of chatroom owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]cr_uid[/td][td]channel.channel_id of chatroom owner[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]cr_name[/td][td]visible name of chatroom[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]cr_created[/td][td]creation timestampe[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]cr_edited[/td][td]edited timestamp[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]cr_expire[/td][td]expiration period for chats in this chatroom in minutes, 0 is no expiration[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td]permissions for this room[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_clients.bb b/doc/en/database/db_clients.bb new file mode 100644 index 000000000..0c66a4fc2 --- /dev/null +++ b/doc/en/database/db_clients.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]client_id[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]pw[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]clname[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]icon[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_config.bb b/doc/en/database/db_config.bb new file mode 100644 index 000000000..f32d3c259 --- /dev/null +++ b/doc/en/database/db_config.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]v[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_conv.bb b/doc/en/database/db_conv.bb new file mode 100644 index 000000000..5adfa8c80 --- /dev/null +++ b/doc/en/database/db_conv.bb @@ -0,0 +1,25 @@ + +Used in Diaspora private mails + +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]guid[/td][td]A unique identifier for this conversation[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]recips[/td][td]sender_handle;recipient_handle[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]creator[/td][td]handle of creator[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td]creation timestamp[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]updated[/td][td]edited timestamp[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]subject[/td][td]subject of initial message (obscured for privacy)[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_event.bb b/doc/en/database/db_event.bb new file mode 100644 index 000000000..ad3c15789 --- /dev/null +++ b/doc/en/database/db_event.bb @@ -0,0 +1,64 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]aid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]event_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]dtstart[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]dtend[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]summary[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]description[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]location[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]etype[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]nofinish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]adjust[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]1[/td][td] +[/td][/tr] +[tr][td]dismissed[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] + +[tr][td]event_status[/td][td][/td][td]charr(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_status_date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_percent[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_repeat[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_sequence[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_priority[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_vdata[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cal_id[/td][td][/td][td]int(10)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] + +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_fcontact.bb b/doc/en/database/db_fcontact.bb new file mode 100644 index 000000000..9bd8c20fe --- /dev/null +++ b/doc/en/database/db_fcontact.bb @@ -0,0 +1,38 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]request[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]nick[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]addr[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]batch[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]notify[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]poll[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]confirm[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]priority[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]network[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]alias[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]pubkey[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]updated[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_ffinder.bb b/doc/en/database/db_ffinder.bb new file mode 100644 index 000000000..c20158d56 --- /dev/null +++ b/doc/en/database/db_ffinder.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]fid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_fserver.bb b/doc/en/database/db_fserver.bb new file mode 100644 index 000000000..4c4b0b530 --- /dev/null +++ b/doc/en/database/db_fserver.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]server[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]posturl[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]key[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_fsuggest.bb b/doc/en/database/db_fsuggest.bb new file mode 100644 index 000000000..9da1f2f6d --- /dev/null +++ b/doc/en/database/db_fsuggest.bb @@ -0,0 +1,24 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cid[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]request[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]note[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_hook.bb b/doc/en/database/db_hook.bb new file mode 100644 index 000000000..233062f98 --- /dev/null +++ b/doc/en/database/db_hook.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]hook[/td][td]name of hook[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]file[/td][td]relative filename of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]fn[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]priority[/td][td]can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[tr][td]hook_version[/td][td]version 0 hooks must have two arguments, the App and the hook data. version 1 hooks have 1 argument - the hook data[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_hubloc.bb b/doc/en/database/db_hubloc.bb new file mode 100644 index 000000000..e4ab7159d --- /dev/null +++ b/doc/en/database/db_hubloc.bb @@ -0,0 +1,38 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]hubloc_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]hubloc_guid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_guid_sig[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]hubloc_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]hubloc_addr[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_network[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_flags[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]hubloc_status[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]hubloc_url[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_url_sig[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]hubloc_host[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_callback[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_connect[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]hubloc_sitekey[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]hubloc_updated[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]hubloc_connected[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_issue.bb b/doc/en/database/db_issue.bb new file mode 100644 index 000000000..0a6f2912b --- /dev/null +++ b/doc/en/database/db_issue.bb @@ -0,0 +1,20 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]issue_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]issue_created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]issue_updated[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]issue_assigned[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]issue_priority[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]issue_status[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]issue_component[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_item.bb b/doc/en/database/db_item.bb new file mode 100644 index 000000000..6383e13f8 --- /dev/null +++ b/doc/en/database/db_item.bb @@ -0,0 +1,151 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]Sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]mid[/td][td]Message-id - globally unique, there can be several items with the same message-ID in the table as they may have different uid owners[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]aid[/td][td]channel_account_id of the channel_id (uid) which owns this copy of the item[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel_id (uid) which owns this copy of the item[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]parent[/td][td]item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]parent_mid[/td][td]Globally unique message-id of the parent to this item[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]thr_parent[/td][td]If the parent of this item is not the top-level item in the conversation, the message-id of the immediate parent; otherwise set to parent_mid[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]created[/td][td]Creation timestamp. If creation is more than ten minutes into the future, set item_delayed to 1; it will automatically be delivered by the poller once the created time has passed[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]edited[/td][td]Date of last edit (default is created)[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]expires[/td][td]Date this item expires and will be removed[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]commented[/td][td]Date of last comment/reply to this item[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]received[/td][Date the item was received at this sitetd][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]changed[/td][td]Date that something in the conversation changed, indicating clients should fetch the conversation again[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]comments_closed[/td][td]Date after which no more comments will be accepted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]owner_xchan[/td][td]xchan_hash of the owner of this conversation (this is who replies are sent to)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]author_xchan[/td][td]xchan_hash of the author of this item[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]source_xchan[/td][td]xchan_hash of the external source of this item belongs to multiple delivery chains and comments need to be uplinked[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]mimetype[/td][td]mime type of the content body[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]title[/td][td]item title[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]body[/td][td]item body content[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]app[/td][td]application which generated this item[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]lang[/td][td]auto-detected language[/td][td]char(64)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]revision[/td][td]future use, version control[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]verb[/td][td]ActivityStreams verb (old style URI)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]obj_type[/td][td]ActivityStreams object type (old style URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]obj[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]tgt_type[/td][td]ActivityStreams target type if applicable (URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]target[/td][td]JSON encoded target structure if used[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]layout_mid[/td][td]For webpages, which layout (mid or message_id) to use when displaying this page[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]postopts[/td][td]External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]route[/td][td]comma separated xchan list of xchans where this message was routed on its way to this destination, used for route loop discovery and rejection of comments which arrived by alternate routes and may have different permissions[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]llink[/td][td]URL of a displayable copy of this post/conversation on this site[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]plink[/td][td]permalink or URL toa displayable copy of the message at its source[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]resource_id[/td][td]Used to link other tables to items, it identifies the linked resource and if set must also set resource_type[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]resource_type[/td][td]default none, if a linked resource this should be the name of the resource type such as "photo" or "event"[/td][td]char(16)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]attach[/td][td]JSON structure representing attachments to this item[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]sig[/td][td]RSA signature of the item body by the original author if the private key is available[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]diaspora_meta[/td][td]Used to store Diaspora comment signatures with their weird requirements[/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]location[/td][td]text location where this item originated[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]coord[/td][td] longitude/latitude pair representing location where this item originated[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]public_policy[/td][td]If the author has specified restrictions (this network, this site) etc. for distribution, the corresponding policy text is present here and item_private = 1[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]comment_policy[/td][td]If the author has specified comment restrictions (thei network, this site, etc.) the corresponding policy text is present here[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td]Access Control - list of allowed xchans '...'[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td]Access Control - list of allowed group hashes, see allow_cid[td][/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td]Access Control - list of denied xchans[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td]Access Control - list of denied groups[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]item_restrict[/td]no longer used[td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_flags[/td][td]no longer used[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_private[/td][td]distribution is restricted[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_origin[/td][td]item originated at this site[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_unseen[/td][td]item has not been seen[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_starred[/td][td]item has been favourited[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_uplink[/td][td]This item is part of a multiple delivery chain and must be uplinked to the original sender (source_xchan)[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_consensus[/td][td]This item allows voting tools[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_wall[/td][td]This item was posted to the wall of uid[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_thread_top[/td][td]parent = id, this is the top post in a conversation [/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_notshown[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_nsfw[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_relay[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_mentionsme[/td][td]The owner of this item was mentioned in it[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_nocomment[/td][td]if 1, no comments are allowed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_obscured[/td][td]no longer used[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_verified[/td][td]the signature has been verified on this site[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_retained[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_rss[/td][td]item originated in a feed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_deleted[/td][td]item has been deleted[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_type[/td][td]used to identify webpage and design element types, 0 is a normal conversation item[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_hidden[/td][td]0 or 1 if item is not to be displayed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_unpublished[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_delayed[/td][td]item is posted in the future[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_pending_remove[/td][td]item is in the process of being removed[/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]item_blocked[/td][td][/td][td]tinyint(4)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] + +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_item_id.bb b/doc/en/database/db_item_id.bb new file mode 100644 index 000000000..ba4cca247 --- /dev/null +++ b/doc/en/database/db_item_id.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]iid[/td][td]item.id of the referenced item[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]sid[/td][td]an additional identifier to attach or link to the referenced item (often used to store a message_id from another system in order to suppress duplicates)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]service[/td][td]the name or description of the service which generated this identifier[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_likes.bb b/doc/en/database/db_likes.bb new file mode 100644 index 000000000..118c9a87e --- /dev/null +++ b/doc/en/database/db_likes.bb @@ -0,0 +1,24 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]channel_id[/td][td][/td][td]int(11) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]liker[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]likee[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]iid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]target_type[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]target_id[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]target[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_mail.bb b/doc/en/database/db_mail.bb new file mode 100644 index 000000000..0628584ae --- /dev/null +++ b/doc/en/database/db_mail.bb @@ -0,0 +1,34 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]convid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]mail_flags[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]from_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]to_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]account_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]title[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]body[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]attach[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]mid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]parent_mid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]expires[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_menu.bb b/doc/en/database/db_menu.bb new file mode 100644 index 000000000..5b478115d --- /dev/null +++ b/doc/en/database/db_menu.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]menu_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]menu_channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]menu_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]menu_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]menu_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_menu_item.bb b/doc/en/database/db_menu_item.bb new file mode 100644 index 000000000..b14aac5e4 --- /dev/null +++ b/doc/en/database/db_menu_item.bb @@ -0,0 +1,28 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]mitem_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]mitem_link[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]mitem_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]mitem_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]mitem_channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]mitem_menu_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]mitem_order[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_notify.bb b/doc/en/database/db_notify.bb new file mode 100644 index 000000000..4787266cd --- /dev/null +++ b/doc/en/database/db_notify.bb @@ -0,0 +1,36 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]hash[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]date[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]msg[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]aid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]link[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]parent[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]seen[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]ntype[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]otype[/td][td][/td][td]char(16)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_obj.bb b/doc/en/database/db_obj.bb new file mode 100644 index 000000000..cc5e75598 --- /dev/null +++ b/doc/en/database/db_obj.bb @@ -0,0 +1,26 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]obj_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]obj_page[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]obj_verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]obj_type[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]obj_obj[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]obj_channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_outq.bb b/doc/en/database/db_outq.bb new file mode 100644 index 000000000..970f99de5 --- /dev/null +++ b/doc/en/database/db_outq.bb @@ -0,0 +1,28 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]outq_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]outq_account[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]outq_channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]outq_driver[/td][td][/td][td]char(32)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]outq_posturl[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]outq_async[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]outq_delivered[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]outq_created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]outq_updated[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]outq_notify[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]outq_msg[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_pconfig.bb b/doc/en/database/db_pconfig.bb new file mode 100644 index 000000000..2ac36e61a --- /dev/null +++ b/doc/en/database/db_pconfig.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_pgrp.bb b/doc/en/database/db_pgrp.bb new file mode 100644 index 000000000..73265b90e --- /dev/null +++ b/doc/en/database/db_pgrp.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]hash[/td][td]unique hash representing this group with the group name appended[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel.channel_id owning this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]visible[/td][td]1 indicates the member list is not private[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_pgrp_member.bb b/doc/en/database/db_pgrp_member.bb new file mode 100644 index 000000000..b9ab8171d --- /dev/null +++ b/doc/en/database/db_pgrp_member.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]gid[/td][td]groups.id of the associated group[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xchan[/td][td]xchan.xchan_hash of the member assigned to the associated group[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_photo.bb b/doc/en/database/db_photo.bb new file mode 100644 index 000000000..91840ec1e --- /dev/null +++ b/doc/en/database/db_photo.bb @@ -0,0 +1,52 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]aid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]resource_id[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]title[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]description[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]album[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]filename[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]mimetype[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td] +[/td][/tr] +[tr][td]height[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]width[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]filesize[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]content[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]scale[/td][td][/td][td]tinyint(3)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]profile[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]photo_flags[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]allow_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_poll.bb b/doc/en/database/db_poll.bb new file mode 100644 index 000000000..57d808b71 --- /dev/null +++ b/doc/en/database/db_poll.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]poll_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]poll_channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]poll_desc[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]poll_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]poll_votes[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_poll_elm.bb b/doc/en/database/db_poll_elm.bb new file mode 100644 index 000000000..fd649d5a6 --- /dev/null +++ b/doc/en/database/db_poll_elm.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]pelm_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]pelm_poll[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]pelm_desc[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]pelm_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[tr][td]pelm_result[/td][td][/td][td]float[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_profdef.bb b/doc/en/database/db_profdef.bb new file mode 100644 index 000000000..a0904fd79 --- /dev/null +++ b/doc/en/database/db_profdef.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]field_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]field_type[/td][td][/td][td]char(16)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]field_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]field_help[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]field_inputs[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_profext.bb b/doc/en/database/db_profext.bb new file mode 100644 index 000000000..ada9dce2a --- /dev/null +++ b/doc/en/database/db_profext.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_profile.bb b/doc/en/database/db_profile.bb new file mode 100644 index 000000000..717fae585 --- /dev/null +++ b/doc/en/database/db_profile.bb @@ -0,0 +1,94 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]profile_guid[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]aid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]profile_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]is_default[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]hide_friends[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]fullname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]pdesc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]chandesc[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]dob[/td][td][/td][td]char(32)[/td][td]NO[/td][td][/td][td]0000-00-00[/td][td] +[/td][/tr] +[tr][td]dob_tz[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]UTC[/td][td] +[/td][/tr] +[tr][td]address[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]locality[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]region[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]postal_code[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]country_name[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]hometown[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]gender[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]partner[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]howlong[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]sexual[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]politic[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]religion[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]keywords[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]likes[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]dislikes[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]about[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]summary[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]music[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]book[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]tv[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]film[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]interest[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]romance[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]employment[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]education[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]contact[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]channels[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]homepage[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]photo[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]thumb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]publish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_profile_check.bb b/doc/en/database/db_profile_check.bb new file mode 100644 index 000000000..3be64c5da --- /dev/null +++ b/doc/en/database/db_profile_check.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]dfrn_id[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]sec[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]expire[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_register.bb b/doc/en/database/db_register.bb new file mode 100644 index 000000000..50672b5e1 --- /dev/null +++ b/doc/en/database/db_register.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]password[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]language[/td][td][/td][td]char(16)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_session.bb b/doc/en/database/db_session.bb new file mode 100644 index 000000000..d7ff0482d --- /dev/null +++ b/doc/en/database/db_session.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]bigint(20) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]sid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]data[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]expire[/td][td][/td][td]bigint(20) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_shares.bb b/doc/en/database/db_shares.bb new file mode 100644 index 000000000..be5255c03 --- /dev/null +++ b/doc/en/database/db_shares.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]share_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]share_type[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]share_target[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]share_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_sign.bb b/doc/en/database/db_sign.bb new file mode 100644 index 000000000..e80ea7ef3 --- /dev/null +++ b/doc/en/database/db_sign.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]iid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]retract_iid[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]signed_text[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]signature[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]signer[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_site.bb b/doc/en/database/db_site.bb new file mode 100644 index 000000000..8dea4dae6 --- /dev/null +++ b/doc/en/database/db_site.bb @@ -0,0 +1,28 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]site_url[/td][td][/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]site_access[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]site_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]site_update[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]site_pull[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]site_sync[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]site_directory[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]site_register[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]site_sellpage[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]site_location[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]site_realm[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_source.bb b/doc/en/database/db_source.bb new file mode 100644 index 000000000..92850a82e --- /dev/null +++ b/doc/en/database/db_source.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]src_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]src_channel_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]src_channel_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]src_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]src_patt[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_spam.bb b/doc/en/database/db_spam.bb new file mode 100644 index 000000000..b75e1edd3 --- /dev/null +++ b/doc/en/database/db_spam.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]spam[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]ham[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]term[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_sys_perms.bb b/doc/en/database/db_sys_perms.bb new file mode 100644 index 000000000..04416a26b --- /dev/null +++ b/doc/en/database/db_sys_perms.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]public_perm[/td][td][/td][td]tinyint(1) unsigned[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_term.bb b/doc/en/database/db_term.bb new file mode 100644 index 000000000..bd155fe21 --- /dev/null +++ b/doc/en/database/db_term.bb @@ -0,0 +1,28 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]tid[/td][td]sequential index[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]aid[/td][td]channel_account_id of the controlling channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel_id of the controlling channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]oid[/td][td]DB index of linked thing[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]otype[/td][td]type of linked thing[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]ttype[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]term[/td][td]the actual taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]url[/td]relevant link (for tags and mentions, a link to the associated resource)[td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]imgurl[/td][td]rarely used - an image associated with this taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]term_hash[/td][td]unique hash for this entry[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]parent_hash[/td][td]for hierarchical taxonomies, the hash of the relevant parent[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_tokens.bb b/doc/en/database/db_tokens.bb new file mode 100644 index 000000000..35da2458c --- /dev/null +++ b/doc/en/database/db_tokens.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]varchar(40)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]secret[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]client_id[/td][td][/td][td]varchar(20)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]expires[/td][td][/td][td]bigint(20) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]scope[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_updates.bb b/doc/en/database/db_updates.bb new file mode 100644 index 000000000..f2e25d84c --- /dev/null +++ b/doc/en/database/db_updates.bb @@ -0,0 +1,20 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]ud_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]ud_hash[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]ud_guid[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]ud_date[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]ud_last[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]ud_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]ud_addr[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_verify.bb b/doc/en/database/db_verify.bb new file mode 100644 index 000000000..9d01181c5 --- /dev/null +++ b/doc/en/database/db_verify.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]channel[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]type[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]token[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]meta[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]created[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_vote.bb b/doc/en/database/db_vote.bb new file mode 100644 index 000000000..0b9a423eb --- /dev/null +++ b/doc/en/database/db_vote.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]vote_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]vote_poll[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]vote_element[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]vote_result[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]vote_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xchan.bb b/doc/en/database/db_xchan.bb new file mode 100644 index 000000000..8932969c5 --- /dev/null +++ b/doc/en/database/db_xchan.bb @@ -0,0 +1,59 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]xchan_hash[/td][td]calculated hash of this extended channel[/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xchan_guid[/td][td]channel_guid of this extended channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_guid_sig[/td][td]base64url encoded signature of the guid[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xchan_pubkey[/td][td]public key for verifying signed data and assertions[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xchan_photo_mimetype[/td][td]mimetype of the profile photo[/td][td]char(32)[/td][td]NO[/td][td][/td][td]image/jpeg[/td][td] +[/td][/tr] +[tr][td]xchan_photo_l[/td][td]photo url 300px[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_photo_m[/td][td]photo url 80 px[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_photo_s[/td][td]photo url 48 px[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_addr[/td][td]user@host[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_url[/td][td]url of channel page on primary hub location[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_connurl[/td]poco url[td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_follow[/td]url template for following %s[td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_connpage[/td][td]for premium channels url of channel to display when connecting[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_name[/td][td]human readabl name of channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_network[/td][td]network of channel for instance 'zot', 'diaspora', 'unknown'[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_instance_url[/td][td]no longer used[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchan_flags[/td][td]no longer used[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_photo_date[/td][td]timestamp of last photo change in GMT[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]xchan_name_date[/td][td]timestamp of last name change in GMT[/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[tr][td]xchan_hidden[/td][td]flag - channel is hidden[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_orphan[/td][td]flag - channel has no known hubloc locations[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_censored[/td][td]flag - channel has been censored[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_selfcensored[/td][td]flag - channel is self censored (adult or nsfw)[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_system[/td][td]flag - this represents a system channel[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_pubforum[/td][td]flag - channel is a public forum[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan_deleted[/td][td]flag - channel was deleted[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] + +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xchat.bb b/doc/en/database/db_xchat.bb new file mode 100644 index 000000000..0897408d1 --- /dev/null +++ b/doc/en/database/db_xchat.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]xchat_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]xchat_url[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchat_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchat_xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xchat_edited[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xconfig.bb b/doc/en/database/db_xconfig.bb new file mode 100644 index 000000000..111d1ce3a --- /dev/null +++ b/doc/en/database/db_xconfig.bb @@ -0,0 +1,16 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cat[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]k[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]v[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xign.bb b/doc/en/database/db_xign.bb new file mode 100644 index 000000000..63c6569de --- /dev/null +++ b/doc/en/database/db_xign.bb @@ -0,0 +1,13 @@ +xign - holds xchan information for channels that have been ignored in 'friend suggestions' +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td]local channel.channel_id[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xchan[/td][td]xchan.xchan_hash of ignored channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xlink.bb b/doc/en/database/db_xlink.bb new file mode 100644 index 000000000..528f8da19 --- /dev/null +++ b/doc/en/database/db_xlink.bb @@ -0,0 +1,22 @@ +xlink - used to store social graph and channel ratings +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]xlink_id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]xlink_xchan[/td][td]xchan.xchan_hash of controlling channel[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xlink_link[/td][td]xchan.xchan_hash of link target (connection or rating)[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xlink_rating[/td][td]int rating[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xlink_rating_txt[/td][td]rating text[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xlink_updated[/td][td]timestamp of update in GMT[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[tr][td]xlink_static[/td][td]0 for social graph, 1 for ratings[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xlink_sig[/td][td]base64url encoded signature of rating information[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xprof.bb b/doc/en/database/db_xprof.bb new file mode 100644 index 000000000..bed79e9ca --- /dev/null +++ b/doc/en/database/db_xprof.bb @@ -0,0 +1,37 @@ +xprof - stores searchable public profile information on directory servers +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]xprof_hash[/td][td]xchan.xchan_hash of this channel[/td][td]char(255)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xprof_age[/td][td]current age (updated monthly)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]xprof_desc[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_dob[/td][td][/td][td]char(12)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_gender[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_sexual[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_locale[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_region[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_postcode[/td][td][/td][td]char(32)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_country[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_keywords[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xprof_about[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xprof_homepage[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]xprof_hometown[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/database/db_xtag.bb b/doc/en/database/db_xtag.bb new file mode 100644 index 000000000..1e6fb9961 --- /dev/null +++ b/doc/en/database/db_xtag.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]xtag_id[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]xtag_hash[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xtag_term[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]xtag_flags[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/en/dev-function-overview.md b/doc/en/dev-function-overview.md new file mode 100644 index 000000000..4dccc8cef --- /dev/null +++ b/doc/en/dev-function-overview.md @@ -0,0 +1,51 @@ +$Projectname development - some useful basic functions +====================================================== + + + +* get_account_id() + +Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. + +* local_channel() + +Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. + +* remote_channel() + +Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. + +* App::get_observer() + +returns an xchan structure representing the current viewer if authenticated (locally or remotely). + +* get_config($family,$key), get_pconfig($uid,$family,$key) + +Returns the config setting for $family and $key or false if unset. + +Deprecated: Use Zotlabs\Lib\Config::Get instead. + +* set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value) + +Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). + +Deprecated: Use Zotlabs\Lib\Config::Set instead. + +* dbesc() + +Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() + +* q($sql,$var1...) + +Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. + +* t($string) + +Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist. + +* x($var), $x($array,$key) + +Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. +If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; + +#include doc/macros/main_footer.bb; diff --git a/doc/en/dev_beginner.bb b/doc/en/dev_beginner.bb new file mode 100644 index 000000000..4ac69c301 --- /dev/null +++ b/doc/en/dev_beginner.bb @@ -0,0 +1,419 @@ +[h2]You want to contribute code?[/h2] +[b]...and don't know how to start to...[/b] +[list] +[*] debug the red#matrix (php on the webserver), +[*] contribute code to the project, +[*] optionally - do it all from inside a virtual machine +[/list] +This manual was tested for Debian (Wheezy) as virtual machine on Lubuntu (Ubuntu 14.0) as host. + +Content + +[toc] + +[h2]Install a Virtual Machine (KVM)[/h2] + +[url=https://wiki.debian.org/KVM]Here[/url] the installation guide for Linux Debian. +The summary: +[list=1] +[*] install KVM +[code]# apt-get install qemu-kvm libvirt-bin[/code] +[*] add yourself to the group libvirt [code]# adduser libvirt[/code] +[*] install gui to manage virtual machines [code]# apt-get install virt-manager[/code] +[*] download an operating system to run inside the vm ([url=http://ftp.nl.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/mini.iso]mini.iso[/url]) +[*] start the virt manager +- create new virtual machine (click on icon) +- choose your iso image (just downloaded) as installation source +- optional: configure the new vm: ram, cpu's,... +- start virtual machine > result: linux debian starts in a new window. +[*] (optional) avoid network errors after restart of host os +[code]# virsh net-start default +# virsh net-autostart default[/code] +[/list] + + +[h2]Install Apache Webserver[/h2] + +Open a terminal and make yourself root +[code]su -l[/code] + +Create the standard group for the Apache webserver +[code]groupadd www-data[/code] +might exist already + +[code]usermod -a -G www-data www-data[/code] + +Check if the system is really up to date +[code]apt-get update +apt-get upgrade[/code] + +Optional restart services after installation +[code]reboot[/code] + +If you restarted, make yourself root +[code]su -l[/code] + +Install Apache: [code] +apt-get install apache2 apache2-doc apache2-utils[/code] + +Open webbrowser on PC and check [url=localhost]localhost[/url] +Should show you a page like "It works" + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[h2]Install PHP, MySQL, phpMyAdmin[/h2] + +[h3]PHP, MySQL[/h3] + +[code]su -l +apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl php5-mcrypt php5-xdebug +apt-get install php5-mysql +apt-get install mysql-server mysql-client[/code] +enter and note the mysql passwort + +Optional since its already enabled during phpmyadmin setup +[code] +php5enmod mcrypt +[/code] + +[h3]phpMyAdmin[/h3] + +Install php myadmin +[code]apt-get install phpmyadmin[/code] + +Configuring phpmyadmin +- Select apache2 (hint: use the tab key to select) +- Configure database for phpmyadmin with dbconfig-common?: Choose Yes + +(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + +[h3]Enable rewrite[/h3] + +The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load + +[code] +root@debian /var/www $ nano /etc/apache2/mods-available/rewrite.load +[/code] + + (You should find the content: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) +To enable and load mod_rewrite, do the rest of steps. +Create a symbolic link in /etc/apache2/mods-enabled + +[code] +cd /var/www +root@debian /var/www $ a2enmod rewrite +[/code] + +Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". + +[code] +root@debian /var/www $nano /etc/apache2/apache2.conf +[/code] +or +[code] +root@debian:/var# gedit /etc/apache2/sites-enabled/000-default +[/code] + +Finally, restart Apache2. + +[code] +root@debian /var/www $service apache2 restart +[/code] + +[h3]Test installation[/h3] + +[code]cd /var/www[/code] + +create a php file to test the php installation[code]nano phpinfo.php[/code] + +Insert into the file: +[code] + +[/code] +(save CTRL+0, ENTER, CTRL+X) + +open webbrowser on PC and try #^[url=http://localhost/phpinfo.php]http://localhost/phpinfo.php[/url] (page shows infos on php) + +connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf +[/code] +- CTRL+V... to the end of the file +- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] + +restart apache +[code]/etc/init.d/apache2 restart +apt-get update +apt-get upgrade +reboot[/code] + +[b]phpMyAdmin[/b] + +open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] + +(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + +[h3]Create an empty database... that is later used by the red#matrix[/h3] + + +open webbrowser on PC and try #^[url=http://localhost/phpmyadmin]http://localhost/phpmyadmin[/url] + +Create an empty database, for example named "red". +Create a database user, for example "red". +Grant all rights for the user "red" to the database "red". + +Note the access details (hostname, username, password, database name). + + +[h2]Fork the project on github[/h2] + +Please follow the instruction in the offiical [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project] documentation[/url] of git. +It is a good idea to read the whole manual! Git is different to other version control systems in many ways. + +Now you should +[list] +[*] create an account at github.com +[*] fork https://framagit.org/hubzilla/core +[*] fork https://framagit.org/hubzilla/addons +[/list] + +If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector". + + +[h2]Install RED and its Addons[/h2] + +[h3]Git at your computer / vm[/h3] + +You should have created an account on github and forked the projects befor you procceed. + +Delete the directory www +[code]root@debian:/var# rm -R www/ +[/code] + +Install git (and optionally git-gui a client gui) +[code]apt-get install git git-gui[/code] + +[h3]Download red#matri and addons[/h3] + +Download the main project red and red-addons +[code] +root@debian:/var# git clone https://github.com/yourname/red www +root@debian:/var# cd www/ +root@debian:/var/www# git clone https://github.com/yourname/red-addons addon +[/code] + +Make this extra folder +[code] +root@debian:/var/www# mkdir -p "store/[data]/smarty3" +[/code] + +Create .htconfig.php and make it writable by the webserver +[code] +root@debian:/var/www# touch .htconfig.php +root@debian:/var/www# chmod ou+w .htconfig.php +[/code] + +Make user www-data (webserver) is the owner all the project files +[code] +root@debian:/var/www# cd .. +root@debian:/var# chown -R www-data:www-data www/ +[/code] + +Add yourself ("surfer" in this example) to the group www-data. Why? Later you want to modify files in eclipse or in another editor. +Then make all files writable by the group www-date you are now a member of. +[code] +root@debian:/var# cd www/ +root@debian:/var/www# usermod -G www-data surfer +root@debian:/var# chmod -R g+w www/ +[/code] + +Restart the computer (or vm) +If you are still not able to modify the project files you can check the members of the group www-data with +[code] +cat /etc/group +[/code] + +[h3]Register yourself as admin[/h3] + +Open http://localhost and init the matrix + +Befor you register a first user switch off the registration mails. +Open /var/www/.htconfig.php +and make sure "0" is set in this line +[code] +App::$config['system']['verify_email'] = 0; +[/code] +You should be able to change the file as "yourself" (instead of using root or www-data). + +[h3]Cron and the poller[/h3] + +Important! +Run the poller to pick up the recent "public" postings of your friends +Set up a cron job or scheduled task to run the poller once every 5-10 +minutes to pick up the recent "public" postings of your friends + +[code] +crontab -e +[/code] + +Add +[code] +*/10 * * * * cd /var/www/; /usr/bin/php include/poller.php +[/code] + +If you don't know the path to PHP type +[code] +whereis php +[/code] + + +[h2]Debug the server via eclipse[/h2] + +[h3]Check the configuration of xdebug[/h3] + +You shoud already have installed xdebug in the steps befor +[code] +apt-get install php5-xdebug +[/code] + +Configuring Xdebug + +Open your terminal and type as root (su -l) +[code] +gedit /etc/php5/mods-available/xdebug.ini +[/code] + +if the file is empty try this location +[code] +gedit /etc/php5/conf.d/xdebug.ini +[/code] + +That command should open the text editor gedit with the Xdebug configuration file +At the end of the file content append the following text + +xdebug.remote_enable=on +xdebug.remote_handler=dbgp +xdebug.remote_host=localhost +xdebug.remote_port=9000 + +Save changes and close the editor. +In you terminal type to restart the web server. +[code] +service apache2 restart +[/code] + + +[h3]Install Eclipse and start debugging[/h3] + +Install eclipse. +Start eclipse with default worspace (or as you like) + +Install the PHP plugin +Menu > Help > Install new software... +Install "PHP Developnent Tools ..." + +Optionally - Install the GitHub connector plugin +Menu > Help > Install new software... +Install "Eclipse Mylyn to GitHub connector" + +Configure the PHP plugin +Menu > Window > Preferences... +> General > Webbrowser > Change to "Use external web browser" +> PHP > Debug > Debug Settings > PHP Debugger > Change to "XDebug" + +Create a new PHP project +Menu > File > New Project > Choose PHP > "PHP Project" +> Choose Create project at existing location" and "/var/www" + +Start debugging +Open index.php and "Debug as..." +Choose as Launch URL: "http://localhost/" + +Expected: +[list] +[*] The web browser starts +[*] The debugger will stop at the first php line +[/list] + + +[h2]Contribute your changes via github[/h2] + +[h3]Preparations[/h3] + +There is a related page in this docs: [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]. +As stated befor it is recommended to read the official documentation [url=http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project]GitHub-Contributing-to-a-Project[/url] of git. + +Eclipse has a usefull plugin for GIT: "Eclipse Mylyn to GitHub connector". + +Make sure you have set your data +[code] +surfer@debian:/var/www$ git config --global user.name "Your Name" +surfer@debian:/var/www$ git config --global user.email "your@mail.com" +[/code] + +[h3]Your first contribution[/h3] + +Create a descriptive topic branch +[code] +surfer@debian:/var/www$ git checkout -b dev_beginning +[/code] + +Make sure your local repository is up-to-date with the main project. +Add the original repository as a remote named “upstream” if not done yet +[code] +surfer@debian:/var/www$ git remote add upstream https://framagit.org/hubzilla/core/ +[/code] + +Fetch the newest work from that remote +[code] +surfer@debian:/var/www$ git fetch upstream +surfer@debian:/var/www$ git merge upstream/master +[/code] + +Hint: You can list the branches +[code] +surfer@debian:/var/www$ git branch -v +[/code] + +Make your changes. In this example it is a new doc file. + +Check your modifications +[code] +surfer@debian:/var/www$ git status +[/code] + +Add (stage) the new file +[code] +surfer@debian:/var/www$ git add doc/dev_beginner.bb +[/code] + +Commit the changes to your local branch. This will open an editor to provide a message. +[code] +surfer@debian:/var/www$ git commit -a +[/code] + +Push back up to the same topic branch online +[code] +surfer@debian:/var/www$ git push +[/code] + +Now you can go to your (online) account at github and create the pull request. + +[h3]Following contributions[/h3] + +In case the main devolpers want you to change something. +Fetch the newest work from the remote upstream/master to be sure you have the latest changes. +[code] +surfer@debian:/var/www$ git fetch upstream +surfer@debian:/var/www$ git merge upstream/master +[/code] +Make your changes, test them, commit (to local repository), push (to online repository) +[code] +surfer@debian:/var/www$ git status +surfer@debian:/var/www$ git commit -a -m "added modification of branch" +surfer@debian:/var/www$ git push +[/code] + + +#include doc/macros/main_footer.bb; diff --git a/doc/en/develop.bb b/doc/en/develop.bb new file mode 100644 index 000000000..20e987a5a --- /dev/null +++ b/doc/en/develop.bb @@ -0,0 +1,31 @@ +[h2]Documentation for Developers[/h2] + +[h3]Technical Documentation[/h3] +[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl] +[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl] +[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] +[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl] +[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl] +[zrl=[baseurl]/help/Widgets]Widgets[/zrl] +[zrl=[baseurl]/help/plugins]Plugins[/zrl] +[zrl=[baseurl]/help/hooklist]Hooks (detailed - under construction)[/zrl] +[zrl=[baseurl]/help/doco]Contributing Documentation[/zrl] +[zrl=[baseurl]/help/DerivedTheme1]Creating Derivative Themes[/zrl] +[zrl=[baseurl]/help/schema_development]Schemas[/zrl] +[zrl=[baseurl]/help/Translations]Translations[/zrl] +[zrl=[baseurl]/help/developers]Developers[/zrl] +[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl] +[zrl=[baseurl]/help/database]Database schema documentation[/zrl] +[zrl=[baseurl]/help/api_functions]API functions[/zrl] +[zrl=[baseurl]/help/api_posting]Posting to $Projectname using the API[/zrl] +[zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl] +[zrl=[baseurl]/doc/html/]Code Reference (Doxygen generated - sets cookies)[/zrl] +[zrl=[baseurl]/help/to_do_doco]To-Do list for $Projectname Documentation Project[/zrl] +[zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl] +[zrl=[baseurl]/help/roadmap]Roadmap[/zrl] +[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl] +[zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl] + +[h3]External Resources[/h3] +[url=https://grid.reticu.li/channel/hubzilla]Development Channel[/url] +[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url] diff --git a/doc/en/developer/api_zot.bb b/doc/en/developer/api_zot.bb new file mode 100644 index 000000000..ff937bfa5 --- /dev/null +++ b/doc/en/developer/api_zot.bb @@ -0,0 +1,766 @@ +[h3]Zot API[/h3] + +Many existing social applications and tools can interface directly using the Twitter/StatusNet API, which is available using the 'twitter_api' addon. + +This document describes the native API; which allows direct programmatic access to several internal data structures and libraries extending beyond the basic social interface. + +The API endpoints detailed below are relative to [code]api/z/1.0[/code], meaning that if an API is listed as [code]channel/stream[/code] the full API URL is [code][baseurl]/api/z/1.0/channel/stream[/code]. + +[h3]channel/export/basic[/h3] + +Export basic channel data + +Options: + - sections + comma-separated list of data types to export + + - posts + if true, return default sections plus 3 months of posts + + If no sections are requested, the following sections are returned: + channel, connections, config, apps, chatrooms, events, webpages, mail, wikis + + Files and large collections of posts may run into memory limits; these must generally be + requested separately. + + +[h3]channel/stream[/h3] + +Fetch channel conversation items + +[h3]network/stream[/h3] + + +Fetch network conversation items + + + +[h3]files[/h3] + + +List file storage (attach DB) + +GET /api/z/1.0/files + + +Options: + + - filehash + return only entries matching hash (exactly) + + - filename + return only entries matching filename (substring) + + - filetype + return only entries matching filetype/mimetype (substring) + + - start + start at record (default 0) + + - records + number of records to return or 0 for unlimited + + + +Example: + +curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/files -d filetype=multipart/mixed + + +Returns: +[code nowrap] + { + + "success": true, + "results": [ + { + "id": "1", + "aid": "1", + "uid": "2", + "hash": "44ee8b2a1a7f36dea07b93b7747a2383a1bc0fdd08339e8928bfcbe45f65d939", + "filename": "Profile Photos", + "filetype": "multipart/mixed", + "filesize": "0", + "revision": "0", + "folder": "", + "os_storage": "1", + "is_dir": "1", + "is_photo": "0", + "flags": "0", + "created": "2016-01-02 21:51:17", + "edited": "2016-01-02 21:51:17", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "" + }, + { + "id": "12", + "aid": "1", + "uid": "2", + "hash": "71883f1fc64af33889229cbc79c5a056deeec5fc277d765f182f19073e1b2998", + "filename": "Cover Photos", + "filetype": "multipart/mixed", + "filesize": "0", + "revision": "0", + "folder": "", + "os_storage": "1", + "is_dir": "1", + "is_photo": "0", + "flags": "0", + "created": "2016-01-15 00:24:33", + "edited": "2016-01-15 00:24:33", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "" + }, + { + "id": "16", + "aid": "1", + "uid": "2", + "hash": "f48f7ec3278499d1dd86b72c3207beaaf4717b07df5cc9b373f14d7aad2e1bcd", + "filename": "2016-01", + "filetype": "multipart/mixed", + "filesize": "0", + "revision": "0", + "folder": "", + "os_storage": "1", + "is_dir": "1", + "is_photo": "0", + "flags": "0", + "created": "2016-01-22 03:24:55", + "edited": "2016-01-22 03:26:57", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "" + } + ] + } +[/code] + + + +[h3]filemeta[/h3] + +Export file metadata for any uploaded file + + +[h3]filedata[/h3] + + +Provides the ability to download a file from cloud storage in chunks + +GET /api/z/1.0/filedata + + +Required: + + - file_id + attach.hash of desired file ('begins with' match) + + +Optional: + + - start + starting byte of returned data in file (counting from 0) + + - length + length (prior to base64 encoding) of chunk to download + + +Returns: + + attach (DB) structure with base64 encoded 'content' comprised of the desired chunk + + + +Example: + + https://xyz.macgirvin.com/api/z/1.0/filedata?f=&file_id=9f5217770fd&start=0&length=48 + +Returns: +[code nowrap] + { + + "attach": { + "id": "107", + "aid": "1", + "uid": "2", + "hash": "9f5217770fd55d563bd77f84d534d8e119a187514bbd391714626cd9c0e60207", + "creator": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "filename": "pcxtopbm.c", + "filetype": "application/octet-stream", + "filesize": "3934", + "revision": "0", + "folder": "", + "flags": "0", + "is_dir": "0", + "is_photo": "0", + "os_storage": "1", + "os_path": "", + "display_path": "", + "content": "LyogcGN4dG9wYm0uYyAtIGNvbnZlcnQgUEMgcGFpbnRicnVzaCAoLnBjeCkgZmls", + "created": "2016-07-24 23:13:01", + "edited": "2016-07-24 23:13:01", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "", + "start": 0, + "length": 48 + } + + } +[/code] + +[h3]file/export[/h3] + + +[h3]file[/h3] + + +[h3]albums[/h3] + + +Description: list photo albums + +GET /api/z/1.0/albums + + +Output: + + text - textual name + + total - number of photos in this album + + url - web URL + + urlencode - textual name, urlencoded + + bin2hex - textual name using bin2hex (which is used in the web URL link) + + +Example: + +[code nowrap] + { + + "success": true, + "albums": [ + { + "text": "/", + "total": "2", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/", + "urlencode": "", + "bin2hex": "" + }, + { + "text": "2016-01", + "total": "6", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3031", + "urlencode": "2016-01", + "bin2hex": "323031362d3031" + }, + { + "text": "2016-02", + "total": "7", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/323031362d3032", + "urlencode": "2016-02", + "bin2hex": "323031362d3032" + }, + { + "text": "Cover Photos", + "total": "5", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/436f7665722050686f746f73", + "urlencode": "Cover+Photos", + "bin2hex": "436f7665722050686f746f73" + }, + { + "text": "Profile Photos", + "total": "26", + "url": "https://xyz.macgirvin.com/photos/hubzilla/album/50726f66696c652050686f746f73", + "urlencode": "Profile+Photos", + "bin2hex": "50726f66696c652050686f746f73" + } + ] + + } +[/code] + + +[h3]photos[/h3] + + +list photo metadata + + +[h3]photo[/h3] + + + +[h3]group[/h3] + + +[code]GET /api/z/1.0/group[/code] + +Description: list privacy groups + +Returns: DB tables of all privacy groups. + +To use with API group_members, provide either 'group_id' from the id element returned in this call, or 'group_name' from the gname returned in this call. + +[code nowrap] + [ + + { + "id": "1", + "hash": "966c946394f3e2627bbb8a55026b5725e582407098415c02f85232de3f3fde76Friends", + "uid": "2", + "visible": "0", + "deleted": "0", + "gname": "Friends" + }, + { + "id": "2", + "hash": "852ebc17f8c3ed4866f2162e384ded0f9b9d1048f93822c0c84196745f6eec66Family", + "uid": "2", + "visible": "1", + "deleted": "0", + "gname": "Family" + }, + { + "id": "3", + "hash": "cc3cb5a7f9818effd7c7c80a58b09a189b62efa698a74319117babe33ee30ab9Co-workers", + "uid": "2", + "visible": "0", + "deleted": "0", + "gname": "Co-workers" + } + ] +[/code] +[h3]group_members[/h3] + + +[code]GET /api/z/1.0/group_members[/code] + +Required: + +group_id or group_name + + +Returns: + +group_member+abook+xchan (DB join) for each member of the privacy group + +[code nowrap] + [ + + { + "id": "1", + "uid": "2", + "gid": "1", + "xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "abook_id": "2", + "abook_account": "1", + "abook_channel": "2", + "abook_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "abook_my_perms": "218555", + "abook_their_perms": "0", + "abook_closeness": "0", + "abook_created": "2016-01-02 21:16:26", + "abook_updated": "2016-01-02 21:16:26", + "abook_connected": "0000-00-00 00:00:00", + "abook_dob": "0000-00-00 00:00:00", + "abook_flags": "0", + "abook_blocked": "0", + "abook_ignored": "0", + "abook_hidden": "0", + "abook_archived": "0", + "abook_pending": "0", + "abook_unconnected": "0", + "abook_self": "1", + "abook_feed": "0", + "abook_profile": "", + "abook_incl": "", + "abook_excl": "", + "abook_instance": "", + "xchan_hash": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "xchan_guid": "lql-1VnxtiO4-WF0h72wLX1Fu8szzHDOXgQaTbELwXW77k8AKFfh-hYr70vqMrc3SSvWN-Flrc5HFhRTWB7ICw", + "xchan_guid_sig": "PafvEL0VpKfxATxlCqDjfOeSIMdmpr3iU7X-Sysa1h5LzDpjSXsjO37tYZL-accb1M5itLlfnW5epkTa5I4flsW21zSY1A2jCuBQUTLLGV7rNyyBy7lgqJUFvAMRx0TfXzP9lcaPqlM9T1tA6jfWOsOmkdzwofGeXBnsjGfjsO2xdGYe6vwjOU0DSavukvzDMnOayB9DekpvDnaNBTxeGLM45Skzr7ZEMcNF7TeXMbnvpfLaALYEKeQs9bGH-UgAG8fBWgzVAzeBfx_XSR1rdixjyiZGP0kq0h35SlmMPcEjliodOBFwMXqpXFB7Ibp4F6o6te2p2ErViJccQVG8VNKB6SbKNXY6bhP5zVcVsJ-vR-p4xXoYJJvzTN7yTDsGAXHOLF4ZrXbo5yi5gFAlIrTLAF2EdWQwxSGyLRWKxG8PrDkzEzX6cJJ0VRcLh5z6OI5QqQNdeghPZbshMFMJSc_ApCPi9_hI4ZfctCIOi3T6bdgTNKryLm5fhy_eqjwLAZTGP-aUBgLZpb1mf2UojBn6Ey9cCyq-0T2RWyk-FcIcbV4qJ-p_8oODqw13Qs5FYkjLr1bGBq82SuolkYrXEwQClxnrfKa4KYc2_eHAXPL01iS9zVnI1ySOCNJshB97Odpooc4wk7Nb2Fo-Q6THU9zuu0uK_-JbK7IIl6go2qA", + "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA18JB76lyP4zzL/y7BCej\neJnfZIWZNtM3MZvI1zEVMWmmwOS+u/yH8oPwyaDk4Y/tnj8GzMPj1lCGVRcd8EJa\nNrCMd50HODA5EsJtxpsOzRcILYjOcTtIAG1K4LtKqELi9ICAaFp0fNfa+Jf0eCek\nvPusx2/ORhy+o23hFoSMhL86o2gmaiRnmnA3Vz4ZMG92ieJEDMXt9IA1EkIqS4y5\nBPZfVPLD1pv8iivj+dtN1XjwplgjUbtxmU0/Ej808nHppscRIqx/XJ0XZU90oNGw\n/wYoK2EzJlPbRsAkwNqoFrAYlr5HPpn4BJ2ebFYQgWBUraD7HwS5atsQEaxGfO21\nlUP0+lDg9t3CXvudDj0UG1jiEKbVIGA+4aG0GN2DSC5AyRq/GRxqyay5W2vQbAZH\nyvxPGrZFO24I65g3pjhpjEsLqZ4ilTLQoLMs0drCIcRm5RxMUo4s/LMg16lT4cEk\n1qRtk2X0Sb1AMQQ2uRXiVtWz77QHMONEYkf6OW4SHbwcv5umvlv69NYEGfCcbgq0\nAV7U4/BWztUz/SWj4r194CG43I9I8dmaEx9CFA/XMePIAXQUuABfe1QMOR6IxLpq\nTHG1peZgHQKeGz4aSGrhQkZNNoOVNaZoIfcvopxcHDTZLigseEIaPPha4WFYoKPi\nUPbZ5o8gTLc750uzrnb2jwcCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "xchan_photo_mimetype": "image/png", + "xchan_photo_l": "https://xyz.macgirvin.com/photo/profile/l/2", + "xchan_photo_m": "https://xyz.macgirvin.com/photo/profile/m/2", + "xchan_photo_s": "https://xyz.macgirvin.com/photo/profile/s/2", + "xchan_addr": "teller@xyz.macgirvin.com", + "xchan_url": "https://xyz.macgirvin.com/channel/teller", + "xchan_connurl": "https://xyz.macgirvin.com/poco/teller", + "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", + "xchan_connpage": "", + "xchan_name": "Teller", + "xchan_network": "zot", + "xchan_instance_url": "", + "xchan_flags": "0", + "xchan_photo_date": "2016-10-19 01:26:50", + "xchan_name_date": "2016-01-02 21:16:26", + "xchan_hidden": "0", + "xchan_orphan": "0", + "xchan_censored": "0", + "xchan_selfcensored": "0", + "xchan_system": "0", + "xchan_pubforum": "0", + "xchan_deleted": "0" + }, + { + "id": "12", + "uid": "2", + "gid": "1", + "xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", + "abook_id": "24", + "abook_account": "1", + "abook_channel": "2", + "abook_xchan": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", + "abook_my_perms": "218555", + "abook_their_perms": "218555", + "abook_closeness": "80", + "abook_created": "2016-01-27 00:48:43", + "abook_updated": "2016-12-04 17:16:58", + "abook_connected": "2016-12-04 17:16:58", + "abook_dob": "0001-01-01 00:00:00", + "abook_flags": "0", + "abook_blocked": "0", + "abook_ignored": "0", + "abook_hidden": "0", + "abook_archived": "0", + "abook_pending": "0", + "abook_unconnected": "0", + "abook_self": "0", + "abook_feed": "0", + "abook_profile": "debb5236efb1626cfbad33ccb49892801e5f844aa04bf81f580cfa7d13204819", + "abook_incl": "", + "abook_excl": "", + "abook_instance": "", + "xchan_hash": "xuSMUYxw1djBB97qXsbrBN1nzJH_gFwQL6pS4zIy8fuusOfBxNlMiVb4h_q5tOEvpE7tYf1EsryjNciMuPIj5w", + "xchan_guid": "d5EMLlt1tHHZ0dANoA7B5Wq9UgXoWcFS9-gXOkL_AAejcPApoQRyxfHTuu8DoTbUaO-bYmX5HPuWuK9PHyqNmA", + "xchan_guid_sig": "CVWEMRPtzI1YcHfnnWHTuv3H964OAmSElgUfxMoX6RdQdxNpqb_POirpVuyP8s3W17mVCfO5V9IAjkg5iKcqCk6YcvOD_egmMy-AnM9TC1kKndQHw55CunD82Q8K_xBNSXkSROizcNkKh9DVLjJPFjW1AqtI4njkZ3EMgrWqnbFRM1qPToUoCY9zM3tEMHoAD9YX1zP90wl40LzfN-dtcNWpSBbiz9owou62uzLbN7mrCwKOMlXLjwwGswRnxIsEnb3O-FXOs8hs0mArKe9snq1-BKeD16LyzxgwlpVLElzIJZGEZGtMdIJgeRzKuBvPjsOIpQ1yAkuOpFJ3nGCM-IPOIIjAmyVl5zD3xPVcxxpZlJRn5fG1Y-gnqTgsrEQCA7M6XPWQdrdHU4akZfyUyFJDhv3uM-jon9VzrYTBw68R0WA-1Z8WafEHA4qh5OWAj85lUarwhr7iTiEckH51ypPCPs6VbT6Pw7yMaxfjFOcipashQagx0tfOlDhE5dQANOXKASFtH1J9-CZY2MQdLPQ6u54d5whuHKMGaJ0V68pnmZ2rOn7g344Ah2WCJrm17jj60QsRMorqRFj7GMdPIA1XB8Wrk88MuYOe3Dhyuu6ZWKI7YTWJS690ZVkKUqAiNHqj0W86DtaiPUc_mmGR0fHl4Gksnko3WmCFv9q2X2E", + "xchan_pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoj2xCJktBA8Ww7Hp+ZNL\nrNuQpo8UB/bfvRkIy+yua3xpF1TuXcnAH61kyRz8vXgOu/l2CyxQbIoaGslCV5Sy\n8JKeNXe+IilUdSSEjMIwCPfSPsYnMHsSnHWmPmclvJwEtQUKOZmW5mMuVBvXy7D2\njomFwc69AYphdyys6eQ7Dcn6+FRBiQbyMprZ5lxyVW+O4DuXVNa3ej2ebx0gCJZ4\ntTIlBoKwEey91dY+FyKVFjdwfNczpmL7LgmZXqcVx+MG3mYgibwdVMiXVj5X06cs\nV9hJ5Xi+Aklsv/UWJtjw9FVt7y9TLptnhh4Ra6T/MDmnBBIAkOR7P/X8cRv078MT\nl0IMsP0RJcDEtTLtwHFVtDs6p52KDFqclKWbqmxmxqV3OTPVYtArRGIzgnJi/5ur\nHRr5G6Cif7QY3UowsIOf78Qvy28LwSbdymgBAWwPPKIviXWxGO+9kMWdmPSUQrWy\nK0+7YA9P9fBUFfn9Hc+p8SJQmQ6OAqLwrDGiPSOlGaNrbEqwqLGgIpXwK+lEFcFJ\n3SPOjJRWdR2whlMxvpwX+39+H7dWN3vSa3Al4/Sq7qW8yW2rYwf+eGyp4Z0lRR+8\nJxFMCwZkSw5g14YdlikAPojv5V1c6KuA5ieg8G1hwyONV7A4JHPyEdPt0W0TZi6C\nCOVkPaC3xGrguETZpJfVpwUCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "xchan_photo_mimetype": "image/png", + "xchan_photo_l": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-4", + "xchan_photo_m": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-5", + "xchan_photo_s": "https://xyz.macgirvin.com/photo/9da63aa910ea14e1501ee1a749d181a6-6", + "xchan_addr": "cloner@xyz.macgirvin.com", + "xchan_url": "http://abc.macgirvin.com/channel/cloner", + "xchan_connurl": "http://abc.macgirvin.com/poco/cloner", + "xchan_follow": "https://xyz.macgirvin.com/follow?f=&url=%s", + "xchan_connpage": "", + "xchan_name": "Karen", + "xchan_network": "zot", + "xchan_instance_url": "", + "xchan_flags": "0", + "xchan_photo_date": "2016-03-31 19:59:20", + "xchan_name_date": "2016-01-26 23:23:42", + "xchan_hidden": "0", + "xchan_orphan": "0", + "xchan_censored": "0", + "xchan_selfcensored": "0", + "xchan_system": "0", + "xchan_pubforum": "0", + "xchan_deleted": "0" + } + + ] +[/code] + +[h3]xchan[/h3] + + +An xchan is a global location independent channel and is the primary record for a network +identity. It may refer to channels on other websites, networks, or services. + +[code]GET /api/z/1.0/xchan[/code] + +Required: one of [ address, hash, guid ] as GET parameters + +Returns a portable xchan structure + +Example: https://xyz.macgirvin.com/api/z/1.0/xchan?f=&address=mike@macgirvin.com + +Returns: +[code nowrap] + { + "hash": "jr54M_y2l5NgHX5wBvP0KqWcAHuW23p1ld-6Vn63_pGTZklrI36LF8vUHMSKJMD8xzzkz7s2xxCx4-BOLNPaVA", + "guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg", + "guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4", + "pubkey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "photo_mimetype": "image/jpeg", + "photo_l": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-4", + "photo_m": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-5", + "photo_s": "https://xyz.macgirvin.com/photo/350b74555c04429148f2e12775f6c403-6", + "address": "mike@macgirvin.com", + "url": "https://macgirvin.com/channel/mike", + "connurl": "https://macgirvin.com/poco/mike", + "follow": "https://macgirvin.com/follow?f=&url=%s", + "connpage": "https://macgirvin.com/connect/mike", + "name": "Mike Macgirvin", + "network": "zot", + "instance_url": "", + "flags": "0", + "photo_date": "2012-12-06 05:06:11", + "name_date": "2012-12-06 04:59:13", + "hidden": "1", + "orphan": "0", + "censored": "0", + "selfcensored": "0", + "system": "0", + "pubforum": "0", + "deleted": "0" + } +[/code] +[h3]item/update[/h3] + + +Create or update an item (post, activity, webpage, etc.) + +Usage: [code]POST /api/z/1.0/item/update[/code] + +Description: item/update posts an item (typically a conversation item or post, but can be any item) using form input. + + +Required: + +- body + + text/bbcode contents by default. + + +Optional: + +- $_FILES['media'] + + uploaded media file to include with post + +- title + + title of post/item + +- contact_allow + + array of xchan.xchan_hash allowed to view this item + +- group_allow + + array of group.hash allowed to view this item + +- contact_deny + + array of xchan.xchan_hash not allowed to view this item + +- group_deny + + array of group.hash not allowed to view this item + +- coord + + geographic coordinates + +- location + + freefrom location + +- expire + + datetime this post will expire or be removed + +- mimetype + + mimetype if not text/bbcode + +- parent + + item.id of parent to this post (makes it a comment) + +- parent_mid + + alternate form of parent using message_id + +- remote_xchan + + xchan.xchan_hash of this message author if not the channel owner + +- consensus + + boolean set to true if this is a consensus or voting item (default false) + +- nocomment + + boolean set to true if comments are to be disabled (default false) + +- origin + + do not use this without reading the code + +- namespace + + persistent identity for a remote network or service + +- remote_id + + message_id of this resource on a remote network or service + +- message_id + + message_id of this item (leave unset to generate one) + +- created + + datetime of message creation + +- post_id + + existing item.id if this is an edit operation + +- app + + application or network name to display with item + +- category + + comma separated categories for this item + +- webpage + + item.page_type if not 0 + +- pagetitle + + for webpage and design elements, the 'page name' + +- layout_mid + + item.mid of layout for this design element + +- plink + + permalink for this item if different than the default + +- verb + + activitystream verb for this item/activity + +- obj_type + + activitystream object type for this item/activity + + + +Example: + + curl -u mychannel:mypassword https://xyz.macgirvin.com/api/z/1.0/item/update -d body="hello world" + + +Returns: + +[code nowrap] + { + + "success": true, + "item_id": "2245", + "item": { + "id": "2245", + "mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "aid": "1", + "uid": "2", + "parent": "2245", + "parent_mid": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "thr_parent": "14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "created": "2016-12-03 20:00:12", + "edited": "2016-12-03 20:00:12", + "expires": "0001-01-01 00:00:00", + "commented": "2016-12-03 20:00:12", + "received": "2016-12-03 20:00:12", + "changed": "2016-12-03 20:00:12", + "comments_closed": "0001-01-01 00:00:00", + "owner_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "author_xchan": "pgcJx1IQjuPkx8aI9qheJlBMZzJz-oTPjHy3h5pWlOVOriBO_cSiUhhqwhuZ74TYJ8_ECO3pPiRMWC0q8YPCQg", + "source_xchan": "", + "mimetype": "text/bbcode", + "title": "", + "body": "hello world", + "html": "", + "app": "", + "lang": "", + "revision": "0", + "verb": "http://activitystrea.ms/schema/1.0/post", + "obj_type": "http://activitystrea.ms/schema/1.0/note", + "obj": "", + "tgt_type": "", + "target": "", + "layout_mid": "", + "postopts": "", + "route": "", + "llink": "https://xyz.macgirvin.com/display/14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "plink": "https://xyz.macgirvin.com/channel/mychannel/?f=&mid=14135cdecf6b8e3891224e4391748722114da6668eebbcb56fe4667b60b88249@xyz.macgirvin.com", + "resource_id": "", + "resource_type": "", + "attach": "", + "sig": "sa4TOQNfHtV13HDZ1tuQGWNBpZp-nWhT2GMrZEmelXxa_IvEepD2SEsCTWOBqM8OKPJLfNy8_i-ORXjrOIIgAa_aT8cw5vka7Q0C8L9eEb_LegwQ_BtH0CXO5uT30e_8uowkwzh6kmlVg1ntD8QqrGgD5jTET_fMQOIw4gQUBh40GDG9RB4QnPp_MKsgemGrADnRk2vHO7-bR32yQ0JI-8G-eyeqGaaJmIwkHoi0vXsfjZtU7ijSLuKEBWboNjKEDU89-vQ1c5Kh1r0pmjiDk-a5JzZTYShpuhVA-vQgEcADA7wkf4lJZCYNwu3FRwHTvhSMdF0nmyv3aPFglQDky38-SAXZyQSvd7qlABHGCVVDmYrYaiq7Dh4rRENbAUf-UJFHPCVB7NRg34R8HIqmOKq1Su99bIWaoI2zuAQEVma9wLqMoFsluFhxX58KeVtlCZlro7tZ6z619-dthS_fwt0cL_2dZ3QwjG1P36Q4Y4KrCTpntn9ot5osh-HjVQ01h1I9yNCj6XPgYJ8Im3KT_G4hmMDFM7H9RUrYLl2o9XYyiS2nRrf4aJHa0UweBlAY4zcQG34bw2AMGCY53mwsSArf4Hs3rKu5GrGphuwYX0lHa7XEKMglwBWPWHI49q7-oNWr7aWwn1FnfaMfl4cQppCMtKESMNRKm_nb9Dsh5e0", + "diaspora_meta": "", + "location": "", + "coord": "", + "public_policy": "", + "comment_policy": "contacts", + "allow_cid": "", + "allow_gid": "", + "deny_cid": "", + "deny_gid": "", + "item_restrict": "0", + "item_flags": "0", + "item_private": "0", + "item_origin": "1", + "item_unseen": "0", + "item_starred": "0", + "item_uplink": "0", + "item_consensus": "0", + "item_wall": "1", + "item_thread_top": "1", + "item_notshown": "0", + "item_nsfw": "0", + "item_relay": "0", + "item_mentionsme": "0", + "item_nocomment": "0", + "item_obscured": "0", + "item_verified": "1", + "item_retained": "0", + "item_rss": "0", + "item_deleted": "0", + "item_type": "0", + "item_hidden": "0", + "item_unpublished": "0", + "item_delayed": "0", + "item_pending_remove": "0", + "item_blocked": "0" + } + + } +[/code] +[h3]item/full[/h3] + + +Get all data associated with an item + +[h3]abook[/h3] + + +Connections + +[h3]abconfig[/h3] + + +Connection metadata (such as permissions) + +[h3]perm_allowed[/h3] + + +Check a permission for a given xchan diff --git a/doc/en/developer/covenant.bb b/doc/en/developer/covenant.bb new file mode 100644 index 000000000..431cc74e9 --- /dev/null +++ b/doc/en/developer/covenant.bb @@ -0,0 +1,47 @@ +[size=large]Contributor Covenant Code of Conduct[/size] + +[h3]Our Pledge[/h3] + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +[h3]Our Standards[/h3] + +Examples of behavior that contributes to creating a positive environment +include: + +[list] + [*]Using welcoming and inclusive language + [*]Being respectful of differing viewpoints and experiences + [*]Gracefully accepting constructive criticism + [*]Focusing on what is best for the community + [*]Showing empathy towards other community members +[/list] + +Examples of unacceptable behavior by participants include: + +[list] + [*]The use of sexualized language or imagery and unwelcome sexual attention or advances + [*]Trolling, insulting/derogatory comments, and personal or political attacks + [*]Public or private harassment + [*]Publishing others' private information, such as a physical or electronic address, without explicit permission + [*]Other conduct which could reasonably be considered inappropriate in a professional setting +[/list] + +[h3]Our Responsibilities[/h3] + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +[h3]Scope[/h3] + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +[h3]Enforcement[/h3] + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at project@hubzilla.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +[h3]Attribution[/h3] + +This Code of Conduct is adapted from the [url=http://contributor-covenant.org]Contributor Covenant[/url], version 1.4, available at [url=http://contributor-covenant.org/version/1/4/]http://contributor-covenant.org/version/1/4[/url]. + diff --git a/doc/en/developer/developer_guide.bb b/doc/en/developer/developer_guide.bb new file mode 100644 index 000000000..d04cec121 --- /dev/null +++ b/doc/en/developer/developer_guide.bb @@ -0,0 +1,176 @@ +[h3]Who is a $Projectname developer? Should I read this?[/h3] + +Anyone who contributes to making $Projectname better is a developer. There are many different and important ways you can contribute to this amazing technology, [i]even if you do not know how to write code[/i]. The software itself is only a part of the $Projectname project. You can contribute by +[list] +[*] translating text to your language so that people around the world have the opportunity to use $Projectname +[*] promoting $Projectname and spreading awareness of the platform through blog posts, articles, and word-of-mouth +[*] creating artwork and graphics for project assets such as icons and marketing material +[*] supporting project infrastructure like the project website and demo servers +[/list] +[i]Software[/i] developers are of course welcomed; there are so many great ideas to implement and not enough people to make them all a reality! The $Projectname code base is an advanced and mature system, but the platform is still very flexible and responsive to new ideas. + +We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/developer/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. + +This document will help you get started learning and contributing to $Projectname. + +[h3]Versions and Releases[/h3] + +$Projectname currently uses a standard version numbering sequence of $x.$y(.$z), for instance '1.12' or '1.12.1'. The first digit is the major version number. Major versions are released "roughly" once per year; often in December. + +The second digit is the minor release number. If this number is odd, it is a development version. If the number is even, it is a released version. Minor versions are released (moved from dev to master) typically once per month when development is 'stable', but this is likely to increase. Going forward minor releases will be made somewhere between one and three months; corresponding to a stable code point and when there is general community consensus that the current code base is stable enough to consider a release. + +The final digit is an interface or patch designator. + +The release process involves changing the version number (by definition the minor version number will be odd, and the minor number will be incremented). Once a year for a major release the major version will be incremented, and the minor number reset to 0. + +The release candidate is moved to a new branch; and testing will commence/continue for a period of 1-2 weeks afterward or until any significant issues have been resolved. This branch is usually labelled with RC (release candidate); for instance 1.8RC represents the pending release of version 1.8. At this time, the minor version number on the dev branch is incremented to the next odd number. (For instance 1.9). New development can then take place in the dev branch. + +Bug fixes should always be applied to 'dev' and from there merged forward (typically with git cherry-pick) to the RC branch and if necessary applied to the master or official release branch. + +At the time a release candidate is produced, the language strings file is frozen until a release is made. Translation work may continue, but all translations should be submitted to 'dev' and merged forward to RC. + +Once RC testing is completed, RC is merged to 'master' and the RC version designator removed; resulting in one final checkin to change the version number. The CHANGELOG file should also be updated at or just prior to this time. If there are merge conflicts during this final merge, the merge will be abandoned; and 'git merge -s ours' applied. This results in a replacement of master with the contents of the RC branch. Conflicts often arise with string updates which were made to master after the last release and cannot easily be resolved without hand editing. Since this is a release of tested code, hand editing is discouraged, and the replacement merge strategy should be used instead. It is assumed that RC now contains the most recent well-tested code. + +Once the release is live and merged to master, the RC branch may be removed. + +Fixes may be made to master after release. Where possible these should be made to dev and 'git cherry-pick' used to merge forward; which preserves the commit info and prevents merge conflicts in the next cycle. Only rarely does a patch only apply to the master branch. If necessary this can be made. If the change is severe, the interface version number should be incremented. This is at the discretion of the community. In any event, a 'git pull' of the master branch should always result in the latest release with any post-release patches applied. + +The interface number (the $z in $x.$y.$z) should be incremented in dev whenever a change is made which changes the interfaces or API in incompatible ways so that any external packages (especially addons and API clients) relying on a the current behaviour can discover and change their own interfaces accordingly at the point that it changed. + +[h3]Git repository branches[/h3] + +There are two official branches of the $Projectname git repo. +[list] +[*] The stable version is maintained on the [b]master[/b] branch. The latest commit in this branch is considered to be suitable for production hubs. +[*] Experimental development occurs on the [b]dev[/b] branch, which is merged into [b]master[/b] when it is deemed tested and stable enough. +[/list] + +[h3]Developer tools and workflows[/h3] + +[h4]Hub Snapshots[/h4] + +The [url=[baseurl]/help/admin/hub_snapshots]hub snapshots[/url] page provides instructions and scripts for taking complete snapshots of a hub to support switching between consistent and completely known states. This is useful to prevent situations where the content or database schema might be incompatible with the code. + +[h3]Translations[/h3] + +Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/Friendica/hubzilla/]Transifex[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. + +[h4]Translation Process[/h4] + +The strings used in the UI of $Projectname is translated at [url=https://www.transifex.com/Friendica/hubzilla/]Transifex[/url] and then +included in the git repository at github. If you want to help with translation +for any language, be it correcting terms or translating $Projectname to a +currently not supported language, please register an account at transifex.com +and contact the translation team there. + +Translating $Projectname is simple. Just use the online tool at transifex. If you +don't want to deal with git & co. that is fine, we check the status of the translations +regularly and import them into the source tree at github so that others can use them. + +We do not include every translation from transifex in the source tree to avoid +a scattered and disturbed overall experience. As an uneducated guess we have a +lower limit of 50% translated strings before we include the language. This +limit is judging only by the amount of translated strings under the assumption +that the most prominent strings for the UI will be translated first by a translation +team. If you feel your translation useable before this limit, +please contact us and we will probably include your teams work in the source tree. + +If you want to get your work into the source tree yourself, feel free to do so +and contact us with and question that arises. The process is simple and +$Projectname ships with all the tools necessary. + +The location of the translated files in the source tree is + /view/LNG-CODE/ +where LNG-CODE is the language code used, e.g. de for German or fr for French. +For the email templates (the *.tpl files) just place them into the directory +and you are done. The translated strings come as a "hmessages.po" file from +Transifex which needs to be translated into the PHP file $Projectname uses. To do +so, place the file in the directory mentioned above and use the "po2php" +utility from the util directory of your $Projectname installation. + +Assuming you want to convert the German localization which is placed in +view/de/hmessages.po you would do the following. + +1. Navigate at the command prompt to the base directory of your + $Projectname installation + +2. Execute the po2php script, which will place the translation + in the hstrings.php file that is used by $Projectname. + + $> php util/po2php.php view/de/hmessages.po + + The output of the script will be placed at view/de/hstrings.php where + froemdoca os expecting it, so you can test your translation mmediately. + +3. Visit your $Projectname page to check if it still works in the language you + just translated. If not try to find the error, most likely PHP will give + you a hint in the log/warnings.about the error. + + For debugging you can also try to "run" the file with PHP. This should + not give any output if the file is ok but might give a hint for + searching the bug in the file. + + $> php view/de/hstrings.php + +4. commit the two files with a meaningful commit message to your git + repository, push it to your fork of the $Projectname repository at github and + issue a pull request for that commit. + +[h4]Utilities[/h4] + +Additional to the po2php script there are some more utilities for translation +in the "util" directory of the $Projectname source tree. If you only want to +translate $Projectname into another language you wont need any of these tools most +likely but it gives you an idea how the translation process of $Projectname +works. + +For further information see the utils/README file. + +[h4]Known Problems[/h4] + +* $Projectname uses the language setting of the visitors browser to determain the + language for the UI. Most of the time this works, but there are some known + quirks. +* the early translations are based on the friendica translations, if you + some rough translations please let us know or fix them at Transifex. + +[h3]Licensing[/h3] + +All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. + +[h3]Coding Style[/h3] + +In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. +[list] +[*]All comments should be in English. +[*]We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged. +[*]Indentation is accomplished primarily with tabs using a tab-width of 4. +[*]String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';" +[*]Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes. +[*]Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability. +[*]Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. +[*]Some functions take arguments in argc/argv style like main() in C or function args in bash or Perl. Urls are broken up within a module. e.g, given "http://example.com/module/arg1/arg2", then $this->argc will be 3 (integer) and $this->argv will contain: [0] => 'module', [1] => 'arg1', [2] => 'arg2'. There will always be one argument. If provided a naked domain URL, $this->argv[0] is set to "home". +[/list] + +[h3]File system layout[/h3] +[table border=0] +[th]Directory[/th][th]Description[/th][/tr] +[tr][td]addon[/td][td]optional addons/plugins[/td][/tr] +[tr][td]boot.php[/td][td]Every process uses this to bootstrap the application structure[/td][/tr] +[tr][td]doc[/td][td]Help Files[/td][/tr] +[tr][td]images[/td][td]core required images[/td][/tr] +[tr][td]include[/td][td]The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing[/td][/tr] +[tr][td]index.php[/td][td]The front-end controller for web access[/td][/tr] +[tr][td]install[/td][td]Installation and upgrade files and DB schema[/td][/tr] +[tr][td]library[/td][td]Third party modules (must be license compatible)[/td][/tr] +[tr][td]mod[/td][td]Controller modules based on URL pathname (e.g. [url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php)[/td][/tr] +[tr][td]mod/site/[/td][td]site-specific mod overrides, excluded from git[/td][/tr] +[tr][td]util[/td][td]translation tools, main English string database and other miscellaneous utilities[/td][/tr] +[tr][td]version.inc[/td][td]contains current version (auto-updated via cron for the master repository and distributed via git)[/td][/tr] +[tr][td]view[/td][td]theming and language files[/td][/tr] +[tr][td]view/(css,js,img,php,tpl)[/td][td]default theme files[/td][/tr] +[tr][td]view/(en,it,es ...)[/td][td]language strings and resources[/td][/tr] +[tr][td]view/theme/[/td][td]individual named themes containing (css,js,img,php,tpl) over-rides[/td][/tr] +[/table] + +[b][url=[baseurl]/help/developer/unorganized]More information needing re-organization and updating...[/url][/b] diff --git a/doc/en/developer/testing.md b/doc/en/developer/testing.md new file mode 100644 index 000000000..f7e8ffeba --- /dev/null +++ b/doc/en/developer/testing.md @@ -0,0 +1,130 @@ +# Testing + +Hubzilla uses [PHPUnit] for automated testing, often called _unit testing_ or _integration testing_. + +The tests are written as PHP classes, and live under the `tests/unit` subdirectory of the main Hubzilla repository. This guide will explain how to run the tests, how the tests are structured, and how you can write your own tests. + +## Running the test suite + +### Installing the dependencies + +To be able to run the tests you have to install the developer dependencies listen in the `composer.json` file. Make sure you have [composer installed] on your development system, and then run: + + % composer install + +This will install phpunit and a few other dependencies. It will also update some files in the `vendor/composer` subdirectory. This may seem a bit noisy, but it's important that these changes are *not* committed to the repository! + +**Warning:** Do not commit the changes to the files in the `vendor/composer` directory to your repository! + +### Setting up the test database + +We have included a script (`tests/create_test_db.sh`) that will help you set up the test database. You can run it like this: + + % HZ_TEST_DB_TYPE=mysql ./tests/create_test_db.sh + +If you are running PostgreSQL instead, you create the test db like this: + + % HZ_TEST_DB_TYPE=postgres ./tests/create_test_db.sh + +The script make some assumptions about your setup, but everything is configurable using environment variables. If you need any customization, see the script source for the details. + +### Running the tests + +Once you have installed the developer dependencies and set up the test database, you can run the tests like this: + + % ./vendor/bin/phpunit -c tests/phpunit.xml + +Again, by default the configuration in `tests/phpunit.xml` makes some assumptions about your setup, which can be overridden using environment variables. See `tests/phpunit.xml` for the details. + +You can also run a specific test, or a specific set of tests using the `--filter` argument to PHPUnit: + + % ./vendor/bin/phpunit -c tests/phpunit.xml --filter Autoname + +Will run any test mathcing "Autoname". + +### Generating coverage reports + +To generate coverage reports you need a driver that is able to generate the coverage info that PHPUnit will collect. We recommend [Xdebug], but see the PHPUnit [page on code coverage analysis](https://docs.phpunit.de/en/9.6/code-coverage-analysis.html) for alternatives and details. + +With Xdebug properly set up, you can generate the coverage report like this: + + % XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./tests/phpunit.xml + +This will generate a number of HTML files in directories under the `tests/results/coverage/` subdirectory. + +Open the `index.php file in your web browser to view the stats. + +### Debugging + +With Xdebug installed, you can also do step debugging and a number of other things to debug and get information about the execution of the tests. See the [Xdebug] pages and your prefered editor for how to set this up. + +## Test structure and organization + +Tests are located in the `tests/unit` subdirectory, and subdirectories under there again, more or less reflecting the directory layout of the core code repository. + +Tests are written as PHP classes that extends the UnitTestCase class (located in `tests/unit/UnitTestcase.php`). The file name and the test class it contains should be the same, and they _must_ end with `Test.php`. + +Examples are: + +* `tests/unit/includes/AccountTest.php` +* `tests/unit/Lib/ActivityTest.php` + +The test classes contain one or more test functions, these must be public and prefixed with `test`. + +Here's an example: + + use Zotlabs\Tests\Unit\UnitTestCase; + + class AccountTest extends UnitTestCase { + public function test_get_account_by_id_returns_existing_account() { + $account = get_account_by_id(42); + $this->assertNotFalse($account); + $this->assertEquals( + $this->fixtures['account'][0]['account_email'], + $account['account_email'] + ); + } + +Notice that we try to make the name of the test funtion as descriptive as possible. + +The class can also contain any number of other functions to keep things tidy and nice. These can be private, protected or public as needed by the test code. + +Results and artifacts from the test runs will be left in the `tests/results/` directory. This will typically include the test log, code coverage report etc. + +### Hubzilla specific features + +#### Test database access: + +Ideally it should be able to test each part of the code in isolation, where any dependencies should be replaced by stubs, mocks or fakes. + +This is not feasible with a legacy codebase like Hubzilla, that has not been written with testability in mind. For this reason we use a separate test database, and make it available to the code under test using the same mechanisms as Hubzilla normally do. + +This means that any code that executes database queries will behave as normal when called by a test. + +To make this work we connect to the database before running each test function. We also load some initial data into the database to make sure things work as expected, and that we have a known state of the database when the test runs. + +When the test finishes, the test database is wiped clean, so that we have the same consistent state when the next test runs. + +All of this is handled by the `UnitTestCase` base class. + +#### Database fixtures: + +We need some predictable content in the database to set up things like logging, and other content that's useful in general for the tests. These are database fixtures that are loaded into the database for each test run. + +The database fixtures are located in the `tests/unit/include/dba/_files` directory, and consist of YAML files, where each file represents the content of a database table with the same name as the file itself. + +While database fixtures are nice to have, we try to keep the number of them as minimal as possible. It's usually better to add any content needed for a specific test in the test itself. + +#### Fakes: + +Fakes are classes that we can pass to the code under test that will look and (to the code under test) behave the same as the original class. These are useful when we're able to pass objects to the code under test, as we can control it completely from the test code. + +Fakes are located under the `tests/fakes` directory. + +## Writing your own tests + +To be done + +[PHPUnit]: https://phpunit.de +[composer installed]: https://getcomposer.org/ +[Xdebug]: https://xdebug.org/ \ No newline at end of file diff --git a/doc/en/developer/unorganized.md b/doc/en/developer/unorganized.md new file mode 100644 index 000000000..5ba719226 --- /dev/null +++ b/doc/en/developer/unorganized.md @@ -0,0 +1,73 @@ +### To-be-organized information + +**Here is how you can join us.** + +First, get yourself a working git package on the system where you will be +doing development. + +Create your own github account. + +You may fork/clone the Red repository from [https://framagit.org/hubzilla/core.git](https://framagit.org/hubzilla/core.git). + +Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) +to create and use your own tracking fork on github + +Then go to your github page and create a "Pull request" when you are ready +to notify us to merge your work. + + +**Important** + +Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. + +Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. + +**How to theme Hubzilla** + +This is a short documentation on what I found while trying to modify Hubzilla's appearance. + +First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . + +Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). + +At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). + +Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. + + +We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. + +**Here is how you can join us.** + +First, get yourself a working git package on the system where you will be +doing development. + +Create your own github account. + +You may fork/clone the Red repository from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] + +Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] +to create and use your own tracking fork on github + +Then go to your github page and create a "Pull request" when you are ready +to notify us to merge your work. + + +**Important** + +Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. + +Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. + +Further documentation can be found at the Github wiki pages at: [url=https://github.com/friendica/red/wiki]https://github.com/friendica/red/wiki[/url] + +**Concensus Building** + +Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature. + +We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to [url=https://zothub.com/channel/one]Channel One[/url]. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. + +There are places where opposition cannot be resolved. In these cases, please consider making your feature **optional** or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off. + +If a feature uses other networks or websites and or is only seen as desirable by a small minority of the community, consider making the functionality available via an addon or plugin. Once again, those who don't desire the feature won't need to install it. Plugins are relatively easy to create and "hooks" can be easily added or modified if the current hooks do not do what is needed to allow your plugin to work. + diff --git a/doc/en/developer/zot_protocol.bb b/doc/en/developer/zot_protocol.bb new file mode 100644 index 000000000..e9355bca8 --- /dev/null +++ b/doc/en/developer/zot_protocol.bb @@ -0,0 +1,478 @@ +[h3] What is Zot?[/h3] +Zot is the revolutionary protocol that powers $Projectname, providing [b]communications[/b], [b]identity management[/b], and [b]access control[/b] across a fully [b]decentralised[/b] network of independent websites, often called "the grid". The resulting platform is a robust system that supports privacy and security while enabling the kind of rich web services typically seen only in centralized, proprietary solutions. + +Consider this typical scenario: + +Jaquelina wishes to share photos with Roberto from her blog at [b]jaquelina.org[/b], but to nobody else. Roberto maintains his own family hub at [b]roberto.net[/b] on a completely independent server. Zot allows Jaquelina to publish her photos using an [i]access control list (ACL)[/i] that includes only Roberto. That means that while Roberto can see the photos when he visits her blog, his brother Marco cannot, and neither can any of his other family members who have accounts on [b]roberto.net[/b]. + +The magic in this scenario comes from the fact that Roberto never logged in to Jaquelina's website. Instead, he had to login only once using his password on his [i]own[/i] website at [b]roberto.net[/b]. When Roberto visits [b]jaquelina.org[/b], her hub seamlessly authenticates him by remotely querying his server in the background. + +It is not uncommon for servers to have technical problems or become inaccessible for a variety of reasons. Zot provides robustness for Roberto's online activities by allowing him to have [i]clones[/i] of his online identity, or [i]channel[/i], on multiple independent hubs. Imagine that Roberto's server crashes for some reason and he cannot log in there. He simply logs in to one of his clones at [b]gadfly.com[/b], a site operated by his friend Peter. Once authenticated at [b]gadfly.com[/b], Roberto can view Jaquelina's blog as before, without Jaquelina having to grant any additional access! + +[h4] Communications[/h4] +Communications and social networking are an integral part of the grid. Any channel (and any services provided by that channel) can make full use of feature-rich social communications on a global scale. These communications may be public or private - and private communications comprise not only fully encrypted transport, but also encrypted storage to help protect against accidental snooping and disclosure by rogue system administrators and internet service providers. + +Zot supports a wide array of background services in the grid, from friend suggestions to directory services. New content and data updates are propagated in the background between hubs across the grid according to access control lists and permissions specified by both sender [i]and[/i] receiver channels. Data is also synchronized between an arbitrary number of channel clones, allowing hub members to access data and continue collaborating seamlessly in the event that their primary hub is inaccessible or offline. + +[h4] Identity [/h4] +Zot's identity layer is unique. It provides [b]invisible single sign-on[/b] across all sites in the grid. + +It also provides [b]nomadic identity[/b], so that your communications with friends, family, and or anyone else you're communicating with won't be affected by the loss of your primary communication node - either temporarily or permanently. + +The important bits of your identity and relationships can be backed up to a thumb drive, or your laptop, and may appear at any node in the grid at any time - with all your friends and preferences intact. + +Crucially, these nomadic instances are kept in sync so any instance can take over if another one is compromised or damaged. This protects you against not only major system failure, but also temporary site overloads and governmental manipulation or censorship. + +Nomadic identity, single sign-on, and $Projectname's decentralisation of hubs, we believe, introduce a high degree of degree of [b]resiliency[/b] and [b]persistence[/b] in internet communications, that are sorely needed amidst global trends towards corporate centralization, as well as mass and indiscriminate government surveillance and censorship. + +As you browse the grid, viewing channels and their unique content, you are seamlessly authenticated as you go, even across completely different server hubs. No passwords to enter. Nothing to type. You're just greeted by name on every new site you visit. + +How does Zot do that? We call it [b]magic-auth[/b], because $Projectname hides the details of the complexities that go into single sign-on logins, and nomadic identities, from the experience of browsing on the grid. This is one of the design goals of $Projectname: to increase privacy, and freedom on the web, while reducing the complexity and tedium brought by the need to enter new passwords and login names for every different sight that someone might visit online. You login only once on your home hub (or any nomadic backup hub you have chosen). This allows you to access any authenticated services provided anywhere in the grid - such as shopping, blogs, forums, and access to private information. Your password isn't stored on a thousand different sites; it is stored on servers that you control or that you have chosen to trust. + +You cannot be silenced. You cannot be removed from the grid unless you yourself choose to exit it. + +[h4] Access Control[/h4] +Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the grid. This is like having one super huge website made up of an army of small individual websites - and where each channel in the grid can completely control their privacy and sharing preferences for any web resources they create. + +Currently, $Projectname supports access control for many types of data, including post/comment discussion threads, photo albums, events, cloud files, web pages, wikis, and more. Every object and how it is shared and with whom is completely under your control. + +This type of control is trivial on large corporate providers because they own the user database. Within the grid, there is no need for a huge user database on your machine - because the grid [b]is[/b] your user database. It has what is essentially infinite capacity (limited by the total number of hubs online across the internet), and is spread amongst hundreds, and potentially millions of computers. + +Access can be granted or denied for any resource, to any channel, or any group of channels; anywhere within the grid. Others can access your content if you permit them to do so, and they do not even need to have an account on your hub. + +[h3]Technical Introduction[/h3] +Zot is a JSON-based web framework for implementing secure decentralised communications and services. In order to provide this functionality, Zot creates a decentralised globally unique identifier for each hub on the network. This global identifier is not linked inextricably to DNS, providing the requisite mobility. Many existing decentralised communications frameworks provide the communication aspect, but do not provide remote access control and authentication. Additionally most of these are based on 'webfinger', which still binds identity to domain names and cannot support nomadic identity. + +The primary issues Zot addresses are + +[list] +[*] completely decentralised communications +[*] independence from DNS-based identity +[*] node mobility +[*] seamless remote authentication +[*] high performance +[/list] +We will rely on DNS-based user@host addresses as a "user-friendly" mechanism to let people know where you are, specifically on a named host with a given username, and communication will be carried out to DNS entities using TCP and the web. + +But the underlying protocol will provide an abstraction layer on top of this, so that a communications node (e.g. "identity") can move to an alternate DNS location and (to the best of our ability) gracefully recover from site re-locations and/or maintain pre-existing communication relationships. A side effect of this requirement is the ability to communicate from alternate/multiple DNS locations and service providers and yet maintain a single online identity. + +We will call this overlay network the "grid". Servers attached to this network are known as "hubs" and may support any number of individual identities. + +An identity does not necessarily correspond to a person. It is just something which requires the ability to communicate within the grid. + +The ability to recover will be accomplished by communication to the original location when creating a new or replacement identity, or as a fallback from a stored file describing the identity and their contacts in the case where the old location no longer responds. + +At least on the short term, the mobility of existing content is not a top priority. This may or may not take place at a later stage. The most important things we want to keep are your identity and your friends. + +Addresses which are shared amongst people are user@host, and which describe the [b]current[/b] local account credentials for a given identity. These are DNS based addresses and used as a seed to locate a given identity within the grid. The machine communications will bind this address to a globally unique ID. A single globally unique ID may be attached or bound to any number of DNS locations. Once an identity has been mapped or bound to a DNS location, communications will consist of just knowing the globally unique address, and what DNS (url) is being used currently (in order to call back and verify/complete the current communication). These concepts will be specified in better detail. + +In order for an identity to persist across locations, one must be able to provide or recover + +[list] +[*] the globally unique ID for that identity +[*] the private key assigned to that identity +[*] (if the original server no longer exists) an address book of contacts for that identity. +[/list] +This information will be exportable from the original server via API, and/or downloadable to disk or thumb-drive. + +We may also attempt to recover with even less information, but doing so is prone to account hijacking and will require that your contacts confirm the change. + +In order to implement high performance communications, the data transfer format for all aspects of Zot is JSON. XML communications require way too much overhead. + +Bi-directional encryption is based on RSA 4096-bit keys expressed in DER/ASN.1 format using the PKCS#8 encoding variant, with AES encryption of variable length or large items. The precise encryption algorithms are negotiable between sites. + +Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. $Projectname project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. + +In order to create a globally unique ID, we will base it on a whirlpool hash of the identity URL of the origination node and a psuedo-random number, which should provide us with a 256 bit ID with an extremely low probability of collision (256 bits represents approximately 115 quattuorviginitillion or 1.16 X 10^77 unique numbers). This will be represented in communications as a base64url-encoded string. We will not depend on probabilities however and the ID must also be attached to a public key with public key cryptography used to provide an assurance of identity which has not been copied or somehow collided in whirlpool hash space. + +Basing this ID on DNS provides a globally unique seed, which would not be the case if it was based completely on psuedo-random number generation. + +We will refer to the encoded globally unique uid string as zot_uid + +As there may be more than one DNS location attached/bound to a given zot_uid identity, delivery processes should deliver to all of them - as we do not know for sure which hub instance may be accessed at any given time. However we will designate one DNS location as "primary" and which will be the preferred location to view web profile information. + +We must also provide the ability to change the primary to a new location. A look-up of information on the current primary location may provide a "forwarding pointer" which will tell us to update our records and move everything to the new location. There is also the possibility that the primary location is defunct and no longer responding. In that case, a location which has already been mapped to this zot_uid can seize control, and declare itself to be primary. In both cases the primary designation is automatically approved and moved. A request can also be made from a primary location which requests that another location be removed. + +In order to map a zot_uid to a second (or tertiary) location, we require a secure exchange which verifies that the new location is in possession of the private key for this zot_uid. Security of the private key is thus essential to avoid hijacking of identities. + +Communications will then require +[list] +[*] zot_uid (string) +[*] uid_sig +[*] callback (current location Zot endpoint url) +[*] callback_sig +[*] spec (int) +[/list] +passed with every communique. The spec is a revision number of the applicable Zot spec so that communications can be maintained with hubs using older and perhaps incompatible protocol specifications. Communications are verified using a stored public key which was copied when the connection to this zot_uid was first established. + +Key revocation and replacement must take place from the primary hub. The exact form for this is still being worked out, but will likely be a notification to all other bound hubs to "phone home" (to the primary hub) and request a copy of the new key. This communique should be verified using a site or hub key; as the original identity key may have been compromised and cannot be trusted. + +In order to eliminate confusion, there should be exactly one canonical url for any hub, so that these can be indexed and referenced without ambiguity. + +So as to avoid ambiguity of scheme, it is strongly encouraged that all addresses to be https with a "browser valid" cert and a single valid host component (either www.domain.ext or domain.ext, but not both), which is used in all communications. Multiple URLs may be provided locally, but only one unique URL should be used for all Zot communications within the grid. + +Test installation which do not connect to the public grid may use non-SSL, but all traffic flowing over public networks should be safe from session-hijacking, preferably with a "browser recognised" cert. + +Where possible, Zot encourages the use of "batching" to minimise network traffic between two hubs. This means that site 'A' can send multiple messages to site 'B' in a single transaction, and also consolidate deliveries of identical messages to multiple recipients on the same hub. + +Messages themselves may or may not be encrypted in transit, depending on the private nature of the messages. SSL (strongly encouraged) provides unconditional encryption of the data stream, however there is little point in encrypting public communications which have been designated as having unrestricted visibility. The encryption of data storage and so-called "end-to-end encryption" is outside the scope of zot. It is presumed that hub operators will take adequate safeguards to ensure the security of their data stores and these are functions of application and site integrity as opposed to protocol integrity. + + +[h4]Messages[/h4] + +Given the constraints listed previously, a Zot communique should therefore be a json array of individual messages. These can be mixed and combined within the same transmission. + +Each message then requires: +[list] +[*] type +[*] (optional) recipient list +[/list] +Lack of a recipient list would indicate an unencrypted public or site level message. The recipient list would contain an array of zot_uid with an individual decryption key, and a common iv. The decryption key is encoded with the recipient identity's public key. The iv is encrypted with the sender's private key. + +All messages should be digitally signed by the sender. + +The type can be one of (this list is extensible): +[list] +[*] post (or activity) +[*] mail +[*] identity +[*] authenticate +[/list] +Identity messages have no recipients and notify the system social graph of an identity update, which could be a new or deleted identity, a new or deleted location, or a change in primary hub. The signature for these messages uses system keys as opposed to identity-specific keys. + +Posts include many different types of activities, such as top-level posts, likes/dislikes, comments, tagging activities, etc. These types are indicated within the message sturcture. + +authenticate messages result in mutual authentication and browser redirect to protected resources on the remote hub such as the ability to post wall-to-wall messages and view private photo albums and events, etc. + +[h4]Discovery[/h4] + +A well-known url is used to probe a hub for Zot capabilities and identity lookups, including the discovery of public keys, profile locations, profile photos, and primary hub location. + +The location for this service is /.well-known/zot-info - and must be available at the root of the chosen domain. + +To perform a lookup, a POST request is made to the discovery location with the following parameters: + +Required: + +address => an address on the target system such as "john" + +Optional + +target => the Zot "guid" of the observer for evaluating permissions + +target_sig => an RSA signature (base64url encoded) of the guid + +key => The public key needed to verify the signature + +token => a string (possibly random) chosen by the requesting service. If provided, an entry in the discovered packet will be provided called 'signed_token' which consists of the base64url_encoded RSA signature of the concatenation of the string 'token.' and the provided token using the private key of the discovered channel. This can be verified using the provided 'key' entry, and provides assurance that the server is in possession of the private key for the discovered identity. After 2017-01-01 it is [b]required[/b] that a server provide a signed_token [i]if[/i] a token was provided in the request. + +With no target provided, the permissions returned will be generic permissions +for unknown or unauthenticated observers + +Example of discovery packet for 'mike@zothub.com' +[code nowrap] + { + + "success": true, + "signed_token": "KBJrKTq1qrctNuxF3GwVh3GAGRqmgkirlXANPcJZAeWlvSt_9TMV097slR4AYnYCBEushbVqHEJ9Rb5wHTa0HzMbfRo8cRdl2yAirvvv5d98dtwHddQgX1jB0xEypXtmIYMdPGDLvhI1RNdIBhHkkrRcNreRzoy4xD--HM6m1W0-A8PJJJ9BcNxmGPcBtLzW08wzoP9trJ3M7DQ6Gkk6j7iwVsyApw1ZBaDvabGTdc_SFV-Iegtqw3rjzT_xXWsfzMlKBy-019MYn_KS-gu23YzjvGu5tS_zDfkQb8DMUlPLz5yyxM0yOMlUDtG2qQgIJAU2O0X6T5xDdJ6mtolNyhepg845PvFDEqBQGMIH1nc47CNumeudDi8IWymEALhjG_U8KAK7JVlQTJj2EKUb0au1g6fpiBFab5mmxCMtZEX3Jreyak5GOcFFz-WpxuXJD9TdSoIvaBfBFOoJnXkg2zE4RHXeQzZ2FotmrbBG5dm8B-_6byYGoHBc08ZsWze1K96JIeRnLpBaj6ifUDcVHxZMPcGHHT27dvU2PNbgLiBjlAsxhYqkhN5qOHN8XBcg2KRjcMBaI3V0YMxlzXz5MztmZq3fcB1p-ccIoIyMPMzSj3yMB7J9CEU2LYPSTHMdPkIeDE6GaCkQKviaQQJQde346tK_YjA2k7_SOBmvPYE", + "guid": "sebQ-IC4rmFn9d9iu17m4BXO-kHuNutWo2ySjeV2SIW1LzksUkss12xVo3m3fykYxN5HMcc7gUZVYv26asx-Pg", + "guid_sig": "Llenlbl4zHo6-g4sa63MlQmTP5dRCrsPmXHHFmoCHG63BLq5CUZJRLS1vRrrr_MNxr7zob_Ykt_m5xPKe5H0_i4pDj-UdP8dPZqH2fqhhx00kuYL4YUMJ8gRr5eO17vsZQ3XxTcyKewtgeW0j7ytwMp6-hFVUx_Cq08MrXas429ZrjzaEwgTfxGnbgeQYQ0R5EXpHpEmoERnZx77VaEahftmdjAUx9R4YKAp13pGYadJOX5xnLfqofHQD8DyRHWeMJ4G1OfWPSOlXfRayrV_jhnFlZjMU7vOdQwHoCMoR5TFsRsHuzd-qepbvo3pzvQZRWnTNu6oPucgbf94p13QbalYRpBXKOxdTXJrGdESNhGvhtaZnpT9c1QVqC46jdfP0LOX2xrVdbvvG2JMWFv7XJUVjLSk_yjzY6or2VD4V6ztYcjpCi9d_WoNHruoxro_br1YO3KatySxJs-LQ7SOkQI60FpysfbphNyvYMkotwUFI59G08IGKTMu3-GPnV1wp7NOQD1yzJbGGEGSEEysmEP0SO9vnN45kp3MiqbffBGc1r4_YM4e7DPmqOGM94qksOcLOJk1HNESw2dQYWxWQTBXPfOJT6jW9_crGLMEOsZ3Jcss0XS9KzBUA2p_9osvvhUKuKXbNztqH0oZIWlg37FEVsDs_hUwUJpv2Ar09k4", + "key": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7QCwvuEIwCHjhjbpz3Oc\ntyei/Pz9nDksNbsc44Cm8jxYGMXsTPFXDZYCcCB5rcAhPPdZSlzaPkv4vPVcMIrw\n5cdX0tvbwa3rNTng6uFE7qkt15D3YCTkwF0Y9FVZiZ2Ko+G23QeBt9wqb9dlDN1d\nuPmu9BLYXIT/JXoBwf0vjIPFM9WBi5W/EHGaiuqw7lt0qI7zDGw77yO5yehKE4cu\n7dt3SakrXphL70LGiZh2XGoLg9Gmpz98t+gvPAUEotAJxIUqnoiTA8jlxoiQjeRK\nHlJkwMOGmRNPS33awPos0kcSxAywuBbh2X3aSqUMjcbE4cGJ++/13zoa6RUZRObC\nZnaLYJxqYBh13/N8SfH7d005hecDxWnoYXeYuuMeT3a2hV0J84ztkJX5OoxIwk7S\nWmvBq4+m66usn6LNL+p5IAcs93KbvOxxrjtQrzohBXc6+elfLVSQ1Rr9g5xbgpub\npSc+hvzbB6p0tleDRzwAy9X16NI4DYiTj4nkmVjigNo9v2VPnAle5zSam86eiYLO\nt2u9YRqysMLPKevNdj3CIvst+BaGGQONlQalRdIcq8Lin+BhuX+1TBgqyav4XD9K\nd+JHMb1aBk/rFLI9/f2S3BJ1XqpbjXz7AbYlaCwKiJ836+HS8PmLKxwVOnpLMbfH\nPYM8k83Lip4bEKIyAuf02qkCAwEAAQ==\n-----END PUBLIC KEY-----\n", + "name": "Mike Macgirvin", + "name_updated": "2012-12-06 04:59:13", + "address": "mike@zothub.com", + "photo_mimetype": "image/jpeg", + "photo": "https://zothub.com/photo/profile/l/1", + "photo_updated": "2012-12-06 05:06:11", + "url": "https://zothub.com/channel/mike", + "connections_url": "https://zothub.com/poco/mike", + "target": "", + "target_sig": "", + "searchable": false, + "permissions": { + "view_stream": true, + "view_profile": true, + "view_photos": true, + "view_contacts": true, + "view_storage": true, + "view_pages": true, + "send_stream": false, + "post_wall": false, + "post_comments": false, + "post_mail": false, + "post_photos": false, + "tag_deliver": false, + "chat": false, + "write_storage": false, + "write_pages": false, + "delegate": false + }, + "profile": { + "description": "Freedom Fighter", + "birthday": "0000-05-14", + "next_birthday": "2013-05-14 00:00:00", + "gender": "Male", + "marital": "It's complicated", + "sexual": "Females", + "locale": "", + "region": "", + "postcode": "", + "country": "Australia" + }, + "locations": [ + { + "host": "zothub.com", + "address": "mike@zothub.com", + "primary": true, + "url": "https://zothub.com", + "url_sig": "eqkB_9Z8nduBYyyhaSQPPDN1AhSm5I4R0yfcFxPeFpuu17SYk7jKD7QzvmsyahM5Kq7vDW6VE8nx8kdFYpcNaurqw0_IKI2SWg15pGrhkZfrCnM-g6A6qbCv_gKCYqXvwpSMO8SMIO2mjQItbBrramSbWClUd2yO0ZAceq3Z_zhirCK1gNm6mGRJaDOCuuTQNb6D66TF80G8kGLklv0o8gBfxQTE12Gd0ThpUb5g6_1L3eDHcsArW_RWM2XnNPi_atGNyl9bS_eLI2TYq0fuxkEdcjjYx9Ka0-Ws-lXMGpTnynQNCaSFqy-Fe1aYF7X1JJVJIO01LX6cCs-kfSoz29ywnntj1I8ueYldLB6bUtu4t7eeo__4t2CUWd2PCZkY3PKcoOrrnm3TJP5_yVFV_VpjkcBCRj3skjoCwISPcGYrXDufJxfp6bayGKwgaCO6QoLPtqqjPGLFm-fbn8sVv3fYUDGilaR3sFNxdo9mQ3utxM291XE2Pd0jGgeUtpxZSRzBuhYeOybu9DPusID320QbgNcbEbEImO8DuGIxuVRartzEXQF4WSYRdraZzbOqCzmU0O55P836JAfrWjgxTQkXlYCic-DBk-iE75JeT72smCtZ4AOtoFWCjZAABCw42J7JELY9APixZXWriKtjy6JI0G9d3fs6r7SrXr1JMy0", + "callback": "https://zothub.com/post", + "sitekey": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1IWXwd/BZuevq8jzNFoR\n3VkenduQH2RpR3Wy9n4+ZDpbrUKGJddUGm/zUeWEdKMVkgyllVA/xHdB7jdyKs1X\nuIet9mIdnzvhdLO/JFD5hgbNG2wpSBIUY6aSNeCFTzszqXmuSXMW5U0Ef5pCbzEA\nnhoCoGL1KAgPqyxnGKUlj7q2aDwC9IRNtAqNyFQL67oT91vOQxuMThjlDhbR/29Q\ncYR4i1RzyahgEPCnHCPkT2GbRrkAPjNZAdlnk9UesgP16o8QB3tE2j50TVrbVc/d\nYRbzC56QMPP9UgUsapNeSJBHji75Ip/E5Eg/kfJC/HEQgyCqjCGfb7XeUaeQ7lLO\nqc7CGuMP+Jqr/cE54/aSHg8boTwxkMp11Ykb+ng17fl57MHTM2RJ99qZ1KBkXezR\nuH1lyvjzeJPxEFr9rkUqc4GH74/AgfbgaFvQc8TS7ovEa5I/7Pg04m7vLSEYc6UF\nYJYxXKrzmZT2TDoKeJzaBBx5MFLhW19l68h9dQ8hJXIpTP0hJrpI+Sr6VUAEfFQC\ndIDRiFcgjz6j7T/x8anqh63/hpsyf2PMYph1+4/fxtSCWJdvf+9jCRM8F1IDfluX\n87gm+88KBNaklYpchmGIohbjivJyru41CsSLe0uinQFvA741W00w6JrcrOAX+hkS\nRQuK1dDVwGKoIY85KtTUiMcCAwEAAQ==\n-----END PUBLIC KEY-----\n" + } + ], + "site": { + "url": "https://zothub.com", + "directory_mode": "primary", + "directory_url": "https://zothub.com/dirsearch" + } + + } +[/code] + + +Discovery returns a JSON array with the following components: + +'success' => (true or false) Operation was successful if true. Otherwise an optional 'message' may be present indicating the source of error. + +'signed_token' => If a token parameter was provided in the request, it is prepended with the text 'token.' and then RSA signed with the channel private key and base64url encoded and returned as 'signed_token'. + +'guid' => the guid of the address on the target system + +'guid_sig' => the base64url encoded RSA signature of the guid, signed with the private key associated with that guid. + +'key' => the public key associated with that guid + +'name' => channel name + +'name_updated' => MySQL style timestamp '2012-01-01 00:00:00' when the name was last changed (UTC) + +'address' => "webbie" or user@host address associated with this channel + +'photo' => URL of a profile photo for this channel (ideally 175x175) + +'photo_mimetype' => content-type of the profile photo + +'photo_updated' => MySQL style timestamp when photo was last updated (UTC) + +'url' => location of channel homepage + +'connections_url' => location of Portable Contacts (extended for zot) URL for this channel + +'target' => if a permissions target was specified, it is mirrored + +'target_sig' => if a permissions target was specified, the signature is mirrored. + +'searchable' => (true or false) true indicates this entry can be searched in a directory + +[h5]Permissions[/h5] + +'permissions' => extensible array of permissions appropriate to this target, values are true or false + + Permissions may include: +[list] +[*] view_stream +[*] view_profile +[*] view_photos +[*] view_contacts +[*] view_storage +[*] view_pages +[*] send_stream +[*] post_wall +[*] post_comments +[*] post_mail +[*] post_photos +[*] tag_deliver +[*] chat +[*] write_storage +[*] write_pages +[*] delegate +[/list] + + +[h5]Profile[/h5] + + +'profile' => array of important profile fields +[list] +[*] description +[*] birthday YYYY-MM-DD , all fields are optional, any field (such as year) may be zero +[*] next_birthday => MySQL datetime string representing the next upcoming birthday, converted from the channel's default timezone to UTC. +[*] gender (free form) +[*] marital (marital status) +[*] sexual (preference) +[*] locale (city) +[*] region (state) +[*] postcode +[*] country +[/list] + +[h5]Locations[/h5] + + +'locations' => array of registered locations (DNS locations) this channel may be visible or may be posting from + +Each location is an array of + +'host' => DNS hostname, e.g. example.com + +'address' => the webbie or user@host identifier associated with this location + +'primary' => (true or false) whether or not this is the primary location for this channel where files and web pages are generally found + +'url' => url of the root of this DNS location e.g. https://example.com + +'url_sig' => base64url encoded RSA signature of the URL, signed with the channel private key + +'callback' => Zot communications endpoint on this site, usually https://example.com/post + +'sitekey' => public key of this site/host + + +[h5]Site[/h5] + + +'site' => array providing the directory role of the site responding to this request + +'url' => url of this site e.g. https://example.com + +'directory_mode' => one of 'primary', 'secondary', 'normal', or 'standalone' + +'directory_url' => if this is a directory server or standalone, the URL for the directory search module + + + +[h3]Magic Auth[/h3] + +So-called "magic auth" takes place by a special exchange. On the remote computer, a redirection is made to the Zot endpoint with special GET parameters. + +Endpoint: https://example.com/post/name + +where 'name' is the left hand side of the channel webbie, for instance 'mike' where the webbie is 'mike@zothub.com' + +Additionally four parameters are supplied: +[list] +[*] auth => the webbie of the person requesting access +[*] dest => the desired destination URL (urlencoded) +[*] sec => a random string which is also stored locally for use during the verification phase. +[*] version => the Zot revision +[/list] +When this packet is received, a Zot message is initiated to the auth identity: + +[code nowrap] + { + "type":"auth_check", + "sender":{ + "guid":"kgVFf_1_SSbyqH-BNWjWuhAvJ2EhQBTUdw-Q1LwwssAntr8KTBgBSzNVzUm9_RwuDpxI6X8me_QQhZMf7RfjdA", + "guid_sig":"PT9-TApzpm7QtMxC63MjtdK2nUyxNI0tUoWlOYTFGke3kNdtxSzSvDV4uzq_7SSBtlrNnVMAFx2_1FDgyKawmqVtRPmT7QSXrKOL2oPzL8Hu_nnVVTs_0YOLQJJ0GYACOOK-R5874WuXLEept5-KYg0uShifsvhHnxnPIlDM9lWuZ1hSJTrk3NN9Ds6AKpyNRqf3DUdz81-Xvs8I2kj6y5vfFtm-FPKAqu77XP05r74vGaWbqb1r8zpWC7zxXakVVOHHC4plG6rLINjQzvdSFKCQb5R_xtGsPPfvuE24bv4fvN4ZG2ILvb6X4Dly37WW_HXBqBnUs24mngoTxFaPgNmz1nDQNYQu91-ekX4-BNaovjDx4tP379qIG3-NygHTjFoOMDVUvs-pOPi1kfaoMjmYF2mdZAmVYS2nNLWxbeUymkHXF8lT_iVsJSzyaRFJS1Iqn7zbvwH1iUBjD_pB9EmtNmnUraKrCU9eHES27xTwD-yaaH_GHNc1XwXNbhWJaPFAm35U8ki1Le4WbUVRluFx0qwVqlEF3ieGO84PMidrp51FPm83B_oGt80xpvf6P8Ht5WvVpytjMU8UG7-js8hAzWQeYiK05YTXk-78xg0AO6NoNe_RSRk05zYpF6KlA2yQ_My79rZBv9GFt4kUfIxNjd9OiV1wXdidO7Iaq_Q", + "url":"http:\/\/podunk.edu", + "url_sig":"T8Bp7j5DHHhQDCFcAHXfuhUfGk2P3inPbImwaXXF1xJd3TGgluoXyyKDx6WDm07x0hqbupoAoZB1qBP3_WfvWiJVAK4N1FD77EOYttUEHZ7L43xy5PCpojJQmkppGbPJc2jnTIc_F1vvGvw5fv8gBWZvPqTdb6LWF6FLrzwesZpi7j2rsioZ3wyUkqb5TDZaNNeWQrIEYXrEnWkRI_qTSOzx0dRTsGO6SpU1fPWuOOYMZG8Nh18nay0kLpxReuHCiCdxjXRVvk5k9rkcMbDBJcBovhiSioPKv_yJxcZVBATw3z3TTE95kGi4wxCEenxwhSpvouwa5b0hT7NS4Ay70QaxoKiLb3ZjhZaUUn4igCyZM0h6fllR5I6J_sAQxiMYD0v5ouIlb0u8YVMni93j3zlqMWdDUZ4WgTI7NNbo8ug9NQDHd92TPmSE1TytPTgya3tsFMzwyq0LZ0b-g-zSXWIES__jKQ7vAtIs9EwlPxqJXEDDniZ2AJ6biXRYgE2Kd6W_nmI7w31igwQTms3ecXe5ENI3ckEPUAq__llNnND7mxp5ZrdXzd5HHU9slXwDShYcW3yDeQLEwAVomTGSFpBrCX8W77n9hF3JClkWaeS4QcZ3xUtsSS81yLrp__ifFfQqx9_Be89WVyIOoF4oydr08EkZ8zwlAsbZLG7eLXY" + }, + "recipients":{ + { + "guid":"ZHSqb3yGar3TYV_o9S-JkD-6o_V4DhUcxtv0VeyX8Kj_ENHPI_M3SyAUucU835-mIayGMmTpqJz3ujPkcavVhA", + "guid_sig":"JsAAXigNghTkkbq8beGMJjj9LBKZn28hZ-pHSsoQuwYWvBJ2lSnfc4r9l--WgO6sucH-SR6RiBo78eWn1cZrh_cRMu3x3LLx4y-tjixg-oOOgtZakkBg4vmOhkKPkci0mFtzvUrpY4YHySqsWTuPwRx_vOlIYIGEY5bRXpnkNCoC8J4EJnRucDrgSARJvA8QQeQQL0H4mWEdGL7wlsZp_2VTC6nEMQ48Piu6Czu5ThvLggGPDbr7PEMUD2cZ0jE4SeaC040REYASq8IdXIEDMm6btSlGPuskNh3cD0AGzH2dMciFtWSjmMVuxBU59U1I6gHwcxYEV6BubWt_jQSfmA3EBiPhKLyu02cBMMiOvYIdJ3xmpGoMY1Cn__vhHnx_vEofFOIErb6nRzbD-pY49C28AOdBA5ffzLW3ss99d0A-6GxZmjsyYhgJu4tFUAa7JUl84tMbq28Tib0HW6qYo6QWw8K1HffxcTpHtwSL5Ifx0PAoGMJsGDZDD1y_r9a4vH5pjqmGrjL3RXJJUy-m4eLV5r7xMWXsxjqu3D8r04_dcw4hwwexpMT1Nwf8CTB0TKb8ElgeOpDFjYVgrqMYWP0XdhatcFtAJI7gsS-JtzsIwON9Kij66-VAkqy_z1IXI0ziyqV1yapSVYoUV1vMScRZ_nMqwiB5rEDx-XLfzko" + } + } + "callback":"\/post", + "version":1, + "secret":"1eaa6613699be6ebb2adcefa5379c61a3678aa0df89025470fac871431b70467", + "secret_sig":"eKV968b1sDkOVdSMi0tLRtOhQw4otA8yFKaVg6cA4I46_zlAQGbFptS-ODiZlSAqR7RiiZQv4E2uXCKar52dHo0vvNKbpOp_ezWYcwKRu1shvAlYytsflH5acnDWL-FKOOgz5zqLLZ6cKXFMoR1VJGG_Od-DKjSwajyV9uVzTry58Hz_w0W2pjxwQ-Xv11rab5R2O4kKSW77YzPG2R5E6Q7HN38FrLtyWD_ai3K9wlsFOpwdYC064dk66X7BZtcIbKtM6zKwMywcfJzvS5_0U5yc5GGbIY_lY6SViSfx9shOKyxkEKHfS29Ynk9ATYGnwO-jnlMqkJC7t149H-sI9hYWMkLuCzaeLP56k2B2TmtnYvE_vHNQjzVhTwuHCIRVr-p6nplQn_P3SkOpYqPi3k_tnnOLa2d3Wtga8ClEY90oLWFJC3j2UkBf_VEOBNcg-t5XO3T-j9O4Sbk96k1Qoalc-QlznbGx4bOVsGkRBBMiH4YUqiiWB_OkFHtdqv7dqGeC-u-B4u9IxzYst46vvmyA3O-Q4APSZ1RY8ITUH0jLTbh6EAV7Oki8pIbOg0t56p-8RlanOZqmFvR-grVSc7Ak1ZcD8NACmvidUpa1B7WEvRcOeffx9lype0bt5XenDnMyx6szevwxZIiM8qGM2lsSk4fu8HI9cW0mLywzZT0" + } +[/code] + +auth_check messages MUST be encrypted. This message is sent to the origination site, which checks the 'secret' to see if it is the same as the 'sec' which it passed originally. It also checks the secret_sig which is the secret signed by the destination channel's private key and base64url encoded. If everything checks out, a json packet is returned: +[code nowrap] + { + "success":1, + "confirm":"q0Ysovd1uQRsur2xG9Tg6bC23ynzw0191SkVd7CJcYoaePy6e_v0vnmPg2xBUtIaHpx_aSuhgAkd3aVjPeaVBmts6aakT6a_yAEy7l2rBydntu2tvrHhoVqRNOmw0Q1tI6hwobk1BgK9Pm0lwOeAo8Q98BqIJxf47yO9pATa0wktOg6a7LMogC2zkkhwOV5oEqjJfeHeo27TiHr1e2WaphfCusjmk27V_FAYTzw05HvW4SPCx55EeeTJYIwDfQwjLfP4aKV-I8HQCINt-2yxJvzH7Izy9AW-7rYU0Il_gW5hrhIS5MTM12GBXLVs2Ij1CCLXIs4cO0x6e8KEIKwIjf7iAu60JPmnb_fx4QgBlF2HLw9vXMwZokor8yktESoGl1nvf5VV5GHWSIKAur3KPS2Tb0ekNh-tIk9u-xob4d9eIf6tge_d3aq1LcAtrDBDLk8AD0bho5zrVuTmZ9k-lBVPr_DRHSV_dlpu088j3ThaBsuV1olHK3vLFRhYCDIO0CqqK5IuhqtRNnRaqhlNN6fQUHpXk2SwHiJ2W36RCYMTnno6ezFk_tN-RA2ly-FomNZoC5FPA9gFwoJR7ZmVFDmUeK3bW-zYTA5vu15lpBPnt7Up_5rZKkr0WQVbhWJmylqOuwuNWbn3SrMQ8rYFZ23Tv300cOfKVgRBaePWQb4" + } +[/code] +'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the base64url encoded whirlpool hash of the source guid and guid_sig; signed with the source channel private key. This prevents a man-in-the-middle from inserting a rogue success packet. Upon receipt and successful verification of this packet, the destination site will redirect to the original destination URL and indicate a successful remote login. + +[h3]Zot Structures[/h3] +[h4]Zot Signatures[/h4] +All signed data in Zot is accomplished by performing an RSA sign operation using the private key of the initiator. The binary result is then base64url encoded for transport. +[h4]Zot Encryption[/h4] +Encryption is currently provided by AES256CTR. Additional algorithms MAY be supported. A 32-octet key and 16-octet initialisation vector are randomly generated. The desired data is then encrypted using these generated strings and the result base64url encoded. Then we build an array: + +[dl terms="b"] +[*= data]The base64url encoded encrypted data +[*= alg]The chosen algorithm, in this case the string 'aes256ctr'. +[*= key]The randomly generated key, RSA encrypted using the recipients public key, and the result base64url encoded +[*= iv]The randomly generated initialization vector, RSA encrypted using the recipient's public key, and the result base64url encoded +[/dl] + +[h4]Basic Zot Packet[/h4] +Used for initiating a dialogue with another Zot site. This packet MAY be encrypted. The presence of an array element 'iv' indicates encryption has been applied. When sending an 'auth_check' packet type, this packet MUST be encrypted, using the public key of the destination site (the site key, as opposed to a sender key). + +[code nowrap] + { + "type":"notify", + "sender":{ + "guid":"kgVFf_1_SSbyqH-BNWjWuhAvJ2EhQBTUdw-Q1LwwssAntr8KTBgBSzNVzUm9_RwuDpxI6X8me_QQhZMf7RfjdA", + "guid_sig":"PT9-TApzpm7QtMxC63MjtdK2nUyxNI0tUoWlOYTFGke3kNdtxSzSvDV4uzq_7SSBtlrNnVMAFx2_1FDgyKawmqVtRPmT7QSXrKOL2oPzL8Hu_nnVVTs_0YOLQJJ0GYACOOK-R5874WuXLEept5-KYg0uShifsvhHnxnPIlDM9lWuZ1hSJTrk3NN9Ds6AKpyNRqf3DUdz81-Xvs8I2kj6y5vfFtm-FPKAqu77XP05r74vGaWbqb1r8zpWC7zxXakVVOHHC4plG6rLINjQzvdSFKCQb5R_xtGsPPfvuE24bv4fvN4ZG2ILvb6X4Dly37WW_HXBqBnUs24mngoTxFaPgNmz1nDQNYQu91-ekX4-BNaovjDx4tP379qIG3-NygHTjFoOMDVUvs-pOPi1kfaoMjmYF2mdZAmVYS2nNLWxbeUymkHXF8lT_iVsJSzyaRFJS1Iqn7zbvwH1iUBjD_pB9EmtNmnUraKrCU9eHES27xTwD-yaaH_GHNc1XwXNbhWJaPFAm35U8ki1Le4WbUVRluFx0qwVqlEF3ieGO84PMidrp51FPm83B_oGt80xpvf6P8Ht5WvVpytjMU8UG7-js8hAzWQeYiK05YTXk-78xg0AO6NoNe_RSRk05zYpF6KlA2yQ_My79rZBv9GFt4kUfIxNjd9OiV1wXdidO7Iaq_Q", + "url":"http:\/\/podunk.edu", + "url_sig":"T8Bp7j5DHHhQDCFcAHXfuhUfGk2P3inPbImwaXXF1xJd3TGgluoXyyKDx6WDm07x0hqbupoAoZB1qBP3_WfvWiJVAK4N1FD77EOYttUEHZ7L43xy5PCpojJQmkppGbPJc2jnTIc_F1vvGvw5fv8gBWZvPqTdb6LWF6FLrzwesZpi7j2rsioZ3wyUkqb5TDZaNNeWQrIEYXrEnWkRI_qTSOzx0dRTsGO6SpU1fPWuOOYMZG8Nh18nay0kLpxReuHCiCdxjXRVvk5k9rkcMbDBJcBovhiSioPKv_yJxcZVBATw3z3TTE95kGi4wxCEenxwhSpvouwa5b0hT7NS4Ay70QaxoKiLb3ZjhZaUUn4igCyZM0h6fllR5I6J_sAQxiMYD0v5ouIlb0u8YVMni93j3zlqMWdDUZ4WgTI7NNbo8ug9NQDHd92TPmSE1TytPTgya3tsFMzwyq0LZ0b-g-zSXWIES__jKQ7vAtIs9EwlPxqJXEDDniZ2AJ6biXRYgE2Kd6W_nmI7w31igwQTms3ecXe5ENI3ckEPUAq__llNnND7mxp5ZrdXzd5HHU9slXwDShYcW3yDeQLEwAVomTGSFpBrCX8W77n9hF3JClkWaeS4QcZ3xUtsSS81yLrp__ifFfQqx9_Be89WVyIOoF4oydr08EkZ8zwlAsbZLG7eLXY" + "sitekey":"-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxTeIwXZWrw/S+Ju6gewh +LgkKnNNe2uCUqCqMZoYgJar3T5sHCDhvXc4dDCbDkxVIaA/+V1mURtBV60a3IGjn +OAO0W0XGGLe2ED7G5o9U8T9mVGq8Mauv0v1oQ5wIR1gEAhBavkQ2OUGuF/YKn2nj +HlKsv9HzUAHpcDMUe3Uklc2RhQbMcnJxEgkyjCkDyrTtCZzISkTAocHvpCG1KSog +njUZdiz9UWxvM4rCFkCJvQU4RwRZJb7GA9ul+9JrF7NvUQTx8csRP2weBk1E9yyj +wbe187E0eVj9RXX2Mx3mYhgrTdodxLOVMSXZLg1/SMpeFFl7QBhuM0SiOPg8a7Et +e2iNA/RD4WiUFqCDfafasRa1TOozOm7LA+08lkAh5PeQPJsJbrX0wVVft++Y+5/z +BvcUOP73vcbz7j5hJ7HLsbQtye/UUCfODBFybuDqRM84Aet8rjZohX7vukXdMD4I +2HuB7pjR4uIfyYr0J63ANkvbsn8LR+RnirmHrK5H/OgxxjXcfYbGEQgFxvxhF6lA +FpMu6Do4dx3CIb6pRmZ8bjSImXexJ0BSo9n3gtrz0XYLecsYFlQ9+QQjm83qxyLb +M23in0xqMVsyQvzjNkpImrO/QdbEFRIIMee83IHq+adbyjQR49Z2hNEIZhkLPc3U +2cJJ2HkzkOoF2K37qwIzk68CAwEAAQ== +-----END PUBLIC KEY----- +" + }, + "recipients":{ + { + "guid":"lql-1VnxtiO4-WF0h72wLX1Fu8szzHDOXgQaTbELwXW77k8AKFfh-hYr70vqMrc3SSvWN-Flrc5HFhRTWB7ICw", + "guid_sig":"PafvEL0VpKfxATxlCqDjfOeSIMdmpr3iU7X-Sysa1h5LzDpjSXsjO37tYZL-accb1M5itLlfnW5epkTa5I4flsW21zSY1A2jCuBQUTLLGV7rNyyBy7lgqJUFvAMRx0TfXzP9lcaPqlM9T1tA6jfWOsOmkdzwofGeXBnsjGfjsO2xdGYe6vwjOU0DSavukvzDMnOayB9DekpvDnaNBTxeGLM45Skzr7ZEMcNF7TeXMbnvpfLaALYEKeQs9bGH-UgAG8fBWgzVAzeBfx_XSR1rdixjyiZGP0kq0h35SlmMPcEjliodOBFwMXqpXFB7Ibp4F6o6te2p2ErViJccQVG8VNKB6SbKNXY6bhP5zVcVsJ-vR-p4xXoYJJvzTN7yTDsGAXHOLF4ZrXbo5yi5gFAlIrTLAF2EdWQwxSGyLRWKxG8PrDkzEzX6cJJ0VRcLh5z6OI5QqQNdeghPZbshMFMJSc_ApCPi9_hI4ZfctCIOi3T6bdgTNKryLm5fhy_eqjwLAZTGP-aUBgLZpb1mf2UojBn6Ey9cCyq-0T2RWyk-FcIcbV4qJ-p_8oODqw13Qs5FYkjLr1bGBq82SuolkYrXEwQClxnrfKa4KYc2_eHAXPL01iS9zVnI1ySOCNJshB97Odpooc4wk7Nb2Fo-Q6THU9zuu0uK_-JbK7IIl6go2qA" + }, + }, + "callback":"\/post", + "version":"1.2", + "encryption":{ + "aes256ctr" + }, + "secret":"1eaa6613699be6ebb2adcefa5379c61a3678aa0df89025470fac871431b70467", + "secret_sig":"0uShifsvhHnxnPIlDM9lWuZ1hSJTrk3NN9Ds6AKpyNRqf3DUdz81-Xvs8I2kj6y5vfFtm-FPKAqu77XP05r74vGaWbqb1r8zpWC7zxXakVVOHHC4plG6rLINjQzvdSFKCQb5R_xtGsPPfvuE24bv4fvN4ZG2ILvb6X4Dly37WW_HXBqBnUs24mngoTxFaPgNmz1nDQNYQu91-ekX4-BNaovjDx4tP379qIG3-NygHTjFoOMDVUvs-pOPi1kfaoMjmYF2mdZAmVYS2nNLWxbeUymkHXF8lT_iVsJSzyaRFJS1Iqn7zbvwH1iUBjD_pB9EmtNmnUraKrCU9eHES27xTwD-yaaH_GHNc1XwXNbhWJaPFAm35U8ki1Le4WbUVRluFx0qwVqlEF3ieGO84PMidrp51FPm83B_oGt80xpvf6P8Ht5WvVpytjMU8UG7-js8hAzWQeYiK05YTXk-78xg0AO6NoNe_RSRk05zYpF6KlA2yQ_My79rZBv9GFt4kUfIxNjd9OiV1wXdidO7Iaq_Q" + } +[/code] + +[dl terms="b"] +[*= type] The message type: [b]notify, purge, refresh, force_refresh, auth_check, ping[/b] or [b]pickup[/b]. The packet contents vary by message type. Here we will describe the [b]notify[/b] packet. +[*= callback]A string to be appended onto the url which identifies the Zot communications endpoint on this system. It is typically the string "/post". +[*= version]The Zot protocol identifier, to allow future protocol revisions to co-exist. +[*= encryption] array of supported encryption algorithms, order by decreasing preference. If no compatible encryption methods are provided, applications MUST use 'aes256cbc'. +[*= secret]A 64-char string which is randomly generated by the sending site. +[*= secret_sig]The RSA signature of the secret, signed with the sender's private key. +[*= sender] An array of four components that provide a portable identity. We can contact the URL provided and download a Zot info packet to obtain the public key of the sender, and use that to verify the sender guid and the posting URL signatures. + [dl terms="b"] + [*= guid]Typically a 64 character base64url encoded string. This is generated when an identity is created and an attempt is made that it be unique; though this isn't required. + [*= guid_sig]The RSA signature of the guid, signed by the sender's private key and base64url encoded. + [*= url]The base url of the location this post is originating from. + [*= url_sig]The RSA signature of url, signed by the sender's private key and base64url encoded. + [*= sitekey]The public key of the website specified in the url + [/dl] +[*= recipients] Only used for private messages. An array of envelope recipients. Each recipient is represented by an array of guid and guid_sig. When recipients are specified, the entire packet is also encapsulated using a negotiated cryptographic algorithm or 'aes256cbc' if none could be negotiated. + [dl terms="b"] + [*= guid]The guid of a private recipient. + [*= guid_sig]The RSA signature of the guid, signed by the recipient's private key and base64url encoded + [/dl] +[/dl] diff --git a/doc/en/developer_function_primer.bb b/doc/en/developer_function_primer.bb new file mode 100644 index 000000000..f39954d73 --- /dev/null +++ b/doc/en/developer_function_primer.bb @@ -0,0 +1,47 @@ +[b]$Projectname development - some useful basic functions[/b] + +[b]get_account_id()[/b] + +Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. + +[b]local_channel()[/b] + +Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. + +[b]remote_channel()[/b] + +Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. + +[b]App::get_observer()[/b] + +returns an xchan structure representing the current viewer if authenticated (locally or remotely). + +[b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b] + +Returns the config setting for $family and $key or false if unset. + +Deprecated: Use Zotlabs\Lib\Config::Get instead. + +[b] set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b] + +Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). The xconfig version get/sets the value for a specific xchan hash - generally used for remote users. + +Deprecated: Use Zotlabs\Lib\Config::Set instead. + +[b]dbesc()[/b] + +Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval() + +[b]q($sql,$var1...)[/b] + +Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. + +[b]t($string)[/b] + +Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist. + +[b]x($var), $x($array,$key)[/b] + +Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; + +#include doc/macros/main_footer.bb; diff --git a/doc/en/developers.bb b/doc/en/developers.bb new file mode 100644 index 000000000..22dc82d7e --- /dev/null +++ b/doc/en/developers.bb @@ -0,0 +1,71 @@ +[b]$Projectname Developer Guide[/b] + +We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/contributor/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine. + +[b]Here is how you can join us.[/b] + +First, get yourself a working git package on the system where you will be +doing development. + +Create your own github account. + +You may fork/clone the project repository from [url=https://framagit.org/hubzilla/core.git]https://framagit.org/hubzilla/core.git[/url] + +Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] +to create and use your own tracking fork on framagit + +Then go to your framagit page and create a "Pull request" when you are ready +to notify us to merge your work. + +[b]Translations[/b] + +Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/hubzilla/]https://www.transifex.com/projects/p/hubzilla/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'hmessages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. + +[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl] + +[b]Important[/b] + +Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions. + +Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. + + +[b]Licensing[/b] + +All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything. + +[b]Concensus Building[/b] + +Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature. + +We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to the [url=https://project.hubzilla.org/channel/hubzilla]Hubzilla Development[/url] forum. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. + +There are places where opposition cannot be resolved. In these cases, please consider making your feature [b]optional[/b] or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off. + +If a feature uses other networks or websites and or is only seen as desirable by a small minority of the community, consider making the functionality available via an addon or plugin. Once again, those who don't desire the feature won't need to install it. Plugins are relatively easy to create and "hooks" can be easily added or modified if the current hooks do not do what is needed to allow your plugin to work. + + +[b]Coding Style[/b] + +In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. + +[li] All comments should be in English.[/li] + +[li] We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged.[/li] + +[li] Indentation is accomplished primarily with tabs using a tab-width of 4.[/li] + +[li] String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';"[/li] + +[li] Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes.[/li] + +[li] Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability.[/li] + +[li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li] + +[li] Some functions take arguments in argc/argv style like main() in C or function args in bash or Perl. Urls are broken up within a module. e.g, given "http://example.com/module/arg1/arg2", then $this->argc will be 3 (integer) and $this->argv will contain: [0] => 'module', [1] => 'arg1', [2] => 'arg2'. There will always be one argument. If provided a naked domain URL, $this->argv[0] is set to "home".[/li] + +[b]See Also[/b] +[zrl=[baseurl]/help/sql_conventions]SQL Conventions[/zrl] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/diaspora_compat.bb b/doc/en/diaspora_compat.bb new file mode 100644 index 000000000..f27a63b9d --- /dev/null +++ b/doc/en/diaspora_compat.bb @@ -0,0 +1,68 @@ +[h3]Diaspora Compatibility[/h3] + +The Diaspora Protocol addon allows a site to communicate using the Diaspora protocol, which allows communications and connections to be made with Diaspora members (and also Friendica members, since that network also provides the Diaspora Protocol). + +This addon is available in the 'basic' and 'standard' server configurations. It is not available with and the plugin is disabled completely when you are using the 'pro' server configuration. The reason for this is that the Diaspora protocol is not very sophisticated and many $projectname features do not work well with it. + +Members will have to be aware of limitations of the protocol or limit their own activities to those which are compatible with Diaspora. The 'pro' server configuration is free from these limitations and you may use all of the project features and abilities without regard for how they translate to other networks. Many features are unique to $Projectname and are supported by the "Zot" protocol, which is our native communications language between servers/hubs. + +If you are using a configuration which allows direct Diaspora communications you should be aware of the limitations presented here. + +[ul] +[*]Private mail retraction (unsend) is not possible for Diaspora connections. + +[*]Private posts and their associated comments are sent in plaintext email notifications in Diaspora and Friendica. This is a major privacy issue and affects any private communications you have where *any* member of the conversation is on another network. Be aware of it. + +[*]Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled hubzilla objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media and provides an illusion of photo privacy by using obscured URLs rather than protecting the photo from snooping by unauthorised viewers. + +There is no workaround except to make your media resources public (to everybody on the internet). + + +[*]Edited posts will not be delivered. Diaspora members will see the original post/comment without edits. There is no mechanism in the protocol to update an existing post. We cannot delete it and submit another invisibly because the message-id will change and we need to keep the same message-id on our own network. The only workaround is to delete the post/comment and do it over. (If this is a post, this will delete any existing likes/comments). We may eventually provide a way to delete the out of date copy only from Diaspora and keep it intact on networks that can handle edits. + +[*]Nomadic identity ($projectname 'standard' only) will not work with Diaspora. We may eventually provide an **option** which will allow you to "start sharing" from all of your clones when you make the first connection. The Diaspora person does not have to accept this, but it will allow your communications to continue if they accept this connection. Without this option, if you go to another server from where you made the connection originally or you make the connection before creating the clone, you will need to connect with them again from the new location. + +[*]Post expiration is not supported on Diaspora. We may provide you an option to not send expiring posts to that network. In the future this may be provided with a remote delete request. + +[*]End-to-end encryption is not supported. We will translate these posts into a lock icon, which can never be unlocked from the Diaspora side. + +[*]Message verification will eventually be supported. + +[*]Multiple profiles are not supported. Diaspora members can only see your default profile. + +[*]Birthday events will not appear in Diaspora. Other events will be translated and sent as a post, but all times will either be in the origination channel's timezone or in GMT. We do not know the recipient's timezone because Diaspora doesn't have this concept. + +[*]We currently allow tags to be hijacked by default. An option is provided to allow you to prevent the other end of the network from hijacking your tags and point them at its own resources. + +[*]Community tags will not work. We will send a tagging activity as a comment. It won't do anything. + +[*]Privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues. + +[*]Plus-tagged hubzilla forums should work from Diaspora. + + +[*]You cannot use Diaspora channels as channel sources. + + +[*]Dislikes of posts will be converted to comments and you will have the option to send these as comments or not send them to Diaspora (which does not provide dislike). Currently they are not sent. + +[*]We will do the same for both likes and dislikes of [b][i]comments[/i][/b]. They can either be sent as comments or you will have the ability to prevent them from being transmitted to Diaspora. Currently they are not sent. + +[*]Emojis are currently untranslated. + +[*]"observer tags" will be converted to empty text. + + +[*]Embedded apps will be translated into links. + + +[*]Embedded page design elements (work in progress) will be either stripped or converted to an error message. + +[*]Diaspora members will not appear in the directory. + + +[*]There are differences in oembed compatibility between the networks. Some embedded resources will turn into a link on one side or the other. + +[/ul] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/directories.bb b/doc/en/directories.bb new file mode 100644 index 000000000..60a0b624d --- /dev/null +++ b/doc/en/directories.bb @@ -0,0 +1,95 @@ +[h3]Directory Configuration[/h3] + +Directories in $Projectname serve the purpose of searching and locating members anywhere in the network. They are also used to store and query "ratings" of members and sites. The directory services are distributed and mirrored so that a failure of one will not take down or disrupt the entire network. + +[b]Standard Configuration[/b] + +New sites operating as directory clients will automatically select from a hard-coded list of directory servers during their first directory access. You may examine or over-ride this decision using + +[code] +util/config system directory_server +[/code] + +To set a different server, + +[code] +util/config system directory_server https://newdirectory.something +[/code] + + +[b]Standalone configuration[/b] + +Some sites may wish to operate in 'standalone' mode and not connect to any external directory services. This is useful for isolated sites ("off the gird") and test sites, but can also be useful for small organisations who do not wish to connect with other sites in the network. + +To configure this, please look in your .htconfig.php file for the following text and set the configuration accordingly. + +[code] +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +App::$config['system']['directory_mode'] = DIRECTORY_MODE_STANDALONE; +[/code] + + +[b]Secondary server configuration[/b] + +You may also configure your site as a secondary server. This operates as a mirror of the primary directory and allows disitribution of the load amongst available servers. There is very little functional difference between a primary and secondary sever, however there may only be *one* primary directory server per realm (realms are discussed later in this document). + +Before choosing to be a directory server, please be advised that you should be an active member of the network and have the resources and time available to manage these services. They don't typically require management, but the requirement is more for stability as losing a directory server can cause issues to directory clients which are reliant on it. + + +[b]Changing the directory server[/b] + +If a directory server indicates that it is no longer a directory server, this should be detected by the software and the configuration for that server will be removed (blanked). If it goes offline permanently without warning, you will only know if site members report that directory services are unavailable. Currently this can only be repaired manually by the site administrator by selecting a new directory and performing: + +[code] +util/config system directory_server https://newdirectory.something +[/code] + +Eventually we hope to make this a selectable box from the site admin panel. + + +[h2]Directory realms[/h2] + +Large organisations may wish to use directory 'realms' rather than a single standalone directory. The standard and default realm is known as RED_GLOBAL. By creating a new realm, your organisation has the ability to create its own hierarchy of primary and secondary servers and clients. + +[code] +util/config system directory_realm MY_REALM +[/code] + +Your realm *must* have a primary directory. Create this first. Then set the realm the same on all sites within your directory realm (servers and clients). + +You may also provide a "sub-realm" that operates indepently from the RED_GLOBAL realm (or any other realm) but allows cross membership and some ability to lookup members of the entire directory space. This has only undergone light testing so be prepared to help out and fix any issues that may arise. A sub-realm contains its parent realm within the realm name. + + +[code] +util/config system directory_realm RED_GLOBAL:MY_REALM +[/code] + + +[b]Realm access[/b] + +You may wish that your directory servers and services are only used by members of your realm. To do this a token or password must be supplied to access the realm directory services. This token is not encrypted during transit, but is sufficient to prevent casual access to your directory servers. The following must be configured for all sites (clients and directory servers) within the realm: + +[code] +util/config system realm_token my-secret-realm-password +[/code] + + + +[h2]Directory mirrors[/h2] + +Mirroring occurs with a daily transaction log of activities which are shared between directory servers. In the case of directory and profile updates, the channel address performing the update is transmitted, and the other directory servers probe that channel at its source for changes. We do not and should not trust any information given us by other directory servers. We always check the information at the source. + +Ratings are handled slightly differently - an encrypted packet (signed by the channel that created the rating) is passed between the servers. This signature needs to be verified before the rating is accepted. Ratings are always published to the primary directory server and propagated to all other directory servers from there. For this reason there can only be one primary server in a realm. If a misconfigured site claims to be a primary directory, it is ignored in the RED_GLOBAL realm. For other realms there is currently no such protection. Be aware of this when working with alternate realms. + +Newly created directory servers are not provided a "full dump", but for performance reasons and minimal disruption to the other servers in the network, they are brought online slowly. It may take up to a month for a new secondary directory server to provide a full view of the network. Please do not add any secondary servers to the hard-coded list of fallback directory servers until it has been operating as a directory for at least a month. + +All channels are configured to "ping" their directory server once a month, at somewhat random times during the month. This gives the ability for the directory to discover dead channels and sites (they stop pinging). Subsequently they are marked dead or unreachable and over time will be removed from the directory results. + +Channels may be configured to be "hidden" from the directory. These channels may still exist in the directory but will be un-searchable and some "sensitive" personal information will not be stored at all. + + \ No newline at end of file diff --git a/doc/en/dnt-policy.txt b/doc/en/dnt-policy.txt new file mode 100644 index 000000000..ad946d1f8 --- /dev/null +++ b/doc/en/dnt-policy.txt @@ -0,0 +1,218 @@ +Do Not Track Compliance Policy + +Version 1.0 + +This domain complies with user opt-outs from tracking via the "Do Not Track" +or "DNT" header [http://www.w3.org/TR/tracking-dnt/]. This file will always +be posted via HTTPS at https://example-domain.com/.well-known/dnt-policy.txt +to indicate this fact. + +SCOPE + +This policy document allows an operator of a Fully Qualified Domain Name +("domain") to declare that it respects Do Not Track as a meaningful privacy +opt-out of tracking, so that privacy-protecting software can better determine +whether to block or anonymize communications with this domain. This policy is +intended first and foremost to be posted on domains that publish ads, widgets, +images, scripts and other third-party embedded hypertext (for instance on +widgets.example.com), but it can be posted on any domain, including those users +visit directly (such as www.example.com). The policy may be applied to some +domains used by a company, site, or service, and not to others. Do Not Track +may be sent by any client that uses the HTTP protocol, including websites, +mobile apps, and smart devices like TVs. Do Not Track also works with all +protocols able to read HTTP headers, including SPDY. + +NOTE: This policy contains both Requirements and Exceptions. Where possible +terms are defined in the text, but a few additional definitions are included +at the end. + +REQUIREMENTS + +When this domain receives Web requests from a user who enables DNT by actively +choosing an opt-out setting in their browser or by installing software that is +primarily designed to protect privacy ("DNT User"), we will take the following +measures with respect to those users' data, subject to the Exceptions, also +listed below: + +1. END USER IDENTIFIERS: + + a. If a DNT User has logged in to our service, all user identifiers, such as + unique or nearly unique cookies, "supercookies" and fingerprints are + discarded as soon as the HTTP(S) response is issued. + + Data structures which associate user identifiers with accounts may be + employed to recognize logged in users per Exception 4 below, but may not + be associated with records of the user's activities unless otherwise + excepted. + + b. If a DNT User is not logged in to our service, we will take steps to ensure + that no user identifiers are transmitted to us at all. + +2. LOG RETENTION: + + a. Logs with DNT Users' identifiers removed (but including IP addresses and + User Agent strings) may be retained for a period of 10 days or less, + unless an Exception (below) applies. This period of time balances privacy + concerns with the need to ensure that log processing systems have time to + operate; that operations engineers have time to monitor and fix technical + and performance problems; and that security and data aggregation systems + have time to operate. + + b. These logs will not be used for any other purposes. + +3. OTHER DOMAINS: + + a. If this domain transfers identifiable user data about DNT Users to + contractors, affiliates or other parties, or embeds from or posts data to + other domains, we will either: + + b. ensure that the operators of those domains abide by this policy overall + by posting it at /.well-known/dnt-policy.txt via HTTPS on the domains in + question, + + OR + + ensure that the recipient's policies and practices require the recipient + to respect the policy for our DNT Users' data. + + OR + + obtain a contractual commitment from the recipient to respect this policy + for our DNT Users' data. + + NOTE: if an “Other Domain” does not receive identifiable user information + from the domain because such information has been removed, because the + Other Domain does not log that information, or for some other reason, these + requirements do not apply. + + c. "Identifiable" means any records which are not Anonymized or otherwise + covered by the Exceptions below. + +4. PERIODIC REASSERTION OF COMPLIANCE: + + At least once every 12 months, we will take reasonable steps commensurate + with the size of our organization and the nature of our service to confirm + our ongoing compliance with this document, and we will publicly reassert our + compliance. + +5. USER NOTIFICATION: + + a. If we are required by law to retain or disclose user identifiers, we will + attempt to provide the users with notice (unless we are prohibited or it + would be futile) that a request for their information has been made in + order to give the users an opportunity to object to the retention or + disclosure. + + b. We will attempt to provide this notice by email, if the users have given + us an email address, and by postal mail if the users have provided a + postal address. + + c. If the users do not challenge the disclosure request, we may be legally + required to turn over their information. + + d. We may delay notice if we, in good faith, believe that an emergency + involving danger of death or serious physical injury to any person + requires disclosure without delay of information relating to the + emergency. + +EXCEPTIONS + +Data from DNT Users collected by this domain may be logged or retained only in +the following specific situations: + +1. CONSENT / "OPT BACK IN" + + a. DNT Users are opting out from tracking across the Web. It is possible + that for some feature or functionality, we will need to ask a DNT User to + "opt back in" to be tracked by us across the entire Web. + + b. If we do that, we will take reasonable steps to verify that the users who + select this option have genuinely intended to opt back in to tracking. + One way to do this is by performing scientifically reasonable user + studies with a representative sample of our users, but smaller + organizations can satisfy this requirement by other means. + + c. Where we believe that we have opt back in consent, our server will + send a tracking value status header "Tk: C" as described in section 6.2 + of the W3C Tracking Preference Expression draft: + + http://www.w3.org/TR/tracking-dnt/#tracking-status-value + +2. TRANSACTIONS + + If a DNT User actively and knowingly enters a transaction with our + services (for instance, clicking on a clearly-labeled advertisement, + posting content to a widget, or purchasing an item), we will retain + necessary data for as long as required to perform the transaction. This + may for example include keeping auditing information for clicks on + advertising links; keeping a copy of posted content and the name of the + posting user; keeping server-side session IDs to recognize logged in + users; or keeping a copy of the physical address to which a purchased + item will be shipped. By their nature, some transactions will require data + to be retained indefinitely. + +3. TECHNICAL AND SECURITY LOGGING: + + a. If, during the processing of the initial request (for unique identifiers) + or during the subsequent 10 days (for IP addresses and User Agent strings), + we obtain specific information that causes our employees or systems to + believe that a request is, or is likely to be, part of a security attack, + spam submission, or fraudulent transaction, then logs of those requests + are not subject to this policy. + + b. If we encounter technical problems with our site, then, in rare + circumstances, we may retain logs for longer than 10 days, if that is + necessary to diagnose and fix those problems, but this practice will not be + routinized and we will strive to delete such logs as soon as possible. + +4. AGGREGATION: + + a. We may retain and share anonymized datasets, such as aggregate records of + readership patterns; statistical models of user behavior; graphs of system + variables; data structures to count active users on monthly or yearly + bases; database tables mapping authentication cookies to logged in + accounts; non-unique data structures constructed within browsers for tasks + such as ad frequency capping or conversion tracking; or logs with truncated + and/or encrypted IP addresses and simplified User Agent strings. + + b. "Anonymized" means we have conducted risk mitigation to ensure + that the dataset, plus any additional information that is in our + possession or likely to be available to us, does not allow the + reconstruction of reading habits, online or offline activity of groups of + fewer than 5000 individuals or devices. + + c. If we generate anonymized datasets under this exception we will publicly + document our anonymization methods in sufficient detail to allow outside + experts to evaluate the effectiveness of those methods. + +5. ERRORS: + +From time to time, there may be errors by which user data is temporarily +logged or retained in violation of this policy. If such errors are +inadvertent, rare, and made in good faith, they do not constitute a breach +of this policy. We will delete such data as soon as practicable after we +become aware of any error and take steps to ensure that it is deleted by any +third-party who may have had access to the data. + +ADDITIONAL DEFINITIONS + +"Fully Qualified Domain Name" means a domain name that addresses a computer +connected to the Internet. For instance, example1.com; www.example1.com; +ads.example1.com; and widgets.example2.com are all distinct FQDNs. + +"Supercookie" means any technology other than an HTTP Cookie which can be used +by a server to associate identifiers with the clients that visit it. Examples +of supercookies include Flash LSO cookies, DOM storage, HTML5 storage, or +tricks to store information in caches or etags. + +"Risk mitigation" means an engineering process that evaluates the possibility +and likelihood of various adverse outcomes, considers the available methods of +making those adverse outcomes less likely, and deploys sufficient mitigations +to bring the probability and harm from adverse outcomes below an acceptable +threshold. + +"Reading habits" includes amongst other things lists of visited DNS names, if +those domains pertain to specific topics or activities, but records of visited +DNS names are not reading habits if those domain names serve content of a very +diverse and general nature, thereby revealing minimal information about the +opinions, interests or activities of the user. diff --git a/doc/en/doco.bb b/doc/en/doco.bb new file mode 100644 index 000000000..7ca64cfea --- /dev/null +++ b/doc/en/doco.bb @@ -0,0 +1,33 @@ +[b]Creating Documentation[/b] + +To contribute documentation, simply put some words in a cunning order, and make their existence known to a developer. You can do this literally anywhere as long as a developer can see it. Once made aware, somebody will check it in for you. You should try to avoid proprietary formats, or locations that require authentication with methods other than Zot in order to make it easy for a developer to access, but even this is not a strict requirement. + +If you wish to contribute directly, that's fine too. To contribute directly, documentation should be in one of the following formats: + +[li]Markdown[/li] +[li]BBCode[/li] +[li]HTML[/li] +[li]Plain Text[/li] + +Other formats are also allowed, but support for the format must be added to mod/help.php first. + +If editing a plain text file, please keep column width to 80. This is because plain text is used in instances where we may not have a working installation - the installation documentation, for example - and it should be easy to read these from a CLI text editor. + +The advantage of Markdown is that it is human readable. + +The advantage of BBCode is that it is identity aware. + +Therefore, if using BBCode, try to make the most of it: +[li]Use ZRL links where appropriate to ensure a link to another site retains authentication and keeps identity based documentation working[/li] +[li]Use baseurl or observer.baseurl tags where appropriate instead of example.com for authenticated viewers.[/li] +[li]Support non-authenticated users with observer=0 tags. We presently do not do this due to historical oversights. This needs adding everywhere[/li] + +[b]Translations[/b] + +To translate documentation, or provided documentation in languages other than English: +[li]Create a directory in doc/ with your two letter country code if it doesn't already exist (eg, doc/de/ for German or doc/fr/ for French)[/li] +[li]Create a document with the same filename as the English version, but with content in your own language. This allows us to fallback to the English if the translation for a particular page is not provided[/li] + +To create documentation that has no equivalent file in English, you can create a new file with a name of your choosing - but you'll also need to provide a localised version of the index page (main.bb in English) to make it accessible from the menu. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/encryption.bb b/doc/en/encryption.bb new file mode 100644 index 000000000..9985f4b33 --- /dev/null +++ b/doc/en/encryption.bb @@ -0,0 +1,18 @@ +[size=large]Builtin Automatic Encryption[/size] + +Full disclosure: The encryption $Projectname uses per default is not absolutely waterproof. There [i]are[/i] known procedures to circumvent it. [i]But[/i] this takes a lot of effort and needs to be done individually for each channel. And to make this clear: Other services store your messages in plaintext, therefore we regard this approach as a [i]significant[/i] improvement for your privacy. Plus you are always free to use further encryption and password protection if you so desire. + + +To explain this in more detail: + +- each channel has its key pair +- every non-public post is automatically encrypted +- optional password protect content via crypto-javascript browser-to-browser encryption (needs to be enabled in settings) Full disclosure: A rogue hub admin could injects malicious javascript-code (e.g. keylogging-abilities) into the code. Encrypt our stuff out of band with GPG, become a hub administrator yourself or use other means of communication if this worries you. + +So what is the scope of security? Full disclosure: This might be great, but it is not perfect. +- every non-public post is automatically encrypted but persons who have access to the site's database and files [i]may[/i] be able to decrypt everything by using these keys which obviously need to be stored on the server. To be clear: The encrypion keys are different for every channel and it is [i]quite an effort[/i] to do this. And again: Other services store your messages in plain text unencrypted. So this [i]is[/i] quite a significant win for your privacy. + +We believe that the NSA-level dragnet plaintext extracting mass surveillance is probably not possible due to the design of the zot protocol. Dedicated attacks including hacking into one hub to obtain the server logs and database only partly reveal what is going on between people communication between different hubs. We believe that this makes it much more expensive for state-level attackers to access your content in $Projectname. + + +We gladly accept help improving the security of the system and auditing it as well. diff --git a/doc/en/external-resource-links.bb b/doc/en/external-resource-links.bb new file mode 100644 index 000000000..338db8023 --- /dev/null +++ b/doc/en/external-resource-links.bb @@ -0,0 +1,21 @@ +[h2]External resource links[/h2] +[h3]Third-Party Themes[/h3] +[ul] +[*][url=https://github.com/omigeot/redstrap3]Redstrap[/url] +[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url] +[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url] +[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's themes[/url] +[/ul] +[h3]Third-Party addons[/h3] +[ul] +[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url] +[/ul] +[h3]Related projects[/h3] +[ul] +[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url] +[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url] +[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url] +[*][url=https://wordpress.org/plugins/hubzilla-wp/]WordPress gateway (combine with wppost addon for full features)[/url] +[/ul] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/extra_features.bb b/doc/en/extra_features.bb new file mode 100644 index 000000000..17d85228e --- /dev/null +++ b/doc/en/extra_features.bb @@ -0,0 +1,98 @@ +// multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file? +[b]Features[/b] + +The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page. + +[b]Content Expiration[/b] + +Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed. + +[b]Multiple Profiles[/b] + +The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. + +[b]Web Pages[/b] + +Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks. + +[b]Private Notes[/b] + +On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. + +[b]Extended Identity Sharing[/b] + +By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix. + +[b]Expert Mode[/b] + +This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking. + +[b]Premium Channel[/b] + +This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect. + +[b]Post Preview[/b] + +Allows previewing posts and comments exactly as they would look on the page before publishing them. + +[b]Channel Sources[/b] + +Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel. + +[b]Even More Encryption[/b] + +Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog". + +[b]Search by Date[/b] + +This provides the ability to select posts by date ranges + +[b]Privacy Group Filter[/b] + +Enable widget to display stream posts only from selected privacy groups. This also toggles the outbound permissions while you are viewing a group. This is analogous to Google "circles" or Disapora "aspects". + +[b]Saved Searches[/b] + +Provides a search widget on your matrix page which can save selected search terms for re-use. + +[b]Personal Tab[/b] + +Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. + +[b]New Tab[/b] + +Enables a tab to display all new matrix activity as a firehose or timeline. + +[b]Affinity Tool[/b] + +Filter matrix stream activity by the depth of your relationships + +[b]Edit Sent Posts[/b] + +Edit and correct posts and comments after sending + +[b]Tagging[/b] + +Ability to tag existing posts, including those written by others. + +[b]Post Categories[/b] + +Add categories to your channel posts + +[b]Saved Folders[/b] + +Ability to file posts under folders or tags for later recall + +[b]Dislike Posts[/b] + +Ability to dislike posts/comments + +[b]Star Posts[/b] + +Ability to mark special posts with a star indicator + +[b]Tag Cloud[/b] + +Provide a personal tag cloud on your channel page + +#include doc/macros/main_footer.bb; diff --git a/doc/en/faq_admins.bb b/doc/en/faq_admins.bb new file mode 100644 index 000000000..0b54a41de --- /dev/null +++ b/doc/en/faq_admins.bb @@ -0,0 +1,78 @@ +[size=large][b]$Projectname FAQ[/b][/size] + +[toc] + +[h3]Is there a way to change the Admin account?[/h3] +[h3]Is there a way to have multiple administrators?[/h3] +Yes, but it's a bit messy at the moment as it is not yet exposed in the UI. To make an account an administrative account, +one needs to add 4096 to the account_roles entry in the account table of the database. Likewise, to remove administrative permissions, +one must subtract 4096 from the account roles. + +[h3]I can log in, but there are no posts or webpages[/h3] + +Most likely, your item table has crashed. Run the MySQL command [code]repair table item;[/code] + +[h3]Login doesn't work, immediately after login, the page reloads and I'm logged out[/h3] + +Most likely, your session table has crashed. Run the MySQL command [code]repair table session;[/code] + +[h3]When I switch theme, I sometimes get elements of one theme superimposed on top of the other[/h3] + +a) store/[data]/smarty3 isn't writeable by the webserver. Make it so. + +b) You're using Midori, or with certain themes, Konqueror in KHTML mode. + +[b]My network tab won't load, it appears to be caused by a photo or video[/h3] + +Your PHP memory limit is too low. Increase the size of the memory_limit directive in your php.ini + +Contrary to popular belief, the number of users on a hub doesn't make any difference to the required memory limit, rather, the content +of an individuals matrix counts. Streams with lots of photos and video require more memory than streams with lots of text. + +[h3]I have no communication with anybody[/h3] + +You're listening on port 443, but do not have a valid SSL certificate. Note this applies even if your baseurl is http. +Don't listen on port 443 if you cannot use it. It is strongly recommended to solve this problem by installing a browser +valid SSL certificate rather than disabling port 443. + +[h3]How do I update a non-Git install?[/h3] +1) Backup .htconfig.php +2) Backup everything in store/ +3) Backup any custom changes in mod/site/ and view/site +3) Delete your existing installation +4) Upload the new version. +5) Upload the new version of themes and addons. +6) Restore everything backed up earlier. + +[h3]What do I need to do when moving my hub to a different server[/h3] + +1) Git clone on the new server. Repeat the process for any custom themes, and addons. +2) Rsync .htconfig.php +3) Rsync everything in store/ +4) Rsync everything in mod/site/ and view/site (these will only exist if you have custom modules) +5) Dump and restore DB. + +[h3]How do I reinstall an existing hub on the same server?[/h3] + +1) [code]git reset --hard HEAD[/code] will reset all files to their upstream defaults. This will not reset any local files that do not also exist upstream. Eg, if you have local changes to mod/channel.php, this will reset them - but will not reset any changes in mod/site/channel.php +2) If you absolutely must reinstall - for example, if you need to upgrade operating system - follow the steps for moving to a different server, but instead of using rsync, backup and restore some other way. + +Do not reinstall a hub with a fresh database and fresh .htconfig.php unless as a very last resort. Creating a temporary account and ask for help via a support channel for non-trivial reinstalls is preferable to reinstalling fresh. + +[h3]How do I set the default homepage for logged out viewers?[/h3] + +Use the custom_home addon available in the main addons repository. + +[h3]What do the different directory mode settings mean?[/h3] +[code]// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory (all of your member's queries will be directed elsewhere) +// DIRECTORY_MODE_SECONDARY = caching directory or mirror (keeps in sync with realm primary [adds significant cron execution time]) +// DIRECTORY_MODE_PRIMARY = main directory server (you do not want this unless you are operating your own realm. one per realm.) +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services (only local site members in directory) +[/code] +- The default is NORMAL. This off-loads most directory services to a different server. The server used is the config:system/directory_server. This setting MAY be updated by the code to one of the project secondaries if the current server is unreachable. You should either be in control of this other server, or should trust it to use this setting. +- SECONDARY. This allows your local site to act as a directory server without exposing your member's queries to another server. It requires extra processing time during the cron polling, and is not recommended to be run on a shared web host. +- PRIMARY. This allows you to run a completely separate 'Network' of directory servers with your own Realm. By default, all servers are on the RED_GLOBAL realm unless the config:system/directory_realm setting is overridden. [i]Do not use this unless you have your own directory_realm.[/i] +- STANDALONE. This is like primary, except it's a 'Network' all on it's own without talking to any other servers. Use this if you have only one server and want to be segregated from the Red#Matrix directory listings. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/feature/access_tokens.bb b/doc/en/feature/access_tokens.bb new file mode 100644 index 000000000..eb5c03717 --- /dev/null +++ b/doc/en/feature/access_tokens.bb @@ -0,0 +1,47 @@ +Feature: Zot Access Tokens +Status: Draft +Date: 15 July 2016 + + +Purpose: + +In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). + + +Scope: + +Zot Access Tokens do not convey membership in the site or network. In particular, they do not provide an account or channel; which may be necessary to interact with the hub owner or with others in the network or federation of networks. In most cases they can only be used to consume restricted resources and do not have an ability to create those resources, however this ability may be provided by custom configurations or in future releases or addons. + +For instance the ability for a temporary login to access a chatroom may provide suitable permission to create chat messages inside that chatroom. + + +Implementation: + +Zot Access Tokens are managed through a "tab" of the settings page. Access to this tab may be controlled by site configuration. On this page, channels may create, edit, list, and remove any access tokens under their control. + +The form to create/edit accepts three parameters, a human readable name, a password or access token, and an optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be automatically purged from the list of temporary accounts. The password field in the create/edit forms displays the text of the access token and not an obscured password. By default we will create a token using the autoname() function, which generally produces a random character sequence which is "pronounceable", hence easy to convey or remember. This can be changed to any other character sequence which is acceptable to the site password complexity policy. (In most Hubzilla installations this imposes a minimum of three characters, but may be extended by plugin or site policy). + + +Usage: + +We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided. + + Example: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied. + +The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album. + + +Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented. + +Zot Acess Tokens are represented internally as an authenticated "observer". Querying the observer in code should return a pseudo or system generated xchan with an unknown protocol and a default profile photo. It will match (successfully) any access control rule which allows authenticated observers. + +Security Considerations: + +The URL form of authentication is inherently less secure than using a login, but may be preferable for some uses of this feature. It probably should not be transmitted over non-SSL links. + + +Future development: + +It might be desirable for future implementations to provide an options for single-use, where the access token is removed promptly following first use. + + \ No newline at end of file diff --git a/doc/en/feature/additional/access.md b/doc/en/feature/additional/access.md new file mode 100644 index 000000000..b7f0df717 --- /dev/null +++ b/doc/en/feature/additional/access.md @@ -0,0 +1,41 @@ +## Access Control and Permissions + + +### Privacy Groups + +Enable management and selection of privacy groups. + + +Minimum required technical skill level to see this feature: 0 + + +### Multiple Profiles + +Ability to create multiple profiles. + + +Minimum required technical skill level to see this feature: 3 + + +### Permission Categories + +Provide alternate connection permission limits. + + +Minimum required technical skill level to see this feature: 2 + + +### OAuth Clients + +Manage authenticatication tokens for mobile and remote apps. + + +Minimum required technical skill level to see this feature: 1 + + +### Access Tokens + +Create access tokens so that non-members can access private content. + + +Minimum required technical skill level to see this feature: 2 diff --git a/doc/en/feature/additional/composition.md b/doc/en/feature/additional/composition.md new file mode 100644 index 000000000..1256f7501 --- /dev/null +++ b/doc/en/feature/additional/composition.md @@ -0,0 +1,67 @@ +## Post Composition Features + + +### Large Photos + +Include large (1024px) photo thumbnails in posts. +If not enabled, use small (640px) photo thumbnails + + +Minimum required technical skill level to see this feature: 1 + + +### Channel Sources + +Automatically import channel content from other channels or feeds + + +Minimum required technical skill level to see this feature: 3 + + +### Even More Encryption + +Allow optional encryption of content end-to-end with a shared secret key + + +Minimum required technical skill level to see this feature: 3 + + +### Enable Voting Tools + +Provide a class of post which others can vote on + + +Minimum required technical skill level to see this feature: 3 + + +### Disable Comments + +Provide the option to disable comments for a post + + +Minimum required technical skill level to see this feature: 2 + + +### Delayed Posting + +Allow posts to be published at a later date + + +Minimum required technical skill level to see this feature: 2 + + +### Content Expiration + +Remove posts/comments and/or private messages at a future time + + +Minimum required technical skill level to see this feature: 1 + + +### Suppress Duplicate Posts/Comments + +Prevent posts with identical content to be published +with less than two minutes in between submissions. + + +Minimum required technical skill level to see this feature: 1 diff --git a/doc/en/feature/additional/filtering.md b/doc/en/feature/additional/filtering.md new file mode 100644 index 000000000..ba8e1e29f --- /dev/null +++ b/doc/en/feature/additional/filtering.md @@ -0,0 +1,57 @@ +## Network and Stream Filtering + + +### Search by Date + +Ability to select posts by date ranges + + +Minimum required technical skill level to see this feature: 1 + + +### Saved Searches + +Save search terms for re-use + + +Minimum required technical skill level to see this feature: 2 + + +### Network Personal Tab + +Enable tab to display only Network posts that you've interacted on + + +Minimum required technical skill level to see this feature: 1 + + +### Network New Tab + +Enable tab to display all new Network activity + + +Minimum required technical skill level to see this feature: 2 + + +### Affinity Tool + +Filter stream activity by depth of relationships + + +Minimum required technical skill level to see this feature: 1 + + +### Suggest Channels + +Show friend and connection suggestions + + +Minimum required technical skill level to see this feature: 1 + + +### Connection Filtering + +Filter incoming posts from connections based on keywords/content + + +Minimum required technical skill level to see this feature: 3 diff --git a/doc/en/feature/additional/general.md b/doc/en/feature/additional/general.md new file mode 100644 index 000000000..a1b712b12 --- /dev/null +++ b/doc/en/feature/additional/general.md @@ -0,0 +1,130 @@ +## General Features + + +### New Member Links + +Display new member quick links menu. + + +Minimum required technical skill level to see this feature: 1 + + +### Advanced Profiles + +Additional profile sections and selections + + +Minimum required technical skill level to see this feature: 1 + + +### Profile Import/Export + +Save and load profile details across sites/channels + + +Minimum required technical skill level to see this feature: 3 + + +### Web Pages + +Provide managed web pages on your channel + + +Minimum required technical skill level to see this feature: 3 + + +### Wiki + +Provide a wiki for your channel + + +Minimum required technical skill level to see this feature: 2 + + +### Private Notes + +Enables a tool to store notes and reminders (note: not encrypted) + + +Minimum required technical skill level to see this feature: 1 + + +### Cards + +Create personal planning cards + + +Minimum required technical skill level to see this feature: 1 + + +### Articles + +Create interactive articles + + +Minimum required technical skill level to see this feature: 1 + + +### Navigation Channel Select + +Change channels directly from within the navigation dropdown menu + + +Minimum required technical skill level to see this feature: 3 + + +### Photo Location + +If location data is available on uploaded photos, link this to a map. + + +Minimum required technical skill level to see this feature: 2 + + +### Access Controlled Chatrooms + +Provide chatrooms and chat services with access control. + + +Minimum required technical skill level to see this feature: 1 + + +### Smart Birthdays + +Make birthday events timezone aware in case your friends are scattered across the planet. + + +Minimum required technical skill level to see this feature: 2 + + +### Event Timezone Selection + +Allow event creation in timezones other than your own. + + +Minimum required technical skill level to see this feature: 2 + + +### Premium Channel + +Allows you to set restrictions and terms +on those that connect with your channel + + +Minimum required technical skill level to see this feature: 4 + + +### Advanced Directory Search + +Allows creation of complex directory search queries + + +Minimum required technical skill level to see this feature: 4 + + +### Advanced Theme and Layout Settings + +Allows fine tuning of themes and page layouts + + +Minimum required technical skill level to see this feature: 4 diff --git a/doc/en/feature/additional/overview.md b/doc/en/feature/additional/overview.md new file mode 100644 index 000000000..b51f60bcd --- /dev/null +++ b/doc/en/feature/additional/overview.md @@ -0,0 +1,33 @@ +[chset]: /settings "Channel Settings" +[ftset]: /settings/features "Additional Features Settings" +[ftgen]: /help/feature/additional/general "General Features" +[ftacc]: /help/feature/additional/access "Access Control and Permissions" +[ftcom]: /help/feature/additional/composition "Post Composition Features" +[ftfil]: /help/feature/additional/filtering "Network and Stream Filtering" +[ftpos]: /help/feature/additional/posts "Post/Comment Tools" + + +# Additional Features + + + + + +You can switch the features on and off from the +[Additional Features][ftset] link in the [Channel Settings][chset]. + + + +The following pages decribe all the available features +grouped in the same way as they are with the accordion tabs on the +[Additional Features][ftset] settings page: + +[General Features][ftgen] + +[Access Control and Permissions][ftacc] + +[Post Composition Features][ftcom] + +[Network and Stream Filtering][ftfil] + +[Post/Comment Tools][ftpos] diff --git a/doc/en/feature/additional/posts.md b/doc/en/feature/additional/posts.md new file mode 100644 index 000000000..d3f6b37db --- /dev/null +++ b/doc/en/feature/additional/posts.md @@ -0,0 +1,57 @@ +## Post/Comment Tools + + +### Community Tagging + +Ability to tag existing posts + + +Minimum required technical skill level to see this feature: 1 + + +### Post Categories + +Add categories to your posts + + +Minimum required technical skill level to see this feature: 1 + + +### Emoji Reactions + +Add emoji reaction ability to posts + + +Minimum required technical skill level to see this feature: 1 + + +### Saved Folders + +Ability to file posts under folders + + +Minimum required technical skill level to see this feature: 2 + + +### Dislike Posts + +Ability to dislike posts/comments + + +Minimum required technical skill level to see this feature: 1 + + +### Star Posts + +Ability to mark special posts with a star indicator + + +Minimum required technical skill level to see this feature: 1 + + +### Tag Cloud + +Provide a personal tag cloud on your channel page + + +Minimum required technical skill level to see this feature: 2 diff --git a/doc/en/federate.bb b/doc/en/federate.bb new file mode 100644 index 000000000..9137ec160 --- /dev/null +++ b/doc/en/federate.bb @@ -0,0 +1,71 @@ +[h2]Creating protocol federation services[/h2] + +There are three main components to writing federation plugins. These are: + +[1] Channel discovery and making connections +[2] Sending posts/messages +[3] Receiving posts/messages + +In addition, federation drivers must handle + +[4] differences in privacy policies (and content formats) + + +[h3]Making connections[/h3] + +The core application provides channel discovery in the following sequence: + +[1] Zot channel discovery +[2] Webfinger (channel@hub) lookup + [2.1] RFC7033 webfinger + [2.2] XRD based webfinger (old style) +[3] URL discovery (currently only used to discover RSS feeds) +[4] If all of these fail, the network is "unknown" and we are unable to communicate with or connect with the channel. An 'xchan' record [i]may[/i] still be created [b]if[/b] there is enough information known to identify a unique channel. + +Any of the lookup services may be bound to a plugin and extended. When a channel is discovered, we create an 'xchan' record which is a platform neutral representation of the channel identity. If we need to send information to the channel, a 'hubloc' (hub location) record is also generally required. A 'follow' plugin hook is provided to bypass webfinger and this discovery sequence completely. + +The final step in gluing this together is to create an 'abook' record, which attaches an xchan in a relationship to a local channel with a given set of permissions. + +For networks which do not support nomadic identity, your plugin must also set "abook_instance" which is a comma-separated list of local URLs that the remote channel is connected with. For instance if your member was connected to my channel clone at https://example.com, the abook_instance for that connection would read 'https://example.com'. If you also connected to my clone at https://abc.example.com, the string would be changed to 'https://example.com,https://abc.example.com'. This allows local channels to differentiate which instance a given remote channel is connected with and avoid delivery failures to those channels from other clone instances. + +A federation plugin for a webfinger based system needs only to examine the webfinger or XRD results and identify a protocol stack which can be used to connect or communicate. Then create an xchan record with the given 'xchan_network' type and a hubloc record with the same 'hubloc_network' with the information given. Currently the plugin will need to create the entire record, but in the future this will be extended so that the plugin only need identify a network name and the record will be populated with all other known values. + +An xchan record is always required in order to connect. To connect, create an abook record with the desired permissions. + +Additional information that your plugin requires for communication can be stored in the xconfig table and/or abconfig table if there is no convenient or appropriate table column in the xchan or hubloc tables. + +When a connection is made, we generally call the notifier (include/notifier.php) to send a message to the remote channel. This is bound to the hook 'permissions_create'. Your plugin will need to handle this in order to send a "follow" or "make friends" message to the other network. + +Notes: The first stage zot lookup will be replaced with a webfinger lookup. This work is in progress. A separate lookup was required initially as webfinger does not allow non-SSL connections. We will provide non-SSL zot lookups (usually test and development sites) via the "old" XRD based webfinger to avoid this limitation. + +The core application will attempt to create xchan records for projects identified as members of the "open web"; currently Hubzilla, Friendica, Diaspora, GNU-Social and Pump.io. This is so that comments can be passed amongst project sites and the network correctly identified. A federation plugin is required to fully federate with other networks, but comments may be passed to sites without such a plugin installed so that there are no unexplained holes in conversations. + +The core application must also provide signing ability for Diaspora comments since they require a special signing format and must be signed by the comment author regardless of whether that channel federates with Diaspora. The owner of the conversation may federate with Diaspora so the comments must be signed. This is unfortunate but necessary. + + +[h3]Sending Messages[/h3] + +Whenever any message is sent (with the sole exception of directory communications), we invoke the notifier (include/notifier.php), and pass it the type of message and generally an identifier to lookup the information being sent from the database (items or conversational things, private mail, permissions updates, etc.). + +The notifier has several hooks which may be used by plugins in different ways, depending on how their delivery loop works. For different message types and complex delivery situations you may need to tie into multiple hooks. The 'permissions_create' hook was mentioned in the first section. There is also a 'permissions_update' message if permissions have changed and the other end of the link needs to be advised. Few services will provide or handle this (as their permissions are static), but it is also used for instance to send profile and profile photo update messages and you may wish to handle this. + +The next plugin hook is 'notifier_process'. It is passed an array providing the complete state of the notifier and is called once per notifier invocation. It contains the complete list of recipients (with xchan_network set for each). + +There is also 'notifier_hub' which like 'notifier_process' is passed the complete state of the notifier, but the difference is that it is called for each individual hub or distinct URL delivery and may be matched on the hubloc_network type. Hub delivery is much more efficient than recipient delivery but may not be suitable for all protocol stacks. + + +Your plugin will be required to understand the message state and recipients and translate the sent item to the desired format. You will also be required to check privacy and block communication to anybody but the intended recipients - *if* it is a private communication. The plugin will often at this point stick the message into the queue and return the queue id to the notifier. + + +Queue handlers exist already for simple posted data. If you create a queue entry with 'post' type we'll open an HTTP POST request and post the data provided and acknowledge success or failure. You can create other forms of communication by providing a different outq_driver type and handling the processing of queue requests yourself. Delivery reporting is available if you wish to acknowledge different error conditions, or anything beyond success/failure. Advanced delivery reporting will also require a custom queue type. The basic 'post' type only deals with success (communication successful with the remote site) and failure. + + + +[h3]Receiving Messages[/h3] + + +Receiving messages from the remote network will probably require a 'receive' endpoint or module dedicated to your network communication protocol. This is a URL route that your plugin may need to register with the'module_loaded' hook. You module will then take responsibility for importing any data which arrives at that endpoint and translating it to the format required for this project and storing the resulting data. The basic structure we use is an extensible activitystream item but with slightly different field names and several optional fields. It can be easily mapped to an activitystream. Additional data can be stored in the "iconfig" table. item_store() and item_store_update() are generally used to store the data and send appropriate notifications. Similiar facilities are available for private mail and profile information. + + + + diff --git a/doc/en/filesync.md b/doc/en/filesync.md new file mode 100644 index 000000000..4c64bdb09 --- /dev/null +++ b/doc/en/filesync.md @@ -0,0 +1,61 @@ +File Sync and Clone +=================== + + + +File cloning across multiple instances of a channel is a very hard problem, due to the nature of PHP memory allocation. This needs to be handled dramatically differently than cloning or syncing of other information. (Processing one large video file or 40-50 photos could exhaust memory). Therefore we can't easily just dump all the data to a dump file and sequentially process it. Loading the dump file itself is likely to exhaust memory. + +There are also two primary operations we are considering. The first is the hardest - saving and then importing all your channel information into a new channel clone. The second is synchronising file changes as they occur across two or more "active" clones. + +For the first cut at this tool we will concentrate on the second case, while trying to maintain some measure of compatibility with the first case so that we can re-use the same tools. + +Meta Data +========= + + +First we need the metadata for the file in order to precisely re-construct its structure on another site. This requires the following information: + +'attach' structure (without file contents - which is the default) for the file itself **and** its parent directories so that we can re-create its precise place in the file system, since we do not know if the parent directory has been imported previously or ever. + +'photo' structure for any photo elements which were created as a result of uploading this file into the system. This typically contains several different 'scales' or thumbnail images, some of which may be cropped for profile photo use or cover photo use. We need to retain the cropping information which is not present in the metadata, but only in the stored data. The actual thumbnail image data may or may not be included in the metadata. A cover photo of large scale (scale #7) could potentially cause memory issues. Not as bad as a 100M video, but if you have several of these they could add up. + +'item' entries which are linked to this file. These can be file share activities, the "parent item" linked to photos, and any attached conversation items (photo likes, comments, etc.) + +All of these items will require URL replacement and re-signing of the item as they are relocated to another site. + + +File Data +========= + +Then we have the actual file data we need to reconstruct the file. This needs to be stored separately from the meta-data to avoid memory exhaustion when processing. The actual file data can be used to reconstruct the attach structure and the first four photo scales. If this is a photo, we need access to the "#4 scale" (profile photo) and the #7 scale (cover photo) as they were originally cropped. All other thumbnails can be generated from these. + + + +File Sync +========= + + +We will consider this operation first because it is probably the most straightforward to implement. When a photo is added to or removed or changed from the source system, we will send a clone sync packet to all known clones containing the metadata - but **no file data** . We can only send one sync packet per file operation that needs to be synced. + +The receiving end will create and perform URL translation on all the metadata structures and store them. Then it will need to fetch the actual data. Assuming CURL supports streaming, an authenticated request is sent to the original site and the original file is requested and streamed directly to disk (bypassing all processing). If photo scale #4 or scale #7 is required, these are requested and stored into their respective structures. We're assuming in this case that the cover photo large scale will not exhaust memory. If CURL cannot be made to support streaming, request packets need to be queued and sent to the origination site to obtain "chunks" of the file and re-assembled once all chunks have been retrieved. + +The authenticated request depends on the mechanism. For CURL streaming, some signed secret with a timestamp will probably need to be generated and posted to the file origination site. Then the data can be retrieved with minimal internal processing and dumped directly to disk using stdio buffering. In the case of a zot request, the zot request packet will be validated, however scheduling chunk batches and re-assembling them could be tricky. + + +File Backup/Restore +=================== + +This is much more complicated as we do not have an authenticate web server to request data from. The metadata can be mostly the same, but we need some form of signalling that we will not be fetching the file via the web. This will likely require a client side process to parse each metadata file and locate a file on disk which it is associated with. Then the data would need to be streamed to the destination server with a special endpoint designed for this task. A java app might be the best option here to retain platform neutrality. + +Another option would be to use WebDAV for this step. The metadata files would be uploaded first, and then the data files. If a data file corresponded to an existing metadata file, the metadata would be processed; the file stored appropriately, and the metadata file then removed. In this case, photos of scales 4 and 7 would need to be provided in the metadata. + + +Optionally, this step could also be performed with a filesystem local to the destination server. This would be the highest performance, and a suite of shell-based tools (in the case of Linux) could perform the "client-side" of the task. + +The complexity of this task mandates careful planning into how the data is organised and stored and if necessary backed up remotely or transmitted for backup by the source website. + + +Backward Compatibility +====================== + +There are some obvious issues with making data available for backup or cloning which existed on the system prior to the existence of restore/sync tools. To keep the tools themselves relatively uncomplicated (to the extent possible given the constraints) backward compatibility may have to be preformed by dedicated plugin or addon. \ No newline at end of file diff --git a/doc/en/first-post.bb b/doc/en/first-post.bb new file mode 100644 index 000000000..cf6ed5b49 --- /dev/null +++ b/doc/en/first-post.bb @@ -0,0 +1,3 @@ +[size=large]Your first posting[/size] + +... to be written ... diff --git a/doc/en/gdpr1.md b/doc/en/gdpr1.md new file mode 100644 index 000000000..daa401a3d --- /dev/null +++ b/doc/en/gdpr1.md @@ -0,0 +1,114 @@ + +Privacy Notice May 2018 + +How your information will be used +================================= + +Information you provide to this website may be stored and used to provide services to you. + +We require an email address to idenitfy the account holder. This will not be shared with +any other website or service. It is used to send you notifications about your account and +perform administrative tasks such as resetting your password. You have the option to +opt-out of all email notifications through your settings. + +Communication channels created on this website require a name and a photo or avatar. A +default avatar will be chosen if you do not supply one. The name, avatar, and a link to +the channel webpage will be shared with other servers and services in order to refer to +this identity. The name does not need to be your real name and the photo or avatar does +not need to resemble you. + +All other information you supply to this website is optional. + +As a social communication and cloud storage service, you will usually be using this website +to share information with others. We provide a range of privacy options to allow you to +restrict this sharing to only those you choose. + + +Processing of your information +============================== + +Our processing of your information is limited to storing it for you to use. We MAY keep logs +of activity to help diagnose software issues and to maintain security of the system against +intrusion. These logs are routinely deleted after a few days. + +We MAY (if you have provided this permission) try to suggest frendships or connections based +on analysing publicly available information about your connections. This is currently the most +advanced data "processing" performed at this website. You may restrict access to this information +if this processing is undesired. + +If supplied, we MAY use your gender to formulate text messages in your native language, for +instance "Bob commented on HIS post." + +In all other cases, your data is stored under your desired privacy policy and to the best +of our ability is only shared with those who you have elected to share it with. + +We do not share your private information with third parties or analyse your behaviour or personal +characteristics. We have no advertisements or business relationships with advertisers. + +We MAY be asked or forced to divulge information provided by you in response to legitimate +criminal and legal proceedings. Where possible we will notify you if this happens. + + +Access to your information +========================== + +Some communications are shared with other websites. Those using the same software will usually +have similar privacy policies. + + +You may be shown embedded videos and provided links to visit other websites as part of your +day-to-day activities using this website. This MAY expose you to monitoring by external services, such +as (but not limited to) Facebook, Twitter, and Google. Each website operator is allowed to configure +whether or not embedded content is permitted. + +Further access to your personal data and stored files is under your control. + +Our storage of your data is provided under your implied consent through your continued use of +the service. You may withdraw this consent at any time and on account deletion we will remove +all data which belongs to you. The process of deletion may take several days as we also make a good faith +effort to delete it from any internetworked websites that have been provided a copy. + + +All data and files stored for a communications channel are available for you to +download for either archival puposes or to transfer to another compatible website. + + + +Your rights +=========== + +Under the General Data Protection Regulation +(GDPR) and The Data Protection Act 2018 +(DPA) you have a number of rights with regard to your personal data. +You have the right to request from us access to and rectification or erasure of your personal data, +the right to restrict processing, object to processing as well as in certain circumstances the right +to data portability. + +If you have provided consent for the processing of your data you have the right (in certain +circumstances) to withdraw that consent at any time which will not affect the lawfulness of +the processing before your consent was withdrawn. + +You have the right to lodge a complaint to the Information Commissioners’ Office if you +believe that we have not complied with the requirements of the GDPR or DPA 18 with regard +to your personal data. + +Identity and contact details of controller and data protection officer + +[NAME OF COMPANY] +is the controller +[and processor] +of data for the purposes of the DPA 18 and GDPR. 3 + +If you have any concerns as to how your data is processed you can contact: + +[ +[NAME] +Data Protection Offer at +[EMAIL ADDRESS] +] +[NAME] [JOB TITLE] +at +[EMAIL ADDRESS] +or you can write to these +individuals using the address of +[] diff --git a/doc/en/general.bb b/doc/en/general.bb new file mode 100644 index 000000000..0b80db756 --- /dev/null +++ b/doc/en/general.bb @@ -0,0 +1,18 @@ +[h2]Project and site information[/h2] +[h3]$Projectname[/h3] +[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl] +[zrl=[baseurl]/help/project/governance]Project Governance[/zrl] +[zrl=[baseurl]/help/contributor/convenant]Project Covenant and Code of Conduct[/zrl] + +[h3]External resources[/h3] +[zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl] +[url=https://framagit.org/hubzilla/core/]Main Website[/url] +[url=https://framagit.org/hubzilla/addons]Addon Website[/url] +[url=[baseurl]/help/credits]$Projectname Credits[/url] +[h3]About this $Projectname hub[/h3] +[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] +[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl] +[zrl=[baseurl]/siteinfo/json]Detailed Technical Hub Information in JSON format(/siteinfo/json)[/zrl] + +#include doc/macros/main_footer.bb; + diff --git a/doc/en/git_for_non_developers.bb b/doc/en/git_for_non_developers.bb new file mode 100644 index 000000000..5fba17439 --- /dev/null +++ b/doc/en/git_for_non_developers.bb @@ -0,0 +1,71 @@ +[b]Git For Non-Developers[/b] + +So you're handling a translation, or you're contributing to a theme, and every time you make a pull request you have to talk to one of the developers before your changes can be merged in? + +Chances are, you just haven't found a quick how-to explaining how to keep things in sync on your end. It's really very easy. + +After you've created a fork of the repo (just click "fork" at github), you need to clone your own copy. + +For the sake of examples, we'll assume you're working on a theme called redexample (which does not exist). + +[code]git clone https://github.com/username/red.git[/code] + +Once you've done that, cd into the directory, and add an upstream. + +[code] +cd red +git remote add upstream https://framagit.org/hubzilla/core/ +[/code] + +From now on, you can pull upstream changes with the command +[code]git fetch upstream[/code] + +Before your changes can be merged automatically, you will often need to merge upstream changes. + +[code] +git merge upstream/master +[/code] + +You should always merge upstream before pushing any changes, and [i]must[/i] merge upstream with any pull requests to make them automatically mergeable. + +99% of the time, this will all go well. The only time it won't is if somebody else has been editing the same files as you - and often, only if they have been editing the same lines of the same files. If that happens, that would be a good time to request help until you get the hang of handling your own merge conflicts. + +Then you just need to add your changes [code]git add view/theme/redexample/[/code] + +This will add all the files in view/theme/redexample and any subdirectories. If your particular files are mixed throughout the code, you should add one at a time. Try not to do git add -a, as this will add everything, including temporary files (we mostly, but not always catch those with a .gitignore) and any local changes you have, but did not intend to commit. + +Once you have added all the files you have changed, you need to commit them. [code]git commit[/code] + +This will open up an editor where you can describe the changes you have made. Save this file, and exit the editor. + +Finally, push the changes to your own git +[code]git push[/code] + +And that's it, your repo is up to date! + +All you need to do now is actually create the pull request. There are two ways to do this. + +The easy way, if you're using Github is to simply click the green button at the top of your own copy of the repository, enter a description of the changes, and click 'create pull request'. The +main repository, themes, and addons all have their main branch at Github, so this method can be used most of the time. + +Most people can stop here. + +Some projects in the extended RedMatrix ecosphere have no Github presence, to pull request these is a bit different - you'll have to create your pull request manually. Fortunately, this isn't +much harder. + +[code]git request-pull -p [/code] + +Start is the name of a commit to start at. This must exist upstream. Normally, you just want master. + +URL is the URL of [i]your[/i] repo. + +One can also specify . This defaults to HEAD. + +Example: +[code] +git request-pull master https://example.com/project +[/code] + +And simply send the output to the project maintainer. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/hidden_configs.bb b/doc/en/hidden_configs.bb new file mode 100644 index 000000000..4eac1aa6e --- /dev/null +++ b/doc/en/hidden_configs.bb @@ -0,0 +1,127 @@ +[h1]Advanced Configurations for Administrators[/h1] + +[i]This document assumes you're an administrator.[/i] + +$Projectname contains many configuration options hidden from the main admin panel. These are generally options considered too niche, advanced or prone do confusion. + +These settings can be modified through the shell, from the the top level web directory, with the syntax: + +[code]util/config cat key value[/code] +for a site configuration, or + +[code]util/pconfig channel_id cat key value[/code] +for a member configuration. + +For a site configuration, another option is to add a line to .htconfig.php, with the syntax: +[code]App::$config['cat']['key'] = 'value';[/code] + + +[h2]Member configuration (pconfig)[/h2] + +[dl terms="mb"] + [*= system.always_my_theme ] Always use your own theme when viewing channels on the same hub. This will break in some quite imaginative ways when viewing channels with theme dependent Comanche. + [*= system.blocked ] An array of xchans blocked by this channel. Technically, this is a hidden config and does belong here, however, addons (notably superblock) have made this available in the UI. + [*= system.default_cipher ] Set the default cipher used for E2EE items. + [*= system.display_friend_count ] Set the number of connections to display in the connections profile widget. + [*= system.do_not_track ] As the browser header. This will break many identity based features. You should really just set permissions that make sense. + [*= system.forcepublicuploads ] Force uploaded photos to be public when uploaded as wall items. It makes far more sense to just set your permissions properly in the first place. Do that instead. + [*= system.network_page_default ] Set default params when viewing the network page. This should contain the same querystring as manual filtering. + [*= system.paranoia ] Sets the security level of IP checking. If the IP address of a logged-in session changes apply this level to determine if the account should be logged out as a security breach. +Options are: + 0 — no IP checking + 1 — check 3 octets + 2 — check 2 octets + 3 — check for any difference at all + + [*= system.prevent_tag_hijacking ] Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources. + [*= system.startpage ] Another of those technically hidden configs made available by addons. Sets the default page to view when logging in. This is exposed to the UI by the startpage addon. + [*= system.taganyone ] Requires the config of the same name to be enabled. Allow the @mention tagging of anyone, whether you are connected or not. This doesn't scale. + [*= system.anonymous_comments ] By default or if set to 1, custom permissions can be set to allow anonymous (moderated) comments like WordPress, moderated by the channel owner. If set to 0, no member of your site can select or enable this. + [*= system.user_scalable ] Determine if the app is scalable on touch screens. Defaults to on, to disable, set to zero - real zero, not just false. +[/dl] + +[h2]Site configuration[/h2] + +[dl terms="mb"] + [*= randprofile.check ] When requesting a random profile, check that it actually exists first + [*= randprofile.retry ] Number of times to retry getting a random profile + [*= system.admin_email ] Specifies the administrator's email for this site. This is initially set during install. + [*= system.authlog ] Logfile to use for logging auth errors. Used to plug in to server side software such as fail2ban. Auth failures are still logged to the main logs as well. + [*= system.auto_channel_create ] Add the necessary form elements to create the first channel on the account registration page, and create it (possibly following email validation or administrator approval). This precludes the ability to import a channel from another site as the first channel created on this site for a new account. Use with system.default_permissions_role to streamline registration. + [*= system.auto_follow ] Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses). + [*= system.blacklisted_sites ] An array of specific hubs to block from this hub completely. + [*= system.block_public_search ] Similar to block_public, except only blocks public access to search features. Useful for sites that want to be public, but keep getting hammered by search engines. + [*= system.cron_hour ] Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC. + [*= system.default_permissions_role ] If set to a valid permissions role name, use that role for the first channel created by a new account and don't ask for the "Channel Type" on the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', 'forum', 'forum_restricted' and 'forum_private'. Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl]. + [*= system.default_profile_photo ] Set the profile photo that new channels start with. This should contain the name of a directory located under [font=courier]images/default_profile_photos/[/font], or be left unset. If not set then 'rainbow_man' is assumed. + [*= system.directorytags ] Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a positive integer. + [*= system.disable_directory_keywords ] If '1', do not show directory keywords. If the hub is a directory server, prevent returning tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm. + [*= system.disable_discover_tab ] This allows you to completely disable the ability to discover public content from external sites. + [*= system.disable_dreport ] If '1', don't store or link to delivery reports + [*= system.dlogfile ] Logfile to use for logging development errors. Exactly the same as logger otherwise. This isn't magic, and requires your own logging statements. Developer tool. + [*= system.email_notify_icon_url ] URL of image (32x32) to display in email notifications (HTML bodies). + [*= system.expire_delivery_reports ] Expiration in days for delivery reports - default 10 + [*= system.expire_limit ] Don't expire any more than this number of posts per channel per expiration run to keep from exhausting memory. Default 5000. + [*= system.photo_storage_type] If '1', use filesystem instead SQL database to store thumbnails. Default is '0'. Introduced in 4.2 + [*= system.hidden_version_siteinfo ] If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages). + [*= system.hide_help ] Don't display help documentation link in nav bar + [*= system.hide_in_statistics ] Tell the red statistics servers to completely hide this hub in hub lists. + [*= system.hide_version ] If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php + [*= system.ignore_imagick ] Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick. + [*= system.max_daily_registrations ] Set the maximum number of new registrations allowed on any day. Useful to prevent oversubscription after a bout of publicity for the project. + [*= system.max_import_size ] If configured, the maximum length of an imported text message. This is normally left at 200Kbytes or more to accomodate Friendica private photos, which are embedded. + [*= system.max_tagged_forums ] Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery. + [*= system.minimum_feedcheck_minutes ] The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'. + [*= system.no_age_restriction ] Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing. + [*= system.object_cache_days] Set how long is cached embedded content can be used without refetching. Default is 30 days. + [*= system.openssl_conf_file ] Specify a file containing OpenSSL configuration. Needed in some Windows installations to locate the openssl configuration file on the system. Read the code first. If you can't read the code, don't play with it. + [*= system.openssl_encrypt ] Use openssl encryption engine, default is false (uses mcrypt for AES encryption) + [*= system.optimize_items ] Runs optimise_table during some tasks to keep your database nice and defragmented. This comes at a performance cost while the operations are running, but also keeps things a bit faster while it's not. There also exist CLI utilities for performing this operation, which you may prefer, especially if you're a large site. + [*= system.override_poll_lockfile ] Ignore the lock file in the poller process to allow more than one process to run at a time. + [*= system.paranoia ] As the pconfig, but on a site-wide basis. Can be overwritten by member settings. + [*= system.pin_types ] Array of allowed item types for pinning. Defaults depend on module but can be redifined here. + [*= system.photo_cache_time ] How long to cache photos, in seconds. Default is 86400 (1 day). Longer time increases performance, but it also means it takes longer for changed permissions to apply. + [*= system.platform_name ] What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php + [*= system.rating_enabled ] Distributed reputation reporting and data collection. This feature is currently being re-worked. + [*= system.poke_basic ] Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs. + [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well. + [*= system.projecthome ] Display the project page on your home page for logged out viewers. + [*= system.projecthome ] Set the project homepage as the homepage of your hub. (Obsolete) + [*= system.pubstream_ordering ] Set pubstream ordering. Possible values 'commented' (default), 'created' and 'edited'. + [*= system.register_link ] path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever. + [*= system.reserved_channels ] Don't allow members to register channels with this comma separated list of names (no spaces) + [*= system.sellpage ] A URL shown in the public sites list to sell your hub - display service classes, etc. + [*= system.startpage ] Set the default page to be taken to after a login for all channels at this website. Can be overwritten by user settings. + [*= system.sys_expire_days ] How many days to keep discovered public content from other sites + [*= system.taganyone ] Allow the @mention tagging of anyone whether you are connected or not. + [*= system.tempdir ] Place to store temporary files (currently unused), default is defined in the PHP configuration. + [*= system.tos_url ] Set an alternative link for the ToS location. + [*= system.transport_security_header ] if non-zero and SSL is being used, include a strict-transport-security header on webpages + [*= system.uploaddir ] Location to upload files (default is system.tempdir, currently used only by js_upload plugin) + [*= system.workflow_channel_next ] The page to direct new members to immediately after creating a channel. + [*= system.workflow_register_next ] The page to direct members to immediately after creating an account (only when auto_channel_create or UNO is enabled). +[/dl] + + +[h3]Directory config[/h3] + +[h4]Directory search defaults[/h4] + +[dl terms="mb"] + [*= directory.globaldir ] 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network. + [*= directory.pubforums ] 0 or 1. Public forums [i]should[/i] be default 0. + [*= directory.safemode ] 0 or 1. +[/dl] + +[h4]Directory server configuration[/h4][i](see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/i] + +[dl terms="mb"] + [*= system.directory_mode ] + [*= system.directory_primary ] + [*= system.directory_realm ] + [*= system.directory_server ] + [*= system.realm_token ] +[/dl] + +#include doc/macros/main_footer.bb; + diff --git a/doc/en/hook/about_hook.bb b/doc/en/hook/about_hook.bb new file mode 100644 index 000000000..22b60d786 --- /dev/null +++ b/doc/en/hook/about_hook.bb @@ -0,0 +1 @@ +[h2]about_hook[/h2] diff --git a/doc/en/hook/accept_follow.bb b/doc/en/hook/accept_follow.bb new file mode 100644 index 000000000..e8b1ed0c4 --- /dev/null +++ b/doc/en/hook/accept_follow.bb @@ -0,0 +1 @@ +[h2]accept_follow[/h2] diff --git a/doc/en/hook/account_downgrade.bb b/doc/en/hook/account_downgrade.bb new file mode 100644 index 000000000..63bae0a58 --- /dev/null +++ b/doc/en/hook/account_downgrade.bb @@ -0,0 +1 @@ +[h2]account_downgrade[/h2] diff --git a/doc/en/hook/account_settings.bb b/doc/en/hook/account_settings.bb new file mode 100644 index 000000000..91b3a8385 --- /dev/null +++ b/doc/en/hook/account_settings.bb @@ -0,0 +1 @@ +[h2]account_settings[/h2] diff --git a/doc/en/hook/account_settings_post.bb b/doc/en/hook/account_settings_post.bb new file mode 100644 index 000000000..bbd7a57a8 --- /dev/null +++ b/doc/en/hook/account_settings_post.bb @@ -0,0 +1 @@ +[h2]account_settings_post[/h2] diff --git a/doc/en/hook/activity_decode_mapper.bb b/doc/en/hook/activity_decode_mapper.bb new file mode 100644 index 000000000..43d08a136 --- /dev/null +++ b/doc/en/hook/activity_decode_mapper.bb @@ -0,0 +1 @@ +[h2]activity_decode_mapper[/h2] diff --git a/doc/en/hook/activity_filter.bb b/doc/en/hook/activity_filter.bb new file mode 100644 index 000000000..9d0768577 --- /dev/null +++ b/doc/en/hook/activity_filter.bb @@ -0,0 +1 @@ +[h2]activity_filter[/h2] diff --git a/doc/en/hook/activity_mapper.bb b/doc/en/hook/activity_mapper.bb new file mode 100644 index 000000000..db65fadc4 --- /dev/null +++ b/doc/en/hook/activity_mapper.bb @@ -0,0 +1 @@ +[h2]activity_mapper[/h2] diff --git a/doc/en/hook/activity_obj_decode_mapper.bb b/doc/en/hook/activity_obj_decode_mapper.bb new file mode 100644 index 000000000..a96b32eee --- /dev/null +++ b/doc/en/hook/activity_obj_decode_mapper.bb @@ -0,0 +1 @@ +[h2]activity_obj_decode_mapper[/h2] diff --git a/doc/en/hook/activity_obj_mapper.bb b/doc/en/hook/activity_obj_mapper.bb new file mode 100644 index 000000000..7c14a1b81 --- /dev/null +++ b/doc/en/hook/activity_obj_mapper.bb @@ -0,0 +1 @@ +[h2]activity_obj_mapper[/h2] diff --git a/doc/en/hook/activity_order.bb b/doc/en/hook/activity_order.bb new file mode 100644 index 000000000..4a4670d03 --- /dev/null +++ b/doc/en/hook/activity_order.bb @@ -0,0 +1 @@ +[h2]activity_order[/h2] diff --git a/doc/en/hook/activity_received.bb b/doc/en/hook/activity_received.bb new file mode 100644 index 000000000..2e9d68bf3 --- /dev/null +++ b/doc/en/hook/activity_received.bb @@ -0,0 +1 @@ +[h2]activity_received[/h2] diff --git a/doc/en/hook/addon_app_installed_filter.bb b/doc/en/hook/addon_app_installed_filter.bb new file mode 100644 index 000000000..e610b3205 --- /dev/null +++ b/doc/en/hook/addon_app_installed_filter.bb @@ -0,0 +1,18 @@ +[h2]addon_app_installed_filter[/h2] + +Allow plugins to filter the result of addon_app_installed. + +Code excerpt: + +[code] + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('addon_app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; +[/code] + +cxref: Zotlabs/Lib/Apps.php + diff --git a/doc/en/hook/affinity_labels.bb b/doc/en/hook/affinity_labels.bb new file mode 100644 index 000000000..7234b7632 --- /dev/null +++ b/doc/en/hook/affinity_labels.bb @@ -0,0 +1 @@ +[h2]affinity_labels[/h2] diff --git a/doc/en/hook/api_perm_is_allowed.bb b/doc/en/hook/api_perm_is_allowed.bb new file mode 100644 index 000000000..862cbd653 --- /dev/null +++ b/doc/en/hook/api_perm_is_allowed.bb @@ -0,0 +1 @@ +[h2]api_perm_is_allowed[/h2] diff --git a/doc/en/hook/app_destroy.bb b/doc/en/hook/app_destroy.bb new file mode 100644 index 000000000..386d7af16 --- /dev/null +++ b/doc/en/hook/app_destroy.bb @@ -0,0 +1,4 @@ +[h2]app_destroy[/h2] + +Allows addons to perform some post delete actions. + diff --git a/doc/en/hook/app_installed_filter.bb b/doc/en/hook/app_installed_filter.bb new file mode 100644 index 000000000..f0d91d6f0 --- /dev/null +++ b/doc/en/hook/app_installed_filter.bb @@ -0,0 +1,17 @@ +[h2]app_installed_filter[/h2] + +Allow plugins to filter the result of app_installed. + +Code excerpt: + +[code] + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; +[/code] + +cxref: Zotlabs/Lib/Apps.php diff --git a/doc/en/hook/atom_author.bb b/doc/en/hook/atom_author.bb new file mode 100644 index 000000000..c9d05a593 --- /dev/null +++ b/doc/en/hook/atom_author.bb @@ -0,0 +1 @@ +[h2]atom_author[/h2] diff --git a/doc/en/hook/atom_entry.bb b/doc/en/hook/atom_entry.bb new file mode 100644 index 000000000..0aec89f16 --- /dev/null +++ b/doc/en/hook/atom_entry.bb @@ -0,0 +1 @@ +[h2]atom_entry[/h2] diff --git a/doc/en/hook/atom_feed.bb b/doc/en/hook/atom_feed.bb new file mode 100644 index 000000000..69775ca5e --- /dev/null +++ b/doc/en/hook/atom_feed.bb @@ -0,0 +1 @@ +[h2]atom_feed[/h2] diff --git a/doc/en/hook/atom_feed_end.bb b/doc/en/hook/atom_feed_end.bb new file mode 100644 index 000000000..4f019fc8f --- /dev/null +++ b/doc/en/hook/atom_feed_end.bb @@ -0,0 +1 @@ +[h2]atom_feed_end[/h2] diff --git a/doc/en/hook/attach_delete.bb b/doc/en/hook/attach_delete.bb new file mode 100644 index 000000000..3b63f28d3 --- /dev/null +++ b/doc/en/hook/attach_delete.bb @@ -0,0 +1,11 @@ +[h2]attach_delete[/h2] + +Invoked when an attachment is deleted using attach_delete(). + +[code] +$arr = ['channel_id' => $channel_id, 'resource' => $resource, 'is_photo'=>$is_photo]; +call_hooks("attach_delete",$arr); +[/code] + + +See include/attach.php diff --git a/doc/en/hook/attach_upload_file.bb b/doc/en/hook/attach_upload_file.bb new file mode 100644 index 000000000..1f8056caa --- /dev/null +++ b/doc/en/hook/attach_upload_file.bb @@ -0,0 +1 @@ +[h2]attach_upload_file[/h2] diff --git a/doc/en/hook/authenticate.bb b/doc/en/hook/authenticate.bb new file mode 100644 index 000000000..eb8071e73 --- /dev/null +++ b/doc/en/hook/authenticate.bb @@ -0,0 +1,29 @@ +[h2]authenticate[/h2] + +Invoked when a POST request is made with non-null $_POST['auth-params'] such as from the login form. +If the hook handler does not set the 'authenticated' parameter of the passed array, normal login functions continue; + +The 'user_record' is in fact an account DB record. To provide automatic provisioning of accounts from other authentication realms, this record should be generated and stored during the verification phase. + + +[code] + $addon_auth = array( + 'username' => trim($_POST['username']), + 'password' => trim($_POST['password']), + 'authenticated' => 0, + 'user_record' => null + ); + + /** + * + * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record + * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained + * and later plugins should not interfere with an earlier one that succeeded. + * + */ + + call_hooks('authenticate', $addon_auth); +[/code] + + +See include/auth.php diff --git a/doc/en/hook/author_is_pmable.bb b/doc/en/hook/author_is_pmable.bb new file mode 100644 index 000000000..11d1185f3 --- /dev/null +++ b/doc/en/hook/author_is_pmable.bb @@ -0,0 +1,14 @@ +[h2]author_is_pmable[/h2] + +Called from thread action menu before returning a 'send mail' link for the post author. Not all authors will be able to receive private mail, for instance those on other networks with incompatible mail systems. + +By default author_is_pmable() returns true for 'zot' xchans, and false for all others. + +The plugin is passed an array + + [ 'xchan' => $author_xchan, 'abook' => abook record, 'result' => 'unset' ] + +A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash. A value of false will disable the 'send mail' link. + + + diff --git a/doc/en/hook/bb2diaspora.bb b/doc/en/hook/bb2diaspora.bb new file mode 100644 index 000000000..c28f1883e --- /dev/null +++ b/doc/en/hook/bb2diaspora.bb @@ -0,0 +1 @@ +[h2]bb2diaspora[/h2] diff --git a/doc/en/hook/bbcode.bb b/doc/en/hook/bbcode.bb new file mode 100644 index 000000000..f6b8711b0 --- /dev/null +++ b/doc/en/hook/bbcode.bb @@ -0,0 +1,6 @@ +[h2]bbcode[/h2] + + +Called at end of bbcode to html conversion. + +Hook argument contains the converted text string. diff --git a/doc/en/hook/bbcode_filter.bb b/doc/en/hook/bbcode_filter.bb new file mode 100644 index 000000000..efeb2e1b0 --- /dev/null +++ b/doc/en/hook/bbcode_filter.bb @@ -0,0 +1,7 @@ +[h2]bbcode_filter[/h2] + + +Called at beginning of bbcode to html conversion. + +Hook argument contains the text string to be converted. + diff --git a/doc/en/hook/build_pagehead.bb b/doc/en/hook/build_pagehead.bb new file mode 100644 index 000000000..8fc3486c7 --- /dev/null +++ b/doc/en/hook/build_pagehead.bb @@ -0,0 +1,2 @@ +[b]build_pagehead[/b] + diff --git a/doc/en/hook/can_comment_on_post.bb b/doc/en/hook/can_comment_on_post.bb new file mode 100644 index 000000000..2cfd3b2da --- /dev/null +++ b/doc/en/hook/can_comment_on_post.bb @@ -0,0 +1,13 @@ +[h3]can_comment_on_post[/h3] + +Called when deciding whether or not to display a comment box for a post. + + +Hook data (array): + observer_hash => xchan_hash of current observer + item => posted item + allowed => 'unset' + + +To over-ride the default behaviour, change allowed to true or false + diff --git a/doc/en/hook/change_channel.bb b/doc/en/hook/change_channel.bb new file mode 100644 index 000000000..4514b9265 --- /dev/null +++ b/doc/en/hook/change_channel.bb @@ -0,0 +1,11 @@ +[h2]change_channel[/h2] + +Called when entering a logged in state in a channel context (as opposed to an account context). +The hook array provides two arguments, 'channel_id' and 'chanx'. 'chanx' is a union of the channel +and xchan records for the now active channel. + +Use this to capture what would traditionally be known as 'login events'. In this platform, login is +a separate authentication activity and doesn't necessarily require "connecting to an identity", which +is what the change_channel activity represents. + + diff --git a/doc/en/hook/channel_links.bb b/doc/en/hook/channel_links.bb new file mode 100644 index 000000000..c0243dac6 --- /dev/null +++ b/doc/en/hook/channel_links.bb @@ -0,0 +1,12 @@ +[h2]channel_links[/h2] + +Called when generating the Link HTTP header for the channel page. Different protocol stacks can add links to this header. + +Hook data = array + 'channel_address' => channel nickname, no checking is done to see if it is valid + 'channel_links' => array of channel links in the format + 'url' => url of resource + 'rel' => link relation + 'type' => MIME type + +All fields are required \ No newline at end of file diff --git a/doc/en/hook/channel_remove.bb b/doc/en/hook/channel_remove.bb new file mode 100644 index 000000000..db9e9dd82 --- /dev/null +++ b/doc/en/hook/channel_remove.bb @@ -0,0 +1 @@ +[h2]channel_remove[/h2] diff --git a/doc/en/hook/chat_message.bb b/doc/en/hook/chat_message.bb new file mode 100644 index 000000000..ccc93bb2c --- /dev/null +++ b/doc/en/hook/chat_message.bb @@ -0,0 +1 @@ +[h2]chat_message[/h2] diff --git a/doc/en/hook/chat_post.bb b/doc/en/hook/chat_post.bb new file mode 100644 index 000000000..7cb3c9fa1 --- /dev/null +++ b/doc/en/hook/chat_post.bb @@ -0,0 +1 @@ +[h2]chat_post[/h2] diff --git a/doc/en/hook/check_account_email.bb b/doc/en/hook/check_account_email.bb new file mode 100644 index 000000000..b309706a0 --- /dev/null +++ b/doc/en/hook/check_account_email.bb @@ -0,0 +1 @@ +[h2]check_account_email[/h2] diff --git a/doc/en/hook/check_account_invite.bb b/doc/en/hook/check_account_invite.bb new file mode 100644 index 000000000..8d4a40522 --- /dev/null +++ b/doc/en/hook/check_account_invite.bb @@ -0,0 +1 @@ +[h2]check_account_invite[/h2] diff --git a/doc/en/hook/check_account_password.bb b/doc/en/hook/check_account_password.bb new file mode 100644 index 000000000..ce5202f48 --- /dev/null +++ b/doc/en/hook/check_account_password.bb @@ -0,0 +1,17 @@ +[h2]check_account_password[/h2] +Use this hook to provide additional checks or validations of the password given when +registering and account. +[h3]Arguments:[/h3] +[code=php]array( + 'password' => $password, // The password to check + 'result' => array( + 'error' => false, + 'message' => '' + ) +)[/code] +[h3]Results:[/h3] +For a failed check set the [code]error[/code] member of the [code]result[/code] +array to [code]true[/code] and the [code]message[/code] to a short message +explaining why it failed. + +Otherwise, leave it alone. diff --git a/doc/en/hook/check_channelallowed.bb b/doc/en/hook/check_channelallowed.bb new file mode 100644 index 000000000..e7559c92f --- /dev/null +++ b/doc/en/hook/check_channelallowed.bb @@ -0,0 +1,11 @@ +[h2]check_channelallowed[/h2] + +Called when checking the channel (xchan) black and white lists to see if a channel is blocked. + +Hook data + + array('hash' => xchan_hash of xchan to check); + + create and set array element 'allowed' to true or false to override the system checks + + diff --git a/doc/en/hook/check_siteallowed.bb b/doc/en/hook/check_siteallowed.bb new file mode 100644 index 000000000..28134cbd2 --- /dev/null +++ b/doc/en/hook/check_siteallowed.bb @@ -0,0 +1,10 @@ +[h2]check_siteallowed[/h2] + +Called when checking the site black and white lists to see if a site is blocked. + +Hook data + + array('url' => URL of site to check); + + create and set array element 'allowed' to true or false to override the system checks + diff --git a/doc/en/hook/collect_public_recipients.bb b/doc/en/hook/collect_public_recipients.bb new file mode 100644 index 000000000..de3f4049e --- /dev/null +++ b/doc/en/hook/collect_public_recipients.bb @@ -0,0 +1,42 @@ +[h2]collect_public_recipients[/h2] + +Replace the default list of public recipients (i.e., all contacts). + +Allow plugins to create a list of recipients for public messages instead of the default +of all channel connections. + +Called with the following array: + [ + 'recipients' => [], + 'item' => $item, + 'private_envelope' => $private_envelope, + 'include_groups' => $include_groups + ]; + +[code] + if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') { + + $hookinfo = [ + 'recipients' => [], + 'item' => $item, + 'private_envelope' => $private_envelope, + 'include_groups' => $include_groups + ]; + + call_hooks('collect_public_recipients',$hookinfo); + + if ($hookinfo['recipients']) { + $r = $hookinfo['recipients']; + } else { + $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 ", + intval($item['uid']) + ); + } + + if($r) { + + . . . + +[/code] + +see: include/item.php diff --git a/doc/en/hook/comments_are_now_closed.bb b/doc/en/hook/comments_are_now_closed.bb new file mode 100644 index 000000000..4d3baa95a --- /dev/null +++ b/doc/en/hook/comments_are_now_closed.bb @@ -0,0 +1,11 @@ +[h3]comments_are_now_closed[/h3] + +Called when deciding whether or not commenting is closed for an item. + + +Hook data (array): + item => posted item + closed => 'unset' + + +To over-ride the default behaviour, change closed to true or false diff --git a/doc/en/hook/connect_premium.bb b/doc/en/hook/connect_premium.bb new file mode 100644 index 000000000..ae3aafc66 --- /dev/null +++ b/doc/en/hook/connect_premium.bb @@ -0,0 +1 @@ +[h2]connect_premium[/h2] diff --git a/doc/en/hook/connection_remove.bb b/doc/en/hook/connection_remove.bb new file mode 100644 index 000000000..bd13ae5f2 --- /dev/null +++ b/doc/en/hook/connection_remove.bb @@ -0,0 +1,9 @@ +[h3]connection_remove[/h3] + +Called when deleting a connection. + + +Passed parameter array: + + 'channel_id' => channel_id of the channel removing the connection + 'abook_id' => abook_id of the connection being removed diff --git a/doc/en/hook/connector_settings.bb b/doc/en/hook/connector_settings.bb new file mode 100644 index 000000000..9b59c49da --- /dev/null +++ b/doc/en/hook/connector_settings.bb @@ -0,0 +1 @@ +[h2]connector_settings[/h2] diff --git a/doc/en/hook/construct_page.bb b/doc/en/hook/construct_page.bb new file mode 100644 index 000000000..700d9256f --- /dev/null +++ b/doc/en/hook/construct_page.bb @@ -0,0 +1 @@ +[h2]construct_page[/h2] diff --git a/doc/en/hook/contact_block_end.bb b/doc/en/hook/contact_block_end.bb new file mode 100644 index 000000000..30a7d2d76 --- /dev/null +++ b/doc/en/hook/contact_block_end.bb @@ -0,0 +1 @@ +[h2]contact_block_end[/h2] diff --git a/doc/en/hook/contact_edit.bb b/doc/en/hook/contact_edit.bb new file mode 100644 index 000000000..5fd31fb1d --- /dev/null +++ b/doc/en/hook/contact_edit.bb @@ -0,0 +1 @@ +[h2]contact_edit[/h2] diff --git a/doc/en/hook/contact_edit_post.bb b/doc/en/hook/contact_edit_post.bb new file mode 100644 index 000000000..bc736f8b8 --- /dev/null +++ b/doc/en/hook/contact_edit_post.bb @@ -0,0 +1 @@ +[h2]contact_edit_post[/h2] diff --git a/doc/en/hook/contact_select_options.bb b/doc/en/hook/contact_select_options.bb new file mode 100644 index 000000000..65f9154ff --- /dev/null +++ b/doc/en/hook/contact_select_options.bb @@ -0,0 +1 @@ +[h2]contact_select_options[/h2] diff --git a/doc/en/hook/content_security_policy.bb b/doc/en/hook/content_security_policy.bb new file mode 100644 index 000000000..96b8095ae --- /dev/null +++ b/doc/en/hook/content_security_policy.bb @@ -0,0 +1,39 @@ +[h2]content_security_policy[/h2] + +Called to modify CSP settings prior to the output of the Content-Security-Policy header. + +This hook permits addons to modify the content-security-policy if necessary to allow loading of foreign js libraries or css styles. + +[code] +if(App::$config['system']['content_security_policy']) { + $cspsettings = Array ( + 'script-src' => Array ("'self'","'unsafe-inline'","'unsafe-eval'"), + 'style-src' => Array ("'self'","'unsafe-inline'") + ); + call_hooks('content_security_policy',$cspsettings); + + // Legitimate CSP directives (cxref: https://content-security-policy.com/) + $validcspdirectives=Array( + "default-src", "script-src", "style-src", + "img-src", "connect-src", "font-src", + "object-src", "media-src", 'frame-src', + 'sandbox', 'report-uri', 'child-src', + 'form-action', 'frame-ancestors', 'plugin-types' + ); + $cspheader = "Content-Security-Policy:"; + foreach ($cspsettings as $cspdirective => $csp) { + if (!in_array($cspdirective,$validcspdirectives)) { + logger("INVALID CSP DIRECTIVE: ".$cspdirective,LOGGER_DEBUG); + continue; + } + $cspsettingsarray=array_unique($cspsettings[$cspdirective]); + $cspsetpolicy = implode(' ',$cspsettingsarray); + if ($cspsetpolicy) { + $cspheader .= " ".$cspdirective." ".$cspsetpolicy.";"; + } + } + header($cspheader); +} +[/code] + +see: boot.php diff --git a/doc/en/hook/conversation_start.bb b/doc/en/hook/conversation_start.bb new file mode 100644 index 000000000..7208c8d8f --- /dev/null +++ b/doc/en/hook/conversation_start.bb @@ -0,0 +1 @@ +[h2]conversation_start[/h2] diff --git a/doc/en/hook/create_identity.bb b/doc/en/hook/create_identity.bb new file mode 100644 index 000000000..5c1da2d43 --- /dev/null +++ b/doc/en/hook/create_identity.bb @@ -0,0 +1 @@ +[h2]create_identity[/h2] diff --git a/doc/en/hook/cron.bb b/doc/en/hook/cron.bb new file mode 100644 index 000000000..55120b6c2 --- /dev/null +++ b/doc/en/hook/cron.bb @@ -0,0 +1,5 @@ +[h2]cron[/h2] + +Called when cron task (include/poller.php) is executed. The hook data is a string representing the current time (UTC). + + diff --git a/doc/en/hook/cron_daily.bb b/doc/en/hook/cron_daily.bb new file mode 100644 index 000000000..802bea5e4 --- /dev/null +++ b/doc/en/hook/cron_daily.bb @@ -0,0 +1,3 @@ +[h2]cron_daily[/h2] + +Called when cron task (include/poller.php) performs a cron_daily operation. The hook data is a string representing the current time (UTC). diff --git a/doc/en/hook/cron_weekly.bb b/doc/en/hook/cron_weekly.bb new file mode 100644 index 000000000..c01bf9611 --- /dev/null +++ b/doc/en/hook/cron_weekly.bb @@ -0,0 +1,3 @@ +[h2]cron_weekly[/h2] + +Called when cron task (include/poller.php) performs a cron_weekly operation. The hook data is a string representing the current time (UTC). diff --git a/doc/en/hook/crypto_methods.bb b/doc/en/hook/crypto_methods.bb new file mode 100644 index 000000000..1b16f567d --- /dev/null +++ b/doc/en/hook/crypto_methods.bb @@ -0,0 +1,5 @@ +[h2]crypto_mthods[/h2] + +Passed an array of crypto methods in local priority order. + +You may change the order and add new methods or disable existing methods. 'aes256cbc' is always supported as a fallback and currently removing this has no effect. \ No newline at end of file diff --git a/doc/en/hook/daemon_addon.bb b/doc/en/hook/daemon_addon.bb new file mode 100644 index 000000000..b60b25748 --- /dev/null +++ b/doc/en/hook/daemon_addon.bb @@ -0,0 +1,15 @@ +[h2]daemon_addon[/h2] + + +A foreground plugin can create a background process by invoking: + +[code] +\Zotlabs\Daemon\Master::Summon([ 'Addon', 'myplugin', 'something' ]); +[/code] + +This starts up a background process (called 'Addon') specifically for addons to use. + +Then if your plugin is also catching the daemon_addon hook that handler will be called with the +argv array of the background process. In this case [ 'myplugin', 'something' ]; + +We recommend using this convention so that plugins can share this hook without causing conflicts; that is check to see if your plugin is the first array argument and if not, return from the hook. Otherwise you can initiate background processing. Something to remember is that during background processes there is no session. You are detached from the web page which created the background process. \ No newline at end of file diff --git a/doc/en/hook/daemon_master_release.bb b/doc/en/hook/daemon_master_release.bb new file mode 100644 index 000000000..a17216d48 --- /dev/null +++ b/doc/en/hook/daemon_master_release.bb @@ -0,0 +1,5 @@ +[h2]daemon_master_release[/h2] + +Permit filtering or alternate methods of processing of background processes when [code] \Zotlabs\Daemon\Master::Release() [/code] is called. + +Default behavior is for a new PHP process to fire immediately upon a call to Master::Summon(). This hook permits pre-emption and the ability to provide queuing or other alternatives to this procedure. diff --git a/doc/en/hook/directory_item.bb b/doc/en/hook/directory_item.bb new file mode 100644 index 000000000..cb710e0b4 --- /dev/null +++ b/doc/en/hook/directory_item.bb @@ -0,0 +1 @@ +[h2]directory_item[/h2] diff --git a/doc/en/hook/discover_channel_webfinger.bb b/doc/en/hook/discover_channel_webfinger.bb new file mode 100644 index 000000000..b0eb5f2c4 --- /dev/null +++ b/doc/en/hook/discover_channel_webfinger.bb @@ -0,0 +1,14 @@ +[h2]discover_channel_webfinger[/h2] + +Called after performing channel discovery using RFC7033 webfinger and where the channel is not recognised as zot. + +Passed an array: + + address: URL or address that is being discovered + success: set to true if the plugin discovers something + webfinger: array of webfinger links (output of webfinger_rfc7033()) + + + if your plugin indicates success you are expected to generate and populate an xchan (and hubloc) record prior to returning. + + \ No newline at end of file diff --git a/doc/en/hook/display_item.bb b/doc/en/hook/display_item.bb new file mode 100644 index 000000000..a6bfd621d --- /dev/null +++ b/doc/en/hook/display_item.bb @@ -0,0 +1 @@ +[h2]display_item[/h2] diff --git a/doc/en/hook/display_settings.bb b/doc/en/hook/display_settings.bb new file mode 100644 index 000000000..1f1e0b491 --- /dev/null +++ b/doc/en/hook/display_settings.bb @@ -0,0 +1 @@ +[h2]display_settings[/h2] diff --git a/doc/en/hook/display_settings_post.bb b/doc/en/hook/display_settings_post.bb new file mode 100644 index 000000000..d3bb39359 --- /dev/null +++ b/doc/en/hook/display_settings_post.bb @@ -0,0 +1 @@ +[h2]display_settings_post[/h2] diff --git a/doc/en/hook/donate_contributors.bb b/doc/en/hook/donate_contributors.bb new file mode 100644 index 000000000..f97c77efa --- /dev/null +++ b/doc/en/hook/donate_contributors.bb @@ -0,0 +1 @@ +[h2]donate_contributors[/h2] diff --git a/doc/en/hook/donate_plugin.bb b/doc/en/hook/donate_plugin.bb new file mode 100644 index 000000000..db4a6f113 --- /dev/null +++ b/doc/en/hook/donate_plugin.bb @@ -0,0 +1 @@ +[h2]donate_plugin[/h2] diff --git a/doc/en/hook/donate_sponsors.bb b/doc/en/hook/donate_sponsors.bb new file mode 100644 index 000000000..3abd46d42 --- /dev/null +++ b/doc/en/hook/donate_sponsors.bb @@ -0,0 +1 @@ +[h2]donate_sponsors[/h2] diff --git a/doc/en/hook/dreport_is_storable.bb b/doc/en/hook/dreport_is_storable.bb new file mode 100644 index 000000000..9ca99b896 --- /dev/null +++ b/doc/en/hook/dreport_is_storable.bb @@ -0,0 +1 @@ +[h2]dreport_is_storable[/h2] diff --git a/doc/en/hook/dreport_process.bb b/doc/en/hook/dreport_process.bb new file mode 100644 index 000000000..3ad331f41 --- /dev/null +++ b/doc/en/hook/dreport_process.bb @@ -0,0 +1,7 @@ +[h2]dreport_process[/h2] + +Called for each delivery report received + +Passed a delivery_report array. + +see: include/zot.php diff --git a/doc/en/hook/drop_item.bb b/doc/en/hook/drop_item.bb new file mode 100644 index 000000000..35bb80f82 --- /dev/null +++ b/doc/en/hook/drop_item.bb @@ -0,0 +1 @@ +[h2]drop_item[/h2] diff --git a/doc/en/hook/dropdown_extras.bb b/doc/en/hook/dropdown_extras.bb new file mode 100644 index 000000000..6d7110a76 --- /dev/null +++ b/doc/en/hook/dropdown_extras.bb @@ -0,0 +1,17 @@ +[h2]dropdown_extras[/h2] + +Modify the dropdown menu available through the cog of items as displayed by conv_item.tpl + +This hook allows plugins to add arbitrary html to the cog dropdown of thread items displayed with the conv_item.tpl template. + +It is fed an array of ['item' => $item, 'dropdown_extras' => '']. Any additions to the cog menu should be prepended/appended to +the ['dropdown_extras'] element. + +[code] +$dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ]; +call_hooks('dropdown_extras',$dropdown_extras_arr); +$dropdown_extras = $dropdown_extras_arr['dropdown_extras']; +[/code] + +see: Zotlabs/Lib/ThreadItem.php +see: view/tpl/conv_item.tpl diff --git a/doc/en/hook/encode_object.bb b/doc/en/hook/encode_object.bb new file mode 100644 index 000000000..0c8e86458 --- /dev/null +++ b/doc/en/hook/encode_object.bb @@ -0,0 +1 @@ +[h2]encode_object[/h2] diff --git a/doc/en/hook/enotify.bb b/doc/en/hook/enotify.bb new file mode 100644 index 000000000..703a3ffa0 --- /dev/null +++ b/doc/en/hook/enotify.bb @@ -0,0 +1 @@ +[h2]enotify[/h2] diff --git a/doc/en/hook/enotify_mail.bb b/doc/en/hook/enotify_mail.bb new file mode 100644 index 000000000..adeb8bd30 --- /dev/null +++ b/doc/en/hook/enotify_mail.bb @@ -0,0 +1 @@ +[h2]enotify_mail[/h2] diff --git a/doc/en/hook/enotify_store.bb b/doc/en/hook/enotify_store.bb new file mode 100644 index 000000000..dc44cc320 --- /dev/null +++ b/doc/en/hook/enotify_store.bb @@ -0,0 +1 @@ +[h2]enotify_store[/h2] diff --git a/doc/en/hook/event_created.bb b/doc/en/hook/event_created.bb new file mode 100644 index 000000000..222602e77 --- /dev/null +++ b/doc/en/hook/event_created.bb @@ -0,0 +1 @@ +[h2]event_created[/h2] diff --git a/doc/en/hook/event_store_event.bb b/doc/en/hook/event_store_event.bb new file mode 100644 index 000000000..7015a8322 --- /dev/null +++ b/doc/en/hook/event_store_event.bb @@ -0,0 +1,11 @@ +[h2]event_store_event[/h2] + +Called from event_store_event() when an event record is being stored. + +Hook info is an array + +'event' => the passed event details, ready for storage +'existing_event' => If the event already exists, a copy of the original event record from the database +'cancel' => false - set to true to cancel the operation. + + diff --git a/doc/en/hook/event_updated.bb b/doc/en/hook/event_updated.bb new file mode 100644 index 000000000..69e3c72c1 --- /dev/null +++ b/doc/en/hook/event_updated.bb @@ -0,0 +1 @@ +[h2]event_updated[/h2] diff --git a/doc/en/hook/externals_url_select.bb b/doc/en/hook/externals_url_select.bb new file mode 100644 index 000000000..a542dcb29 --- /dev/null +++ b/doc/en/hook/externals_url_select.bb @@ -0,0 +1 @@ +[h2]externals_url_select[/h2] diff --git a/doc/en/hook/feature_enabled.bb b/doc/en/hook/feature_enabled.bb new file mode 100644 index 000000000..5630cc768 --- /dev/null +++ b/doc/en/hook/feature_enabled.bb @@ -0,0 +1 @@ +[h2]feature_enabled[/h2] diff --git a/doc/en/hook/feature_settings.bb b/doc/en/hook/feature_settings.bb new file mode 100644 index 000000000..d1691eb38 --- /dev/null +++ b/doc/en/hook/feature_settings.bb @@ -0,0 +1 @@ +[h2]feature_settings[/h2] diff --git a/doc/en/hook/feature_settings_post.bb b/doc/en/hook/feature_settings_post.bb new file mode 100644 index 000000000..eecf941ff --- /dev/null +++ b/doc/en/hook/feature_settings_post.bb @@ -0,0 +1 @@ +[h2]feature_settings_post[/h2] diff --git a/doc/en/hook/fetch_and_store.bb b/doc/en/hook/fetch_and_store.bb new file mode 100644 index 000000000..afece11a6 --- /dev/null +++ b/doc/en/hook/fetch_and_store.bb @@ -0,0 +1 @@ +[h2]fetch_and_store[/h2] diff --git a/doc/en/hook/follow.bb b/doc/en/hook/follow.bb new file mode 100644 index 000000000..a97632b06 --- /dev/null +++ b/doc/en/hook/follow.bb @@ -0,0 +1 @@ +[h2]follow[/h2] diff --git a/doc/en/hook/follow_allow.bb b/doc/en/hook/follow_allow.bb new file mode 100644 index 000000000..fdab1865c --- /dev/null +++ b/doc/en/hook/follow_allow.bb @@ -0,0 +1 @@ +[h2]follow_allow[/h2] diff --git a/doc/en/hook/gender_selector.bb b/doc/en/hook/gender_selector.bb new file mode 100644 index 000000000..0b56b5c9b --- /dev/null +++ b/doc/en/hook/gender_selector.bb @@ -0,0 +1 @@ +[h2]gender_selector[/h2] diff --git a/doc/en/hook/gender_selector_min.bb b/doc/en/hook/gender_selector_min.bb new file mode 100644 index 000000000..9d143855a --- /dev/null +++ b/doc/en/hook/gender_selector_min.bb @@ -0,0 +1 @@ +[h2]gender_selector_min[/h2] diff --git a/doc/en/hook/generate_map.bb b/doc/en/hook/generate_map.bb new file mode 100644 index 000000000..33672d552 --- /dev/null +++ b/doc/en/hook/generate_map.bb @@ -0,0 +1 @@ +[h2]generate_map[/h2] diff --git a/doc/en/hook/generate_named_map.bb b/doc/en/hook/generate_named_map.bb new file mode 100644 index 000000000..5bacb846d --- /dev/null +++ b/doc/en/hook/generate_named_map.bb @@ -0,0 +1 @@ +[h2]generate_named_map[/h2] diff --git a/doc/en/hook/get_all_api_perms.bb b/doc/en/hook/get_all_api_perms.bb new file mode 100644 index 000000000..eb41f8a02 --- /dev/null +++ b/doc/en/hook/get_all_api_perms.bb @@ -0,0 +1 @@ +[h2]get_all_api_perms[/h2] diff --git a/doc/en/hook/get_all_perms.bb b/doc/en/hook/get_all_perms.bb new file mode 100644 index 000000000..149f8c78c --- /dev/null +++ b/doc/en/hook/get_all_perms.bb @@ -0,0 +1 @@ +[h2]get_all_perms[/h2] diff --git a/doc/en/hook/get_default_export_sections b/doc/en/hook/get_default_export_sections new file mode 100644 index 000000000..09b146643 --- /dev/null +++ b/doc/en/hook/get_default_export_sections @@ -0,0 +1,10 @@ +[h3]get_default_export_sections[/h3] + +The get_default_export_sections call returns the basic functional groups of data to export using channel_export_basic(). + +The hook is passed an array + [ + 'sections' => [ 'channel', 'connections', 'config', 'apps', 'chatrooms', 'events', 'webpages', 'mail', 'wikis' ] + ] + +If you desire the export to contain three months of items, add 'items' to the 'sections' array diff --git a/doc/en/hook/get_features.bb b/doc/en/hook/get_features.bb new file mode 100644 index 000000000..66e81f13c --- /dev/null +++ b/doc/en/hook/get_features.bb @@ -0,0 +1 @@ +[h2]get_features[/h2] diff --git a/doc/en/hook/get_photo.bb b/doc/en/hook/get_photo.bb new file mode 100644 index 000000000..eaf3beffb --- /dev/null +++ b/doc/en/hook/get_photo.bb @@ -0,0 +1,14 @@ +[h2]get_photo[/h2] + +Called when fetching the content of photos (except for profile photos) in mod_photo. + + +Hook arguments: + +'imgscale' => integer resolution requested +'resource_id' => resource_id of requested photo +'photo' => array of matching photo table rows after querying for the photo +'allowed' => whether or not access to this resource is allowed + + + diff --git a/doc/en/hook/get_profile_photo.bb b/doc/en/hook/get_profile_photo.bb new file mode 100644 index 000000000..ab07179ae --- /dev/null +++ b/doc/en/hook/get_profile_photo.bb @@ -0,0 +1,18 @@ +[h2]get_profile_photo[/h2] + +Called when fetching the content of the default profile photo for a local channel in mod_photo. + + +Hook arguments: + +'imgscale' => integer resolution requested (4, 5, or 6) +'channel_id' => channel_id of requested profile photo +'default' => filename of default profile photo of this imgscale +'data' => empty string +'mimetype' => empty string + + +If 'data' is set, this data will be used instead of the data obtained from the database search for the profile photo. +If 'mimetype' is set, this mimetype will be used instead of the mimetype obtained from the database or the default profile photo mimetype. + + diff --git a/doc/en/hook/get_role_perms.bb b/doc/en/hook/get_role_perms.bb new file mode 100644 index 000000000..87830f8e3 --- /dev/null +++ b/doc/en/hook/get_role_perms.bb @@ -0,0 +1 @@ +[h2]get_role_perms[/h2] diff --git a/doc/en/hook/global_permissions.bb b/doc/en/hook/global_permissions.bb new file mode 100644 index 000000000..fe998ee9c --- /dev/null +++ b/doc/en/hook/global_permissions.bb @@ -0,0 +1 @@ +[h2]global_permissions[/h2] diff --git a/doc/en/hook/home_content.bb b/doc/en/hook/home_content.bb new file mode 100644 index 000000000..7f32b3547 --- /dev/null +++ b/doc/en/hook/home_content.bb @@ -0,0 +1 @@ +[h2]home_content[/h2] diff --git a/doc/en/hook/home_init.bb b/doc/en/hook/home_init.bb new file mode 100644 index 000000000..25dd72792 --- /dev/null +++ b/doc/en/hook/home_init.bb @@ -0,0 +1 @@ +[h2]home_init[/h2] diff --git a/doc/en/hook/hostxrd.bb b/doc/en/hook/hostxrd.bb new file mode 100644 index 000000000..2b67320cf --- /dev/null +++ b/doc/en/hook/hostxrd.bb @@ -0,0 +1 @@ +[h2]hostxrd[/h2] diff --git a/doc/en/hook/html2bbcode.bb b/doc/en/hook/html2bbcode.bb new file mode 100644 index 000000000..3061f05f0 --- /dev/null +++ b/doc/en/hook/html2bbcode.bb @@ -0,0 +1 @@ +[h2]html2bbcode[/h2] diff --git a/doc/en/hook/identity_basic_export.bb b/doc/en/hook/identity_basic_export.bb new file mode 100644 index 000000000..71329ba1e --- /dev/null +++ b/doc/en/hook/identity_basic_export.bb @@ -0,0 +1,10 @@ +[h2]identity_basic_export[/h2] + +Called when exporting data for a channel +Passed array contains + + [ + 'channel_id' => channel_id being exported + 'sections' => array of functional export sections which are being exported + 'data' => the export data array which has been generated + ] diff --git a/doc/en/hook/import_author_xchan.bb b/doc/en/hook/import_author_xchan.bb new file mode 100644 index 000000000..e2340469d --- /dev/null +++ b/doc/en/hook/import_author_xchan.bb @@ -0,0 +1 @@ +[h2]import_author_xchan[/h2] diff --git a/doc/en/hook/import_channel.bb b/doc/en/hook/import_channel.bb new file mode 100644 index 000000000..b220b7415 --- /dev/null +++ b/doc/en/hook/import_channel.bb @@ -0,0 +1 @@ +[h2]import_channel[/h2] diff --git a/doc/en/hook/import_directory_profile.bb b/doc/en/hook/import_directory_profile.bb new file mode 100644 index 000000000..e2fac59bc --- /dev/null +++ b/doc/en/hook/import_directory_profile.bb @@ -0,0 +1 @@ +[h2]import_directory_profile[/h2] diff --git a/doc/en/hook/import_xchan.bb b/doc/en/hook/import_xchan.bb new file mode 100644 index 000000000..40e0783ce --- /dev/null +++ b/doc/en/hook/import_xchan.bb @@ -0,0 +1 @@ +[h2]import_xchan[/h2] diff --git a/doc/en/hook/item_custom.bb b/doc/en/hook/item_custom.bb new file mode 100644 index 000000000..d20c7d76c --- /dev/null +++ b/doc/en/hook/item_custom.bb @@ -0,0 +1,24 @@ +[h2]item_custom[/h2] + +Allow addons to create and process custom item types. + +Addon authors will need to use iconfig meta data (with sharing on) or some other method +to specify and determine whether the custom item is destined for their addon. + +It is fed an array of ['item' => ${item_array}, 'allow_exec' => {true/false}] + +By default $arr['item']['cancel'] is set to TRUE which will abort storage of the +custom item in the item table unless the addon unsets it or sets it to false. + +[code] + if ($arr['item_type']==ITEM_TYPE_CUSTOM) { + /* Custom items are not stored by default + because they require an addon to process. */ + $d['item']['cancel']=true; + + call_hooks('item_custom',$d); + } + +[/code] + +see: include/items.php diff --git a/doc/en/hook/item_photo_menu.bb b/doc/en/hook/item_photo_menu.bb new file mode 100644 index 000000000..8f9860a90 --- /dev/null +++ b/doc/en/hook/item_photo_menu.bb @@ -0,0 +1 @@ +[h2]item_photo_menu[/h2] diff --git a/doc/en/hook/item_store.bb b/doc/en/hook/item_store.bb new file mode 100644 index 000000000..5d49b725c --- /dev/null +++ b/doc/en/hook/item_store.bb @@ -0,0 +1 @@ +[h2]item_store[/h2] diff --git a/doc/en/hook/item_store_update.bb b/doc/en/hook/item_store_update.bb new file mode 100644 index 000000000..a7c58939a --- /dev/null +++ b/doc/en/hook/item_store_update.bb @@ -0,0 +1 @@ +[h2]item_store_update[/h2] diff --git a/doc/en/hook/item_stored.bb b/doc/en/hook/item_stored.bb new file mode 100644 index 000000000..8d706cb4e --- /dev/null +++ b/doc/en/hook/item_stored.bb @@ -0,0 +1,18 @@ +[h2]item_stored[/h2] + +Allow addons to continue processing after an item has been stored in the event +that they need access to the item_id or other data that gets assigned during +the storage process. + +It is fed an array of type item (including terms and iconfig data). + +[code] + /** + * @hooks item_stored + * Called after new item is stored in the database. + * (By this time we have an item_id and other frequently needed info.) + */ + call_hooks('item_stored',$arr); +[/code] + +see: include/items.php diff --git a/doc/en/hook/item_stored_update.bb b/doc/en/hook/item_stored_update.bb new file mode 100644 index 000000000..4532a347c --- /dev/null +++ b/doc/en/hook/item_stored_update.bb @@ -0,0 +1,15 @@ +[h2]item_stored_update[/h2] + +Allow addons to continue processing after an item update has been stored + +It is fed an array of type item (including terms and iconfig data). + +[code] + /** + * @hooks item_stored_update + * Called after updated item is stored in the database. + */ + call_hooks('item_stored_update',$arr); +[/code] + +see: include/items.php diff --git a/doc/en/hook/item_translate.bb b/doc/en/hook/item_translate.bb new file mode 100644 index 000000000..695494b9c --- /dev/null +++ b/doc/en/hook/item_translate.bb @@ -0,0 +1 @@ +[h2]item_translate[/h2] diff --git a/doc/en/hook/jot_header_tpl_filter.bb b/doc/en/hook/jot_header_tpl_filter.bb new file mode 100644 index 000000000..b17d81d03 --- /dev/null +++ b/doc/en/hook/jot_header_tpl_filter.bb @@ -0,0 +1,5 @@ +[h2]jot_header_tpl_filter[/h2] + +Allows addon developers to modify the values of replacements fed into jot-header.tpl + +cxref: include/conversation.php diff --git a/doc/en/hook/jot_networks.bb b/doc/en/hook/jot_networks.bb new file mode 100644 index 000000000..4c1629ba7 --- /dev/null +++ b/doc/en/hook/jot_networks.bb @@ -0,0 +1 @@ +[h2]jot_networks[/h2] diff --git a/doc/en/hook/jot_tool.bb b/doc/en/hook/jot_tool.bb new file mode 100644 index 000000000..22ba9701e --- /dev/null +++ b/doc/en/hook/jot_tool.bb @@ -0,0 +1 @@ +[h2]jot_tool[/h2] diff --git a/doc/en/hook/jot_tpl_filter.bb b/doc/en/hook/jot_tpl_filter.bb new file mode 100644 index 000000000..426da3c56 --- /dev/null +++ b/doc/en/hook/jot_tpl_filter.bb @@ -0,0 +1,5 @@ +[h2]jot_tpl_filter[/h2] + +Allows addon developers to alter the macro replacements prior to being fed into jot.tpl + +cxref: include/conversation.php diff --git a/doc/en/hook/legal_webbie.bb b/doc/en/hook/legal_webbie.bb new file mode 100644 index 000000000..8c7d32d56 --- /dev/null +++ b/doc/en/hook/legal_webbie.bb @@ -0,0 +1,10 @@ +[h2]legal_webbie[/h2] + +Called when validating a channel address. By default the valid characters are +a-z,0-9,-,_, and . Uppercase ASCII characters are folded to lower and any invalid characters are stripped. + +Some federated networks require more restrictive rules. + +The hook is called with an array [ 'input' => (supplied text), 'output' => (validated text) ] + +A plugin will generally perform a regex filter or text operation on 'input' and provide the results in 'output'. \ No newline at end of file diff --git a/doc/en/hook/legal_webbie_text.bb b/doc/en/hook/legal_webbie_text.bb new file mode 100644 index 000000000..32c74c93b --- /dev/null +++ b/doc/en/hook/legal_webbie_text.bb @@ -0,0 +1,7 @@ +[h2]legal_webbie_text[/h2] + +Returns a string describing the text rules applied to legal_webbie(). + +Called with an array [ 'text' => (descriptive text describing text character limitations) ] + +A plugin should return the description of the allowed characters and operation performed in the 'legal_webbie' hook to assist people when creating a new channel. \ No newline at end of file diff --git a/doc/en/hook/load_pdl.bb b/doc/en/hook/load_pdl.bb new file mode 100644 index 000000000..149a3e766 --- /dev/null +++ b/doc/en/hook/load_pdl.bb @@ -0,0 +1 @@ +[h2]load_pdl[/h2] diff --git a/doc/en/hook/local_dir_update.bb b/doc/en/hook/local_dir_update.bb new file mode 100644 index 000000000..d0b0f8ac1 --- /dev/null +++ b/doc/en/hook/local_dir_update.bb @@ -0,0 +1 @@ +[h2]local_dir_update[/h2] diff --git a/doc/en/hook/logged_in.bb b/doc/en/hook/logged_in.bb new file mode 100644 index 000000000..b01041576 --- /dev/null +++ b/doc/en/hook/logged_in.bb @@ -0,0 +1 @@ +[h2]logged_in[/h2] diff --git a/doc/en/hook/logger.bb b/doc/en/hook/logger.bb new file mode 100644 index 000000000..8fe989abd --- /dev/null +++ b/doc/en/hook/logger.bb @@ -0,0 +1,16 @@ +[h2]logger[/h2] + +Called when making an entry to the application logfile + +Hook data: + + array( + 'filename' => name of logfile relative to application basedir. String. + 'loglevel' => the log level of this log entry, if this is higher than the configured maximum loglevel + this hook will not be called. Integer. + 'message' => The formatted log message, ready for logging. String. + 'logged' => boolean, default is false. Set to true to prevent the normal logfile entry to be made + (e.g. if the plugin is configured to handle this aspect of the function, or if it is determined + that this log entry should not be made) + ) + diff --git a/doc/en/hook/logging_out.bb b/doc/en/hook/logging_out.bb new file mode 100644 index 000000000..d47b9f1df --- /dev/null +++ b/doc/en/hook/logging_out.bb @@ -0,0 +1 @@ +[h2]logging_out[/h2] diff --git a/doc/en/hook/login_hook.bb b/doc/en/hook/login_hook.bb new file mode 100644 index 000000000..156a0afcd --- /dev/null +++ b/doc/en/hook/login_hook.bb @@ -0,0 +1 @@ +[h2]login_hook[/h2] diff --git a/doc/en/hook/magic_auth.bb b/doc/en/hook/magic_auth.bb new file mode 100644 index 000000000..80d6edb27 --- /dev/null +++ b/doc/en/hook/magic_auth.bb @@ -0,0 +1 @@ +[h2]magic_auth[/h2] diff --git a/doc/en/hook/magic_auth_openid_success.bb b/doc/en/hook/magic_auth_openid_success.bb new file mode 100644 index 000000000..810f2e06d --- /dev/null +++ b/doc/en/hook/magic_auth_openid_success.bb @@ -0,0 +1 @@ +[h2]magic_auth_openid_success[/h2] diff --git a/doc/en/hook/magic_auth_success.bb b/doc/en/hook/magic_auth_success.bb new file mode 100644 index 000000000..d795e43e5 --- /dev/null +++ b/doc/en/hook/magic_auth_success.bb @@ -0,0 +1 @@ +[h2]magic_auth_success[/h2] diff --git a/doc/en/hook/main_slider.bb b/doc/en/hook/main_slider.bb new file mode 100644 index 000000000..a63c2170a --- /dev/null +++ b/doc/en/hook/main_slider.bb @@ -0,0 +1 @@ +[h2]main_slider[/h2] diff --git a/doc/en/hook/marital_selector.bb b/doc/en/hook/marital_selector.bb new file mode 100644 index 000000000..0f76c3f5a --- /dev/null +++ b/doc/en/hook/marital_selector.bb @@ -0,0 +1 @@ +[h2]marital_selector[/h2] diff --git a/doc/en/hook/marital_selector_min.bb b/doc/en/hook/marital_selector_min.bb new file mode 100644 index 000000000..f02d21f20 --- /dev/null +++ b/doc/en/hook/marital_selector_min.bb @@ -0,0 +1 @@ +[h2]marital_selector_min[/h2] diff --git a/doc/en/hook/markdown_to_bb.bb b/doc/en/hook/markdown_to_bb.bb new file mode 100644 index 000000000..8af637c8c --- /dev/null +++ b/doc/en/hook/markdown_to_bb.bb @@ -0,0 +1,5 @@ +[h2]markdown_to_bb[/h2] + +Called when processing markdown to bbcode conversion such as when importing Diaspora protocol source or other markdown sources. The plugin is called post conversion. + +The function takes one argument which is the string being converted. It may be additionally processed by the plugin. diff --git a/doc/en/hook/module_loaded.bb b/doc/en/hook/module_loaded.bb new file mode 100644 index 000000000..cb0d2302d --- /dev/null +++ b/doc/en/hook/module_loaded.bb @@ -0,0 +1 @@ +[h2]module_loaded[/h2] diff --git a/doc/en/hook/module_mod_aftercontent.bb b/doc/en/hook/module_mod_aftercontent.bb new file mode 100644 index 000000000..04e3c8d88 --- /dev/null +++ b/doc/en/hook/module_mod_aftercontent.bb @@ -0,0 +1,12 @@ +[h2]module_mod_aftercontent[/h2] + + + +The hook data for this call consists of an array + + $arr['content'] + +This element contains the HTML content which was prepared for this page by calling the module_content() function. It is invoked after the content has been created. It does not contain the result of AJAX or asynchronous page load calls. + + The current module may be determined by lookin at App::$module + diff --git a/doc/en/hook/module_mod_content.bb b/doc/en/hook/module_mod_content.bb new file mode 100644 index 000000000..eef5b7ba5 --- /dev/null +++ b/doc/en/hook/module_mod_content.bb @@ -0,0 +1,10 @@ +[h2]module_mod_content[/h2] + +The hook data for this call consists of an array + + $arr['content'] + +This element contains the HTML content before calling the module_content() function. It is invoked before the content region has been populated. This may or may not be empty as there may be other processes or addons generating content prior to your hook handler is run. Be certain to preserve any current content. Typically anything you add here will be placed at the top of the content region of the page, but in any event prior to the main content region being generated. + + The current module may be determined by lookin at App::$module + diff --git a/doc/en/hook/module_mod_init.bb b/doc/en/hook/module_mod_init.bb new file mode 100644 index 000000000..52fe5a616 --- /dev/null +++ b/doc/en/hook/module_mod_init.bb @@ -0,0 +1 @@ +[h2]module_mod_init[/h2] diff --git a/doc/en/hook/module_mod_post.bb b/doc/en/hook/module_mod_post.bb new file mode 100644 index 000000000..3adb0e737 --- /dev/null +++ b/doc/en/hook/module_mod_post.bb @@ -0,0 +1 @@ +[h2]module_mod_post[/h2] diff --git a/doc/en/hook/mood_verbs.bb b/doc/en/hook/mood_verbs.bb new file mode 100644 index 000000000..67fb719dd --- /dev/null +++ b/doc/en/hook/mood_verbs.bb @@ -0,0 +1 @@ +[h2]mood_verbs[/h2] diff --git a/doc/en/hook/nav.bb b/doc/en/hook/nav.bb new file mode 100644 index 000000000..b52f90602 --- /dev/null +++ b/doc/en/hook/nav.bb @@ -0,0 +1,28 @@ +[h2]nav[/h2] + +Called when generating the main navigation bar and menu for a page + +Hook data: + + array( + 'usermenu' => array( 'icon' => photo URL, 'name' => channel name ) + 'nav' => array( + 'usermenu' => usermenu (photo menu) link array + (channel home, profiles, photos, cloud, chats, webapges ...) + 'loginmenu' => login menu link array + 'network' => grid link and grid-notify + 'home' => home link and home-notify + 'intros' => intros link and intros-notify + 'notifications' => notifications link and notifications-notify + 'messages' => PM link and PM-notify + 'all_events' => events link and events notfiy + 'manage' => manage channels link + 'settings' => settings link + 'register' => registration link + 'help' => help/doc link + 'apps' => apps link + 'search' => search link and form + 'directory' => directory link + ) + + diff --git a/doc/en/hook/network_content_init.bb b/doc/en/hook/network_content_init.bb new file mode 100644 index 000000000..224da393a --- /dev/null +++ b/doc/en/hook/network_content_init.bb @@ -0,0 +1 @@ +[h2]network_content_init[/h2] diff --git a/doc/en/hook/network_ping.bb b/doc/en/hook/network_ping.bb new file mode 100644 index 000000000..78deefe78 --- /dev/null +++ b/doc/en/hook/network_ping.bb @@ -0,0 +1 @@ +[h2]network_ping[/h2] diff --git a/doc/en/hook/network_to_name.bb b/doc/en/hook/network_to_name.bb new file mode 100644 index 000000000..eea4a1841 --- /dev/null +++ b/doc/en/hook/network_to_name.bb @@ -0,0 +1 @@ +[h2]network_to_name[/h2] diff --git a/doc/en/hook/notifier_end.bb b/doc/en/hook/notifier_end.bb new file mode 100644 index 000000000..df9d852bd --- /dev/null +++ b/doc/en/hook/notifier_end.bb @@ -0,0 +1 @@ +[h2]notifier_end[/h2] diff --git a/doc/en/hook/notifier_hub.bb b/doc/en/hook/notifier_hub.bb new file mode 100644 index 000000000..4255ce446 --- /dev/null +++ b/doc/en/hook/notifier_hub.bb @@ -0,0 +1 @@ +[h2]notifier_hub[/h2] diff --git a/doc/en/hook/notifier_normal.bb b/doc/en/hook/notifier_normal.bb new file mode 100644 index 000000000..0059baa47 --- /dev/null +++ b/doc/en/hook/notifier_normal.bb @@ -0,0 +1 @@ +[h2]notifier_normal[/h2] diff --git a/doc/en/hook/obj_verbs.bb b/doc/en/hook/obj_verbs.bb new file mode 100644 index 000000000..ca98229aa --- /dev/null +++ b/doc/en/hook/obj_verbs.bb @@ -0,0 +1 @@ +[h2]obj_verbs[/h2] diff --git a/doc/en/hook/oembed_probe.bb b/doc/en/hook/oembed_probe.bb new file mode 100644 index 000000000..4f32ac267 --- /dev/null +++ b/doc/en/hook/oembed_probe.bb @@ -0,0 +1 @@ +[h2]oembed_probe[/h2] diff --git a/doc/en/hook/other_encapsulate.bb b/doc/en/hook/other_encapsulate.bb new file mode 100644 index 000000000..ea0cdf622 --- /dev/null +++ b/doc/en/hook/other_encapsulate.bb @@ -0,0 +1,7 @@ +[h2]other_encapsulate[/h2] + +Passed an array of 'data', 'pubkey', 'alg', 'result' when encrypting data with an algorithm (alg) which is unknown to the system. Hooks are expected to identify their algorithm, encrypt data with pubkey and place the result in 'result'. + + + + diff --git a/doc/en/hook/other_unencapsulate.bb b/doc/en/hook/other_unencapsulate.bb new file mode 100644 index 000000000..c8b0b617f --- /dev/null +++ b/doc/en/hook/other_unencapsulate.bb @@ -0,0 +1,5 @@ +[h2]other_unencapsulate[/h2] + +Passed an array of 'data', 'prvkey', 'alg', 'result' when decrypting data with an algorithm (alg) which is unknown to the system. Hooks are expected to identify their algorithm, decrypt data with prvkey and place the result in 'result'. + + diff --git a/doc/en/hook/page_content_top.bb b/doc/en/hook/page_content_top.bb new file mode 100644 index 000000000..137e3abfd --- /dev/null +++ b/doc/en/hook/page_content_top.bb @@ -0,0 +1 @@ +[h2]page_content_top[/h2] diff --git a/doc/en/hook/page_end.bb b/doc/en/hook/page_end.bb new file mode 100644 index 000000000..09293cf50 --- /dev/null +++ b/doc/en/hook/page_end.bb @@ -0,0 +1 @@ +[h2]page_end[/h2] diff --git a/doc/en/hook/page_header.bb b/doc/en/hook/page_header.bb new file mode 100644 index 000000000..ffaa791c9 --- /dev/null +++ b/doc/en/hook/page_header.bb @@ -0,0 +1 @@ +[h2]page_header[/h2] diff --git a/doc/en/hook/page_meta.bb b/doc/en/hook/page_meta.bb new file mode 100644 index 000000000..30a8f9440 --- /dev/null +++ b/doc/en/hook/page_meta.bb @@ -0,0 +1,13 @@ +[h2]page_meta[/h2] + +Called before generating the page header. + +[code] + $pagemeta = [ 'og:title' => self::$page['title'] ]; + + call_hooks('page_meta',$pagemeta); + foreach ($pagemeta as $metaproperty => $metavalue) { + self::$meta->set($metaproperty,$metavalue); + } + +[/code] diff --git a/doc/en/hook/parse_atom.bb b/doc/en/hook/parse_atom.bb new file mode 100644 index 000000000..c8037317f --- /dev/null +++ b/doc/en/hook/parse_atom.bb @@ -0,0 +1 @@ +[h2]parse_atom[/h2] diff --git a/doc/en/hook/parse_link.bb b/doc/en/hook/parse_link.bb new file mode 100644 index 000000000..1c328059c --- /dev/null +++ b/doc/en/hook/parse_link.bb @@ -0,0 +1 @@ +[h2]parse_link[/h2] diff --git a/doc/en/hook/pdl_selector.bb b/doc/en/hook/pdl_selector.bb new file mode 100644 index 000000000..bee01c843 --- /dev/null +++ b/doc/en/hook/pdl_selector.bb @@ -0,0 +1 @@ +[h2]pdl_selector[/h2] diff --git a/doc/en/hook/perm_is_allowed.bb b/doc/en/hook/perm_is_allowed.bb new file mode 100644 index 000000000..aac647609 --- /dev/null +++ b/doc/en/hook/perm_is_allowed.bb @@ -0,0 +1 @@ +[h2]perm_is_allowed[/h2] diff --git a/doc/en/hook/permissions_create.bb b/doc/en/hook/permissions_create.bb new file mode 100644 index 000000000..22f80a80e --- /dev/null +++ b/doc/en/hook/permissions_create.bb @@ -0,0 +1 @@ +[h2]permissions_create[/h2] diff --git a/doc/en/hook/permissions_update.bb b/doc/en/hook/permissions_update.bb new file mode 100644 index 000000000..40366b33d --- /dev/null +++ b/doc/en/hook/permissions_update.bb @@ -0,0 +1 @@ +[h2]permissions_update[/h2] diff --git a/doc/en/hook/permit_hook.bb b/doc/en/hook/permit_hook.bb new file mode 100644 index 000000000..e69de29bb diff --git a/doc/en/hook/personal_xrd.bb b/doc/en/hook/personal_xrd.bb new file mode 100644 index 000000000..71d4bd8dd --- /dev/null +++ b/doc/en/hook/personal_xrd.bb @@ -0,0 +1 @@ +[h2]personal_xrd[/h2] diff --git a/doc/en/hook/photo_post_end.bb b/doc/en/hook/photo_post_end.bb new file mode 100644 index 000000000..8a3291763 --- /dev/null +++ b/doc/en/hook/photo_post_end.bb @@ -0,0 +1 @@ +[h2]photo_post_end[/h2] diff --git a/doc/en/hook/photo_upload_begin.bb b/doc/en/hook/photo_upload_begin.bb new file mode 100644 index 000000000..5e441a12a --- /dev/null +++ b/doc/en/hook/photo_upload_begin.bb @@ -0,0 +1 @@ +[h2]photo_upload_begin[/h2] diff --git a/doc/en/hook/photo_upload_end.bb b/doc/en/hook/photo_upload_end.bb new file mode 100644 index 000000000..956175f1d --- /dev/null +++ b/doc/en/hook/photo_upload_end.bb @@ -0,0 +1 @@ +[h2]photo_upload_end[/h2] diff --git a/doc/en/hook/photo_upload_file.bb b/doc/en/hook/photo_upload_file.bb new file mode 100644 index 000000000..726622ac0 --- /dev/null +++ b/doc/en/hook/photo_upload_file.bb @@ -0,0 +1 @@ +[h2]photo_upload_file[/h2] diff --git a/doc/en/hook/photo_upload_form.bb b/doc/en/hook/photo_upload_form.bb new file mode 100644 index 000000000..70b8318b8 --- /dev/null +++ b/doc/en/hook/photo_upload_form.bb @@ -0,0 +1 @@ +[h2]photo_upload_form[/h2] diff --git a/doc/en/hook/photo_view_filter.bb b/doc/en/hook/photo_view_filter.bb new file mode 100644 index 000000000..0780c1edc --- /dev/null +++ b/doc/en/hook/photo_view_filter.bb @@ -0,0 +1 @@ +[h2]photo_view_filter[/h2] diff --git a/doc/en/hook/poke_verbs.bb b/doc/en/hook/poke_verbs.bb new file mode 100644 index 000000000..54d68c3a2 --- /dev/null +++ b/doc/en/hook/poke_verbs.bb @@ -0,0 +1 @@ +[h2]poke_verbs[/h2] diff --git a/doc/en/hook/post_local.bb b/doc/en/hook/post_local.bb new file mode 100644 index 000000000..5aa723cb9 --- /dev/null +++ b/doc/en/hook/post_local.bb @@ -0,0 +1 @@ +[h2]post_local[/h2] diff --git a/doc/en/hook/post_local_end.bb b/doc/en/hook/post_local_end.bb new file mode 100644 index 000000000..380166fdb --- /dev/null +++ b/doc/en/hook/post_local_end.bb @@ -0,0 +1 @@ +[h2]post_local_end[/h2] diff --git a/doc/en/hook/post_local_start.bb b/doc/en/hook/post_local_start.bb new file mode 100644 index 000000000..2f684f67a --- /dev/null +++ b/doc/en/hook/post_local_start.bb @@ -0,0 +1 @@ +[h2]post_local_start[/h2] diff --git a/doc/en/hook/post_mail.bb b/doc/en/hook/post_mail.bb new file mode 100644 index 000000000..8f67ad4f0 --- /dev/null +++ b/doc/en/hook/post_mail.bb @@ -0,0 +1 @@ +[h2]post_mail[/h2] diff --git a/doc/en/hook/post_mail_end.bb b/doc/en/hook/post_mail_end.bb new file mode 100644 index 000000000..7f0085773 --- /dev/null +++ b/doc/en/hook/post_mail_end.bb @@ -0,0 +1 @@ +[h2]post_mail_end[/h2] diff --git a/doc/en/hook/post_remote.bb b/doc/en/hook/post_remote.bb new file mode 100644 index 000000000..f8e087eee --- /dev/null +++ b/doc/en/hook/post_remote.bb @@ -0,0 +1 @@ +[h2]post_remote[/h2] diff --git a/doc/en/hook/post_remote_end.bb b/doc/en/hook/post_remote_end.bb new file mode 100644 index 000000000..0fef20cbf --- /dev/null +++ b/doc/en/hook/post_remote_end.bb @@ -0,0 +1 @@ +[h2]post_remote_end[/h2] diff --git a/doc/en/hook/post_remote_update.bb b/doc/en/hook/post_remote_update.bb new file mode 100644 index 000000000..fd358db28 --- /dev/null +++ b/doc/en/hook/post_remote_update.bb @@ -0,0 +1 @@ +[h2]post_remote_update[/h2] diff --git a/doc/en/hook/post_remote_update_end.bb b/doc/en/hook/post_remote_update_end.bb new file mode 100644 index 000000000..95f1e6f78 --- /dev/null +++ b/doc/en/hook/post_remote_update_end.bb @@ -0,0 +1 @@ +[h2]post_remote_update_end[/h2] diff --git a/doc/en/hook/prepare_body.bb b/doc/en/hook/prepare_body.bb new file mode 100644 index 000000000..3f1eaef85 --- /dev/null +++ b/doc/en/hook/prepare_body.bb @@ -0,0 +1 @@ +[h2]prepare_body[/h2] diff --git a/doc/en/hook/prepare_body_final.bb b/doc/en/hook/prepare_body_final.bb new file mode 100644 index 000000000..96d1ae389 --- /dev/null +++ b/doc/en/hook/prepare_body_final.bb @@ -0,0 +1 @@ +[h2]prepare_body_final[/h2] diff --git a/doc/en/hook/prepare_body_init.bb b/doc/en/hook/prepare_body_init.bb new file mode 100644 index 000000000..f3de79970 --- /dev/null +++ b/doc/en/hook/prepare_body_init.bb @@ -0,0 +1 @@ +[h2]prepare_body_init[/h2] diff --git a/doc/en/hook/privacygroup_extras.bb b/doc/en/hook/privacygroup_extras.bb new file mode 100644 index 000000000..bd67f2470 --- /dev/null +++ b/doc/en/hook/privacygroup_extras.bb @@ -0,0 +1,12 @@ +[h2]privacygroup_extras[/h2] + +Add items to the Privacy Group edit form + +[code] + $hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(1) ]; + call_hooks ('privacygroup_extras',$hookinfo); + $pgrp_extras = $hookinfo['pgrp_extras']; +[/code] + +see: Zotlabs/Module/Group.php +see: view/tpl/privacy_groups.tpl diff --git a/doc/en/hook/privacygroup_extras_drop.bb b/doc/en/hook/privacygroup_extras_drop.bb new file mode 100644 index 000000000..fd27ab255 --- /dev/null +++ b/doc/en/hook/privacygroup_extras_drop.bb @@ -0,0 +1,11 @@ +[h2]privacygroup_extras_drop[/h2] + +Called after privacy group is dropped + +[code] + $hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(2) ]; + call_hooks ('privacygroup_extras_drop',$hookinfo); +[/code] + +see: Zotlabs/Module/Group.php +see: view/tpl/privacy_groups.tpl diff --git a/doc/en/hook/privacygroup_extras_post.bb b/doc/en/hook/privacygroup_extras_post.bb new file mode 100644 index 000000000..704db1997 --- /dev/null +++ b/doc/en/hook/privacygroup_extras_post.bb @@ -0,0 +1,11 @@ +[h2]privacygroup_extras_post[/h2] + +Called as privacy group edit form is edited. + +[code] + $hookinfo = [ 'pgrp_extras' => '', 'group'=>$group['id'] ]; + call_hooks ('privacygroup_extras_post',$hookinfo); +[/code] + +see: Zotlabs/Module/Group.php +see: view/tpl/privacy_groups.tpl diff --git a/doc/en/hook/proc_run.bb b/doc/en/hook/proc_run.bb new file mode 100644 index 000000000..a3759794a --- /dev/null +++ b/doc/en/hook/proc_run.bb @@ -0,0 +1 @@ +[h2]proc_run[/h2] diff --git a/doc/en/hook/process_channel_sync_delivery.bb b/doc/en/hook/process_channel_sync_delivery.bb new file mode 100644 index 000000000..c0416c8cb --- /dev/null +++ b/doc/en/hook/process_channel_sync_delivery.bb @@ -0,0 +1 @@ +[h2]process_channel_sync_delivery[/h2] diff --git a/doc/en/hook/profile_advanced.bb b/doc/en/hook/profile_advanced.bb new file mode 100644 index 000000000..65e56afd6 --- /dev/null +++ b/doc/en/hook/profile_advanced.bb @@ -0,0 +1 @@ +[h2]profile_advanced[/h2] diff --git a/doc/en/hook/profile_edit.bb b/doc/en/hook/profile_edit.bb new file mode 100644 index 000000000..e60663d4a --- /dev/null +++ b/doc/en/hook/profile_edit.bb @@ -0,0 +1 @@ +[h2]profile_edit[/h2] diff --git a/doc/en/hook/profile_photo_content_end.bb b/doc/en/hook/profile_photo_content_end.bb new file mode 100644 index 000000000..518415c4d --- /dev/null +++ b/doc/en/hook/profile_photo_content_end.bb @@ -0,0 +1 @@ +[h2]profile_photo_content_end[/h2] diff --git a/doc/en/hook/profile_post.bb b/doc/en/hook/profile_post.bb new file mode 100644 index 000000000..d22d8fbc7 --- /dev/null +++ b/doc/en/hook/profile_post.bb @@ -0,0 +1 @@ +[h2]profile_post[/h2] diff --git a/doc/en/hook/profile_sidebar.bb b/doc/en/hook/profile_sidebar.bb new file mode 100644 index 000000000..bfd059e4b --- /dev/null +++ b/doc/en/hook/profile_sidebar.bb @@ -0,0 +1 @@ +[h2]profile_sidebar[/h2] diff --git a/doc/en/hook/profile_sidebar_enter.bb b/doc/en/hook/profile_sidebar_enter.bb new file mode 100644 index 000000000..9d6726a30 --- /dev/null +++ b/doc/en/hook/profile_sidebar_enter.bb @@ -0,0 +1 @@ +[h2]profile_sidebar_enter[/h2] diff --git a/doc/en/hook/register_account.bb b/doc/en/hook/register_account.bb new file mode 100644 index 000000000..df4de2b30 --- /dev/null +++ b/doc/en/hook/register_account.bb @@ -0,0 +1 @@ +[h2]register_account[/h2] diff --git a/doc/en/hook/render_location.bb b/doc/en/hook/render_location.bb new file mode 100644 index 000000000..41501c087 --- /dev/null +++ b/doc/en/hook/render_location.bb @@ -0,0 +1 @@ +[h2]render_location[/h2] diff --git a/doc/en/hook/replace_macros.bb b/doc/en/hook/replace_macros.bb new file mode 100644 index 000000000..fac39dd7b --- /dev/null +++ b/doc/en/hook/replace_macros.bb @@ -0,0 +1 @@ +[h2]replace_macros[/h2] diff --git a/doc/en/hook/reverse_magic_auth.bb b/doc/en/hook/reverse_magic_auth.bb new file mode 100644 index 000000000..4cbd84b93 --- /dev/null +++ b/doc/en/hook/reverse_magic_auth.bb @@ -0,0 +1 @@ +[h2]reverse_magic_auth[/h2] diff --git a/doc/en/hook/settings_form.bb b/doc/en/hook/settings_form.bb new file mode 100644 index 000000000..d65341181 --- /dev/null +++ b/doc/en/hook/settings_form.bb @@ -0,0 +1 @@ +[h2]settings_form[/h2] diff --git a/doc/en/hook/settings_post.bb b/doc/en/hook/settings_post.bb new file mode 100644 index 000000000..f72546c11 --- /dev/null +++ b/doc/en/hook/settings_post.bb @@ -0,0 +1 @@ +[h2]settings_post[/h2] diff --git a/doc/en/hook/sexpref_selector.bb b/doc/en/hook/sexpref_selector.bb new file mode 100644 index 000000000..b4dad6b38 --- /dev/null +++ b/doc/en/hook/sexpref_selector.bb @@ -0,0 +1 @@ +[h2]sexpref_selector[/h2] diff --git a/doc/en/hook/sexpref_selector_min.bb b/doc/en/hook/sexpref_selector_min.bb new file mode 100644 index 000000000..6f49946af --- /dev/null +++ b/doc/en/hook/sexpref_selector_min.bb @@ -0,0 +1 @@ +[h2]sexpref_selector_min[/h2] diff --git a/doc/en/hook/smilie.bb b/doc/en/hook/smilie.bb new file mode 100644 index 000000000..575acc178 --- /dev/null +++ b/doc/en/hook/smilie.bb @@ -0,0 +1,19 @@ +[h2]smilie[/h2] + + +Called when processing translation of emoticons. It is passed an array containing two sub-arrays: + + array( + 'texts' => array('text1','text2',...), + 'icons' => array('icon1','icon2',...) + ); + + texts is the emoticon text - for example ':-)' for a traditional smile face. + icons is the HTML used as a replacement. For example + '<img class="smiley" src="https://localhost/images/smiley-smile.gif" alt=":-)" />' + + If adding or removing an entry from either array, the corresponding element from the matching array must also + be added or removed. Emoticons less than three characters in length or not recommended as they get triggered + incorrectly quite often. Extended emoticons are indicated by convention using a preceding colon, for example + + :walrus_kissing_a_baby \ No newline at end of file diff --git a/doc/en/hook/status_editor.bb b/doc/en/hook/status_editor.bb new file mode 100644 index 000000000..00e97a7c9 --- /dev/null +++ b/doc/en/hook/status_editor.bb @@ -0,0 +1,31 @@ +[h2]status_editor[/h2] + +Replace the default status_editor (jot). + +Allow plugins to replace the default status editor in a context dependent manner. + +It is fed an array of ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]. + +All calls to the status_editor at the time of the creation of this hook have been updated +to set $module at invocation. This allows addon developers to have a context dependent editor +based on the Hubzilla module/addon. + +Calls to status_editor() are in the form of: + status_editor($a, $x, $popup, $module). + +Future module/addon developers are encouraged to set $popup and $module when invoking the +status_editor. + + +[code] + $hook_info = ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]; + call_hooks('status_editor',$hook_info); + if ($hook_info['editor_html'] == '') { + return hz_status_editor($a, $x, $popup); + } else { + return $hook_info['editor_html']; + } + +[/code] + +see: include/conversation.php diff --git a/doc/en/hook/stream_item.bb b/doc/en/hook/stream_item.bb new file mode 100644 index 000000000..30086961d --- /dev/null +++ b/doc/en/hook/stream_item.bb @@ -0,0 +1,13 @@ +[h2]stream_item[/h2] + + +Called for each item processed for viewing by conversation(); + +The hook data consists of an array + + array( + 'mode' => current mode of conversation() + 'item' => item being processed + ); + + Set item['blocked'] to block the item from viewing. This action will not affect comment or sub-thread counts, so if there are three comments in a conversation and you block one, three comments will still be reported even though only two are visible. diff --git a/doc/en/hook/system_app_installed_filter.bb b/doc/en/hook/system_app_installed_filter.bb new file mode 100644 index 000000000..a269a79a8 --- /dev/null +++ b/doc/en/hook/system_app_installed_filter.bb @@ -0,0 +1,18 @@ +[h2]system_app_installed_filter[/h2] + +Allow plugins to filter the result of system_app_installed. + +Code excerpt: + +[code] + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('system_app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; +[/code] + +cxref: Zotlabs/Lib/Apps.php + diff --git a/doc/en/hook/tagged.bb b/doc/en/hook/tagged.bb new file mode 100644 index 000000000..05d081d07 --- /dev/null +++ b/doc/en/hook/tagged.bb @@ -0,0 +1,16 @@ +[h2]tagged[/h2] + + +This hook is called when a delivery is made which results in the recipient being tagged. + +The hook data is an array containing + + array( + 'channel_id' => int, + 'item' => item structure of the delivered item from database, + 'body' => the body of the referenced item + + ); + + Note: This hook is called before secondary delivery chains are invoked in the case of tagging a forum. This means that permissions and some item attributes will be those of the item before being re-packaged and before ownership of this item is given to the forum. + diff --git a/doc/en/hook/update_unseen.bb b/doc/en/hook/update_unseen.bb new file mode 100644 index 000000000..8fb02c239 --- /dev/null +++ b/doc/en/hook/update_unseen.bb @@ -0,0 +1,9 @@ +[h3]update_unseen[/h3] + +Called prior to automatically marking items 'seen'; allowing a plugin the choice to not perform this action. + +hook data + +[ 'channel_id' => local_channel(), 'update' => 'unset' ]; + +If 'update' is set to 0 or false on return, the update operation is not performed. \ No newline at end of file diff --git a/doc/en/hook/validate_channelname.bb b/doc/en/hook/validate_channelname.bb new file mode 100644 index 000000000..2ab12bbec --- /dev/null +++ b/doc/en/hook/validate_channelname.bb @@ -0,0 +1,23 @@ +[h2]validate_channelname[/h2] + +Called when creating a new channel or changing the channel name in mod/settings.php + +Hook data consists of an array + + array( + 'name' => supplied name + ); + + If the hook handler determines the name is valid, do nothing. If there is an issue with the name, + set $hook_data['message'] to the message text which should be displayed to the member - and the name will + not be accepted. + + + Example: + [code] + if(mb_strlen($hook_data['name']) < 3) + $hook_data['message'] = t('Name too short.'); + [/code] + + + \ No newline at end of file diff --git a/doc/en/hook/webfinger.bb b/doc/en/hook/webfinger.bb new file mode 100644 index 000000000..7cc24322f --- /dev/null +++ b/doc/en/hook/webfinger.bb @@ -0,0 +1 @@ +[h2]webfinger[/h2] diff --git a/doc/en/hook/well_known.bb b/doc/en/hook/well_known.bb new file mode 100644 index 000000000..778b27a02 --- /dev/null +++ b/doc/en/hook/well_known.bb @@ -0,0 +1 @@ +[h2]well_known[/h2] diff --git a/doc/en/hook/wiki_preprocess.bb b/doc/en/hook/wiki_preprocess.bb new file mode 100644 index 000000000..913b601ba --- /dev/null +++ b/doc/en/hook/wiki_preprocess.bb @@ -0,0 +1,11 @@ +[h3]wiki_preprocess[/h3] + +Called before markdown/bbcode processors are run for wiki pages + +Passed parameter array: + + 'content' => wiki page content + 'mimetype' => page mimetype + + +see: Zotlabs/Module/Wiki.php diff --git a/doc/en/hook/zid.bb b/doc/en/hook/zid.bb new file mode 100644 index 000000000..2210c1342 --- /dev/null +++ b/doc/en/hook/zid.bb @@ -0,0 +1 @@ +[h2]zid[/h2] diff --git a/doc/en/hook/zid_init.bb b/doc/en/hook/zid_init.bb new file mode 100644 index 000000000..131dd8f72 --- /dev/null +++ b/doc/en/hook/zid_init.bb @@ -0,0 +1 @@ +[h2]zid_init[/h2] diff --git a/doc/en/hook/zot_best_algorithm.bb b/doc/en/hook/zot_best_algorithm.bb new file mode 100644 index 000000000..ccde505cb --- /dev/null +++ b/doc/en/hook/zot_best_algorithm.bb @@ -0,0 +1,3 @@ +[h2]zot_best_algorithm[/h2] + + diff --git a/doc/en/hook/zot_finger.bb b/doc/en/hook/zot_finger.bb new file mode 100644 index 000000000..9383b4c31 --- /dev/null +++ b/doc/en/hook/zot_finger.bb @@ -0,0 +1 @@ +[h2]zot_finger[/h2] diff --git a/doc/en/hooklist.bb b/doc/en/hooklist.bb new file mode 100644 index 000000000..7231cd185 --- /dev/null +++ b/doc/en/hooklist.bb @@ -0,0 +1,698 @@ +[h2]Hooks[/h2] + +Hooks allow plugins/addons to "hook into" the code at many points and alter the behaviour or otherwise perform independent actions when an activity takes place or when certain data structures are accessed. There are many hooks which allow you to tie into the software at most any point and do something slightly different than the default thing. These hooks are passed two variables. The first is the App structure which contains details about the entire state of the page request as we build the resulting page. The second is unique to the specific hook that is called and provides specific detail about what is happening in the software at the time the hook is invoked. + +[zrl=[baseurl]/help/hooks]Generated index of all hooks and the files which call them[/zrl] + +[zrl=[baseurl]/help/hook/module_mod_aftercontent]module_mod_aftercontent[/zrl] + General purpose hook for any module, executed after mod_content(). Replace 'module' with module name, e.g. 'photos_mod_aftercontent'. + +[zrl=[baseurl]/help/hook/module_mod_content]module_mod_content[/zrl] + General purpose hook for any module, executed before mod_content(). Replace 'module' with module name, e.g. 'photos_mod_content'. + +[zrl=[baseurl]/help/hook/module_mod_init]module_mod_init[/zrl] + General purpose hook for any module, executed before mod_init(). Replace 'module' with module name, e.g. 'photos_mod_init'. + +[zrl=[baseurl]/help/hook/module_mod_post]module_mod_post[/zrl] + General purpose hook for any module, executed before mod_post(). Replace 'module' with module name, e.g. 'photos_mod_post'. + +[zrl=[baseurl]/help/hook/about_hook]about_hook[/zrl] + Called from the siteinfo page + +[zrl=[baseurl]/help/hook/accept_follow]accept_follow[/zrl] + Called when accepting a connection (friend request) + +[zrl=[baseurl]/help/hook/account_downgrade]account_downgrade[/zrl] + Called when an account has expired, indicating a potential downgrade to "basic" service class + +[zrl=[baseurl]/help/hook/account_settings]account_settings[/zrl] + Called when generating the account settings form + +[zrl=[baseurl]/help/hook/account_settings_post]account_settings_post[/zrl] + Called when posting from the account settings form + +[zrl=[baseurl]/help/hook/activity_filter]activity_filter[/zrl] + Called when generating the list of filters for the network page + +[zrl=[baseurl]/help/hook/activity_filter]activity_mapper[/zrl] + Called when determining the activity type for transmission. + +[zrl=[baseurl]/help/hook/activity_filter]activity_decode_mapper[/zrl] + Called when determining the activity type for transmission. + +[zrl=[baseurl]/help/hook/activity_filter]activity_obj_mapper[/zrl] + Called when determining the object type for transmission. + +[zrl=[baseurl]/help/hook/activity_filter]activity_obj_decode_mapper[/zrl] + Called when determining the object type for transmission. + +[zrl=[baseurl]/help/hook/activity_order]activity_order[/zrl] + Called when generating the list of order options for the network page + +[zrl=[baseurl]/help/hook/addon_app_installed_filter]addon_app_installed_filter[/zrl] + Called when determining whether an addon_app is installed + +[zrl=[baseurl]/help/hook/activity_received]activity_received[/zrl] + Called when an activity (post, comment, like, etc.) has been received from a zot source + +[zrl=[baseurl]/help/hook/admin_aside]admin_aside[/zrl] + Called when generating the admin page sidebar widget + +[zrl=[baseurl]/help/hook/affinity_labels]affinity_labels[/zrl] + Used to generate alternate labels for the affinity slider. + +[zrl=[baseurl]/help/hook/api_perm_is_allowed]api_perm_is_allowed[/zrl] + Called when perm_is_allowed() is executed from an API call. + +[zrl=[baseurl]/help/hook/app_destroy]app_destroy[/zrl] + Called when an app is deleted + +[zrl=[baseurl]/help/hook/app_installed_filter]app_installed_filter[/zrl] + Called when determining whether an app is installed + +[zrl=[baseurl]/help/hook/app_menu]app_menu[/zrl] + Called when generating the app_menu dropdown (may be obsolete) + +[zrl=[baseurl]/help/hook/attach_delete]attach_delete[/zrl] + Called when attachments are deleted from the attach table + +[zrl=[baseurl]/help/hook/atom_author]atom_author[/zrl] + Called when generating an author or owner element for an Atom ActivityStream feed + +[zrl=[baseurl]/help/hook/atom_entry]atom_entry[/zrl] + Called when generating each item entry of an Atom ActivityStreams feed + +[zrl=[baseurl]/help/hook/atom_feed]atom_feed[/zrl] + Called when generating an Atom ActivityStreams feed + +[zrl=[baseurl]/help/hook/atom_feed_end]atom_feed_end[/zrl] + Called when generation of an Atom ActivityStreams feed is completed + +[zrl=[baseurl]/help/hook/attach_upload_file]attach_upload_file[/zrl] + Called when uploading a file + +[zrl=[baseurl]/help/hook/authenticate]authenticate[/zrl] + Can provide alternate authentication mechanisms + +[zrl=[baseurl]/help/hook/author_is_pmable]author_is_pmable[/zrl] + Called from the thread action menu to determine if we can send private mail to the post author + +[zrl=[baseurl]/help/hook/bb2diaspora]bb2diaspora[/zrl] + called when converting bbcode to markdown + +[zrl=[baseurl]/help/hook/bbcode]bbcode[/zrl] + Called at end of converting bbcode to HTML + +[zrl=[baseurl]/help/hook/bbcode_filter]bbcode_filter[/zrl] + Called when beginning to convert bbcode to HTML + +[zrl=[baseurl]/help/hook/bb_translate_video]bb_translate_video[/zrl] + Called when extracting embedded services from bbcode video elements (rarely used) + +[zrl=[baseurl]/help/hook/build_pagehead]build_pagehead[/zrl] + Called when creating the HTML page header + +[zrl=[baseurl]/help/hook/can_comment_on_post]can_comment_on_post[/zrl] + Called when deciding whether or not to present a comment box for a post + +[zrl=[baseurl]/help/hook/change_channel]change_channel[/zrl] + Called when logging in to a channel (either during login or afterward through the channel manager) + +[zrl=[baseurl]/help/hook/channel_remove]channel_remove[/zrl] + Called when removing a channel + +[zrl=[baseurl]/help/hook/channel_links]channel_links[/zrl] + Called when generating the Link: HTTP header for a channel + +[zrl=[baseurl]/help/hook/channel_settings]channel_settings[/zrl] + Called when displaying the channel settings page + +[zrl=[baseurl]/help/hook/chat_message]chat_message[/zrl] + Called to create a chat message. + +[zrl=[baseurl]/help/hook/chat_post]chat_post[/zrl] + Called when a chat message has been posted + +[zrl=[baseurl]/help/hook/check_account_email]check_account_email[/zrl] + Validate the email provided in an account registration + +[zrl=[baseurl]/help/hook/check_account_invite]check_account_invite[/zrl] + Validate an invitation code when using site invitations + +[zrl=[baseurl]/help/hook/check_account_password]check_account_password[/zrl] + Used to provide policy control over account passwords (minimum length, character set inclusion, etc.) + +[zrl=[baseurl]/help/hook/check_channelallowed]check_channelallowed[/zrl] + Used to over-ride or bypass the channel black/white block lists + +[zrl=[baseurl]/help/hook/check_siteallowed]check_siteallowed[/zrl] + Used to over-ride or bypass the site black/white block lists + +[zrl=[baseurl]/help/hook/collect_public_recipients]collect_public_recipients[/zrl] + Used to establish a list of recipients to send a public message to. + +[zrl=[baseurl]/help/hook/comment_buttons]comment_buttons[/zrl] + Called when rendering the edit buttons for comments + +[zrl=[baseurl]/help/hook/comments_are_now_closed]comments_are_now_closed[/zrl] + Called when deciding whether or not to present a comment box for a post + +[zrl=[baseurl]/help/hook/connect_premium]connect_premium[/zrl] + Called when connecting to a premium channel + +[zrl=[baseurl]/help/hook/connection_remove]connection_remove[/zrl] + Called when deleting/removing a connection + +[zrl=[baseurl]/help/hook/connector_settings]connector_settings[/zrl] + Called when posting to the features/addon settings page + +[zrl=[baseurl]/help/hook/construct_page]construct_page[/zrl] + General purpose hook to provide content to certain page regions. Called when constructing the Comanche page. + +[zrl=[baseurl]/help/hook/contact_block_end]contact_block_end[/zrl] + Called when generating the sidebar "Connections" widget + +[zrl=[baseurl]/help/hook/contact_edit]contact_edit[/zrl] + Called when editing a connection via connedit + +[zrl=[baseurl]/help/hook/contact_edit_post]contact_edit_post[/zrl] + Called when posting to connedit + +[zrl=[baseurl]/help/hook/contact_select_options]contact_select_options[/zrl] + Deprecated/unused + +[zrl=[baseurl]/help/hook/content_security_policy]content_security_policy[/zrl] + Called prior to output of the Content-Security-Policy header + +[zrl=[baseurl]/help/hook/conversation_start]conversation_start[/zrl] + Called in the beginning of rendering a conversation (message or message collection or stream) + +[zrl=[baseurl]/help/hook/cover_photo_content_end]cover_photo_content_end[/zrl] + Called after a cover photo has been uplaoded + +[zrl=[baseurl]/help/hook/create_identity]create_identity[/zrl] + Called when creating a channel + +[zrl=[baseurl]/help/hook/cron]cron[/zrl] + Called when scheduled tasks (poller) is executed + +[zrl=[baseurl]/help/hook/cron_daily]cron_daily[/zrl] + Called when daily scheduled tasks are executed + +[zrl=[baseurl]/help/hook/cron_weekly]cron_weekly[/zrl] + Called when weekly scheduled tasks are executed + +[zrl=[baseurl]/help/hook/crypto_methods]crypto_methods[/zrl] + Called when generating a list of crypto algorithms in the locally preferred order + +[zrl=[baseurl]/help/hook/daemon_addon]daemon_addon[/zrl] + Called when invoking the extensible background daemon + +[zrl=[baseurl]/help/hook/daemon_master_release]daemon_master_release[/zrl] + Called at the start of processing \Zotlabs\Daemon\Master::Release() + +[zrl=[baseurl]/help/hook/directory_item]directory_item[/zrl] + Called when generating a directory listing for display + +[zrl=[baseurl]/help/hook/discover_channel_webfinger]discover_channel_webfinger[/zrl] + Called when performing a webfinger lookup + +[zrl=[baseurl]/help/hook/display_item]display_item[/zrl] + Called for each item being displayed in a conversation thread + +[zrl=[baseurl]/help/hook/display_settings]display_settings[/zrl] + Called from settings module when displaying the 'display settings' section + +[zrl=[baseurl]/help/hook/display_settings_post]display_settings_post[/zrl] + Called when posting from the settings module 'display settings' form + +[zrl=[baseurl]/help/hook/donate_contributors]donate_contributors[/zrl] + called by the 'donate' addon when generating a list of donation recipients + +[zrl=[baseurl]/help/hook/donate_plugin]donate_plugin[/zrl] + called by the 'donate' addon + +[zrl=[baseurl]/help/hook/donate_sponsors]donate_sponsors[/zrl] + called by the 'donate' addon + +[zrl=[baseurl]/help/hook/dreport_is_storable]dreport_is_storable[/zrl] + called before storing a dreport record to determine whether to store it + +[zrl=[baseurl]/help/hook/dreport_process]dreport_process[/zrl] + called for each valid delivery report + +[zrl=[baseurl]/help/hook/dropdown_extras]dropdown_extras[/zrl] + Add additional items to the dropdown cog when item/threads are displayed. + +[zrl=[baseurl]/help/hook/drop_item]drop_item[/zrl] + called when an 'item' is removed + +[zrl=[baseurl]/help/hook/encode_object]encode_object[/zrl] + called when encoding an object for transmission. + +[zrl=[baseurl]/help/hook/enotify]enotify[/zrl] + called before any notification + +[zrl=[baseurl]/help/hook/enotify_mail]enotify_mail[/zrl] + called when sending a notification email + +[zrl=[baseurl]/help/hook/enotify_store]enotify_store[/zrl] + called when storing a notification record + +[zrl=[baseurl]/help/hook/enotify_store_end]enotify_store_end[/zrl] + called after a notification record has been stored + +[zrl=[baseurl]/help/hook/event_created]event_created[/zrl] + called when an event record is created + +[zrl=[baseurl]/help/hook/event_store_event]event_store_event[/zrl] + called when an event record is created or updated + +[zrl=[baseurl]/help/hook/event_updated]event_updated[/zrl] + called when an event record is modified + +[zrl=[baseurl]/help/hook/externals_url_select]externals_url_select[/zrl] + called when generating a list of random sites to pull public posts from + +[zrl=[baseurl]/help/hook/feature_enabled]feature_enabled[/zrl] + called when 'feature_enabled()' is used + +[zrl=[baseurl]/help/hook/feature_settings]feature_settings[/zrl] + called from settings page when visiting 'addon/feature settings' + +[zrl=[baseurl]/help/hook/feature_settings_post]feature_settings_post[/zrl] + called from settings page when posting from 'addon/feature settings' + +[zrl=[baseurl]/help/hook/fetch_and_store]fetch_and_store[/zrl] + called to allow filtering of 'decoded' items before storage. + +[zrl=[baseurl]/help/hook/file_thumbnail]file_thumbnail[/zrl] + called when generating thumbnail images for cloud page in 'view tiles' mode + +[zrl=[baseurl]/help/hook/follow]follow[/zrl] + called when a follow operation takes place + +[zrl=[baseurl]/help/hook/follow_from_feed]follow_from_feed[/zrl] + called when a follow operation takes place on an RSS feed + +[zrl=[baseurl]/help/hook/follow_allow]follow_allow[/zrl] + called before storing the results of a follow operation + +[zrl=[baseurl]/help/hook/gender_selector]gender_selector[/zrl] + called when creating the 'gender' drop down list (advanced profile) + +[zrl=[baseurl]/help/hook/gender_selector_min]gender_selector_min[/zrl] + called when creating the 'gender' drop down list (normal profile) + +[zrl=[baseurl]/help/hook/generate_map]generate_map[/zrl] + called to generate the HTML for displaying a map location by coordinates + +[zrl=[baseurl]/help/hook/generate_named_map]generate_named_map[/zrl] + called to generate the HTML for displaying a map location by text location + +[zrl=[baseurl]/help/hook/get_all_api_perms]get_all_api_perms[/zrl] + Called when retrieving the permissions for API uses + +[zrl=[baseurl]/help/hook/get_all_perms]get_all_perms[/zrl] + called when get_all_perms() is used + +[zrl=[baseurl]/help/hook/get_best_language]get_best_language[/zrl] + called when choosing the preferred language for the page + +[zrl=[baseurl]/help/hook/get_default_export_sections]get_default_export_sections[/zrl] + Called to get the default list of functional data groups to export in identity_basic_export() + +[zrl=[baseurl]/help/hook/get_features]get_features[/zrl] + Called when get_features() is called + +[zrl=[baseurl]/help/hook/get_photo]get_photo[/zrl] + Called when photo content (except for profile photos) is fetched in mod_photo + +[zrl=[baseurl]/help/hook/get_profile_photo]get_profile_photo[/zrl] + Called when local profile photo content is fetched in mod_photo + +[zrl=[baseurl]/help/hook/get_role_perms]get_role_perms[/zrl] + Called when get_role_perms() is called to obtain permissions for named permission roles + +[zrl=[baseurl]/help/hook/global_permissions]global_permissions[/zrl] + Called when the global permissions list is generated + +[zrl=[baseurl]/help/hook/home_content]home_content[/zrl] + Called from mod_home to replace the content of the home page + +[zrl=[baseurl]/help/hook/home_init]home_init[/zrl] + Called from the home page home_init() function + +[zrl=[baseurl]/help/hook/hostxrd]hostxrd[/zrl] + Called when generating .well-known/hosts-meta for "old webfinger" (used by Diaspora protocol) + +[zrl=[baseurl]/help/hook/html2bb_video]html2bb_video[/zrl] + Called when using the html2bbcode translation to handle embedded media + +[zrl=[baseurl]/help/hook/html2bbcode]html2bbcode[/zrl] + Called when using the html2bbcode translation + +[zrl=[baseurl]/help/hook/identity_basic_export]identity_basic_export[/zrl] + Called when exporting a channel's basic information for backup or transfer + +[zrl=[baseurl]/help/hook/import_author_xchan]import_author_xchan[/zrl] + Called when looking up an author of a post by xchan_hash to ensure they have an xchan record on our site + +[zrl=[baseurl]/help/hook/import_channel]import_channel[/zrl] + Called when importing a channel from a file or API source + +[zrl=[baseurl]/help/hook/import_directory_profile]import_directory_profile[/zrl] + Called when processing delivery of a profile structure from an external source (usually for directory storage) + +[zrl=[baseurl]/help/hook/import_xchan]import_xchan[/zrl] + Called when processing the result of zot_finger() to store the result + +[zrl=[baseurl]/help/hook/item_photo_menu]item_photo_menu[/zrl] + Called when generating the list of actions associated with a displayed conversation item + +[zrl=[baseurl]/help/hook/item_store]item_store[/zrl] + Called when item_store() stores a record of type item + +[zrl=[baseurl]/help/hook/item_stored]item_stored[/zrl] + Called after item_store() has stored a record of type item in the database. + +[zrl=[baseurl]/help/hook/item_custom]item_custom[/zrl] + Called before item_store() stores a record of type item (allowing addons to process ITEM_TYPE_CUSTOM items). + +[zrl=[baseurl]/help/hook/item_store_update]item_store_update[/zrl] + Called when item_store_update() is called to update a stored item. + +[zrl=[baseurl]/help/hook/item_stored_update]item_stored_update[/zrl] + Called after item_store_update() has updated a stored item. + +[zrl=[baseurl]/help/hook/item_translate]item_translate[/zrl] + Called from item_store and item_store_update after the post language has been autodetected + +[zrl=[baseurl]/help/hook/jot_networks]jot_networks[/zrl] + Called to generate the list of additional post plugins to enable from the ACL form + +[zrl=[baseurl]/help/hook/jot_tool]jot_tool[/zrl] + Deprecated and possibly obsolete. Allows one to add action buttons to the post editor. + +[zrl=[baseurl]/help/hook/jot_tpl_filter]jot_tpl_filter[/zrl] + Called to filter template vars before replacement in jot.tpl. + +[zrl=[baseurl]/help/hook/jot_header_tpl_filter]jot_header_tpl_filter[/zrl] + Called to filter template vars before replacement in jot_header.tpl. + +[zrl=[baseurl]/help/hook/legal_webbie]legal_webbie[/zrl] + Called to validate a channel address + +[zrl=[baseurl]/help/hook/legal_webbie_text]legal_webbie_text[/zrl] + Provides an explanation of text/character restrictions for legal_webbie() + +[zrl=[baseurl]/help/hook/load_pdl]load_pdl[/zrl] + Called when we load a PDL file or description + +[zrl=[baseurl]/help/hook/local_dir_update]local_dir_update[/zrl] + Called when processing a directory update from a channel on the directory server + +[zrl=[baseurl]/help/hook/location_move]location_move[/zrl] + Called when a new location has been provided to a UNO channel (indicating a move rather than a clone) + +[zrl=[baseurl]/help/hook/logged_in]logged_in[/zrl] + Called when authentication by any means has succeeeded + +[zrl=[baseurl]/help/hook/logger]logger[/zrl] + Called when making an entry to the application logfile + +[zrl=[baseurl]/help/hook/logging_out]logging_out[/zrl] + Called when logging out + +[zrl=[baseurl]/help/hook/login_hook]login_hook[/zrl] + Called when generating the login form + +[zrl=[baseurl]/help/hook/magic_auth]magic_auth[/zrl] + Called when processing a magic-auth sequence + +[zrl=[baseurl]/help/hook/markdown_to_bb]markdown_to_bb[/zrl] + Called when processing markdown conversion + +[zrl=[baseurl]/help/hook/match_webfinger_location]match_webfinger_location[/zrl] + Called when processing webfinger requests + +[zrl=[baseurl]/help/hook/magic_auth_openid_success]magic_auth_openid_success[/zrl] + Called when a magic-auth was successful due to openid credentials + +[zrl=[baseurl]/help/hook/magic_auth_success]magic_auth_success[/zrl] + Called when a magic-auth was successful + +[zrl=[baseurl]/help/hook/main_slider]main_slider[/zrl] + Called when generating the affinity tool + +[zrl=[baseurl]/help/hook/marital_selector]marital_selector[/zrl] + Called when generating the list of choices for the 'marital status' profile dropdown (advanced profile) + +[zrl=[baseurl]/help/hook/marital_selector_min]marital_selector_min[/zrl] + Called when generating the list of choices for the 'marital status' profile dropdown (normal profile) + +[zrl=[baseurl]/help/hook/module_loaded]module_loaded[/zrl] + Called when a module has been successfully locate to server a URL request + +[zrl=[baseurl]/help/hook/mood_verbs]mood_verbs[/zrl] + Called when generating the list of moods + +[zrl=[baseurl]/help/hook/nav]nav[/zrl] + Called when generating the navigation bar + +[zrl=[baseurl]/help/hook/network_content_init]network_content_init[/zrl] + Called when loading cntent for the network page + +[zrl=[baseurl]/help/hook/network_ping]network_ping[/zrl] + Called during a ping request + +[zrl=[baseurl]/help/hook/network_to_name]network_to_name[/zrl] + Deprecated + +[zrl=[baseurl]/help/hook/notifier_end]notifier_end[/zrl] + Called when a delivery loop has completed + +[zrl=[baseurl]/help/hook/notifier_hub]notifier_hub[/zrl] + Called when a hub is delivered + +[zrl=[baseurl]/help/hook/notifier_normal]notifier_normal[/zrl] + Called when the notifier is invoked for a 'normal' delivery + +[zrl=[baseurl]/help/hook/notifier_process]notifier_process[/zrl] + Called when the notifier is processing a message/event + +[zrl=[baseurl]/help/hook/obj_verbs]obj_verbs[/zrl] + Called when creating the list of verbs available for profile "things". + +[zrl=[baseurl]/help/hook/oembed_action]oembed_action[/zrl] + Called when deciding if an oembed url is to be filter, blocked, or approved + +[zrl=[baseurl]/help/hook/oembed_probe]oembed_probe[/zrl] + Called when performing an oembed content lookup + +[zrl=[baseurl]/help/hook/other_encapsulate]other_encapsulate[/zrl] + Called when encrypting content for which the algorithm is unknown (see also crypto_methods) + +[zrl=[baseurl]/help/hook/other_unencapsulate]other_unencapsulate[/zrl] + Called when decrypting content for which the algorithm is unknown (see also crypto_methods) + +[zrl=[baseurl]/help/hook/page_content_top]page_content_top[/zrl] + Called when we generate a webpage (before calling the module content function) + +[zrl=[baseurl]/help/hook/page_end]page_end[/zrl] + Called after we have generated the page content + +[zrl=[baseurl]/help/hook/page_header]page_header[/zrl] + Called when generating the navigation bar + +[zrl=[baseurl]/help/hook/page_header]page_meta[/zrl] + Called when generating the meta data in the page header. + +[zrl=[baseurl]/help/hook/parse_atom]parse_atom[/zrl] + Called when parsing an atom/RSS feed item + +[zrl=[baseurl]/help/hook/parse_link]parse_link[/zrl] + Called when probing a URL to generate post content from it + +[zrl=[baseurl]/help/hook/pdl_selector]pdl_selector[/zrl] + Called when creating a layout selection in a form + +[zrl=[baseurl]/help/hook/perm_is_allowed]perm_is_allowed[/zrl] + Called during perm_is_allowed() to determine if a permission is allowed for this channel and observer + +[zrl=[baseurl]/help/hook/permissions_create]permissions_create[/zrl] + Called when an abook entry (connection) is created + +[zrl=[baseurl]/help/hook/permissions_update]permissions_update[/zrl] + Called when a permissions refresh is transmitted + +[zrl=[baseurl]/help/hook/permit_hook]permit_hook[/zrl] + Called before a registered hook is actually executed to determine if it should be allowed or blocked + +[zrl=[baseurl]/help/hook/personal_xrd]personal_xrd[/zrl] + Called when generating the personal XRD for "old webfinger" (Diaspora) + +[zrl=[baseurl]/help/hook/photo_post_end]photo_post_end[/zrl] + Called after uploading a photo + +[zrl=[baseurl]/help/hook/photo_upload_begin]photo_upload_begin[/zrl] + Called when attempting to upload a photo + +[zrl=[baseurl]/help/hook/photo_upload_end]photo_upload_end[/zrl] + Called when a photo upload has been processed + +[zrl=[baseurl]/help/hook/photo_upload_file]photo_upload_file[/zrl] + Called to generate alternate filenames for an upload + +[zrl=[baseurl]/help/hook/photo_upload_form]photo_upload_form[/zrl] + Called when generating a photo upload form + +[zrl=[baseurl]/help/hook/photo_view_filter]photo_view_filter[/zrl] + Called before the data is handed over to the photo_view template + +[zrl=[baseurl]/help/hook/poke_verbs]poke_verbs[/zrl] + Called when generating the list of actions for "poke" module + +[zrl=[baseurl]/help/hook/post_local]post_local[/zrl] + Called when an item has been posted on this machine via mod/item.php (also via API) + +[zrl=[baseurl]/help/hook/post_local_end]post_local_end[/zrl] + Called after a local post operation has completed + +[zrl=[baseurl]/help/hook/post_local_start]post_local_start[/zrl] + Called when a local post operation is commencing + +[zrl=[baseurl]/help/hook/post_mail]post_mail[/zrl] + Called when a mail message has been composed + +[zrl=[baseurl]/help/hook/post_mail_end]post_mail_end[/zrl] + Called when a mail message has been delivered + +[zrl=[baseurl]/help/hook/post_remote]post_remote[/zrl] + Called when an activity arrives from another site + +[zrl=[baseurl]/help/hook/post_remote_end]post_remote_end[/zrl] + Called after processing a remote post + +[zrl=[baseurl]/help/hook/post_remote_update]post_remote_update[/zrl] + Called when processing a remote post that involved an edit or update + +[zrl=[baseurl]/help/hook/post_remote_update_end]post_remote_update_end[/zrl] + Called after processing a remote post that involved an edit or update + +[zrl=[baseurl]/help/hook/prepare_body]prepare_body[/zrl] + Called when generating the HTML for a displayed conversation item + +[zrl=[baseurl]/help/hook/prepare_body_final]prepare_body_final[/zrl] + Called after generating the HTML for a displayed conversation item + +[zrl=[baseurl]/help/hook/prepare_body_init]prepare_body_init[/zrl] + Called before generating the HTML for a displayed conversation item + +[zrl=[baseurl]/help/hook/privacygroup_extras]privacygroup_extras[/zrl] + Called before generating the HTML for the Privacy Group edit options + +[zrl=[baseurl]/help/hook/privacygroup_extras_delete]privacygroup_extras_delete[/zrl] + Called after privacy group is dropped. + +[zrl=[baseurl]/help/hook/privacygroup_extras_post]privacygroup_extras_post[/zrl] + Called when privacy group edit form is submitted. + +[zrl=[baseurl]/help/hook/proc_run]proc_run[/zrl] + Called when invoking PHP sub processes + +[zrl=[baseurl]/help/hook/process_channel_sync_delivery]process_channel_sync_delivery[/zrl] + Called when accepting delivery of a 'sync packet' containing structure and table updates from a channel clone + +[zrl=[baseurl]/help/hook/profile_advanced]profile_advanced[/zrl] + Called when generating an advanced profile page + +[zrl=[baseurl]/help/hook/profile_edit]profile_edit[/zrl] + Called when editing a profile + +[zrl=[baseurl]/help/hook/profile_photo_content_end]profile_photo_content_end[/zrl] + Called when changing a profile photo + +[zrl=[baseurl]/help/hook/profile_post]profile_post[/zrl] + Called when posting an edited profile + +[zrl=[baseurl]/help/hook/profile_sidebar]profile_sidebar[/zrl] + Called when generating the 'channel sidebar' or mini-profile + +[zrl=[baseurl]/help/hook/profile_sidebar_enter]profile_sidebar_enter[/zrl] + Called before generating the 'channel sidebar' or mini-profile + +[zrl=[baseurl]/help/hook/queue_deliver]queue_deliver[/zrl] + Called when delivering a queued message + +[zrl=[baseurl]/help/hook/register_account]register_account[/zrl] + Called when an account has been created + +[zrl=[baseurl]/help/hook/render_location]render_location[/zrl] + Called to generate an ineractive inline map + +[zrl=[baseurl]/help/hook/replace_macros]replace_macros[/zrl] + Called before invoking the template processor + +[zrl=[baseurl]/help/hook/reverse_magic_auth]reverse_magic_auth[/zrl] + Called before invoking reverse magic auth to send you to your own site to authenticate on this site + +[zrl=[baseurl]/help/hook/settings_account]settings_account[/zrl] + Called when generating the account settings form + +[zrl=[baseurl]/help/hook/settings_form]settings_form[/zrl] + Called when generating the channel settings form + +[zrl=[baseurl]/help/hook/settings_post]settings_post[/zrl] + Called when posting from the channel settings form + +[zrl=[baseurl]/help/hook/sexpref_selector]sexpref_selector[/zrl] + Called when generating a dropdown of sexual preference (advanced profile) + +[zrl=[baseurl]/help/hook/sexpref_selector_min]sexpref_selector_min[/zrl] + Called when generating a dropdown of sexual preference (normal profile) + +[zrl=[baseurl]/help/hook/smilie]smilie[/zrl] + Called when translating emoticons + +[zrl=[baseurl]/help/hook/status_editor]status_editor[/zrl] + Called when generating the status_editor. + +[zrl=[baseurl]/help/hook/stream_item]stream_item[/zrl] + Called for each item which is rendered for viewing via conversation() + +[zrl=[baseurl]/help/hook/system_app_installed_filter]system_app_installed_filter[/zrl] + Called when determining whether a system app is installed + +[zrl=[baseurl]/help/hook/tagged]tagged[/zrl] + Called when a delivery is processed which results in you being tagged + +[zrl=[baseurl]/help/hook/thumbnail]thumbnail[/zrl] + Called when generating thumbnails for cloud storage 'tile' view + +[zrl=[baseurl]/help/hook/update_unseen]update_unseen[/zrl] + Called prior to automatically marking items seen which were loaded in the browser + +[zrl=[baseurl]/help/hook/validate_channelname]validate_channelname[/zrl] + Used to validate the names used by a channel + +[zrl=[baseurl]/help/hook/webfinger]webfinger[/zrl] + Called when visiting the webfinger (RFC7033) service + +[zrl=[baseurl]/help/hook/well_known]well_known[/zrl] + Called when accessing the '.well-known' special site addresses + +[zrl=[baseurl]/help/hook/wiki_preprocess]wiki_preprocess[/zrl] + Called before markdown/bbcode processors are run for wiki pages + +[zrl=[baseurl]/help/hook/zot_best_algorithm]zot_best_algorithm[/zrl] + Called when negotiating crypto algorithms with remote sites + +[zrl=[baseurl]/help/hook/zid]zid[/zrl] + Called when adding the observer's zid to a URL + +[zrl=[baseurl]/help/hook/zid_init]zid_init[/zrl] + Called when authenticating a visitor who has used zid + +[zrl=[baseurl]/help/hook/zot_finger]zot_finger[/zrl] + Called when a zot-info packet has been requested (this is our webfinger discovery mechanism) diff --git a/doc/en/hooks.html b/doc/en/hooks.html new file mode 100644 index 000000000..a7ee314e7 --- /dev/null +++ b/doc/en/hooks.html @@ -0,0 +1 @@ +

      Hooks

      FunctionSource FileArg
      $a->module . _mod_aftercontentindex.php$arr
      $a->module . _mod_contentindex.php$arr
      $a->module . _mod_initindex.php$placeholder
      $a->module . _mod_postindex.php$_POST
      $a->module . _post_ . $selnameinclude/acl_selectors.php$o
      $a->module . _post_ . $selnameinclude/acl_selectors.php$o
      $a->module . _post_ . $selnameinclude/acl_selectors.php$o
      $a->module . _pre_ . $selnameinclude/acl_selectors.php$arr
      $a->module . _pre_ . $selnameinclude/acl_selectors.php$arr
      $a->module . _pre_ . $selnameinclude/acl_selectors.php$arr
      $nameinclude/plugin.php&$data = null
      about_hookmod/siteinfo.php$o
      accept_followmod/connedit.php$arr
      account_downgradeinclude/account.php$ret
      account_downgradeinclude/account.php$ret
      account_settingsmod/settings.php$account_settings
      activity_receivedinclude/zot.php$parr
      affinity_labelsinclude/widgets.php$labels
      affinity_labelsmod/connedit.php$labels
      api_perm_is_allowedinclude/permissions.php$arr
      app_menuindex.php$arr
      atom_authorinclude/items.php$o
      atom_entryinclude/items.php$o
      atom_feedinclude/items.php$atom
      atom_feed_endinclude/items.php$atom
      attach_upload_fileinclude/attach.php$f
      authenticateinclude/auth.php$addon_auth
      avatar_lookupinclude/network.php$avatar
      bb2diasporainclude/markdown.php$Text
      bbcodeinclude/bbcode.php$Text
      channel_removeinclude/Contact.php$r[0]
      chat_messageinclude/chat.php$arr
      chat_postmod/chatsvc.php$arr
      check_account_emailinclude/account.php$arr
      check_account_inviteinclude/account.php$arr
      check_account_passwordinclude/account.php$arr
      connect_premiummod/connect.php$arr
      connector_settingsmod/settings.php$settings_connectors
      construct_pageboot.php$arr
      contact_block_endinclude/text.php$arr
      contact_editmod/connedit.php$arr
      contact_edit_postmod/connedit.php$_POST
      contact_select_optionsinclude/acl_selectors.php$x
      conversation_startinclude/conversation.php$cb
      create_identityinclude/channel.php$newuid
      croninclude/cronhooks.php$d
      cron_dailyinclude/poller.phpdatetime_convert()
      cron_weeklyinclude/poller.phpdatetime_convert()
      directory_itemmod/directory.php$arr
      discover_by_webbieinclude/network.php$arr
      display_iteminclude/ItemObject.php$arr
      display_iteminclude/conversation.php$arr
      display_settingsmod/settings.php$o
      display_settings_postmod/settings.php$_POST
      donate_contributorsextend/addon/matrix/donate/donate.php$contributors
      donate_pluginextend/addon/matrix/donate/donate.php$o
      donate_sponsorsextend/addon/matrix/donate/donate.php$sponsors
      dreport_is_storableinclude/zot.php$dr
      drop_iteminclude/items.php$arr
      enotifyinclude/enotify.php$h
      enotify_mailinclude/enotify.php$datarray
      enotify_storeinclude/enotify.php$datarray
      event_createdinclude/event.php$event[id]
      event_updatedinclude/event.php$event[id]
      externals_url_selectinclude/externals.php$arr
      feature_enabledinclude/features.php$arr
      feature_settingsmod/settings.php$settings_addons
      feature_settings_postmod/settings.php$_POST
      followinclude/follow.php$arr
      followinclude/follow.php$arr
      follow_allowinclude/follow.php$x
      gender_selectorinclude/profile_selectors.php$select
      gender_selector_mininclude/profile_selectors.php$select
      generate_mapinclude/text.php$arr
      generate_named_mapinclude/text.php$arr
      get_all_api_permsinclude/permissions.php$arr
      get_all_permsinclude/permissions.php$arr
      get_featuresinclude/features.php$arr
      get_role_permsinclude/permissions.php$ret
      get_widgetsboot.php$arr
      get_widgetsboot.php$arr
      global_permissionsinclude/permissions.php$ret
      home_contentmod/home.php$o
      home_initmod/home.php$ret
      hostxrdmod/hostxrd.php$arr
      html2bbcodeinclude/html2bbcode.php$message
      identity_basic_exportinclude/channel.php$addon
      import_author_xchaninclude/items.php$arr
      import_channelmod/import.php$addon
      import_directory_profileinclude/zot.php$d
      import_xchaninclude/zot.php$arr
      item_photo_menuinclude/conversation.php$args
      item_storeinclude/items.php$d
      item_storeinclude/items.php$arr
      item_store_updateinclude/items.php$d
      item_translateinclude/items.php$translate
      item_translateinclude/items.php$translate
      jot_networksinclude/acl_selectors.php$jotnets
      jot_networksinclude/conversation.php$jotnets
      jot_networksmod/editblock.php$jotnets
      jot_networksmod/editpost.php$jotnets
      jot_networksmod/editwebpage.php$jotnets
      jot_networksmod/editlayout.php$jotnets
      jot_toolinclude/conversation.php$jotplugins
      jot_toolmod/editblock.php$jotplugins
      jot_toolmod/editpost.php$jotplugins
      jot_toolmod/editwebpage.php$jotplugins
      jot_toolmod/editlayout.php$jotplugins
      load_pdlboot.php$arr
      local_dir_updateinclude/dir_fns.php$arr
      logged_ininclude/oauth.php$a->user
      logged_ininclude/api.php$a->user
      logged_ininclude/security.php$a->account
      logged_ininclude/security.php$user_record
      logging_outinclude/auth.php$args
      login_hookboot.php$o
      magic_authmod/magic.php$arr
      magic_auth_openid_successmod/openid.php$arr
      magic_auth_openid_successmod/openid.php$arr
      magic_auth_successmod/post.php$arr
      main_sliderinclude/widgets.php$arr
      marital_selectorinclude/profile_selectors.php$select
      marital_selector_mininclude/profile_selectors.php$select
      module_loadedindex.php$x
      mood_verbsinclude/text.php$arr
      navinclude/nav.php$x
      network_content_initmod/network.php$arr
      network_pingmod/ping.php$arr
      network_tabsinclude/conversation.php$arr
      network_to_nameinclude/contact_selectors.php$nets
      notifier_endinclude/notifier.php$target_item
      notifier_hubinclude/notifier.php$narr
      notifier_normalinclude/deliver_hooks.php$r[0]
      obj_verbsinclude/taxonomy.php$arr
      oembed_probeinclude/oembed.php$x
      page_content_topindex.php$a->page[content]
      page_endindex.php$a->page[content]
      page_headerinclude/nav.php$a->page[nav]
      parse_atominclude/items.php$arr
      parse_linkmod/linkinfo.php$arr
      pdl_selectorinclude/comanche.php$arr
      perm_is_allowedinclude/permissions.php$arr
      permissions_createinclude/notifier.php$perm_update
      permissions_updateinclude/notifier.php$perm_update
      personal_xrdmod/xrd.php$arr
      photo_post_endinclude/photos.php$ret
      photo_post_endinclude/photos.php$ret
      photo_upload_begininclude/attach.php$arr
      photo_upload_begininclude/photos.php$args
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_fileinclude/attach.php$f
      photo_upload_fileinclude/photos.php$f
      photo_upload_formmod/photos.php$ret
      poke_verbsinclude/text.php$arr
      post_localinclude/zot.php$arr
      post_localinclude/items.php$arr
      post_localmod/item.php$datarray
      post_local_endinclude/items.php$arr
      post_local_endinclude/attach.php$arr
      post_local_endinclude/attach.php$arr
      post_local_endextend/addon/matrix/randpost/randpost.php$x
      post_local_endextend/addon/matrix/randpost/randpost.php$x
      post_local_endmod/mood.php$arr
      post_local_endmod/like.php$arr
      post_local_endmod/item.php$datarray
      post_local_endmod/subthread.php$arr
      post_local_startmod/item.php$_REQUEST
      post_mailinclude/items.php$arr
      post_mail_endinclude/items.php$arr
      post_remoteinclude/items.php$arr
      post_remote_endinclude/items.php$arr
      post_remote_updateinclude/items.php$arr
      post_remote_update_endinclude/items.php$arr
      prepare_bodyinclude/text.php$prep_arr
      prepare_body_finalinclude/text.php$prep_arr
      prepare_body_initinclude/text.php$item
      probe_well_knowninclude/probe.php$ret
      proc_runboot.php$arr
      process_channel_sync_deliveryinclude/zot.php$addon
      profile_advancedmod/profile.php$o
      profile_editmod/profiles.php$arr
      profile_photo_content_endmod/profile_photo.php$o
      profile_postmod/profiles.php$_POST
      profile_sidebarinclude/channel.php$arr
      profile_sidebar_enterinclude/channel.php$profile
      register_accountinclude/account.php$result
      render_locationinclude/conversation.php$locate
      replace_macrosinclude/text.php$arr
      reverse_magic_authmod/rmagic.php$arr
      settings_accountmod/settings.php$_POST
      settings_formmod/settings.php$o
      settings_postmod/settings.php$_POST
      sexpref_selectorinclude/profile_selectors.php$select
      sexpref_selector_mininclude/profile_selectors.php$select
      smilieinclude/text.php$params
      smilieextend/addon/matrix/smileybutton/smileybutton.php$params
      taggedinclude/items.php$arr
      validate_channelnameinclude/channel.php$arr
      webfingermod/wfinger.php$arr
      well_knownmod/_well_known.php$arr
      zidinclude/channel.php$arr
      zid_initinclude/channel.php$arr
      zot_fingerinclude/zot.php$ret

      Generated Tue Nov 03 21:19:02 PST 2015

      \ No newline at end of file diff --git a/doc/en/intro_for_developers.bb b/doc/en/intro_for_developers.bb new file mode 100644 index 000000000..172008b7f --- /dev/null +++ b/doc/en/intro_for_developers.bb @@ -0,0 +1,113 @@ +[b]$Projectname Developer Guide[/b] + +[b]File system layout:[/b] + +[addon] optional addons/plugins + +[boot.php] Every process uses this to bootstrap the application structure + +[doc] Help Files + +[images] core required images + +[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing + +[index.php] The front-end controller for web access + +[install] Installation and upgrade files and DB schema + +[library] Third party modules (must be license compatible) + +[mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php) + +[mod/site/] site-specific mod overrides, excluded from git + +[util] translation tools, main English string database and other miscellaneous utilities + +[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git) + +[view] theming and language files + +[view/(css,js,img,php,tpl)] default theme files + +[view/(en,it,es ...)] language strings and resources + +[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides + +[b]The Database:[/b] + + [li]abook - contact table, replaces Friendica 'contact'[/li] + [li]account - service provider account[/li] + [li]addon - registered plugins[/li] + [li]app - peronal app data[/li] + [li]attach - file attachments[/li] + [li]auth_codes - OAuth usage[/li] + [li]cache - OEmbed cache[/li] + [li]channel - replaces Friendica 'user'[/li] + [li]chat - chat room content[/li] + [li]chatpresence - channel presence information for chat[/li] + [li]chatroom - data for the actual chat room[/li] + [li]clients - OAuth usage[/li] + [li]config - main configuration storage[/li] + [li]conv - Diaspora private messages[/li] + [li]event - Events[/li] + [li]fcontact - friend suggestion stuff[/li] + [li]ffinder - friend suggestion stuff[/li] + [li]fserver - obsolete[/li] + [li]fsuggest - friend suggestion stuff[/li] + [li]pgrp - privacy groups[/li] + [li]pgrp_member - privacy groups[/li] + [li]hook - plugin hook registry[/li] + [li]hubloc - Red location storage, ties a location to an xchan[/li] + [li]item - posts[/li] + [li]item_id - other identifiers on other services for posts[/li] + [li]likes - likes of 'things'[/li] + [li]mail - private messages[/li] + [li]menu - channel menu data[/li] + [li]menu_item - items uses by channel menus[/li] + [li]notify - notifications[/li] + [li]notify-threads - need to factor this out and use item thread info on notifications[/li] + [li]obj - object data for things (x has y)[/li] + [li]outq - output queue[/li] + [li]pconfig - personal (per channel) configuration storage[/li] + [li]photo - photo storage[/li] + [li]poll - data for polls[/li] + [li]poll_elm - data for poll elements[/li] + [li]profdef - custom profile field definitions[/li] + [li]profext - custom profile field data[/li] + [li]profile - channel profiles[/li] + [li]profile_check - DFRN remote auth use, may be obsolete[/li] + [li]register - registrations requiring admin approval[/li] + [li]session - web session storage[/li] + [li]shares - shared item information[/li] + [li[sign - Diaspora signatures. To be phased out.[/li] + [li]site - site table to find directory peers[/li] + [li]source - channel sources data[/li] + [li]spam - unfinished[/li] + [li]sys_perms - extensible permissions for the sys channel[/li] + [li]term - item taxonomy (categories, tags, etc.) table[/li] + [li]tokens - OAuth usage[/li] + [li]updates - directory sync updates[/li] + [li]verify - general purpose verification structure[/li] + [li]vote - vote data for polls[/li] + [li]xchan - replaces 'gcontact', list of known channels in the universe[/li] + [li]xchat - bookmarked chat rooms[/li] + [li]xconfig - as pconfig but for channels with no local account[/li] + [li]xlink - "friends of friends" linkages derived from poco[/li] + [li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li] + [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li] + + +[b]How to theme $Projectname - by Olivier Migeot[/b] + +This is a short documentation on what I found while trying to modify $Projectname's appearance. + +First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . + +Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). + +At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). + +Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/macros/addons_footer.bb b/doc/en/macros/addons_footer.bb new file mode 100644 index 000000000..32814c59b --- /dev/null +++ b/doc/en/macros/addons_footer.bb @@ -0,0 +1,2 @@ +Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl] +Return to the [zrl=[baseurl]/help/main]Main documentation[/zrl] diff --git a/doc/en/macros/cloud_footer.bb b/doc/en/macros/cloud_footer.bb new file mode 100644 index 000000000..798cc9ea6 --- /dev/null +++ b/doc/en/macros/cloud_footer.bb @@ -0,0 +1,2 @@ +Return to the [zrl=[baseurl]/help/cloud]Cloud documentation[/zrl] +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/en/macros/de/addons_footer.bb b/doc/en/macros/de/addons_footer.bb new file mode 100644 index 000000000..068bb7ec7 --- /dev/null +++ b/doc/en/macros/de/addons_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/addons]Addons-Hilfe[/zrl] +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/en/macros/de/cloud_footer.bb b/doc/en/macros/de/cloud_footer.bb new file mode 100644 index 000000000..921448a3c --- /dev/null +++ b/doc/en/macros/de/cloud_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/cloud]Cloud-Hilfe[/zrl] +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/en/macros/de/main_footer.bb b/doc/en/macros/de/main_footer.bb new file mode 100644 index 000000000..e71603626 --- /dev/null +++ b/doc/en/macros/de/main_footer.bb @@ -0,0 +1 @@ +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/en/macros/de/troubleshooting_footer.bb b/doc/en/macros/de/troubleshooting_footer.bb new file mode 100644 index 000000000..be8c13a28 --- /dev/null +++ b/doc/en/macros/de/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/troubleshooting]Troubleshooting-Startseite[/zrl] +Zurück zur [zrl=[baseurl]/help/troubleshooting]Hilfe-Startseite[/zrl] diff --git a/doc/en/macros/main_footer.bb b/doc/en/macros/main_footer.bb new file mode 100644 index 000000000..08f671ded --- /dev/null +++ b/doc/en/macros/main_footer.bb @@ -0,0 +1 @@ +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/en/macros/pl/addons_footer.bb b/doc/en/macros/pl/addons_footer.bb new file mode 100644 index 000000000..79ac0a71c --- /dev/null +++ b/doc/en/macros/pl/addons_footer.bb @@ -0,0 +1,2 @@ +Powróć do [zrl=[baseurl]/help/addons]dokumentacji dodatków[/zrl] +Powróć do [zrl=[baseurl]/help/main]głównej strony dokumentacji[/zrl] diff --git a/doc/en/macros/pl/cloud_footer.bb b/doc/en/macros/pl/cloud_footer.bb new file mode 100644 index 000000000..48628ae1a --- /dev/null +++ b/doc/en/macros/pl/cloud_footer.bb @@ -0,0 +1,2 @@ +Powróć do [zrl=[baseurl]/help/cloud]dokumentacji chmury[/zrl] +Powróć do [zrl=[baseurl]/help/main]głównej strony dokumentacji[/zrl] diff --git a/doc/en/macros/pl/main_footer.bb b/doc/en/macros/pl/main_footer.bb new file mode 100644 index 000000000..8bf25fed5 --- /dev/null +++ b/doc/en/macros/pl/main_footer.bb @@ -0,0 +1 @@ +Powróć do [zrl=[baseurl]/help/main]głównej strony dokumentacji[/zrl] diff --git a/doc/en/macros/pl/troubleshooting_footer.bb b/doc/en/macros/pl/troubleshooting_footer.bb new file mode 100644 index 000000000..19328ad64 --- /dev/null +++ b/doc/en/macros/pl/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +[zrl=[baseurl]/help/troubleshooting]Dokumentacja dotycząca rozwiązywania problemów[/zrl] +[zrl=[baseurl]/help/troubleshooting]Główna strona dokumentacji[/zrl] diff --git a/doc/en/macros/troubleshooting_footer.bb b/doc/en/macros/troubleshooting_footer.bb new file mode 100644 index 000000000..c7603a62b --- /dev/null +++ b/doc/en/macros/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +[zrl=[baseurl]/help/troubleshooting]Troubleshooting documentation[/zrl] +[zrl=[baseurl]/help/troubleshooting]Documentation Main Page[/zrl] diff --git a/doc/en/member/assets/qr_text_to_post.png b/doc/en/member/assets/qr_text_to_post.png new file mode 100644 index 000000000..887c85492 Binary files /dev/null and b/doc/en/member/assets/qr_text_to_post.png differ diff --git a/doc/en/member/assets/zat_dialog.png b/doc/en/member/assets/zat_dialog.png new file mode 100644 index 000000000..892964e95 Binary files /dev/null and b/doc/en/member/assets/zat_dialog.png differ diff --git a/doc/en/member/bbcode.html b/doc/en/member/bbcode.html new file mode 100644 index 000000000..e3e079b4d --- /dev/null +++ b/doc/en/member/bbcode.html @@ -0,0 +1,337 @@ + +

      Text Decoration

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      BBcode syntaxRendered text
      [b]bold[/b]bold
      [i]italic[/i]italic
      [u]underlined[/u]underlined
      [s]strike[/s]strike
      [color=red]red[/color]red
      [hl]highlighted[/hl]highlighted
      [font=courier]some text[/font] some text
      [quote]quote[/quote]
      quote
      [quote=Author]Author? Me? No, no, no...[/quote]Author wrote:
      Author? Me? No, no, no...
      + [size=small]small text[/size]
      + [size=xx-large]xx-large text[/size]
      + [size=20]20px exactly[/size]
      +       + Size options include: xx-small, small, medium, large, xx-large      		small text
      xx-large text
      20px exactly
      Add a horizontal bar +[hr] +Like this + + Add a horizontal bar

      Like this +
      This is +[center]centered[/center] +text + This is
      centered

      text +
      + +

      Code blocks

      +Code can be rendered generically in a block or inline format (depending on if there are new line characters in the text), or you can specify a supported language for enhanced syntax highlighting. Syntax highlighting requires a suitable rendering plugin such as hilite. Supported languages with the hilite plugin include php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh . +

      +If a rendering plugin is not installed or an unsupported language is specified, the output for syntax highlighted code blocks is the same as the block format code tag. +

      + + + + + + + + + + + + + + + +
      BBcode syntaxOutput
      [code]function bbcode() { }[/code]function bbcode() { }
      [code=php]function bbcode() {
      + $variable = true;
      + if( $variable ) {
      + echo "true";
      + }
      +}[/code]
      1.  function bbcode() {
      2.    $variable = true;
      3.    if( $variable ) {
      4.      echo "true";
      5.    }
      6.  }
      [nobb][nobb]This is how [i]you[/i] can +[u]show[/u] how to use +[hl]BBcode[/hl] syntax[/nobb][/nobb][nobb]This is how [i]you[/i] can [u]show[/u] how to use [hl]BBcode[/hl] syntax[/nobb]
      + +

      Lists

      + + + + + + + + + + + + + + + + + + +
      BBcode syntaxRendered list
      [ul]
      +[*] First list element
      +[*] Second list element
      +[/ul]
      • First list element
      • Second list element
      [ol]
      +[*] First list element
      +[*] Second list element
      +[/ol]
      • First list element
      • Second list element
      [list=A]
      +[*] First list element
      +[*] Second list element
      +[/list]       + The list type options are 1, i, I, a, A.
      • First list element
      • Second list element
      [dl terms="b"]
      +[*= First element term] First element description
      +[*= Second element term] Second element description
      +[/dl]       + The terms style options can be any combination of: +
      +
      b
      bold
      +
      i
      italic
      +
      u
      underline
      +
      m
      monospace
      +
      l
      large
      +
      h
      horizontal — like this defintion list
      +
      +
      +
      First element term
      First element description
      +
      Second element term
      Second element description
      + +

      Tables

      + + + + + + + + + + + + + + + + +
      BBcode syntaxRendered table
      [table border=0]
      +[tr]
      +[th]Header 1[/th][th]Header 2[/th]
      +[/tr]
      +[tr][td]Content[/td][td]Content[/td][/tr]
      +[tr][td]Content[/td][td]Content[/td][/tr]
      +[/table]      		 +
      Header 1Header 2
      ContentContent
      ContentContent
      [table border=1]
      +[tr]
      +[th]Header 1[/th][th]Header 2[/th]
      +[/tr]
      +[tr][td]Content[/td][td]Content[/td][/tr]
      +[tr][td]Content[/td][td]Content[/td][/tr]
      +[/table]      		 +
      Header 1Header 2
      ContentContent
      ContentContent
      [table]
      +[tr]
      +[th]Header 1[/th][th]Header 2[/th]
      +[/tr]
      +[tr][td]Content[/td][td]Content[/td][/tr]
      +[tr][td]Content[/td][td]Content[/td][/tr]
      +[/table]
      Header 1Header 2
      ContentContent
      ContentContent
      +
      + +

      Links and Embedded Content

      + + + + + + + + + + + + + + + + +
      BBcode syntaxOutput
      [video]video URL[/video]
      +[audio]audio URL[/audio]
      [url=https://hubzilla.org]Hubzilla[/url]Hubzilla
      An image [img]https://example.org/image.jpg[/img] +in some text + An image Image/photo in some text +
      + + +

      $Projectname specific codes

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      BBcode syntaxOutput
      Magic-auth version of [url] tag + [zrl=https://hubzilla.org]Identity-aware link[/zrl] + https://hubzilla.org/?zid=[observer=1][observer.address][/observer][observer=0]your_channel@your.home.hub[/observer]
      Magic-auth version of [img] tag + [zmg]https://hubzilla.org/some/photo.jpg[/zmg] + Image is only viewable by those authenticated and with permission.
      Observer-dependent output: + [nobb][observer=1]Text to display if observer IS authenticated[/observer][/nobb] +
      + + [nobb][observer=0]Text to display if observer IS NOT authenticated[/observer][/nobb] + +
      + + [nobb][observer.language=en]Text to display if observer language is English[/observer][/nobb] + +
      + + [nobb][observer.language!=de]Text to display if observer language is not German[/observer][/nobb] + +
      + + [nobb][observer.url][/nobb] + + channel URL of observer
      + + [nobb][observer.baseurl][/nobb] + + website of observer
      + + [nobb][observer.name][/nobb] + + name of observer
      + + [nobb][observer.webname][/nobb] + + short name in the url of the observer
      + + [nobb][observer.address][/nobb] + + address (ZOT-id) of observer
      + + [nobb][observer.photo][/nobb] + + profile photo of observer
      What is a spoiler?
      + [spoiler]Text you want to hide.[/spoiler]      		 + What is a spoiler?
      Click to open/close
      +
      [toc data-toc='div.page-body' data-toc-headings='h1,h2']
      +Create a table of content in a webpage or wiki page. Please refer to the original jQuery toc to get more explanations. +
        +
      • Optional param: 'data-toc'. If omitted the default is 'body'
        • +
      • Optional param: 'data-toc-headings'. If omitted the default is 'h1,h2,h3'
        • +
      [nobb][rpost=title]Text to post[/rpost][/nobb]
      +The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional      		[baseurl]/rpost?f=&title=title&body=Text+to+post
      This requires the qrator plugin.
      [qr]text to post[/qr]
      This requires a suitable map plugin such as openstreetmap. + [map]Generate an inline map using the current browser coordinates of the poster, if browser location is enabled
      This requires a suitable map plugin such as openstreetmap. + [map=latitude,longitude]Generate a map using global coordinates.
      This requires a suitable map plugin such as openstreetmap. + [map]Place Name[/map] +Generate a map for a given named location. The first matching location is returned. For instance "Sydney" will usually return Sydney, Australia and not Sydney, Nova Scotia, Canada unless the more precise location is specified. It is highly recommended to use the post preview utility to ensure you have the correct location before submitting the post. +
      [&copy;] ©
      diff --git a/doc/en/member/member_faq.bb b/doc/en/member/member_faq.bb new file mode 100644 index 000000000..9533cb557 --- /dev/null +++ b/doc/en/member/member_faq.bb @@ -0,0 +1,10 @@ +[h3]$Projectname FAQ[/h3] +[h4]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/h4] +Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other $Projectname servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to $Projectname posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. +If a posting is public this is even harder, as $Projectname is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. +[h4]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/h4] +Posts and photos/files are provided separately from the channel basic information. This is due to memory limitations dealing with years of conversations and photo archives. Posts and conversations can be synced separately from the basic channel information. Photos and file archives can be transferred using a plugin tool such as 'redfiles', which is currently listed as "experimental". When creating this feature we thought that keeping all your contacts was the most important task. Your friends have already seen your old content. Posts/conversations were next in priority and these may now be synced. Files and photos are the last bit to get completely working. Once we find someone willing to finish implementing this, it will be done. :) +[h4]I can't see private resources[/h4] +You have probably disabled third party cookies. You need to enable them for remote authentication to work. +[h4]There are a lot of foreign language posts. Let's auto-translate them.[/h4] +There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. diff --git a/doc/en/member/member_guide.bb b/doc/en/member/member_guide.bb new file mode 100644 index 000000000..2b772d1c5 --- /dev/null +++ b/doc/en/member/member_guide.bb @@ -0,0 +1,1068 @@ +[h3]Overview[/h3] + +While many features and capabilities of $Projectname are familiar to people who have used social networking sites and blogging software, there are also quite a few new concepts and features that most people have not encountered before. Some of the new ideas are related to the decentralized nature of the grid; others are associated with the advanced permissions system that is necessary to protect your data privacy. The purpose of this guide is to help you understand how to create, configure, and use your nomadic identity. + +[h3]Registration[/h3] + +Not all $Projectname sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all $Projectname sites are linked, it does not matter where your account resides. + +[b]Your Email Address[/b] + +Please provide a valid email address. Your email address is never published. This address will be used to activate your account, to (optionally) send email notifications for incoming messages or items, [i]and to recover lost passwords[/i]. + +[b]Password[/b] + +Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As $Projectname offers a decentralised identity, your account can log you in to many other websites. + +[b]Terms Of Service[/b] + +Click the link to read the site's [zrl=[baseurl]/help/TermsOfService]Terms of Service[/zrl]. Once you've read them, tick the box in the register form to confirm. + +[b]Register[/b] + +Once you have provided the necessary details, click the 'Register' button. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval. + + + +[h3]Channels[/h3] + +[h4]What are channels?[/h4] + +Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be "Me". + +The most important features for a channel that represents "me" are: +[ul] +[*]Secure and private "spam free" communications + +[*]Identity and "single-signon" across the entire network + +[*]Privacy controls and permissions which extend to the entire network + +[*]Directory services (like a phone book) +[/ul] +In short, a channel that represents yourself is "me, on the internet". + + + +[h3]Channel Permission Roles[/h3] + +When you create a new channel, you will be asked to select a permission role based on how you envision using this channel. The most popular permission roles are the Social Networking roles. You have many other choices, providing options which are analagous to Facebook Groups and Pages, collaborative spaces, newsfeeds, and more. These roles automatically configure several different system variables ranging from what permissions are granted to friends, to your default privacy settings and visibility choices. Advanced configurations are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". Thew following describes some of the different roles which are currently available and how they impact your privacy and ability to interact. + +[h4]Social[/h4] + +[b]Federation[/b] + +The channel is a very permissive social networking profile which is compatible with other federated social networks. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. Privacy is a lower priority than ease of access and connecting with others. Anybody in the network can comment on your public posts and send you private mail. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. This mode [i]may[/i] increase your exposure to undesired communications and spam. This role is not generally recommended [i]unless[/i] you need to interact regularly with members of other networks. + +[b]Mostly Public[/b] + +The channel is a typical social networking profile. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. Only your immediate connections can comment on your public posts and send you private mail. The permission policies are similar to Facebook. + + +[b]Restricted[/b] + +By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers. + +[b]Private[/b] + +By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. + + +[h4]Forum[/h4] + +[b]Mostly Public[/b] + +The channel is a typical forum. By default posts and published items are public. Members may post by !mention or wall-to-wall post. Posting photos and other published items is blocked. The channel is visible in the directory. Members are added automatically. + + +[b]Restricted[/b] + +By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by !mention or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner. + +[b]Private[/b] + +By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by !mention is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible. + + +[h4]Feed[/h4] + + +[b]Public[/b] + +Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved. + + +[b]Restricted[/b] + +Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner. + + +[h4]Special[/h4] + +[b]Celebrity/Soapbox[/b] + +Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile. + + +[b]Group Repository[/b] + +A public forum which allows members to post files/photos/webpages. + + +[h4]Custom/Expert Mode[/h4] + +Set all the privacy and permissions manually to suit your specific needs. + + +[h3]Creating channels[/h3] + + +After creating your account, you will be presented with the "Add a channel" screen. Normally, your first channel will be one that represents you - so using your own name (or psuedonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. The "choose a short nickname" box is similar to a "username" field. We will use whatever you enter here to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This looks like an email address, and takes the form nickname@siteyouregisteredat.xyz + +See Also +[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within $Projectname[/zrl] +[zrl=[baseurl]/help/accounts]Accounts[/zrl] +[zrl=[baseurl]/help/profiles]Profiles[/zrl] +[zrl=[baseurl]/help/permissions]Permissions[/zrl] +[zrl=[baseurl]/help/remove_account]Remove Account[/zrl] + + +You can create additonal channels from the "Channel Manager" link. + +Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0][baseurl]/channel/username[/observer] you will find your channel "stream". This is where your recent activity will appear, in reverse chronological order. If you post in the box marked "share", the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The "hamburger" menu in most themes will provide you with navigation to other system components and apps. The Photos page contain photo albums, and the Events page contains events share by both yourself and your contacts. + +[b]Profiles[/b] + +$Projectname has unlimited profiles. You may use different profiles to show different "sides of yourself" to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded "sides" of each channel. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing". + +You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. + +That said, if you want other friends to be able to find you, it helps to have the following information in your public profile... + +[ul][*]Your real name or at least a nickname everybody knows +[*]A photo of you +[*]Your location on the planet, at least to a country level.[/ul] + +In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like. + +To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings > Additional Features[/zrl] and enable "Multiple Profiles" there, otherwise you won't have the ability to use more than just your default profile. + +Then select "Edit Profiles" from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there. + +In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on "Edit visibility" next to the profile in question (only available for the profiles that are not your default profile) and then click on specific connections to add them to or remove them from the group of people who can see this profile. + +Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile. + +There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the "Settings" page. + +If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished. + +[b]Keywords and Directory Search[/b] + +On the directory page, you may search for people with published profiles. Currently, only the name field and the keywords are searched. You may also include such keywords in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page. + +On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance. + +See Also + +[zrl=[baseurl]/help/AdvancedSearch]Advanced Searching[/zrl] + + +[h4]The grid, permissions and delegation[/h4] + +The "Grid" page contains all recent posts from across $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts. + +As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the [zrl=[baseurl]/help/roles]permissions section[/zrl]. + +You can also delegate control of your channels' posts and connections, but not its configurations, to another channel. That is done by editing a connection and assigning it the permission to administer your channel's resources. + +[h3]Connecting To Channels[/h3] + +Connections in $Projectname can take on a great many different meanings. A connection is more accurately defined as a set of permissions that you have granted to somebody else. In traditional social network applications, all connections are granted the same permissions; or at most there two levels (friends and 'followers'). In $Projectname, a range of separate permissions may be set/adjusted depending on the siutation and relationship you have with the other channel. You can allow somebody to view your posts but not your photos. You can also deny them permission to comment on your posts or send private mail to you. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it? + +First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels. + +The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword. + +If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address (for instance bob@example.com) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks. + +To connect with other $Projectname channels: + +Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called "connect". Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes. + +You may also connect with any channel by visiting the "Connections" page of your site or the Directory and typing their "webbie" into the "Add New Connection" field. Use this method if somebody tells you their webbie and you wish to connect with them. The process is the same as connecting via the "Connect" button - you will then be taken to the connection editor to set permissions. + +To connect with channels on other networks: + +The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their "webbie" into the "Add New Connections" box on the "Connections" page. Before you do this however, please visit your Settings page (Feature/Addon Settings) and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, or ActivityPub) is provided on your hub and [b][i]activated[/i] for your channel[/b]. These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails. + +Some communications offer more than one protocol. If you wish to connect with somebody on Mastodon (for instance) they can use either the 'ostatus' or the 'activitypub' protocol for communication. Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but $Projectname will often choose the first protocol it discovers and this may not be the one you want. You may connect with somebody over a specific protocol by prepending the protocol name in square brackets to their "webbie". For example + +[code] +[activitypub]https://foo.bar/foobar +[ostatus]foobar@foo.bar +[diaspora]foobar@foo.bar +[zot]foobar@foo.bar +[feed]https://foo.bar/foobar +[/code] + + +To connect with RSS feeds: + +Your hub admin may allow connecting to RSS feeds. The process for connecting to an RSS feed is the same, exept type (or paste) the URL of the feed into the "Add New Connection" box. Feeds are only processed once or twice per day and your hub admin may impose limits on how many feeds you may add. + +[h4]Block/Ignore/Archive/Hide channels [/h4] + +Channels in your address book can have statuses such as [i]blocked[/i], [i]ignored[/i], [i]archived[/i] and [i]hidden[/i]. From your connections page you can see tabs that display the channels with those statuses. From your edit connection pages you can change the statuses of a channel. + +Here's their meaning: + +[b]Blocked:[/b] the channel can't read your items regardless of permissions, nor can it write to your channel. + +[b]Ignored:[/b] the channel can read your items if it has permission, but can't write to your channel. + +[b]Hidden:[/b] the channel does not show up in your profile's connections list, noone can see you're connected, but beware they may still show up to your other connections, for example in post replies. + +[b]Archived:[/b] if a channel can't be reached for 30 days, it is automatically marked as archived. This keeps all the data but stops polling the channel for new information and removes it from autocomplete. If later you learn the channel has come back online, you may manually unarchive it. + +[h4]Premium Channels[/h4] + +Some channels are designated "Premium Channels" and may require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel. + +[h3]Permissions[/h3] +Permissions in $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere. + +[h4]Permission Roles[/h4] + +When you create a channel we allow you to select different 'roles' for that channel. These create an entire family of permissions and privacy settings that are appropriate for that role. Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public" and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. You can also choose 'Custom/Expert mode' and change any individual permission setting in any way you desire. + + +[h4]Default Permission Limits[/h4] + +There are a large number of individual permissions. These control everything from the ability to view your stream to the ability to chat with you. Every permission has a limit. The scope of these permissions varies from "Only me" to "Everybody on the internet" - though some scopes may not be available for some permissions. The limit applies to any published thing you create which has no privacy or access control. For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit. These limits apply to everything within that permission rule, so you cannot apply a limit to one photo. The limit applies to all your photos. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, [b]all[/b] of your photos will now be visible only to friends. + +[h4]Access Control[/h4] + +Access Control is the preferred method of managing privacy in [i]most[/i] cases, rather than using permission limits. This creates lists of either connections or privacy groups (or both) and uses the access list to decide if a permission is allowed. An access list is attached to everything you publish. Unlike permission limits, if you change the access control list on a single photo, it doesn't affect any of your other photos. You can use privacy groups and a "default access control list" to create and automate the management of access control lists to provide any level of privacy you desire on anything you publish. + +We highly recommend that you use the "typical social network" settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around. + + +[dl terms="l"] +[*= The scopes of permissions are:] +[dl terms="i"] + [*= Nobody Except Yourself ] This is self explanatory. Only you will be allowed access. + + [*= Only those you specifically allow ] By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen. + + [*= Anybody in your address book ] Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions. + + [*= Anybody On This Hub ] Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied. + + [*= Anybody in this network ] Anybody in $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied. + + [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks. + + [*=Guest Access Token] This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be $Projectname members. You can set an expiration for the Access Token. + + [*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all. +[/dl] +[*= The individual permissions are:] +[dl terms="i"] + [*= Can view my "public" stream and posts. ] This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in. + + [*= Can view my "public" channel profile. ] This permission determines who can view your channel's profile. This refers to the "about" tab + + [*= Can view my "public" photo albums. ] This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience. + + [*= Can view my "public" address book. ] This permission determines who can view your contacts. These are the connections displayed in the "View connections" section. + + [*= Can view my "public" file storage. ] This permission determines who can view your public files stored in your cloud. + + [*= Can view my "public" pages. ] This permission determines who can view your public web pages. + + [*= Can send me their channel stream and posts. ] This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery. + + [*= Can post on my channel page ("wall"). ] This permission determines who can write to your wall when clicking through to your channel. + + [*= Can comment on my posts. ] This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission + + [*= Can send me private mail messages. ] This determines who can send you private messages (zotmail). + + [*= Can post photos to my photo albums. ] This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other. + + [*= Can forward to all my channel contacts via post tags. ] Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way. + + [*= Can chat with me (when available). ] This determines who can join the public chat rooms created by your channel. + + [*= Can write to my "public" file storage. ] This determines who can upload files to your public file storage, or 'cloud'. + + [*= Can edit my "public" pages. ] This determines who can edit your webpages. This is useful for wikis or sites with multiple editors. + + [*= Can administer my channel resources. ] This determines who can have full control of your channel. This should normally be set to "nobody except myself". +[/dl][/dl] +[i]Note:[/i] +Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here. + +If you have set any of these permissions to "only those I specifically allow", you may specify individual permissions on the connnection edit screen. + +[h4]Affinity[/h4] + +The connection edit screen offers a slider to select a degree of friendship with the connnection (this tool is enabled through the "Extra Features" tab of your Settings page). Think of this as a measure of how much you like or dislike them. 1 is for people you like, whose posts you want to see all the time. 99 is for people you don't care for, and whose posts you might only wish to look at occasionally. Once you've assigned a value here, you can use the affinity tool on the matrix page to filter content based on this number. + +The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature. + +[h3]Guest Access Tokens[/h3] +Guest access tokens (sometimes called "Zot access tokens") allow you to share a file, folder, photo, album, or channel with a specific person or group of people who are not $Projectname members. These tokens allow you to share individual items by sending a link that includes the token in the URL; alternatively, people can actually [i]log in[/i] using the token credentials, after which they can seamlessly view whatever content has been shared with that token. + +To create and manage guest tokens, open the [zrl=[baseurl]/settings/tokens/]Guest Access Tokens[/zrl] settings page. A random token is generate with each page load, allowing you to create one by inputting an associated login name and optionally specifying an expiration date. Existing tokens are listed below the dialog and can be edited by selecting them or deleted by pressing the trash icon. + +Additional permissions may be granted to the guest token by expanding the [b]Individual Permissions[/b] options and selecting privacy settings such as [b]Can view my channel stream and posts[/b] or [b]Can chat with me[/b]. + +[url=[baseurl]/help/feature/access_tokens]More details can be found here...[/url] + +[img][baseurl]/doc/member/assets/zat_dialog.png[/img] + + +[h3]Markup Languages[/h3] +$Projectname supports several markup languages for advanced formatting of content. The default markup language is a [url=[baseurl]/help/member/bbcode]custom variant of BBcode[/url], tailored for use in $Projectname. [url=[baseurl]/help/member/bbcode]BBcode[/url] is supported for posts, wiki pages, and web page elements. Wiki pages and webpage elements may also be written using standard Markdown. +[table border=0] +[tr][th]Content Type[/th][th]Supported Markup[/th][/tr] +[tr][td]Post[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url][/td][/tr] +[tr][td]Wiki[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url], Markdown[/td][/tr] +[tr][td]Webpage element[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url], Markdown, HTML[/td][/tr] +[/table] + +[h3]Tags And Mentions[/h3] +Like many other platforms, $Projectname uses a special notation inside messages to indicate "tags" or contextual links to other entities. + +[h4]Mentions[/h4] +Channels are tagged by simply preceding their name with the @ character. + +[code] +@Jack +[/code] + +When you start to mention somebody, it will create an auto-complete box to select from your immediate connections. Select one as appropriate. + +If the person mentioned is in the list of recipients for the post, they will receive a tag notification. + +[h4]Deliverable Mentions[/h4] + +The [b]![/b] character designates a deliverable mention to a forum or special channel which allows "re-delivery of mentions". + +[code] +@Gardening - mention the Gardening forum +[/code] + +[code] +!Gardening - mention the Gardening Forum and also post to the Gardening "network" (e.g. send to all the forum members; if you have permission to do so) +[/code] + +Note: In previous releases, forums were delivered by using @forum+ with a plus sign at the end. This mechanism is no longer supported. + +[h4]Private Mentions[/h4] +If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or privacy groups from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to only include them. You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector. + +Forums may be mentioned in the same way. !!dogs will post to the dogs forum privately. The forum will redeliver the post to all the forum members, but your own followers will not see the post unless they are also members of the dogs forum. + +You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it. + +[h4]Mentions and Comments[/h4] +The above mechanisms only apply to "top-level" posts you create. Mentioning a channel with any of the above mechanisms has no effect in comments, except that the mentioned channel may receive a notification if they were already included as a recipient in the conversation. + +[h4]Topical Tags (also known as Hashtags)[/h4] +Topical tags are indicated by preceding the tag name with the # character. This will create a link in the post to a generalised site search for the term provided. For example, #[zrl=[baseurl]/search?tag=cars]cars[/zrl] will provide a search link for all posts mentioning 'cars' on your site. Topical tags are generally a minimum of three characters in length. Shorter search terms are not likely to yield any search results, although this depends on the database configuration. + +Topical tags are also not normally linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections or enclose the entire tag in double quotes (for example #"2012"). Doubles quotes are also required if the tag contains spaces (#"My Tag") and may be required if the tag contains punctuation characters (#"EndsWithPeriod." or #"Exciting!!!"). + +[h4]Bookmarks[/h4] +Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generated automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online, and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks. + +[h4]Manual Mentions[/h4] +Where possible please use the auto-complete window to select tag and mention recipients, because it will generate a coded tag which uniquely identifies one channel. Names are sometimes ambiguous. However, you can "manually" tag a channel by matching the channel name or address. + +[code] +@billy +[/code] + +will tag a connection whose name or network address is 'billy' (exact match). If you have two connections with a name or network address of billy, for instance billy@server1.hubzilla.org and billy@server2.hubzilla2.org, you will need to supply the complete address or the results will be ambiguous and the wrong person may be tagged. + +[code] +@"Robert Johnson" +[/code] + +will tag Robert Johnson. The double quotes are required if the tagged name contains space characters. + + +[h3]Web Pages[/h3] + +$Projectname allows members and allowed connections to create static webpages. To activate this feature, enable the [b]Web Pages[/b] feature in your [b][url=[baseurl]/settings/features/]Additional Features[/url][/b] section. + +Once enabled, a new tab will appear on your channel page labeled "Webpages". Clicking this link will take you to the webpage editor. Pages will be accessible at [b][baseurl]/page/[observer=1][observer.webname][/observer][observer=0]channelname[/observer]/pagelinktitle[/b] + +The "page link title" box allows you to specify the "pagelinktitle" of this URL. If no page link title is set, we will set one for you automatically, using the message ID of the item. + +Beneath the page creation box, a list of existing pages will appear with an "edit" link. Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages. + +[h4]Using Blocks[/h4] + +Blocks can be parts of webpages. The basic HTML of a block looks like this +[code] +
      + Block Content +
      + +[/code] + +If a block has text/html content type it can also contain menu elements. Sample content of +[code] +

      HTML block content

      + [menu]menuname[/menu] + +[/code] +will produce HTML like this +[code] +
      +

      HTML block content

      +
      + +
      +
      + +[/code] + +Via the $content macro a block can also contain the actual webpage content. For this create a block with only +[code] + $content + +[/code]as content. + +To make a block appear in the webpage it must be defined in the page layout inside a region. +[code] + [region=aside] + [block]blockname[/block] + [/region] + +[/code] + +The block appearance can be manipulated in the page layout. + +Custom classes can be assigned +[code] + [region=aside] + [block=myclass]blockname[/block] + [/region] + +[/code] +will produce this HTML +[code] +
      + Block Content +
      + +[/code] + +Via the wrap variable a block can be stripped off its wrapping
      tag +[code] + [region=aside] + [block][var=wrap]none[/var]blockname[/block] + [/region] + +[/code] +will produce this HTML +[code] + Block Content +[/code] + +[h4]Webpage element import tool[/h4] + +There are two methods of importing webpage elements: uploading a zip file or referencing a local cloud files folder. Both methods require that the webpage elements are specified using a specific folder structure. The import tool makes it possible to import all the elements necessary to construct an entire website or set of websites. The goal is to accommodate external development of webpages as well as tools to simplify and automate deployment on a hub. + +[h5] Folder structure [/h5] +Element definitions must be stored in the repo root under folders called +[code] + /pages/ + /blocks/ + /layouts/ +[/code] + +Each element of these types must be defined in an individual subfolder using two files: one JSON-formatted file for the metadata and one plain text file for the element content. + +[h5] Page elements [/h5] +Page element metadata is specified in a JSON-formatted file called [code]page.json[/code] with the following properties: +[list] +[*] title +[*] pagelink +[*] mimetype +[*] layout +[*] contentfile +[/list] +[b]Example[/b] + +Files: +[code] + /pages/my-page/page.json + /pages/my-page/my-page.bbcode +[/code] +Content of [code]page.json[/code]: +[code] + { + "title": "My Page", + "pagelink": "mypage", + "mimetype": "text/bbcode", + "layout": "my-layout", + "contentfile": "my-page.bbcode" + } +[/code] +[h5] Layout elements [/h5] + +Layout element metadata is specified in a JSON-formatted file called [code]layout.json[/code] with the following properties: +[list] +[*] name +[*] description +[*] contentfile +[/list] +[b]Example[/b] + +Files: +[code] + /layouts/my-layout/layout.json + /layouts/my-layout/my-layout.bbcode +[/code] +Content of [code]layout.json[/code]: +[code] + { + "name": "my-layout", + "description": "Layout for my project page", + "contentfile": "my-layout.bbcode" + } +[/code] + +[h5] Block elements [/h5] + +Block element metadata is specified in a JSON-formatted file called [code]block.json[/code] with the following properties: +[list] +[*] name +[*] title +[*] mimetype +[*] contentfile +[/list] +[b]Example[/b] + +Files: +[code] + /blocks/my-block/block.json + /blocks/my-block/my-block.html +[/code] +Content of [code]block.json[/code]: + +[code] + { + "name": "my-block", + "title": "", + "mimetype": "text/html", + "contentfile": "my-block.html" + } +[/code] + +[h3]Comanche Page Description Language[/h3] + +Comanche is a markup language similar to [url=[baseurl]/help/member/bbcode]BBcode[/url] with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages. + +Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose. + +[h4]Page Templates[/h4] +Currently there are five layout templates, unless your site provides additional layouts. + +[dl terms="b"] +[*= default] +The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, +"content" for the main content region, and "footer" for a page footer. + +[*= full] +The full template defines the same as the default template with the exception that there is no "aside" region. + +[*= choklet] +The choklet template provides a number of fluid layout styles which can be specified by flavour: +[list] +[*] (default flavour) - a two column layout similar to the "default" template, but more fluid +[*] bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays +[*] three - three column layout (adds a "right_aside" region to the default template) +[*] edgestwo - two column layout with fixed side margins +[*] edgesthree - three column layout with fixed side margins +[*] full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar +[/list] + +[*= redable] +A template for reading longer texts full screen (so without navigation bar). Three columns: aside, content and right_aside. +For maximum readability it is advised to only use the middle content column. + +[*= zen] +Gives you the freedom to do everything yourself. Just a blank page with a content region. +[/dl] + +To choose a layout template, use the 'template' tag. + +[code] + [template]full[/template] + +[/code] + +To choose the "choklet" template with the "three" flavour: + +[code] + [template=three]choklet[/template] + +[/code] + +The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions. + +Three "macros" have been defined for your use. +[code] + $htmlhead - replaced with the site head content. + $nav - replaced with the site navigation bar content. + $content - replaced with the main page content. + +[/code] + +By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions. + + +To select a theme for your page, use the 'theme' tag. +[code] + [theme]suckerberg[/theme] + +[/code] +This will select the theme named "suckerberg". By default your channel's preferred theme will be used. + +[code] + [theme=passion]suckerberg[/theme] + +[/code] +This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. + +[code] + [theme]suckerberg:passion[/theme] + +[/code] + +The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier. + +[h4]Navbar[/h4] + +[code] + [navbar]tucson[/navbar] +[/code] + +Use the 'tucson' navbar template and CSS rules. By default the 'default' navbar template will be used. + + +[h4]Regions[/h4] +Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag. + +[code] + [region=htmlhead]....content goes here....[/region] + [region=aside]....content goes here....[/region] + [region=nav]....content goes here....[/region] + [region=content]....content goes here....[/region] + +[/code] + +[h4]CSS and Javascript[/h4] +We have the possibility to include javascript and css libraries in the htmlhead region. At present we make use of jquery (js), bootstrap (css/js) and foundation (css/js). +This will overwrite the selected themes htmlhead. + +[code] + [region=htmlhead] + [css]bootstrap[/css] + [js]jquery[/js] + [js]bootstrap[/js] + [/region] + +[/code] + +[h4]Menus and Blocks[/h4] +Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created. + +[code] + [menu]mymenu[/menu] + +[/code] +This places the menu called "mymenu" at this location on the page, which must be inside a region. + +[code] + [menu=horizontal]mymenu[/menu] + +[/code] +This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. + +[code] + [menu][var=wrap]none[/var]mymenu[/menu] + +[/code] +The variable [var=wrap]none[/var] in a block removes the wrapping div element from the menu. + +[code] + [block]contributors[/block] +[/code] +This places a block named "contributors" in this region. + +[code] + [block=someclass]contributors[/block] + +[/code] +This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget". + +[code] + [block][var=wrap]none[/var]contributors[/block] + +[/code] +The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block. + +[h4]Widgets[/h4] +Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. System widgets are listed [url=help/Widgets]here[/url]. Widgets can also ve created by plugins, themes, or your site administrator to provide additional functionality. + + +Widgets and arguments are specified with the 'widget' and 'var' tags. +[code] + [widget=recent_visitors][var=count]24[/var][/widget] + +[/code] + +This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". + +[h4]Comments[/h4] +The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page. + +[code] + [comment]This is a comment[/comment] + +[/code] + +[h4]Conditional Execution[/h4] +You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer. + +[code] + [if $config.system.foo] + ... the configuration variable system.foo evaluates to 'true'. + [else] + ... the configuration variable system.foo evaluates to 'false'. + [/if] + + [if $observer] + ... this content will only be show to authenticated viewers + [/if] + +[/code] + + The 'else' clause is optional. + + Several tests are supported besides boolean evaluation. + +[code] + [if $config.system.foo == bar] + ... the configuration variable system.foo is equal to the string 'bar' + [/if] + [if $config.system.foo != bar] + ... the configuration variable system.foo is not equal to the string 'bar' + [/if] + [if $config.system.foo {} bar ] + ... the configuration variable system.foo is a simple array containing a value 'bar' + [/if] + [if $config.system.foo {*} bar] + ... the configuration variable system.foo is a simple array containing a key named 'bar' + [/if] +[/code] + +[h4]Complex Example[/h4] +[code] + [comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment] + + [template]3-column-with-header[/template] + + [comment]Use the "darknight" theme[/comment] + + [theme]darkknight[/theme] + + [comment]Use the existing site navigation menu[/comment] + + [region=nav]$nav[/region] + + [region=side] + + [comment]Use my chosen menu and a couple of widgets[/comment] + + [menu]myfavouritemenu[/menu] + + [widget=recent_visitors] + [var=count]24[/var] + [var=names_only]1[/var] + [/widget] + + [widget=tagcloud][/widget] + [block]donate[/block] + + [/region] + + + + [region=middle] + + [comment]Show the normal page content[/comment] + + $content + + [/region] + + + + [region=right] + + [comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment] + + [widget]channel[/widget] + + [/region] + +[/code] + + +[h3]Personal Cloud Storage[/h3] + +$Projectname provides an ability to store privately and/or share arbitrary files with friends. + +You may either upload files from your computer into your storage area, or copy them directly from the operating system using the WebDAV protocol. + +On many public servers there may be limits on disk usage. + +[h4]File Attachments[/h4] + +The quickest and easiest way to share files is through file attachments. In the row of icons below the status post editor is a tool to upload attachments. Click the tool, select a file and submit. After the file is uploaded, you will see an attachment code placed inside the text region. Do not edit this line or it may break the ability for your friends to see the attachment. You can use the post permissions dialogue box or privacy hashtags to restrict the visibility of the file - which will be set to match the permissions of the post your are sending. + +To delete attachments or change the permissions on the stored files, visit [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username replacing username with the nickname you provided during channel creation[/observer]. + +[h4]Web Access[/h4] + +Your files are visible on the web at the location [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username[/observer] to anybody who is allowed to view them. If the viewer has sufficient privileges, they may also have the ability to create new files and folders/directories. This should only be used for smaller files and photos (up to a few megabytes) as it uses internal memory. For larger files (videos, music, etc.), please upload using WebDAV. These files may still be retrieved via web access. + +[h4]WebDAV access[/h4] + +WebDAV provides a way to copy files directly to or from your computer's operating system, where your cloud files appear as a virtual disk drive. This should be used to upload large files such as video and audio; as it is not limited to available memory. See [zrl=help/member/member_guide#Cloud_Desktop_Clients]Cloud Desktop Clients[/zrl] below. + +[h4]CalDAV and CardDAV access on Android[/h4] + +You can sync you calendar and contacts on Android with your Hub. + +The following steps where tested for [url=https://f-droid.org/en/packages/at.bitfire.davdroid/]DAVdroid[/url] +[list] +[*] install DAVdroid +[*] add account +[*] use "URL" and "user name" to login +[list] +[*] base url is [baseurl]/cdav +[*] user name is [observer=1][observer.webname][/observer][observer=0]username[/observer] +[/list] +[/list] + +To share your calendar visit [observer.baseurl]/cdav/calendar + + +[h4]Permissions[/h4] + +When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username[/observer] select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate privacy groups. + +[h3]Cloud Desktop Clients[/h3] + + +[h4]Cloud Desktop Clients - Windows[/h4] + +WebDAV using Windows 7 graphical user interface wizard: +1. Left-click the Start-button to open the start menu. +2. Right-click the My computer icon to access its menu. +3. Left-click Map network drive... to open the connection dialog wizard. +4. Type '[baseurl]/dav/nickname' in the textbox (replace nickname with your channel nickname) and click the Complete button. +5. Type your $Projectname channel nickname. IMPORTANT - NO at-sign or domain name. +6. Type your $Projectname password + +[h4]Cloud Desktop Clients - Linux[/h4] + +[h5]Mount as a filesystem[/h5] + +[b]Mounting As A Filesystem[/b] + +To install your cloud directory as a filesystem, you first need davfs2 installed. 99% of the time, this will be included in your distributions repositories. In Debian + +[code]apt-get install davfs2[/code] + +If you want to let normal users mount the filesystem + +[code] dpkg-reconfigure davfs2[/code] + +and select "yes" at the prompt. + +Now you need to add any user you want to be able to mount dav to the davfs2 group + +[code]usermod -aG davfs2 <DesktopUser>[/code] + +[b]Note:[/b] on some systems the user group may be different, i.e. - "network" +on Arch Linux. If in doubt, check the davfs documentation for your +particular OS. + +Edit /etc/fstab + +[code]nano /etc/fstab[/code] + + to include your cloud directory by adding + +[code] +[baseurl]/dav/ /mount/point davfs user,noauto,uid=<DesktopUser>,file_mode=600,dir_mode=700 0 1 +[/code] + +Where [baseurl] is the URL of your hub, /mount/point is the location you want to mount the cloud, and <DesktopUser> is the user you log in to one your computer. Note that if you are mounting as a normal user (not root) the mount point must be in your home directory. + +For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be + +[code][baseurl]/dav/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1[/code] + +Now, create the mount point. + +[code]mkdir /home/bob/cloud[/code] + +and also create a directory file to store your credentials + +[code]mkdir /home/bob/.davfs2[/code] + +Create a file called 'secrets' + +[code]nano /home/bob/.davfs2/secrets[/code] + +and add your cloud login credentials + +[code] +[baseurl]/dav <username> <password> +[/code] + +Where <username> and <password> are the username and password [i]for your hub[/i]. + +Don't let this file be writeable by anyone who doesn't need it with + +[code]chmod 600 /home/bob/.davfs2/secrets[/code] + +Finally, mount the drive. + +[code]mount [baseurl]/dav[/code] + +You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves. + +[b]Troubleshooting[/b] + +With some webservers and certain configurations, you may find davfs2 creating files with 0 bytes file size where other clients work just fine. This is generally caused by cache and locks. If you are affected by this issue, you need to edit your davfs2 configuration. + +[code]nano /etc/davfs2/davfs2.conf[/code] + +Your distribution will provide a sample configuration, and this file should already exist, however, most of it will be commented out with a # at the beginning of the line. + +First step is to remove locks. + +Edit the use_locks line so it reads [code]use_locks 0[/code]. + +Unmount your file system, remount your file system, and try copying over a file from the command line. Note you should copy a new file, and not overwrite an old one for this test. Leave it a minute or two then do [code]ls -l -h[/code] and check the file size of your new file is still greater than 0 bytes. If it is, stop there, and do nothing else. + +If that still doesn't work, disable the cache. Note that this has a performance impact so should only be done if disabling locks didn't solve your problem. Edit the cache_size and set it to [code]cache_size 0[/code] and also set file_refresh to [code]file_refresh 0[/code]. Unmount your filesystem, remount your file system, and test it again. + +If it [i]still[/i] doesn't work, there is one more thing you can try. (This one is caused by a bug in older versions of dav2fs itself, so updating to a new version may also help). Enable weak etag dropping by setting [code]drop_weak_etags 1[/code]. Unmount and remount your filesystem to apply the changes. + + +[h5]Dolphin[/h5] +Visit webdavs://example.com/dav where "example.com" is the URL of your hub. + +When prompted for a username and password, enter your channel name (the first part of your webbie - no @ or domain name) and password for your normal account. + +Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication. + +[h5]Konqueror[/h5] + +Simply visit webdavs://example.com/dav after logging in to your hub, where "example.com" is the URL of your hub. + +No further authentication is required if you are logged in to your hub in the normal manner. + +Additionally, if one has authenticated at a different hub during their normal browser session, your identity will be passed to the cloud for these hubs too - meaning you can access any private files on any server, as long as you have permissions to see them, as long as you have visited that site earlier in your session. + +This functionality is normally restricted to the web interface, and is not available to any desktop software other than KDE. + +[h5]Nautilus[/h5] + +1. Open a File browsing window (that's Nautilus) +2. Select File > Connect to server from the menu +3. Type davs://<domain_name>/dav/<your_channelname> and click Connect +4. You will be prompted for your channel name (same as above) and password +5. Your personal DAV directory will be shown in the window + +[h5]Nemo[/h5] + +For (file browser) Nemo 1.8.2 under Linux Mint 15, Cinnamon 1.8.8. Nemo ist the standard file browser there. + +1st way +type "davs://<domain_name>/dav/<your_channelname>" in the address bar. + +2nd way +Menu > file > connect to server +Fill the dialog +- Server: hubzilla_domain_name +- Type: Secure WebDAV (https) +- Folder: /dav +- Username: yourchannelname +- Password: yourpassword + +Once open you can set a bookmark. + +[h5]Server Notes[/h5] + +Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms. + +[h3]Saved Searches[/h3] + +In order to quickly find information, the 'saved search' widget may be used. This widget may be presented as a sidebar tool on your network page and possibly from your channel page. It is differentiated from the 'navigation bar' search tool in that it does not search the entire site, but only the subset of information available to your channel. + +Additionally the search terms you provide may activate a one-time search or be saved in a list for re-use. Saving the search item also invokes the search in addition to adding it to the saved list (which is displayed below the search text entry box). Any item in the list may be discarded if it is no longer needed. + +The saved search widget will provide autocompletion of channels (the results are prefixed with '@'), and hashtags (prefixed with '#'). You do not need to enter these tags; although entering the desired tag will reduce the autocomplete results to only hold the relevant information. The behaviour maps as follows: + +[list] +[*]@name - search your network stream for posts or comments written by 'name'. This will also change the post editor permissions to include only 'name'; as if this was a privacy group. +[*]#hashtag - search you network stream for posts containing #hashtag. +[*]text - search your network stream for posts containing 'text'. +[/list] + + +[h3]Remove Channel or Account[/h3] + +[h4]Remove Channel[/h4] + +Select the 'Remove Channel' link on your channel settings page or visit the URL: + + [baseurl]/removeme + +You will need to confirm your password and the channel you are currently logged into will be removed. + +[hl][i][b]This is irreversible.[/b][/i][/hl] + +If you have identity clones on other hubs this only removes by default the channel instance which exists on this hub. + +[h4]Remove Account[/h4] + +Select 'Remove Account' from your account settings page or visit the URL: + + [baseurl]/removeaccount + +You will need to confirm your password and the account you are currently logged into will be removed. + +[hl][i][b]This is irreversible.[/b][/i][/hl] + +All your channels will be deleted. If you have identity clones on other hubs this only removes by default the channels instances which exists on this hub. + diff --git a/doc/en/plugins.bb b/doc/en/plugins.bb new file mode 100644 index 000000000..3aecc458f --- /dev/null +++ b/doc/en/plugins.bb @@ -0,0 +1,312 @@ +[b]Plugins[/b] + +So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. + + +In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. +[code] + mkdir addon +[/code] +Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. + +Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. +[code] + mkdir addon/randplace +[/code] +Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file +[code] + addon/randplace/randplace.php +[/code] +The very first line of this file needs to be +[code] + <?php +[/code] +Then we're going to create a comment block to describe the plugin. There's a special format for this. We use /* ... */ comment-style and some tagged lines consisting of +[code] + /** + * + * Name: Random Place (here you can use better descriptions than you could in the filename) + * Description: Sample $Projectname plugin, Sets a random place when posting. + * Version: 1.0 + * Author: Mike Macgirvin <mike@zothub.com> + * + */ +[/code] +These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. + +The typical plugin will have at least the following functions: +[code] + pluginname_load() + pluginname_unload() +[/code] +In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named +[code] + pluginname_install() + pluginname_uninstall() +[/code] + +Next we'll talk about [b]hooks[/b]. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. + +We register hook handlers with the 'Zotlabs\Extend\Hook::register()' function. It typically takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. + +[code] + function randplace_load() { + Zotlabs\Extend\Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + Zotlabs\Extend\Hook::register('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + Zotlabs\Extend\Hook::register('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + + } +[/code] + +So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. + +Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. +[code] + function randplace_unload() { + Zotlabs\Extend\Hook::unregister('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + + Zotlabs\Extend\Hook::unregister('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + Zotlabs\Extend\Hook::unregister('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + } +[/code] + +Hooks are always called with one argument which is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the passed data is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. + +Let's go ahead and add some code to implement our post_local hook handler. +[code] + function randplace_post_hook(&$item) { + + /** + * + * An item was posted on the local system. + * We are going to look for specific items: + * - A status post by a profile owner + * - The profile owner must have allowed our plugin + * + */ + + logger('randplace invoked'); + + if(! local_channel()) /* non-zero if this is a logged in user of this system */ + return; + + if(local_channel() != $item['uid']) /* Does this person own the post? */ + return; + + if(($item['parent']) || (! is_item_normal($item))) { + /* If the item has a parent, or is not "normal", this is a comment or something else, not a status post. */ + return; + } + + /* Retrieve our personal config setting */ + + $active = get_pconfig(local_channel(), 'randplace', 'enable'); + + if(! $active) + return; + /** + * + * OK, we're allowed to do our stuff. + * Here's what we are going to do: + * load the list of timezone names, and use that to generate a list of world cities. + * Then we'll pick one of those at random and put it in the "location" field for the post. + * + */ + + $cities = array(); + $zones = timezone_identifiers_list(); + foreach($zones as $zone) { + if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) + $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); + } + + if(! count($cities)) + return; + $city = array_rand($cities,1); + $item['location'] = $cities[$city]; + + return; + } +[/code] + +Now let's add our functions to create and store preference settings. +[code] + /** + * + * Callback from the settings post function. + * $post contains the global $_POST array. + * We will make sure we've got a valid user account + * and that only our own submit button was clicked + * and if so set our configuration setting for this person. + * + */ + + function randplace_settings_post($post) { + if(! local_channel()) + return; + if($_POST['randplace-submit']) + set_pconfig(local_channel(),'randplace','enable',intval($_POST['randplace'])); + } + + + + /** + * + * Called from the Feature Setting form. + * The second argument is a string in this case, the HTML content region of the page. + * Add our own settings info to the string. + * + * For uniformity of settings pages, we use the following convention + * <div class="settings-block"> + * <h3>title</h3> + * .... settings html - many elements will be floated... + * <div class="clear"></div> <!-- generic class which clears all floats --> + * <input type="submit" name="pluginnname-submit" class="settings-submit" ..... /> + * </div> + */ + + + + function randplace_settings(&$s) { + + if(! local_channel()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + head_add_css(/addon/randplace/randplace.css'); + + /* Get the current state of our config variable */ + + $enabled = get_pconfig(local_channel(),'randplace','enable'); + + $checked = (($enabled) ? ' checked="checked" ' : ''); + + /* Add some HTML to the existing form */ + + $s .= '<div class="settings-block">'; + $s .= '<h3>' . t('Randplace Settings') . '</h3>'; + $s .= '<div id="randplace-enable-wrapper">'; + $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>'; + $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>'; + $s .= '</div><div class="clear"></div>'; + + /* provide a submit button */ + + $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>'; + + } + +[/code] + + + +[h2]Advanced Plugins[/h2] + +Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. + +There are two ways to accomplish this. To create a module object use the following model: +[code] +/.hidden +[/code] + +***Porting Friendica Plugins*** + +$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: + +[li] Friendica's pluginname_install() is pluginname_load()[/li] + +[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li] + +$Projectname has _install and _uninstall functions but these are used differently. + +[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li] + +[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li] + +Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/problems-following-an-update.bb b/doc/en/problems-following-an-update.bb new file mode 100644 index 000000000..7376d6163 --- /dev/null +++ b/doc/en/problems-following-an-update.bb @@ -0,0 +1,38 @@ +[b]Problems Following An Update[/b] + +A good 90% of all bugs encountered immediately after updating the code to the latest version are simple cache errors of one sort or another. If you update and find something very obvious is broken - like your matrix page doesn't load, notifications are missing, or comment boxes are missing - the chances are it's not a bug at all. Breaking basic functionality is the kind of thing developers tend to notice. + +If this happens to you, there are a few simple steps to take before resorting to the support forums: + +[b]Browser Cache[/b] + +Symptoms: Menus do not expand, ACL selector does not open, progress indicator does not display (or loops forever), Matrix and channel pages do not load. + +Force reload the page. Shift reload, or ctrl+f5. Occasionally, but very, very rarely, you will also need to clear the session data - which is achieved by restarting the browser. + +[b]FastCGI[/b] + +Symptoms: Incorrect variables. The basic UI mostly works, but displays incorrect content or is missing content entirely. + +If you're using php5-fpm, this problem is usually resolved with [code]service php5-fpm restart[/code] + +[b]Smarty Cache[/b] + +Symptoms: + +1) White Screen Of Death. This is most prevalent on the settings and admin pages. + +2) Missing icons, tabs, menus or features. + +We use the Smarty3 template engine to generate pages. These templates are compiled before they are displayed. Occasionally, a new or modified template will fail to overwrite the old compiled version. To clear the Smarty cache, delete all the files in store/[data]/smarty3/compiled [b]but do not delete the directory itself[/b]. Templates will then be recompiled on their next access. + +[b]Theme Issues[/b] + +There are many themes for $Projectname. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic. + +Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes. This means new features may only work properly in Redbasic. Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there. If the issue goes away, this is not a bug - it's a theme that isn't up to date. + +Should you report an issue with the theme developers then? No. Theme developers use their themes. Chances are, they know. Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed. There are two workarounds for this situation. Firstly, you can temporarily use Redbasic. Secondly, most themes are open source too - open a pull request and make yourself a friend. + +#include doc/macros/troubleshooting_footer.bb; + diff --git a/doc/en/red2pi.bb b/doc/en/red2pi.bb new file mode 100644 index 000000000..8ae087fbf --- /dev/null +++ b/doc/en/red2pi.bb @@ -0,0 +1,342 @@ +[b]How to install $Projectname on a Raspberry Pi[/b] + +You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name? + +Then this page is for you! You will: +[list=1] +[*] Install Raspberry OS (Debian Linux) on a Raspberry +[*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin +[*] Register a free domain (dynamic DNS) and use it for your hub +[*] Install $Projectname +[*] Keep your Raspberry Pi and $Projectname up-to-date +[*] TODO Setting up SSL +[*] TODO Running with SSL +[*] TODO Make the webserver less vulnarable to attacks +[/list] + +[size=large]1. Install Raspberry OS (Debian Linux)[/size] + +instructions under [url=http://www.raspberrypi.org/downloads]http://www.raspberrypi.org/downloads[/url] +This page links to the quick start containing detailed instruction. + +[b]Format SD card[/b] + +using the program gparted under Linux Mint 15 + +format as FAT32 + +[b]Download NOOBS (offline and network install)[/b] + +[url=http://downloads.raspberrypi.org/noobs]http://downloads.raspberrypi.org/noobs[/url] + +unzip + +copy unzipped files to SD card + +[b]Install Raspbian as OS on the Rasperry Pi[/b] + +connect with keyboard via USB + +connect with monitor via HDMI + +Insert SD card into Rasperry Pi + +Connect with power supply to switch on the Rasperry + +choose Raspbian as OS (> installs Raspbian....) + +wait for the coniguration program raspi-config (you can later start it by sudo raspi-config) + +[b]Configure Raspbian[/b] + +in raspi-config > advanced > choose to use ssh (!! You need this to connect to administrate your Pi from your PC !!) + +in raspi-config > change the password (of default user "pi" from "raspberry" to your password) + +in raspi-config (optional) > Internationalisation options > Change Locale > to de_DE.utf-8 utf-8 (for example) + +in raspi-config (optional) > Internationalisation options > Change Timezoe > set your timezone + +in raspi-config (optional) > Overlock > medium + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]More[/b] + +[code]sudo reboot[/code] + +Now its time to connect the Pi to the network. +[ul] +[*] pull out keyboard +[*] pull out monitor +[*] you even can pull out the power supply (USB) +[*] plug-in the network cable to the router +[*] plug-in the power supply again +[*] wait for a minute or to give the Pi time to boot and start ssh... +[/ul] + +On your PC connect to the Pi to administrate (here update it). +Open the console on the PC (Window: Start > cmd, Linux: Shell) + +Hint: use the router admin tool to find out the IP of your PI[code]ssh pi@192.168.178.37 +sudo apt-get update +sudo apt-get dist-upgrade[/code] + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + + +[size=large]2. Install Apache Web Server, PHP, MaySQL, phpMyAdmin[/size] + +[b]Install Apache Webserver[/b] + +[code]sudo bash +sudo groupadd www-data[/code] might exist already + +[code]sudo usermod -a -G www-data www-data +sudo apt-get update +sudo reboot[/code] + +wait... +reconnect via ssh, example: [code]ssh pi@192.168.178.37 +sudo apt-get install apache2 apache2-doc apache2-utils[/code] + +Open webbrowser on PC and check [url=http://192.168.178.37]http://192.168.178.37[/url] +Should show you a page like "It works" + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]Install PHP, MaySQL, phpMyAdmin[/b] + +[code]sudo bash +apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl +apt-get install php5-mysql +apt-get install mysql-server mysql-client[/code] enter and note the mysql passwort + +[code]apt-get install phpmyadmin[/code] + +Configuring phpmyadmin +- Select apache2 +- Configure database for phpmyadmin with dbconfig-common?: Choose Yes + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]Test installation[/b] + +[code]cd /var/www[/code] + +create a php file to test the php installation[code]sudo nano phpinfo.php[/code] + +Insert into the file:[code] +<?php + phpinfo(); +?> +[/code] +(save CTRL+0, ENTER, CTRL+X) + +open webbrowser on PC and try [url=http://192.168.178.37/phpinfo.php]http://192.168.178.37/phpinfo.php[/url] (page shows infos on php) + +connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf[/code] +- CTRL+V... to the end of the file +- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] + +restart apache[code]/etc/init.d/apache2 restart +sudo apt-get update +sudo apt-get upgrade +sudo reboot[/code] + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]phpMyAdmin[/b] + +open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] + +(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) + + +[b]Create an empty database... that is later used by RED[/b] + +open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] + +Create an empty database + +Note the access details (hostname, username, password, database name). + + +[size=large]3. Selfhost[/size] + +(Source: #^[url=http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html]http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html[/url]) + +[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] + +[b]Step 1[/b] +Register for a Free domain at #^[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] +(We will take techhome.homenet.org in this guide) + +[b]Step 2[/b] + +Logon to FreeDNS (where you just registered) and goto #^[url=http://freedns.afraid.org/dynamic/]http://freedns.afraid.org/dynamic/[/url] +Right click on "Direct Link" and copy the URL and paste it somewhere. +You should notice a large and unique alpha-numeric key in the URL, make a note of it as shown below: +[code]http://freedns.afraid.org/dynamic/update.php?alphanumeric-key[/code] + + +[b]Step 3[/b] +Install inadyn using the following command:[code]sudo apt-get install inadyn[/code] + +[b]Step 4[/b] +Configure inadyn using the below steps:[code]sudo nano /etc/inadyn.conf[/code] +And add the following contains in it replacing the actual values: +[code] +--username [color=red]techhome[/color] +--password [color=red]mypassword[/color] +--update_period 3600 +--forced_update_period 14400 +--alias [color=red]techhome.homenet.org</b>,[color=red]alphanumeric key[/color] +--background +--dyndns_system default@freedns.afraid.org +--syslog + [/code] + + +[b]Step 5[/b] + +Now, we need to ensure that the DNS updater (Inadyn) runs automatically after every re-boot[code]export EDITOR=gedit && sudo crontab -e[/code] +Add the following line:[code]@reboot /usr/sbin/inadyn[/code] + + +[b]Step 6[/b] + +Reboot system and then run the following command to ensure inadyn is running:[code] +sudo reboot +ps -A | grep inadyn +[/code] +Now your host is ready and up for accessing from internet... +You can trying ssh-ing from another computer over the internet +[code]ssh username@techhome.homenet.org[/code] +Or, if any web server is running, then simply browse to #^[url=http://techhome.homenet.org]http://techhome.homenet.org[/url] +Or, you can just ping it to test ping techhome.homenet.org +To check the logs you can use this: +[code]more /var/log/messages |grep INADYN[/code] + + +[size=large]4. Install $Projectname[/size] + +(Source: [zrl=[baseurl]/help/Install][baseurl]/help/Install[/zrl]) + +Linux Appache document root is /var/www/ +Two files exist there (created by the steps above): index.html, phpinfo.php + + +[b]Install $Projectname and its Addons[/b] + +Cleanup: Remove the directory www/ (Git will not create files and folders in directories that are not empty.) Make sure you are in directory var[code]pi@pi /var $ cd /var[/code] + +Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code] + +Download the sources of $Projectname from GIT +[code]pi@pi /var $ sudo git clone https://framagit.org/hubzilla/core.git www[/code] + +Download the sources of the addons from GIT +[code]pi@pi /var/www $ sudo git clone https://framagit.org/hubzilla/addons.git addon[/code] + +Make user www-data the owner of the whole web directory (including subdirectories and files) +(TODO: This step has to be proofed by the next installation.) +[code]pi@pi /var $ chown -R www-data:www-data /var/www/[/code] + +Check if you can update the sources from git[code] +pi@pi /var $ cd www +pi@pi /var/www $ git pull +[/code] + +Check if you can update the addons +[code]pi@pi /var/www $ cd addon/ +pi@pi /var/www/addon $ sudo git pull[/code] + +Make sure folder store/[data]/smarty3 exists and is writable by the webserver +[code]pi@pi /var/www $ sudo chmod ou+w "store/\[data\]/smarty3"[/code] + +Create .htconfig.php and is writable by the webserver +[code]pi@pi /var/www $ sudo touch .htconfig.php +pi@pi /var/www $ sudo chmod ou+w .htconfig.php[/code] + +[b]First start and initial configuration of your RED Matrix hub[/b] + +In browser open #^[zrl=http://einervonvielen.mooo.com/]http://einervonvielen.mooo.com/[/zrl] +(Replace einervonvielen.mooo.com by your domain, see chapter selfhost. Be patient. It takes time.) +(#^[zrl=http://einervonvielen.mooo.com/index.php?q=setup]http://einervonvielen.mooo.com/index.php?q=setup[/zrl]) + +There might be errors like the following. + +Error: libCURL PHP module required but not installed. +Solution: +apt-get install php5-curl + +Error: Apache webserver mod-rewrite module is required but not installed. +Solution +(Source: [url=http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html]http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html[/url]) +The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load +- pi@pi /var/www $ nano /etc/apache2/mods-available/rewrite.load + (You should find the contendt: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) +To enable and load mod_rewrite, do the rest of steps. +Create a symbolic link in /etc/apache2/mods-enabled +- pi@pi /var/www $ sudo a2enmod rewrite +Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". +- pi@pi /var/www $ sudo nano /etc/apache2/sites-available/default +Finally, restart Apache2. +- pi@pi /var/www $ sudo service apache2 restart + +Error store is writable (not checked) +Solution: +(TODO: Make writeable to group www-data only?) +pi@pi /var/www $ sudo mkdir store +pi@pi /var/www $ chown -R www-data:www-data /var/www/red/ +pi@pi /var/www $ sudo chmod ou+w view + +[b]More[/b] + +Set up a cron job to run the poller once every 15 minutes in order to perform background processing. +- pi@pi /var/www $ which php +Make sure you are in the document root directory of the webserver +- pi@pi /var/www $ cd /var/www/ +Try to execute the poller in order to make sure it works +- pi@pi /var/www $ /usr/bin/php include/poller.php +Create the cronjob +- pi@pi /var/www $ crontab -e +Enter +- */15 * * * * cd /var/www/; /usr/bin/php include/poller.php +- Save and exit. + +Prevent search engines from indexing your search pages. Why? This can cause heavy resource use. + +[code] +php util/config system block_public_search 1 +[/code] + + + +[size=large]5. Keep your Raspberry Pi and your $Projectname up-to-date[/size] + +Git update every day at 4 am and addons at 5 am every day +Try if the command is working +- pi@pi /var/www $ sudo git pull +Create the cronjob +- pi@pi /var/www $ crontab -e +Enter the following to update at 4:01 am every day +- 01 04 * * * cd /var/www/; sudo git pull +Enter the following to update the addons at 5:01 am every day +- 01 05 * * * cd /var/www/addon/; sudo git pull +Enter the following to update the Raspberry Pi (Raspbian OS = Debian) at 6:01 am every day +- 01 06 * * * sudo aptitude -y update && sudo aptitude -y safe-upgrade +Save and exit. + +[size=large]6. Running with SSL[/size] + +Follow the instructions here: +[url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url] + +#include doc/macros/main_footer.bb; diff --git a/doc/en/roadmap.bb b/doc/en/roadmap.bb new file mode 100644 index 000000000..dce19848a --- /dev/null +++ b/doc/en/roadmap.bb @@ -0,0 +1,28 @@ + +Roadmap + + +Platform + + Convert E2EE and select Javascript resources to dynamic loading using jQuery.getScript() [or other methods]. + +Webpages + + Make webpage building easy, with point-n-click selectors to build PDLs + + +Events + + Recurring events + Integrate Hubzilla events with CalDAV + + +Connections + + CardDAV integration with abook and profiles + + +Issues manager + + Provide easy(easier) channel move (as opposed to channel copy or clone) + diff --git a/doc/en/schema_development.bb b/doc/en/schema_development.bb new file mode 100644 index 000000000..10832684a --- /dev/null +++ b/doc/en/schema_development.bb @@ -0,0 +1,78 @@ +[b]Red Development - A Guide To The Schema System[/b] + +A schema, in a nutshell, is a collection of settings for a bunch of variables to define +certain elements of a theme. A schema is loaded as though it were part of config.php +and has access to all the same information. Importantly, this means it is identity aware, +and can be used to do some interesting things. One could, for example, restrict options +by service class, or present different options to different members. + +By default, we filter only by whether or not expert mode is enabled. If expert mode is +enabled, all options are presented to the member. If it is not, only scheme, background +image, font face, and iconset are available as choices. + +A schema is loaded *after* the member's personal settings. Therefore, to allow a member +to overwrite a particular aspect of a schema you would use the following syntax: +[code] + if (! $foo) + $foo = 'bar'; +[/code] +However, there are circumstances - particularly with positional elements - where it +may be desirable (or necessary) to override a member's settings. In this case, the syntax +is even simpler: +[code] + $foo = 'bar'; +[/code] +Members will not thank you for this, however, so only use it when it is required. + +If no personal options are set, and no schema is selected, we will first try to load a schema +with the file name "default.php". This file should never be included with a theme. If it +is, merge conflicts will occur as people update their code. Rather, this should be defined +by administrators on a site by site basis. +default.php and default.css MUST be symlinks to existing scheme files. + +You schema does not need to - and should not - contain all of these values. Only the values +that differ from the defaults should be listed. This gives you some very powerful options +with very few lines of code. + +Note the options available differ with each theme. The options available with the Redbasic +theme are as follows: + +[li] nav_colour + The colour of the navigation bar. Options are red, black and silver. Alternatively, + one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and + hover effects.[/li] +[li] banner_colour + The font colour of the banner element. Accepts an RGB or Hex value.[/li] +[li] bgcolour + Set the body background colour. Accepts an RGB or Hex value.[/li] +[li] background_image + Sets a background image. Accepts a URL or path.[/li] +[li] item_colour + Set the background colour of items. Accepts an RGB or Hex value.[/li] +[li] item_opacity + Set the opacity of items. Accepts a value from 0.01 to 1[/li] +[li] toolicon_colour + Set the colour of tool icons. Accepts an RGB or Hex value.[/li] +[li] toolicon_activecolour + Set the colour of active or hovered icon tools.[/li] +[li] font_size + Set the size of fonts in items and posts. Accepts px or em.[/li] +[li] body_font_size + Sets the size of fonts at the body level. Accepts px or em.[/li] +[li] font_colour + Sets the font colour. Accepts an RGB or Hex value.[/li] +[li] radius + Set the radius of corners. Accepts a numeral, and is always in px.[/li] +[li] shadow + Set the size of shadows shown with inline images. Accepts a numerical + value. Note shadows are not applied to smileys.[/li] +[li] converse_width + Set the maximum width of the content region in px.[/li] +[li] nav_min_opacity[/li] +[li] top_photo[/li] +[li] reply_photo[/li] + +If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. +This gives the schem developer the possiblity to override any style component. + +#include doc/macros/main_footer.bb; diff --git a/doc/en/schemaspy_hubzilla/zot.meta.xml b/doc/en/schemaspy_hubzilla/zot.meta.xml new file mode 100644 index 000000000..98a9d370e --- /dev/null +++ b/doc/en/schemaspy_hubzilla/zot.meta.xml @@ -0,0 +1,283 @@ + + + +2015-11-04 - Hubzilla database schema with some corrected cross-table relationships supporting decentralized publishing. Haakon Meland Eriksen. + + + + + + + +
      + +
      + +
      + +
      + + + + + + +
      + +
      + +
      + + + + +
      + + + + +
      + + + + +
      + +
      + +
      + +
      + +
      + + + + +
      + + + + + + + + + +
      + +
      + +
      + +
      + +
      + + + + +
      + + + + + + +
      + +
      + + + + + + +
      + +
      + + + + + + + + + + +
      + +
      + +
      + + + + + + + +
      + + + + +
      + +
      + +
      + + + + + + +
      + +
      + + + + + + +
      + +
      + + + + +
      + +
      + +
      + +
      + + + + + + +
      + +
      + +
      + + + + + + +
      + +
      + + + + +
      + +
      + +
      + + + + + + + +
      + +
      + +
      + + + + + + + + + + + +
      + +
      + + + + + + + +
      + +
      + + + + +
      + + + + + +
      + + + + + +
      + + + + + +
      + + + + + + +
      + + + + + +
      + + +
      + + + + + + + +
      + + + + + + + +
      +       + +       diff --git a/doc/en/sql_conventions.bb b/doc/en/sql_conventions.bb new file mode 100644 index 000000000..f6a4e251f --- /dev/null +++ b/doc/en/sql_conventions.bb @@ -0,0 +1,91 @@ +[h1]SQL Conventions[/h1] +[b]Intro[/b] +The following common SQL conventions appear throughout the code in many places. We use a simple DBA (DataBase Abstraction layer) to handle differences between databases. Please be sure to use only standards-compliant SQL. + +[b]Rule One[/b] +Worth Repeating: Don't use non-standard SQL. This goes for addons as well. If you do use non-standard SQL, and the dba funcs are insufficient, do a if()/switch() or similar for all currently supported databases. Currently nothing red# does requires non-standard SQL. + +[b]Using a format string[/b] +[li]Uses sprintf() +To be written +[code]// Example +$r = q("SELECT * FROM profile WHERE uid = %d", + local_channel() +); +[/code][/li] + +[b]Checking bit flags in a where clause[/b] +[li]You must explicitly convert integers to booleans. The easiest way to do this is to compare to 0. +[code]// Example +$r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 ", + intval($uid), + intval(ABOOK_FLAG_SELF) +); +[/code] +[/li] +[li]Turning off a flag +[code]$y = q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'", + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_ORPHAN), + dbesc($rr['hubloc_hash']) +);[/code] +[/li] +[li]Turning on a flag +[code]$y = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'", + intval(XCHAN_FLAGS_ORPHAN), + dbesc($rr['hubloc_hash']) +);[/code] +[/li] + +[b]Using relative times (INTERVALs)[/b] +[li]Sometimes you want to compare something, like less than x days old. +[code]// Example +$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_dob > %s + interval %s and abook_dob < %s + interval %s", + db_utcnow(), db_quoteinterval('7 day'), + db_utcnow(), db_quoteinterval('14 day') +);[/code] +[/li] +[b]Paged results[/b] +[li]To be written +[code]// Example +$r = q("SELECT * FROM mail WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d OFFSET %d", + intval(api_user()), + intval($count), intval($start) +);[/code][/li] + +[b]NULL dates[/b] +[li]To be written +[code]// Example +$r = q("DELETE FROM mail WHERE expires != '%s' AND expires < %s ", + dbesc(NULL_DATE), + db_utcnow() +);[/code][/li] + +[b]Storing binary data[/b] +[li]To be written +[code]// Example +$x = q("update photo set data = '%s', height = %d, width = %d where resource_id = '%s' and uid = %d and scale = 0", + dbescbin($ph->imageString()), + intval($height), + intval($width), + dbesc($resource_id), + intval($page_owner_uid) +);[/code][/li] + +[b]Current timestamp[/b] +[li][code]// Example +$randfunc = db_getfunc('rand'); +$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", + db_utcnow(), db_quoteinterval('30 day') +);[/code][/li] + +[b]SQL Function and Operator Abstraction[/b] +[li]Sometimes the same function or operator has a different name/symbol in each database. You use db_getfunc('funcname') to look them up. The string is [i]not[/i] case-sensitive; do [i]not[/i] include parens. +[code]// Example +$randfunc = db_getfunc('rand'); +$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", + db_utcnow(), db_quoteinterval('30 day') +);[/code][/li] + +#include doc/macros/main_footer.bb; \ No newline at end of file diff --git a/doc/en/toc.html b/doc/en/toc.html new file mode 100644 index 000000000..d2f2654a1 --- /dev/null +++ b/doc/en/toc.html @@ -0,0 +1,75 @@ +
      +
      +
      +

      + Tutorials +

      +
      + +
      +
      +
      +

      + Members +

      +
      + +
      +
      +
      +

      + Administrators +

      +
      + +
      +
      +
      +

      + Developers +

      +
      + +
      +
      +
      +

      + About +

      +
      + +
      +
      diff --git a/doc/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png b/doc/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png new file mode 100644 index 000000000..d5cf1093f Binary files /dev/null and b/doc/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png differ diff --git a/doc/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png b/doc/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png new file mode 100644 index 000000000..d613925aa Binary files /dev/null and b/doc/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png differ diff --git a/doc/en/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png b/doc/en/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png new file mode 100644 index 000000000..c403bf806 Binary files /dev/null and b/doc/en/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png differ diff --git a/doc/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png b/doc/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png new file mode 100644 index 000000000..ca8ba6fb9 Binary files /dev/null and b/doc/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png differ diff --git a/doc/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png b/doc/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png new file mode 100644 index 000000000..0da2d96e2 Binary files /dev/null and b/doc/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png differ diff --git a/doc/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png b/doc/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png new file mode 100644 index 000000000..2a209b2be Binary files /dev/null and b/doc/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png differ diff --git a/doc/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png b/doc/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png new file mode 100644 index 000000000..f992672b0 Binary files /dev/null and b/doc/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png differ diff --git a/doc/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png b/doc/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png new file mode 100644 index 000000000..b656192dc Binary files /dev/null and b/doc/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png differ diff --git a/doc/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png b/doc/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png new file mode 100644 index 000000000..6129195b6 Binary files /dev/null and b/doc/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png differ diff --git a/doc/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png b/doc/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png new file mode 100644 index 000000000..923403fe9 Binary files /dev/null and b/doc/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png differ diff --git a/doc/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png b/doc/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png new file mode 100644 index 000000000..f158ad5d9 Binary files /dev/null and b/doc/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png differ diff --git a/doc/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png b/doc/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png new file mode 100644 index 000000000..edc8b01cc Binary files /dev/null and b/doc/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png differ diff --git a/doc/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png b/doc/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png new file mode 100644 index 000000000..5b259058b Binary files /dev/null and b/doc/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png differ diff --git a/doc/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png b/doc/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png new file mode 100644 index 000000000..c03ffd18d Binary files /dev/null and b/doc/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png differ diff --git a/doc/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png b/doc/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png new file mode 100644 index 000000000..65d4c5f0a Binary files /dev/null and b/doc/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png differ diff --git a/doc/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png b/doc/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png new file mode 100644 index 000000000..45609a7bb Binary files /dev/null and b/doc/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png differ diff --git a/doc/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png b/doc/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png new file mode 100644 index 000000000..d239d6965 Binary files /dev/null and b/doc/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png differ diff --git a/doc/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png b/doc/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png new file mode 100644 index 000000000..45ed64d00 Binary files /dev/null and b/doc/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png differ diff --git a/doc/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png b/doc/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png new file mode 100644 index 000000000..fcaed8bef Binary files /dev/null and b/doc/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png differ diff --git a/doc/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png b/doc/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png new file mode 100644 index 000000000..0ccfc8995 Binary files /dev/null and b/doc/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png differ diff --git a/doc/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png b/doc/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png new file mode 100644 index 000000000..1cb4d2d22 Binary files /dev/null and b/doc/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png differ diff --git a/doc/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png b/doc/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png new file mode 100644 index 000000000..22e4cb5d5 Binary files /dev/null and b/doc/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png differ diff --git a/doc/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png b/doc/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png new file mode 100644 index 000000000..5674f5207 Binary files /dev/null and b/doc/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png differ diff --git a/doc/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png b/doc/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png new file mode 100644 index 000000000..e6b4a9974 Binary files /dev/null and b/doc/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png differ diff --git a/doc/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png b/doc/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png new file mode 100644 index 000000000..8de042ae4 Binary files /dev/null and b/doc/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png differ diff --git a/doc/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png b/doc/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png new file mode 100644 index 000000000..cec391fb4 Binary files /dev/null and b/doc/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png differ diff --git a/doc/en/tutorials/personal_channel.html b/doc/en/tutorials/personal_channel.html new file mode 100644 index 000000000..3069cd44b --- /dev/null +++ b/doc/en/tutorials/personal_channel.html @@ -0,0 +1,162 @@ + +

      This tutorial is intended to be followed in sequence as if you were setting up a +channel for the first time. It introduces some of the tools and features related +to a personal channel in a natural way.

      + +

      Create a new channel

      + +

      When you log in for the first time after registering, you must create a channel. +(Alternatively you can visit https://your_website/new_channel)

      + +

      image

      + +

      Enter your name and a nickname for the channel address, and select a "role". +Typically if this is a personal channel that represents you, select a Social role +with a level of default privacy that you are comfortable with. If you are unsure, +select Social - Mostly public which allows easy interaction and provides privacy when you need it. +Alternatively, Social - Restricted is very popular among privacy advocates, though it may require a bit more +effort to meet people. Whichever setting you choose can be changed later if you decide you require more or less privacy than what is provided.

      + + + +

      Add a profile photo

      + +

      When your new channel is created, you will be directed to a page determined by your site admin. By default this is the Edit Profile page. + +

      From the Profile Tools dropdown menu, select Change profile photo (or just click the profile photo).

      + +

      image

      + +

      Upload your photo and size as necessary using the image editor.

      + +

      image

      + +

      When you press Done Editing you will be redirected back to the profile editor. +(You might need to clear your browser cache if you have trouble seeing the new photo.)

      + +

      image

      + +

      Returning to your channel home page you will see that a post notifying others of your new +profile pic has been automatically posted.

      + +

      image

      + +

      Compose a post

      + +

      Go to your channel home and open the post editor by pressing the Share textbox +at the top of the channel "wall". Enter a message, and then drag-and-drop an image +file into the post editor text area (alternatively you can use the Attach file +tool at the bottom).

      + +

      image

      + +

      Your image file will be automatically uploaded and stored in your cloud files, and +a link will appear in the post window. Pressing the post preview button will allow you to preview your post before publishing it.

      + +

      image

      + +

      Pressing the lock button near the Submit button will open the Access Control List +so you can specify exactly who can access this post.

      + +

      image

      + +

      Use an uploaded image as a channel cover photo

      + +

      One way to add some pizzazz your channel is to add a cover photo that visitors will +see when they load your channel page. The integrated cloud file system +allows you to choose an existing photo for this purpose.

      + +

      Visit your photos in the Photos app

      + +

      image

      + +

      Select the photo you wish to use and select Use as cover photo from the Photo Tools +dropdown menu.

      + +

      image

      + +

      Crop the image using the photo editor and save your changes.

      + +

      image

      + +

      When you load your channel home page, you will first see the cover photo, and your +channel page will fade in as you scroll down.

      + +

      image

      + +

      Make a connection

      + +

      Making connections between channels to share things is what social communications are all about. +Making a connection is simple. If you do not already know how to reach a channel's home +page, you might try a directory search by opening the Directory link from the menu on the right +side of the top navbar.

      + +

      image

      + +

      You can connect directly from the directory entry using the Connect button there, +or you can open the channel page first and press the Connect button below the +profile photo.

      + +

      image

      + +

      After you connect you are immediately taken to the connection editor page, where +you make some important decisions about what you plan to share with this channel.

      + +

      image

      + +

      The two important settings are

      + +
      • The individual permissions for the newly connected channel
        • +
      • The privacy group(s) the connection is a member of
        • +

      The individual permissions are mostly straightforward, but they can be slightly +unclear at first. For example, Can view my file storage and photos does not +mean that the connected channel will be able to view all of your photos and files! +It means that you will have the option to share photos and files with that +channel. It is perfectly possible for you to allow someone to read your posts but +disallow them from seeing photos in that post. This kind of unusual situation is, +as they say, not a bug; it is a feature.

      + +

      Privacy groups allow you to conveniently share items with groups of people. You can +create whatever groups fit your needs by opening the Add privacy group link.

      + +

      image

      + +

      In this editor, you can switch between the existing privacy groups and see at a +glance what channels are and are not members of the group. Selecting the icon of +a channel in either box will move it to the in or out of the group.

      + +

      image

      + +

      When editing an individual channel's settings, you can set their privacy group +membership using the widget on the left:

      + +

      image

      + +

      Connections are a mutual engagement. The channel you connect can choose to approve your +connection. They will receive a notification that you connected

      + +

      image

      + +

      which takes them to their Connections editor page where +they can choose to approve the connection or not.

      + +

      image

      + +

      After you approve a connection, it is a good idea to open the individual connection +editor by pressing the edit button beside the Delete button.

      + +

      image

      + + diff --git a/doc/encryption.bb b/doc/encryption.bb deleted file mode 100644 index 9985f4b33..000000000 --- a/doc/encryption.bb +++ /dev/null @@ -1,18 +0,0 @@ -[size=large]Builtin Automatic Encryption[/size] - -Full disclosure: The encryption $Projectname uses per default is not absolutely waterproof. There [i]are[/i] known procedures to circumvent it. [i]But[/i] this takes a lot of effort and needs to be done individually for each channel. And to make this clear: Other services store your messages in plaintext, therefore we regard this approach as a [i]significant[/i] improvement for your privacy. Plus you are always free to use further encryption and password protection if you so desire. - - -To explain this in more detail: - -- each channel has its key pair -- every non-public post is automatically encrypted -- optional password protect content via crypto-javascript browser-to-browser encryption (needs to be enabled in settings) Full disclosure: A rogue hub admin could injects malicious javascript-code (e.g. keylogging-abilities) into the code. Encrypt our stuff out of band with GPG, become a hub administrator yourself or use other means of communication if this worries you. - -So what is the scope of security? Full disclosure: This might be great, but it is not perfect. -- every non-public post is automatically encrypted but persons who have access to the site's database and files [i]may[/i] be able to decrypt everything by using these keys which obviously need to be stored on the server. To be clear: The encrypion keys are different for every channel and it is [i]quite an effort[/i] to do this. And again: Other services store your messages in plain text unencrypted. So this [i]is[/i] quite a significant win for your privacy. - -We believe that the NSA-level dragnet plaintext extracting mass surveillance is probably not possible due to the design of the zot protocol. Dedicated attacks including hacking into one hub to obtain the server logs and database only partly reveal what is going on between people communication between different hubs. We believe that this makes it much more expensive for state-level attackers to access your content in $Projectname. - - -We gladly accept help improving the security of the system and auditing it as well. diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb deleted file mode 100644 index 338db8023..000000000 --- a/doc/external-resource-links.bb +++ /dev/null @@ -1,21 +0,0 @@ -[h2]External resource links[/h2] -[h3]Third-Party Themes[/h3] -[ul] -[*][url=https://github.com/omigeot/redstrap3]Redstrap[/url] -[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url] -[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url] -[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's themes[/url] -[/ul] -[h3]Third-Party addons[/h3] -[ul] -[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url] -[/ul] -[h3]Related projects[/h3] -[ul] -[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url] -[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url] -[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url] -[*][url=https://wordpress.org/plugins/hubzilla-wp/]WordPress gateway (combine with wppost addon for full features)[/url] -[/ul] - -#include doc/macros/main_footer.bb; diff --git a/doc/extra_features.bb b/doc/extra_features.bb deleted file mode 100644 index 17d85228e..000000000 --- a/doc/extra_features.bb +++ /dev/null @@ -1,98 +0,0 @@ -// multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file? -[b]Features[/b] - -The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page. - -[b]Content Expiration[/b] - -Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed. - -[b]Multiple Profiles[/b] - -The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. - -[b]Web Pages[/b] - -Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks. - -[b]Private Notes[/b] - -On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. - -[b]Extended Identity Sharing[/b] - -By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix. - -[b]Expert Mode[/b] - -This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking. - -[b]Premium Channel[/b] - -This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect. - -[b]Post Preview[/b] - -Allows previewing posts and comments exactly as they would look on the page before publishing them. - -[b]Channel Sources[/b] - -Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel. - -[b]Even More Encryption[/b] - -Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog". - -[b]Search by Date[/b] - -This provides the ability to select posts by date ranges - -[b]Privacy Group Filter[/b] - -Enable widget to display stream posts only from selected privacy groups. This also toggles the outbound permissions while you are viewing a group. This is analogous to Google "circles" or Disapora "aspects". - -[b]Saved Searches[/b] - -Provides a search widget on your matrix page which can save selected search terms for re-use. - -[b]Personal Tab[/b] - -Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. - -[b]New Tab[/b] - -Enables a tab to display all new matrix activity as a firehose or timeline. - -[b]Affinity Tool[/b] - -Filter matrix stream activity by the depth of your relationships - -[b]Edit Sent Posts[/b] - -Edit and correct posts and comments after sending - -[b]Tagging[/b] - -Ability to tag existing posts, including those written by others. - -[b]Post Categories[/b] - -Add categories to your channel posts - -[b]Saved Folders[/b] - -Ability to file posts under folders or tags for later recall - -[b]Dislike Posts[/b] - -Ability to dislike posts/comments - -[b]Star Posts[/b] - -Ability to mark special posts with a star indicator - -[b]Tag Cloud[/b] - -Provide a personal tag cloud on your channel page - -#include doc/macros/main_footer.bb; diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb deleted file mode 100644 index 0b54a41de..000000000 --- a/doc/faq_admins.bb +++ /dev/null @@ -1,78 +0,0 @@ -[size=large][b]$Projectname FAQ[/b][/size] - -[toc] - -[h3]Is there a way to change the Admin account?[/h3] -[h3]Is there a way to have multiple administrators?[/h3] -Yes, but it's a bit messy at the moment as it is not yet exposed in the UI. To make an account an administrative account, -one needs to add 4096 to the account_roles entry in the account table of the database. Likewise, to remove administrative permissions, -one must subtract 4096 from the account roles. - -[h3]I can log in, but there are no posts or webpages[/h3] - -Most likely, your item table has crashed. Run the MySQL command [code]repair table item;[/code] - -[h3]Login doesn't work, immediately after login, the page reloads and I'm logged out[/h3] - -Most likely, your session table has crashed. Run the MySQL command [code]repair table session;[/code] - -[h3]When I switch theme, I sometimes get elements of one theme superimposed on top of the other[/h3] - -a) store/[data]/smarty3 isn't writeable by the webserver. Make it so. - -b) You're using Midori, or with certain themes, Konqueror in KHTML mode. - -[b]My network tab won't load, it appears to be caused by a photo or video[/h3] - -Your PHP memory limit is too low. Increase the size of the memory_limit directive in your php.ini - -Contrary to popular belief, the number of users on a hub doesn't make any difference to the required memory limit, rather, the content -of an individuals matrix counts. Streams with lots of photos and video require more memory than streams with lots of text. - -[h3]I have no communication with anybody[/h3] - -You're listening on port 443, but do not have a valid SSL certificate. Note this applies even if your baseurl is http. -Don't listen on port 443 if you cannot use it. It is strongly recommended to solve this problem by installing a browser -valid SSL certificate rather than disabling port 443. - -[h3]How do I update a non-Git install?[/h3] -1) Backup .htconfig.php -2) Backup everything in store/ -3) Backup any custom changes in mod/site/ and view/site -3) Delete your existing installation -4) Upload the new version. -5) Upload the new version of themes and addons. -6) Restore everything backed up earlier. - -[h3]What do I need to do when moving my hub to a different server[/h3] - -1) Git clone on the new server. Repeat the process for any custom themes, and addons. -2) Rsync .htconfig.php -3) Rsync everything in store/ -4) Rsync everything in mod/site/ and view/site (these will only exist if you have custom modules) -5) Dump and restore DB. - -[h3]How do I reinstall an existing hub on the same server?[/h3] - -1) [code]git reset --hard HEAD[/code] will reset all files to their upstream defaults. This will not reset any local files that do not also exist upstream. Eg, if you have local changes to mod/channel.php, this will reset them - but will not reset any changes in mod/site/channel.php -2) If you absolutely must reinstall - for example, if you need to upgrade operating system - follow the steps for moving to a different server, but instead of using rsync, backup and restore some other way. - -Do not reinstall a hub with a fresh database and fresh .htconfig.php unless as a very last resort. Creating a temporary account and ask for help via a support channel for non-trivial reinstalls is preferable to reinstalling fresh. - -[h3]How do I set the default homepage for logged out viewers?[/h3] - -Use the custom_home addon available in the main addons repository. - -[h3]What do the different directory mode settings mean?[/h3] -[code]// Configure how we communicate with directory servers. -// DIRECTORY_MODE_NORMAL = directory client, we will find a directory (all of your member's queries will be directed elsewhere) -// DIRECTORY_MODE_SECONDARY = caching directory or mirror (keeps in sync with realm primary [adds significant cron execution time]) -// DIRECTORY_MODE_PRIMARY = main directory server (you do not want this unless you are operating your own realm. one per realm.) -// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services (only local site members in directory) -[/code] -- The default is NORMAL. This off-loads most directory services to a different server. The server used is the config:system/directory_server. This setting MAY be updated by the code to one of the project secondaries if the current server is unreachable. You should either be in control of this other server, or should trust it to use this setting. -- SECONDARY. This allows your local site to act as a directory server without exposing your member's queries to another server. It requires extra processing time during the cron polling, and is not recommended to be run on a shared web host. -- PRIMARY. This allows you to run a completely separate 'Network' of directory servers with your own Realm. By default, all servers are on the RED_GLOBAL realm unless the config:system/directory_realm setting is overridden. [i]Do not use this unless you have your own directory_realm.[/i] -- STANDALONE. This is like primary, except it's a 'Network' all on it's own without talking to any other servers. Use this if you have only one server and want to be segregated from the Red#Matrix directory listings. - -#include doc/macros/main_footer.bb; diff --git a/doc/feature/access_tokens.bb b/doc/feature/access_tokens.bb deleted file mode 100644 index eb5c03717..000000000 --- a/doc/feature/access_tokens.bb +++ /dev/null @@ -1,47 +0,0 @@ -Feature: Zot Access Tokens -Status: Draft -Date: 15 July 2016 - - -Purpose: - -In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). - - -Scope: - -Zot Access Tokens do not convey membership in the site or network. In particular, they do not provide an account or channel; which may be necessary to interact with the hub owner or with others in the network or federation of networks. In most cases they can only be used to consume restricted resources and do not have an ability to create those resources, however this ability may be provided by custom configurations or in future releases or addons. - -For instance the ability for a temporary login to access a chatroom may provide suitable permission to create chat messages inside that chatroom. - - -Implementation: - -Zot Access Tokens are managed through a "tab" of the settings page. Access to this tab may be controlled by site configuration. On this page, channels may create, edit, list, and remove any access tokens under their control. - -The form to create/edit accepts three parameters, a human readable name, a password or access token, and an optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be automatically purged from the list of temporary accounts. The password field in the create/edit forms displays the text of the access token and not an obscured password. By default we will create a token using the autoname() function, which generally produces a random character sequence which is "pronounceable", hence easy to convey or remember. This can be changed to any other character sequence which is acceptable to the site password complexity policy. (In most Hubzilla installations this imposes a minimum of three characters, but may be extended by plugin or site policy). - - -Usage: - -We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided. - - Example: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied. - -The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album. - - -Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented. - -Zot Acess Tokens are represented internally as an authenticated "observer". Querying the observer in code should return a pseudo or system generated xchan with an unknown protocol and a default profile photo. It will match (successfully) any access control rule which allows authenticated observers. - -Security Considerations: - -The URL form of authentication is inherently less secure than using a login, but may be preferable for some uses of this feature. It probably should not be transmitted over non-SSL links. - - -Future development: - -It might be desirable for future implementations to provide an options for single-use, where the access token is removed promptly following first use. - - \ No newline at end of file diff --git a/doc/feature/additional/access.md b/doc/feature/additional/access.md deleted file mode 100644 index b7f0df717..000000000 --- a/doc/feature/additional/access.md +++ /dev/null @@ -1,41 +0,0 @@ -## Access Control and Permissions - - -### Privacy Groups - -Enable management and selection of privacy groups. - - -Minimum required technical skill level to see this feature: 0 - - -### Multiple Profiles - -Ability to create multiple profiles. - - -Minimum required technical skill level to see this feature: 3 - - -### Permission Categories - -Provide alternate connection permission limits. - - -Minimum required technical skill level to see this feature: 2 - - -### OAuth Clients - -Manage authenticatication tokens for mobile and remote apps. - - -Minimum required technical skill level to see this feature: 1 - - -### Access Tokens - -Create access tokens so that non-members can access private content. - - -Minimum required technical skill level to see this feature: 2 diff --git a/doc/feature/additional/composition.md b/doc/feature/additional/composition.md deleted file mode 100644 index 1256f7501..000000000 --- a/doc/feature/additional/composition.md +++ /dev/null @@ -1,67 +0,0 @@ -## Post Composition Features - - -### Large Photos - -Include large (1024px) photo thumbnails in posts. -If not enabled, use small (640px) photo thumbnails - - -Minimum required technical skill level to see this feature: 1 - - -### Channel Sources - -Automatically import channel content from other channels or feeds - - -Minimum required technical skill level to see this feature: 3 - - -### Even More Encryption - -Allow optional encryption of content end-to-end with a shared secret key - - -Minimum required technical skill level to see this feature: 3 - - -### Enable Voting Tools - -Provide a class of post which others can vote on - - -Minimum required technical skill level to see this feature: 3 - - -### Disable Comments - -Provide the option to disable comments for a post - - -Minimum required technical skill level to see this feature: 2 - - -### Delayed Posting - -Allow posts to be published at a later date - - -Minimum required technical skill level to see this feature: 2 - - -### Content Expiration - -Remove posts/comments and/or private messages at a future time - - -Minimum required technical skill level to see this feature: 1 - - -### Suppress Duplicate Posts/Comments - -Prevent posts with identical content to be published -with less than two minutes in between submissions. - - -Minimum required technical skill level to see this feature: 1 diff --git a/doc/feature/additional/filtering.md b/doc/feature/additional/filtering.md deleted file mode 100644 index ba8e1e29f..000000000 --- a/doc/feature/additional/filtering.md +++ /dev/null @@ -1,57 +0,0 @@ -## Network and Stream Filtering - - -### Search by Date - -Ability to select posts by date ranges - - -Minimum required technical skill level to see this feature: 1 - - -### Saved Searches - -Save search terms for re-use - - -Minimum required technical skill level to see this feature: 2 - - -### Network Personal Tab - -Enable tab to display only Network posts that you've interacted on - - -Minimum required technical skill level to see this feature: 1 - - -### Network New Tab - -Enable tab to display all new Network activity - - -Minimum required technical skill level to see this feature: 2 - - -### Affinity Tool - -Filter stream activity by depth of relationships - - -Minimum required technical skill level to see this feature: 1 - - -### Suggest Channels - -Show friend and connection suggestions - - -Minimum required technical skill level to see this feature: 1 - - -### Connection Filtering - -Filter incoming posts from connections based on keywords/content - - -Minimum required technical skill level to see this feature: 3 diff --git a/doc/feature/additional/general.md b/doc/feature/additional/general.md deleted file mode 100644 index a1b712b12..000000000 --- a/doc/feature/additional/general.md +++ /dev/null @@ -1,130 +0,0 @@ -## General Features - - -### New Member Links - -Display new member quick links menu. - - -Minimum required technical skill level to see this feature: 1 - - -### Advanced Profiles - -Additional profile sections and selections - - -Minimum required technical skill level to see this feature: 1 - - -### Profile Import/Export - -Save and load profile details across sites/channels - - -Minimum required technical skill level to see this feature: 3 - - -### Web Pages - -Provide managed web pages on your channel - - -Minimum required technical skill level to see this feature: 3 - - -### Wiki - -Provide a wiki for your channel - - -Minimum required technical skill level to see this feature: 2 - - -### Private Notes - -Enables a tool to store notes and reminders (note: not encrypted) - - -Minimum required technical skill level to see this feature: 1 - - -### Cards - -Create personal planning cards - - -Minimum required technical skill level to see this feature: 1 - - -### Articles - -Create interactive articles - - -Minimum required technical skill level to see this feature: 1 - - -### Navigation Channel Select - -Change channels directly from within the navigation dropdown menu - - -Minimum required technical skill level to see this feature: 3 - - -### Photo Location - -If location data is available on uploaded photos, link this to a map. - - -Minimum required technical skill level to see this feature: 2 - - -### Access Controlled Chatrooms - -Provide chatrooms and chat services with access control. - - -Minimum required technical skill level to see this feature: 1 - - -### Smart Birthdays - -Make birthday events timezone aware in case your friends are scattered across the planet. - - -Minimum required technical skill level to see this feature: 2 - - -### Event Timezone Selection - -Allow event creation in timezones other than your own. - - -Minimum required technical skill level to see this feature: 2 - - -### Premium Channel - -Allows you to set restrictions and terms -on those that connect with your channel - - -Minimum required technical skill level to see this feature: 4 - - -### Advanced Directory Search - -Allows creation of complex directory search queries - - -Minimum required technical skill level to see this feature: 4 - - -### Advanced Theme and Layout Settings - -Allows fine tuning of themes and page layouts - - -Minimum required technical skill level to see this feature: 4 diff --git a/doc/feature/additional/overview.md b/doc/feature/additional/overview.md deleted file mode 100644 index b51f60bcd..000000000 --- a/doc/feature/additional/overview.md +++ /dev/null @@ -1,33 +0,0 @@ -[chset]: /settings "Channel Settings" -[ftset]: /settings/features "Additional Features Settings" -[ftgen]: /help/feature/additional/general "General Features" -[ftacc]: /help/feature/additional/access "Access Control and Permissions" -[ftcom]: /help/feature/additional/composition "Post Composition Features" -[ftfil]: /help/feature/additional/filtering "Network and Stream Filtering" -[ftpos]: /help/feature/additional/posts "Post/Comment Tools" - - -# Additional Features - - - - - -You can switch the features on and off from the -[Additional Features][ftset] link in the [Channel Settings][chset]. - - - -The following pages decribe all the available features -grouped in the same way as they are with the accordion tabs on the -[Additional Features][ftset] settings page: - -[General Features][ftgen] - -[Access Control and Permissions][ftacc] - -[Post Composition Features][ftcom] - -[Network and Stream Filtering][ftfil] - -[Post/Comment Tools][ftpos] diff --git a/doc/feature/additional/posts.md b/doc/feature/additional/posts.md deleted file mode 100644 index d3f6b37db..000000000 --- a/doc/feature/additional/posts.md +++ /dev/null @@ -1,57 +0,0 @@ -## Post/Comment Tools - - -### Community Tagging - -Ability to tag existing posts - - -Minimum required technical skill level to see this feature: 1 - - -### Post Categories - -Add categories to your posts - - -Minimum required technical skill level to see this feature: 1 - - -### Emoji Reactions - -Add emoji reaction ability to posts - - -Minimum required technical skill level to see this feature: 1 - - -### Saved Folders - -Ability to file posts under folders - - -Minimum required technical skill level to see this feature: 2 - - -### Dislike Posts - -Ability to dislike posts/comments - - -Minimum required technical skill level to see this feature: 1 - - -### Star Posts - -Ability to mark special posts with a star indicator - - -Minimum required technical skill level to see this feature: 1 - - -### Tag Cloud - -Provide a personal tag cloud on your channel page - - -Minimum required technical skill level to see this feature: 2 diff --git a/doc/federate.bb b/doc/federate.bb deleted file mode 100644 index 9137ec160..000000000 --- a/doc/federate.bb +++ /dev/null @@ -1,71 +0,0 @@ -[h2]Creating protocol federation services[/h2] - -There are three main components to writing federation plugins. These are: - -[1] Channel discovery and making connections -[2] Sending posts/messages -[3] Receiving posts/messages - -In addition, federation drivers must handle - -[4] differences in privacy policies (and content formats) - - -[h3]Making connections[/h3] - -The core application provides channel discovery in the following sequence: - -[1] Zot channel discovery -[2] Webfinger (channel@hub) lookup - [2.1] RFC7033 webfinger - [2.2] XRD based webfinger (old style) -[3] URL discovery (currently only used to discover RSS feeds) -[4] If all of these fail, the network is "unknown" and we are unable to communicate with or connect with the channel. An 'xchan' record [i]may[/i] still be created [b]if[/b] there is enough information known to identify a unique channel. - -Any of the lookup services may be bound to a plugin and extended. When a channel is discovered, we create an 'xchan' record which is a platform neutral representation of the channel identity. If we need to send information to the channel, a 'hubloc' (hub location) record is also generally required. A 'follow' plugin hook is provided to bypass webfinger and this discovery sequence completely. - -The final step in gluing this together is to create an 'abook' record, which attaches an xchan in a relationship to a local channel with a given set of permissions. - -For networks which do not support nomadic identity, your plugin must also set "abook_instance" which is a comma-separated list of local URLs that the remote channel is connected with. For instance if your member was connected to my channel clone at https://example.com, the abook_instance for that connection would read 'https://example.com'. If you also connected to my clone at https://abc.example.com, the string would be changed to 'https://example.com,https://abc.example.com'. This allows local channels to differentiate which instance a given remote channel is connected with and avoid delivery failures to those channels from other clone instances. - -A federation plugin for a webfinger based system needs only to examine the webfinger or XRD results and identify a protocol stack which can be used to connect or communicate. Then create an xchan record with the given 'xchan_network' type and a hubloc record with the same 'hubloc_network' with the information given. Currently the plugin will need to create the entire record, but in the future this will be extended so that the plugin only need identify a network name and the record will be populated with all other known values. - -An xchan record is always required in order to connect. To connect, create an abook record with the desired permissions. - -Additional information that your plugin requires for communication can be stored in the xconfig table and/or abconfig table if there is no convenient or appropriate table column in the xchan or hubloc tables. - -When a connection is made, we generally call the notifier (include/notifier.php) to send a message to the remote channel. This is bound to the hook 'permissions_create'. Your plugin will need to handle this in order to send a "follow" or "make friends" message to the other network. - -Notes: The first stage zot lookup will be replaced with a webfinger lookup. This work is in progress. A separate lookup was required initially as webfinger does not allow non-SSL connections. We will provide non-SSL zot lookups (usually test and development sites) via the "old" XRD based webfinger to avoid this limitation. - -The core application will attempt to create xchan records for projects identified as members of the "open web"; currently Hubzilla, Friendica, Diaspora, GNU-Social and Pump.io. This is so that comments can be passed amongst project sites and the network correctly identified. A federation plugin is required to fully federate with other networks, but comments may be passed to sites without such a plugin installed so that there are no unexplained holes in conversations. - -The core application must also provide signing ability for Diaspora comments since they require a special signing format and must be signed by the comment author regardless of whether that channel federates with Diaspora. The owner of the conversation may federate with Diaspora so the comments must be signed. This is unfortunate but necessary. - - -[h3]Sending Messages[/h3] - -Whenever any message is sent (with the sole exception of directory communications), we invoke the notifier (include/notifier.php), and pass it the type of message and generally an identifier to lookup the information being sent from the database (items or conversational things, private mail, permissions updates, etc.). - -The notifier has several hooks which may be used by plugins in different ways, depending on how their delivery loop works. For different message types and complex delivery situations you may need to tie into multiple hooks. The 'permissions_create' hook was mentioned in the first section. There is also a 'permissions_update' message if permissions have changed and the other end of the link needs to be advised. Few services will provide or handle this (as their permissions are static), but it is also used for instance to send profile and profile photo update messages and you may wish to handle this. - -The next plugin hook is 'notifier_process'. It is passed an array providing the complete state of the notifier and is called once per notifier invocation. It contains the complete list of recipients (with xchan_network set for each). - -There is also 'notifier_hub' which like 'notifier_process' is passed the complete state of the notifier, but the difference is that it is called for each individual hub or distinct URL delivery and may be matched on the hubloc_network type. Hub delivery is much more efficient than recipient delivery but may not be suitable for all protocol stacks. - - -Your plugin will be required to understand the message state and recipients and translate the sent item to the desired format. You will also be required to check privacy and block communication to anybody but the intended recipients - *if* it is a private communication. The plugin will often at this point stick the message into the queue and return the queue id to the notifier. - - -Queue handlers exist already for simple posted data. If you create a queue entry with 'post' type we'll open an HTTP POST request and post the data provided and acknowledge success or failure. You can create other forms of communication by providing a different outq_driver type and handling the processing of queue requests yourself. Delivery reporting is available if you wish to acknowledge different error conditions, or anything beyond success/failure. Advanced delivery reporting will also require a custom queue type. The basic 'post' type only deals with success (communication successful with the remote site) and failure. - - - -[h3]Receiving Messages[/h3] - - -Receiving messages from the remote network will probably require a 'receive' endpoint or module dedicated to your network communication protocol. This is a URL route that your plugin may need to register with the'module_loaded' hook. You module will then take responsibility for importing any data which arrives at that endpoint and translating it to the format required for this project and storing the resulting data. The basic structure we use is an extensible activitystream item but with slightly different field names and several optional fields. It can be easily mapped to an activitystream. Additional data can be stored in the "iconfig" table. item_store() and item_store_update() are generally used to store the data and send appropriate notifications. Similiar facilities are available for private mail and profile information. - - - - diff --git a/doc/filesync.md b/doc/filesync.md deleted file mode 100644 index 4c64bdb09..000000000 --- a/doc/filesync.md +++ /dev/null @@ -1,61 +0,0 @@ -File Sync and Clone -=================== - - - -File cloning across multiple instances of a channel is a very hard problem, due to the nature of PHP memory allocation. This needs to be handled dramatically differently than cloning or syncing of other information. (Processing one large video file or 40-50 photos could exhaust memory). Therefore we can't easily just dump all the data to a dump file and sequentially process it. Loading the dump file itself is likely to exhaust memory. - -There are also two primary operations we are considering. The first is the hardest - saving and then importing all your channel information into a new channel clone. The second is synchronising file changes as they occur across two or more "active" clones. - -For the first cut at this tool we will concentrate on the second case, while trying to maintain some measure of compatibility with the first case so that we can re-use the same tools. - -Meta Data -========= - - -First we need the metadata for the file in order to precisely re-construct its structure on another site. This requires the following information: - -'attach' structure (without file contents - which is the default) for the file itself **and** its parent directories so that we can re-create its precise place in the file system, since we do not know if the parent directory has been imported previously or ever. - -'photo' structure for any photo elements which were created as a result of uploading this file into the system. This typically contains several different 'scales' or thumbnail images, some of which may be cropped for profile photo use or cover photo use. We need to retain the cropping information which is not present in the metadata, but only in the stored data. The actual thumbnail image data may or may not be included in the metadata. A cover photo of large scale (scale #7) could potentially cause memory issues. Not as bad as a 100M video, but if you have several of these they could add up. - -'item' entries which are linked to this file. These can be file share activities, the "parent item" linked to photos, and any attached conversation items (photo likes, comments, etc.) - -All of these items will require URL replacement and re-signing of the item as they are relocated to another site. - - -File Data -========= - -Then we have the actual file data we need to reconstruct the file. This needs to be stored separately from the meta-data to avoid memory exhaustion when processing. The actual file data can be used to reconstruct the attach structure and the first four photo scales. If this is a photo, we need access to the "#4 scale" (profile photo) and the #7 scale (cover photo) as they were originally cropped. All other thumbnails can be generated from these. - - - -File Sync -========= - - -We will consider this operation first because it is probably the most straightforward to implement. When a photo is added to or removed or changed from the source system, we will send a clone sync packet to all known clones containing the metadata - but **no file data** . We can only send one sync packet per file operation that needs to be synced. - -The receiving end will create and perform URL translation on all the metadata structures and store them. Then it will need to fetch the actual data. Assuming CURL supports streaming, an authenticated request is sent to the original site and the original file is requested and streamed directly to disk (bypassing all processing). If photo scale #4 or scale #7 is required, these are requested and stored into their respective structures. We're assuming in this case that the cover photo large scale will not exhaust memory. If CURL cannot be made to support streaming, request packets need to be queued and sent to the origination site to obtain "chunks" of the file and re-assembled once all chunks have been retrieved. - -The authenticated request depends on the mechanism. For CURL streaming, some signed secret with a timestamp will probably need to be generated and posted to the file origination site. Then the data can be retrieved with minimal internal processing and dumped directly to disk using stdio buffering. In the case of a zot request, the zot request packet will be validated, however scheduling chunk batches and re-assembling them could be tricky. - - -File Backup/Restore -=================== - -This is much more complicated as we do not have an authenticate web server to request data from. The metadata can be mostly the same, but we need some form of signalling that we will not be fetching the file via the web. This will likely require a client side process to parse each metadata file and locate a file on disk which it is associated with. Then the data would need to be streamed to the destination server with a special endpoint designed for this task. A java app might be the best option here to retain platform neutrality. - -Another option would be to use WebDAV for this step. The metadata files would be uploaded first, and then the data files. If a data file corresponded to an existing metadata file, the metadata would be processed; the file stored appropriately, and the metadata file then removed. In this case, photos of scales 4 and 7 would need to be provided in the metadata. - - -Optionally, this step could also be performed with a filesystem local to the destination server. This would be the highest performance, and a suite of shell-based tools (in the case of Linux) could perform the "client-side" of the task. - -The complexity of this task mandates careful planning into how the data is organised and stored and if necessary backed up remotely or transmitted for backup by the source website. - - -Backward Compatibility -====================== - -There are some obvious issues with making data available for backup or cloning which existed on the system prior to the existence of restore/sync tools. To keep the tools themselves relatively uncomplicated (to the extent possible given the constraints) backward compatibility may have to be preformed by dedicated plugin or addon. \ No newline at end of file diff --git a/doc/first-post.bb b/doc/first-post.bb deleted file mode 100644 index cf6ed5b49..000000000 --- a/doc/first-post.bb +++ /dev/null @@ -1,3 +0,0 @@ -[size=large]Your first posting[/size] - -... to be written ... diff --git a/doc/gdpr1.md b/doc/gdpr1.md deleted file mode 100644 index daa401a3d..000000000 --- a/doc/gdpr1.md +++ /dev/null @@ -1,114 +0,0 @@ - -Privacy Notice May 2018 - -How your information will be used -================================= - -Information you provide to this website may be stored and used to provide services to you. - -We require an email address to idenitfy the account holder. This will not be shared with -any other website or service. It is used to send you notifications about your account and -perform administrative tasks such as resetting your password. You have the option to -opt-out of all email notifications through your settings. - -Communication channels created on this website require a name and a photo or avatar. A -default avatar will be chosen if you do not supply one. The name, avatar, and a link to -the channel webpage will be shared with other servers and services in order to refer to -this identity. The name does not need to be your real name and the photo or avatar does -not need to resemble you. - -All other information you supply to this website is optional. - -As a social communication and cloud storage service, you will usually be using this website -to share information with others. We provide a range of privacy options to allow you to -restrict this sharing to only those you choose. - - -Processing of your information -============================== - -Our processing of your information is limited to storing it for you to use. We MAY keep logs -of activity to help diagnose software issues and to maintain security of the system against -intrusion. These logs are routinely deleted after a few days. - -We MAY (if you have provided this permission) try to suggest frendships or connections based -on analysing publicly available information about your connections. This is currently the most -advanced data "processing" performed at this website. You may restrict access to this information -if this processing is undesired. - -If supplied, we MAY use your gender to formulate text messages in your native language, for -instance "Bob commented on HIS post." - -In all other cases, your data is stored under your desired privacy policy and to the best -of our ability is only shared with those who you have elected to share it with. - -We do not share your private information with third parties or analyse your behaviour or personal -characteristics. We have no advertisements or business relationships with advertisers. - -We MAY be asked or forced to divulge information provided by you in response to legitimate -criminal and legal proceedings. Where possible we will notify you if this happens. - - -Access to your information -========================== - -Some communications are shared with other websites. Those using the same software will usually -have similar privacy policies. - - -You may be shown embedded videos and provided links to visit other websites as part of your -day-to-day activities using this website. This MAY expose you to monitoring by external services, such -as (but not limited to) Facebook, Twitter, and Google. Each website operator is allowed to configure -whether or not embedded content is permitted. - -Further access to your personal data and stored files is under your control. - -Our storage of your data is provided under your implied consent through your continued use of -the service. You may withdraw this consent at any time and on account deletion we will remove -all data which belongs to you. The process of deletion may take several days as we also make a good faith -effort to delete it from any internetworked websites that have been provided a copy. - - -All data and files stored for a communications channel are available for you to -download for either archival puposes or to transfer to another compatible website. - - - -Your rights -=========== - -Under the General Data Protection Regulation -(GDPR) and The Data Protection Act 2018 -(DPA) you have a number of rights with regard to your personal data. -You have the right to request from us access to and rectification or erasure of your personal data, -the right to restrict processing, object to processing as well as in certain circumstances the right -to data portability. - -If you have provided consent for the processing of your data you have the right (in certain -circumstances) to withdraw that consent at any time which will not affect the lawfulness of -the processing before your consent was withdrawn. - -You have the right to lodge a complaint to the Information Commissioners’ Office if you -believe that we have not complied with the requirements of the GDPR or DPA 18 with regard -to your personal data. - -Identity and contact details of controller and data protection officer - -[NAME OF COMPANY] -is the controller -[and processor] -of data for the purposes of the DPA 18 and GDPR. 3 - -If you have any concerns as to how your data is processed you can contact: - -[ -[NAME] -Data Protection Offer at -[EMAIL ADDRESS] -] -[NAME] [JOB TITLE] -at -[EMAIL ADDRESS] -or you can write to these -individuals using the address of -[] diff --git a/doc/general.bb b/doc/general.bb deleted file mode 100644 index 0b80db756..000000000 --- a/doc/general.bb +++ /dev/null @@ -1,18 +0,0 @@ -[h2]Project and site information[/h2] -[h3]$Projectname[/h3] -[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl] -[zrl=[baseurl]/help/project/governance]Project Governance[/zrl] -[zrl=[baseurl]/help/contributor/convenant]Project Covenant and Code of Conduct[/zrl] - -[h3]External resources[/h3] -[zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl] -[url=https://framagit.org/hubzilla/core/]Main Website[/url] -[url=https://framagit.org/hubzilla/addons]Addon Website[/url] -[url=[baseurl]/help/credits]$Projectname Credits[/url] -[h3]About this $Projectname hub[/h3] -[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl] -[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl] -[zrl=[baseurl]/siteinfo/json]Detailed Technical Hub Information in JSON format(/siteinfo/json)[/zrl] - -#include doc/macros/main_footer.bb; - diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb deleted file mode 100644 index 5fba17439..000000000 --- a/doc/git_for_non_developers.bb +++ /dev/null @@ -1,71 +0,0 @@ -[b]Git For Non-Developers[/b] - -So you're handling a translation, or you're contributing to a theme, and every time you make a pull request you have to talk to one of the developers before your changes can be merged in? - -Chances are, you just haven't found a quick how-to explaining how to keep things in sync on your end. It's really very easy. - -After you've created a fork of the repo (just click "fork" at github), you need to clone your own copy. - -For the sake of examples, we'll assume you're working on a theme called redexample (which does not exist). - -[code]git clone https://github.com/username/red.git[/code] - -Once you've done that, cd into the directory, and add an upstream. - -[code] -cd red -git remote add upstream https://framagit.org/hubzilla/core/ -[/code] - -From now on, you can pull upstream changes with the command -[code]git fetch upstream[/code] - -Before your changes can be merged automatically, you will often need to merge upstream changes. - -[code] -git merge upstream/master -[/code] - -You should always merge upstream before pushing any changes, and [i]must[/i] merge upstream with any pull requests to make them automatically mergeable. - -99% of the time, this will all go well. The only time it won't is if somebody else has been editing the same files as you - and often, only if they have been editing the same lines of the same files. If that happens, that would be a good time to request help until you get the hang of handling your own merge conflicts. - -Then you just need to add your changes [code]git add view/theme/redexample/[/code] - -This will add all the files in view/theme/redexample and any subdirectories. If your particular files are mixed throughout the code, you should add one at a time. Try not to do git add -a, as this will add everything, including temporary files (we mostly, but not always catch those with a .gitignore) and any local changes you have, but did not intend to commit. - -Once you have added all the files you have changed, you need to commit them. [code]git commit[/code] - -This will open up an editor where you can describe the changes you have made. Save this file, and exit the editor. - -Finally, push the changes to your own git -[code]git push[/code] - -And that's it, your repo is up to date! - -All you need to do now is actually create the pull request. There are two ways to do this. - -The easy way, if you're using Github is to simply click the green button at the top of your own copy of the repository, enter a description of the changes, and click 'create pull request'. The -main repository, themes, and addons all have their main branch at Github, so this method can be used most of the time. - -Most people can stop here. - -Some projects in the extended RedMatrix ecosphere have no Github presence, to pull request these is a bit different - you'll have to create your pull request manually. Fortunately, this isn't -much harder. - -[code]git request-pull -p [/code] - -Start is the name of a commit to start at. This must exist upstream. Normally, you just want master. - -URL is the URL of [i]your[/i] repo. - -One can also specify . This defaults to HEAD. - -Example: -[code] -git request-pull master https://example.com/project -[/code] - -And simply send the output to the project maintainer. - -#include doc/macros/main_footer.bb; diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb deleted file mode 100644 index 4eac1aa6e..000000000 --- a/doc/hidden_configs.bb +++ /dev/null @@ -1,127 +0,0 @@ -[h1]Advanced Configurations for Administrators[/h1] - -[i]This document assumes you're an administrator.[/i] - -$Projectname contains many configuration options hidden from the main admin panel. These are generally options considered too niche, advanced or prone do confusion. - -These settings can be modified through the shell, from the the top level web directory, with the syntax: - -[code]util/config cat key value[/code] -for a site configuration, or - -[code]util/pconfig channel_id cat key value[/code] -for a member configuration. - -For a site configuration, another option is to add a line to .htconfig.php, with the syntax: -[code]App::$config['cat']['key'] = 'value';[/code] - - -[h2]Member configuration (pconfig)[/h2] - -[dl terms="mb"] - [*= system.always_my_theme ] Always use your own theme when viewing channels on the same hub. This will break in some quite imaginative ways when viewing channels with theme dependent Comanche. - [*= system.blocked ] An array of xchans blocked by this channel. Technically, this is a hidden config and does belong here, however, addons (notably superblock) have made this available in the UI. - [*= system.default_cipher ] Set the default cipher used for E2EE items. - [*= system.display_friend_count ] Set the number of connections to display in the connections profile widget. - [*= system.do_not_track ] As the browser header. This will break many identity based features. You should really just set permissions that make sense. - [*= system.forcepublicuploads ] Force uploaded photos to be public when uploaded as wall items. It makes far more sense to just set your permissions properly in the first place. Do that instead. - [*= system.network_page_default ] Set default params when viewing the network page. This should contain the same querystring as manual filtering. - [*= system.paranoia ] Sets the security level of IP checking. If the IP address of a logged-in session changes apply this level to determine if the account should be logged out as a security breach. -Options are: - 0 — no IP checking - 1 — check 3 octets - 2 — check 2 octets - 3 — check for any difference at all - - [*= system.prevent_tag_hijacking ] Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources. - [*= system.startpage ] Another of those technically hidden configs made available by addons. Sets the default page to view when logging in. This is exposed to the UI by the startpage addon. - [*= system.taganyone ] Requires the config of the same name to be enabled. Allow the @mention tagging of anyone, whether you are connected or not. This doesn't scale. - [*= system.anonymous_comments ] By default or if set to 1, custom permissions can be set to allow anonymous (moderated) comments like WordPress, moderated by the channel owner. If set to 0, no member of your site can select or enable this. - [*= system.user_scalable ] Determine if the app is scalable on touch screens. Defaults to on, to disable, set to zero - real zero, not just false. -[/dl] - -[h2]Site configuration[/h2] - -[dl terms="mb"] - [*= randprofile.check ] When requesting a random profile, check that it actually exists first - [*= randprofile.retry ] Number of times to retry getting a random profile - [*= system.admin_email ] Specifies the administrator's email for this site. This is initially set during install. - [*= system.authlog ] Logfile to use for logging auth errors. Used to plug in to server side software such as fail2ban. Auth failures are still logged to the main logs as well. - [*= system.auto_channel_create ] Add the necessary form elements to create the first channel on the account registration page, and create it (possibly following email validation or administrator approval). This precludes the ability to import a channel from another site as the first channel created on this site for a new account. Use with system.default_permissions_role to streamline registration. - [*= system.auto_follow ] Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses). - [*= system.blacklisted_sites ] An array of specific hubs to block from this hub completely. - [*= system.block_public_search ] Similar to block_public, except only blocks public access to search features. Useful for sites that want to be public, but keep getting hammered by search engines. - [*= system.cron_hour ] Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC. - [*= system.default_permissions_role ] If set to a valid permissions role name, use that role for the first channel created by a new account and don't ask for the "Channel Type" on the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', 'forum', 'forum_restricted' and 'forum_private'. Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl]. - [*= system.default_profile_photo ] Set the profile photo that new channels start with. This should contain the name of a directory located under [font=courier]images/default_profile_photos/[/font], or be left unset. If not set then 'rainbow_man' is assumed. - [*= system.directorytags ] Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a positive integer. - [*= system.disable_directory_keywords ] If '1', do not show directory keywords. If the hub is a directory server, prevent returning tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm. - [*= system.disable_discover_tab ] This allows you to completely disable the ability to discover public content from external sites. - [*= system.disable_dreport ] If '1', don't store or link to delivery reports - [*= system.dlogfile ] Logfile to use for logging development errors. Exactly the same as logger otherwise. This isn't magic, and requires your own logging statements. Developer tool. - [*= system.email_notify_icon_url ] URL of image (32x32) to display in email notifications (HTML bodies). - [*= system.expire_delivery_reports ] Expiration in days for delivery reports - default 10 - [*= system.expire_limit ] Don't expire any more than this number of posts per channel per expiration run to keep from exhausting memory. Default 5000. - [*= system.photo_storage_type] If '1', use filesystem instead SQL database to store thumbnails. Default is '0'. Introduced in 4.2 - [*= system.hidden_version_siteinfo ] If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages). - [*= system.hide_help ] Don't display help documentation link in nav bar - [*= system.hide_in_statistics ] Tell the red statistics servers to completely hide this hub in hub lists. - [*= system.hide_version ] If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php - [*= system.ignore_imagick ] Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick. - [*= system.max_daily_registrations ] Set the maximum number of new registrations allowed on any day. Useful to prevent oversubscription after a bout of publicity for the project. - [*= system.max_import_size ] If configured, the maximum length of an imported text message. This is normally left at 200Kbytes or more to accomodate Friendica private photos, which are embedded. - [*= system.max_tagged_forums ] Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery. - [*= system.minimum_feedcheck_minutes ] The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'. - [*= system.no_age_restriction ] Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing. - [*= system.object_cache_days] Set how long is cached embedded content can be used without refetching. Default is 30 days. - [*= system.openssl_conf_file ] Specify a file containing OpenSSL configuration. Needed in some Windows installations to locate the openssl configuration file on the system. Read the code first. If you can't read the code, don't play with it. - [*= system.openssl_encrypt ] Use openssl encryption engine, default is false (uses mcrypt for AES encryption) - [*= system.optimize_items ] Runs optimise_table during some tasks to keep your database nice and defragmented. This comes at a performance cost while the operations are running, but also keeps things a bit faster while it's not. There also exist CLI utilities for performing this operation, which you may prefer, especially if you're a large site. - [*= system.override_poll_lockfile ] Ignore the lock file in the poller process to allow more than one process to run at a time. - [*= system.paranoia ] As the pconfig, but on a site-wide basis. Can be overwritten by member settings. - [*= system.pin_types ] Array of allowed item types for pinning. Defaults depend on module but can be redifined here. - [*= system.photo_cache_time ] How long to cache photos, in seconds. Default is 86400 (1 day). Longer time increases performance, but it also means it takes longer for changed permissions to apply. - [*= system.platform_name ] What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php - [*= system.rating_enabled ] Distributed reputation reporting and data collection. This feature is currently being re-worked. - [*= system.poke_basic ] Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs. - [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well. - [*= system.projecthome ] Display the project page on your home page for logged out viewers. - [*= system.projecthome ] Set the project homepage as the homepage of your hub. (Obsolete) - [*= system.pubstream_ordering ] Set pubstream ordering. Possible values 'commented' (default), 'created' and 'edited'. - [*= system.register_link ] path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever. - [*= system.reserved_channels ] Don't allow members to register channels with this comma separated list of names (no spaces) - [*= system.sellpage ] A URL shown in the public sites list to sell your hub - display service classes, etc. - [*= system.startpage ] Set the default page to be taken to after a login for all channels at this website. Can be overwritten by user settings. - [*= system.sys_expire_days ] How many days to keep discovered public content from other sites - [*= system.taganyone ] Allow the @mention tagging of anyone whether you are connected or not. - [*= system.tempdir ] Place to store temporary files (currently unused), default is defined in the PHP configuration. - [*= system.tos_url ] Set an alternative link for the ToS location. - [*= system.transport_security_header ] if non-zero and SSL is being used, include a strict-transport-security header on webpages - [*= system.uploaddir ] Location to upload files (default is system.tempdir, currently used only by js_upload plugin) - [*= system.workflow_channel_next ] The page to direct new members to immediately after creating a channel. - [*= system.workflow_register_next ] The page to direct members to immediately after creating an account (only when auto_channel_create or UNO is enabled). -[/dl] - - -[h3]Directory config[/h3] - -[h4]Directory search defaults[/h4] - -[dl terms="mb"] - [*= directory.globaldir ] 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network. - [*= directory.pubforums ] 0 or 1. Public forums [i]should[/i] be default 0. - [*= directory.safemode ] 0 or 1. -[/dl] - -[h4]Directory server configuration[/h4][i](see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/i] - -[dl terms="mb"] - [*= system.directory_mode ] - [*= system.directory_primary ] - [*= system.directory_realm ] - [*= system.directory_server ] - [*= system.realm_token ] -[/dl] - -#include doc/macros/main_footer.bb; - diff --git a/doc/hook/about_hook.bb b/doc/hook/about_hook.bb deleted file mode 100644 index 22b60d786..000000000 --- a/doc/hook/about_hook.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]about_hook[/h2] diff --git a/doc/hook/accept_follow.bb b/doc/hook/accept_follow.bb deleted file mode 100644 index e8b1ed0c4..000000000 --- a/doc/hook/accept_follow.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]accept_follow[/h2] diff --git a/doc/hook/account_downgrade.bb b/doc/hook/account_downgrade.bb deleted file mode 100644 index 63bae0a58..000000000 --- a/doc/hook/account_downgrade.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]account_downgrade[/h2] diff --git a/doc/hook/account_settings.bb b/doc/hook/account_settings.bb deleted file mode 100644 index 91b3a8385..000000000 --- a/doc/hook/account_settings.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]account_settings[/h2] diff --git a/doc/hook/account_settings_post.bb b/doc/hook/account_settings_post.bb deleted file mode 100644 index bbd7a57a8..000000000 --- a/doc/hook/account_settings_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]account_settings_post[/h2] diff --git a/doc/hook/activity_decode_mapper.bb b/doc/hook/activity_decode_mapper.bb deleted file mode 100644 index 43d08a136..000000000 --- a/doc/hook/activity_decode_mapper.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_decode_mapper[/h2] diff --git a/doc/hook/activity_filter.bb b/doc/hook/activity_filter.bb deleted file mode 100644 index 9d0768577..000000000 --- a/doc/hook/activity_filter.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_filter[/h2] diff --git a/doc/hook/activity_mapper.bb b/doc/hook/activity_mapper.bb deleted file mode 100644 index db65fadc4..000000000 --- a/doc/hook/activity_mapper.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_mapper[/h2] diff --git a/doc/hook/activity_obj_decode_mapper.bb b/doc/hook/activity_obj_decode_mapper.bb deleted file mode 100644 index a96b32eee..000000000 --- a/doc/hook/activity_obj_decode_mapper.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_obj_decode_mapper[/h2] diff --git a/doc/hook/activity_obj_mapper.bb b/doc/hook/activity_obj_mapper.bb deleted file mode 100644 index 7c14a1b81..000000000 --- a/doc/hook/activity_obj_mapper.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_obj_mapper[/h2] diff --git a/doc/hook/activity_order.bb b/doc/hook/activity_order.bb deleted file mode 100644 index 4a4670d03..000000000 --- a/doc/hook/activity_order.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_order[/h2] diff --git a/doc/hook/activity_received.bb b/doc/hook/activity_received.bb deleted file mode 100644 index 2e9d68bf3..000000000 --- a/doc/hook/activity_received.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]activity_received[/h2] diff --git a/doc/hook/addon_app_installed_filter.bb b/doc/hook/addon_app_installed_filter.bb deleted file mode 100644 index e610b3205..000000000 --- a/doc/hook/addon_app_installed_filter.bb +++ /dev/null @@ -1,18 +0,0 @@ -[h2]addon_app_installed_filter[/h2] - -Allow plugins to filter the result of addon_app_installed. - -Code excerpt: - -[code] - $filter_arr = [ - 'uid'=>$uid, - 'app'=>$app, - 'installed'=>$r - ]; - call_hooks('addon_app_installed_filter',$filter_arr); - $r = $filter_arr['installed']; -[/code] - -cxref: Zotlabs/Lib/Apps.php - diff --git a/doc/hook/affinity_labels.bb b/doc/hook/affinity_labels.bb deleted file mode 100644 index 7234b7632..000000000 --- a/doc/hook/affinity_labels.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]affinity_labels[/h2] diff --git a/doc/hook/api_perm_is_allowed.bb b/doc/hook/api_perm_is_allowed.bb deleted file mode 100644 index 862cbd653..000000000 --- a/doc/hook/api_perm_is_allowed.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]api_perm_is_allowed[/h2] diff --git a/doc/hook/app_destroy.bb b/doc/hook/app_destroy.bb deleted file mode 100644 index 386d7af16..000000000 --- a/doc/hook/app_destroy.bb +++ /dev/null @@ -1,4 +0,0 @@ -[h2]app_destroy[/h2] - -Allows addons to perform some post delete actions. - diff --git a/doc/hook/app_installed_filter.bb b/doc/hook/app_installed_filter.bb deleted file mode 100644 index f0d91d6f0..000000000 --- a/doc/hook/app_installed_filter.bb +++ /dev/null @@ -1,17 +0,0 @@ -[h2]app_installed_filter[/h2] - -Allow plugins to filter the result of app_installed. - -Code excerpt: - -[code] - $filter_arr = [ - 'uid'=>$uid, - 'app'=>$app, - 'installed'=>$r - ]; - call_hooks('app_installed_filter',$filter_arr); - $r = $filter_arr['installed']; -[/code] - -cxref: Zotlabs/Lib/Apps.php diff --git a/doc/hook/atom_author.bb b/doc/hook/atom_author.bb deleted file mode 100644 index c9d05a593..000000000 --- a/doc/hook/atom_author.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]atom_author[/h2] diff --git a/doc/hook/atom_entry.bb b/doc/hook/atom_entry.bb deleted file mode 100644 index 0aec89f16..000000000 --- a/doc/hook/atom_entry.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]atom_entry[/h2] diff --git a/doc/hook/atom_feed.bb b/doc/hook/atom_feed.bb deleted file mode 100644 index 69775ca5e..000000000 --- a/doc/hook/atom_feed.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]atom_feed[/h2] diff --git a/doc/hook/atom_feed_end.bb b/doc/hook/atom_feed_end.bb deleted file mode 100644 index 4f019fc8f..000000000 --- a/doc/hook/atom_feed_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]atom_feed_end[/h2] diff --git a/doc/hook/attach_delete.bb b/doc/hook/attach_delete.bb deleted file mode 100644 index 3b63f28d3..000000000 --- a/doc/hook/attach_delete.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h2]attach_delete[/h2] - -Invoked when an attachment is deleted using attach_delete(). - -[code] -$arr = ['channel_id' => $channel_id, 'resource' => $resource, 'is_photo'=>$is_photo]; -call_hooks("attach_delete",$arr); -[/code] - - -See include/attach.php diff --git a/doc/hook/attach_upload_file.bb b/doc/hook/attach_upload_file.bb deleted file mode 100644 index 1f8056caa..000000000 --- a/doc/hook/attach_upload_file.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]attach_upload_file[/h2] diff --git a/doc/hook/authenticate.bb b/doc/hook/authenticate.bb deleted file mode 100644 index eb8071e73..000000000 --- a/doc/hook/authenticate.bb +++ /dev/null @@ -1,29 +0,0 @@ -[h2]authenticate[/h2] - -Invoked when a POST request is made with non-null $_POST['auth-params'] such as from the login form. -If the hook handler does not set the 'authenticated' parameter of the passed array, normal login functions continue; - -The 'user_record' is in fact an account DB record. To provide automatic provisioning of accounts from other authentication realms, this record should be generated and stored during the verification phase. - - -[code] - $addon_auth = array( - 'username' => trim($_POST['username']), - 'password' => trim($_POST['password']), - 'authenticated' => 0, - 'user_record' => null - ); - - /** - * - * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record - * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained - * and later plugins should not interfere with an earlier one that succeeded. - * - */ - - call_hooks('authenticate', $addon_auth); -[/code] - - -See include/auth.php diff --git a/doc/hook/author_is_pmable.bb b/doc/hook/author_is_pmable.bb deleted file mode 100644 index 11d1185f3..000000000 --- a/doc/hook/author_is_pmable.bb +++ /dev/null @@ -1,14 +0,0 @@ -[h2]author_is_pmable[/h2] - -Called from thread action menu before returning a 'send mail' link for the post author. Not all authors will be able to receive private mail, for instance those on other networks with incompatible mail systems. - -By default author_is_pmable() returns true for 'zot' xchans, and false for all others. - -The plugin is passed an array - - [ 'xchan' => $author_xchan, 'abook' => abook record, 'result' => 'unset' ] - -A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash. A value of false will disable the 'send mail' link. - - - diff --git a/doc/hook/bb2diaspora.bb b/doc/hook/bb2diaspora.bb deleted file mode 100644 index c28f1883e..000000000 --- a/doc/hook/bb2diaspora.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]bb2diaspora[/h2] diff --git a/doc/hook/bbcode.bb b/doc/hook/bbcode.bb deleted file mode 100644 index f6b8711b0..000000000 --- a/doc/hook/bbcode.bb +++ /dev/null @@ -1,6 +0,0 @@ -[h2]bbcode[/h2] - - -Called at end of bbcode to html conversion. - -Hook argument contains the converted text string. diff --git a/doc/hook/bbcode_filter.bb b/doc/hook/bbcode_filter.bb deleted file mode 100644 index efeb2e1b0..000000000 --- a/doc/hook/bbcode_filter.bb +++ /dev/null @@ -1,7 +0,0 @@ -[h2]bbcode_filter[/h2] - - -Called at beginning of bbcode to html conversion. - -Hook argument contains the text string to be converted. - diff --git a/doc/hook/build_pagehead.bb b/doc/hook/build_pagehead.bb deleted file mode 100644 index 8fc3486c7..000000000 --- a/doc/hook/build_pagehead.bb +++ /dev/null @@ -1,2 +0,0 @@ -[b]build_pagehead[/b] - diff --git a/doc/hook/can_comment_on_post.bb b/doc/hook/can_comment_on_post.bb deleted file mode 100644 index 2cfd3b2da..000000000 --- a/doc/hook/can_comment_on_post.bb +++ /dev/null @@ -1,13 +0,0 @@ -[h3]can_comment_on_post[/h3] - -Called when deciding whether or not to display a comment box for a post. - - -Hook data (array): - observer_hash => xchan_hash of current observer - item => posted item - allowed => 'unset' - - -To over-ride the default behaviour, change allowed to true or false - diff --git a/doc/hook/change_channel.bb b/doc/hook/change_channel.bb deleted file mode 100644 index 4514b9265..000000000 --- a/doc/hook/change_channel.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h2]change_channel[/h2] - -Called when entering a logged in state in a channel context (as opposed to an account context). -The hook array provides two arguments, 'channel_id' and 'chanx'. 'chanx' is a union of the channel -and xchan records for the now active channel. - -Use this to capture what would traditionally be known as 'login events'. In this platform, login is -a separate authentication activity and doesn't necessarily require "connecting to an identity", which -is what the change_channel activity represents. - - diff --git a/doc/hook/channel_links.bb b/doc/hook/channel_links.bb deleted file mode 100644 index c0243dac6..000000000 --- a/doc/hook/channel_links.bb +++ /dev/null @@ -1,12 +0,0 @@ -[h2]channel_links[/h2] - -Called when generating the Link HTTP header for the channel page. Different protocol stacks can add links to this header. - -Hook data = array - 'channel_address' => channel nickname, no checking is done to see if it is valid - 'channel_links' => array of channel links in the format - 'url' => url of resource - 'rel' => link relation - 'type' => MIME type - -All fields are required \ No newline at end of file diff --git a/doc/hook/channel_remove.bb b/doc/hook/channel_remove.bb deleted file mode 100644 index db9e9dd82..000000000 --- a/doc/hook/channel_remove.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]channel_remove[/h2] diff --git a/doc/hook/chat_message.bb b/doc/hook/chat_message.bb deleted file mode 100644 index ccc93bb2c..000000000 --- a/doc/hook/chat_message.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]chat_message[/h2] diff --git a/doc/hook/chat_post.bb b/doc/hook/chat_post.bb deleted file mode 100644 index 7cb3c9fa1..000000000 --- a/doc/hook/chat_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]chat_post[/h2] diff --git a/doc/hook/check_account_email.bb b/doc/hook/check_account_email.bb deleted file mode 100644 index b309706a0..000000000 --- a/doc/hook/check_account_email.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]check_account_email[/h2] diff --git a/doc/hook/check_account_invite.bb b/doc/hook/check_account_invite.bb deleted file mode 100644 index 8d4a40522..000000000 --- a/doc/hook/check_account_invite.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]check_account_invite[/h2] diff --git a/doc/hook/check_account_password.bb b/doc/hook/check_account_password.bb deleted file mode 100644 index ce5202f48..000000000 --- a/doc/hook/check_account_password.bb +++ /dev/null @@ -1,17 +0,0 @@ -[h2]check_account_password[/h2] -Use this hook to provide additional checks or validations of the password given when -registering and account. -[h3]Arguments:[/h3] -[code=php]array( - 'password' => $password, // The password to check - 'result' => array( - 'error' => false, - 'message' => '' - ) -)[/code] -[h3]Results:[/h3] -For a failed check set the [code]error[/code] member of the [code]result[/code] -array to [code]true[/code] and the [code]message[/code] to a short message -explaining why it failed. - -Otherwise, leave it alone. diff --git a/doc/hook/check_channelallowed.bb b/doc/hook/check_channelallowed.bb deleted file mode 100644 index e7559c92f..000000000 --- a/doc/hook/check_channelallowed.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h2]check_channelallowed[/h2] - -Called when checking the channel (xchan) black and white lists to see if a channel is blocked. - -Hook data - - array('hash' => xchan_hash of xchan to check); - - create and set array element 'allowed' to true or false to override the system checks - - diff --git a/doc/hook/check_siteallowed.bb b/doc/hook/check_siteallowed.bb deleted file mode 100644 index 28134cbd2..000000000 --- a/doc/hook/check_siteallowed.bb +++ /dev/null @@ -1,10 +0,0 @@ -[h2]check_siteallowed[/h2] - -Called when checking the site black and white lists to see if a site is blocked. - -Hook data - - array('url' => URL of site to check); - - create and set array element 'allowed' to true or false to override the system checks - diff --git a/doc/hook/collect_public_recipients.bb b/doc/hook/collect_public_recipients.bb deleted file mode 100644 index de3f4049e..000000000 --- a/doc/hook/collect_public_recipients.bb +++ /dev/null @@ -1,42 +0,0 @@ -[h2]collect_public_recipients[/h2] - -Replace the default list of public recipients (i.e., all contacts). - -Allow plugins to create a list of recipients for public messages instead of the default -of all channel connections. - -Called with the following array: - [ - 'recipients' => [], - 'item' => $item, - 'private_envelope' => $private_envelope, - 'include_groups' => $include_groups - ]; - -[code] - if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') { - - $hookinfo = [ - 'recipients' => [], - 'item' => $item, - 'private_envelope' => $private_envelope, - 'include_groups' => $include_groups - ]; - - call_hooks('collect_public_recipients',$hookinfo); - - if ($hookinfo['recipients']) { - $r = $hookinfo['recipients']; - } else { - $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 ", - intval($item['uid']) - ); - } - - if($r) { - - . . . - -[/code] - -see: include/item.php diff --git a/doc/hook/comments_are_now_closed.bb b/doc/hook/comments_are_now_closed.bb deleted file mode 100644 index 4d3baa95a..000000000 --- a/doc/hook/comments_are_now_closed.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h3]comments_are_now_closed[/h3] - -Called when deciding whether or not commenting is closed for an item. - - -Hook data (array): - item => posted item - closed => 'unset' - - -To over-ride the default behaviour, change closed to true or false diff --git a/doc/hook/connect_premium.bb b/doc/hook/connect_premium.bb deleted file mode 100644 index ae3aafc66..000000000 --- a/doc/hook/connect_premium.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]connect_premium[/h2] diff --git a/doc/hook/connection_remove.bb b/doc/hook/connection_remove.bb deleted file mode 100644 index bd13ae5f2..000000000 --- a/doc/hook/connection_remove.bb +++ /dev/null @@ -1,9 +0,0 @@ -[h3]connection_remove[/h3] - -Called when deleting a connection. - - -Passed parameter array: - - 'channel_id' => channel_id of the channel removing the connection - 'abook_id' => abook_id of the connection being removed diff --git a/doc/hook/connector_settings.bb b/doc/hook/connector_settings.bb deleted file mode 100644 index 9b59c49da..000000000 --- a/doc/hook/connector_settings.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]connector_settings[/h2] diff --git a/doc/hook/construct_page.bb b/doc/hook/construct_page.bb deleted file mode 100644 index 700d9256f..000000000 --- a/doc/hook/construct_page.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]construct_page[/h2] diff --git a/doc/hook/contact_block_end.bb b/doc/hook/contact_block_end.bb deleted file mode 100644 index 30a7d2d76..000000000 --- a/doc/hook/contact_block_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]contact_block_end[/h2] diff --git a/doc/hook/contact_edit.bb b/doc/hook/contact_edit.bb deleted file mode 100644 index 5fd31fb1d..000000000 --- a/doc/hook/contact_edit.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]contact_edit[/h2] diff --git a/doc/hook/contact_edit_post.bb b/doc/hook/contact_edit_post.bb deleted file mode 100644 index bc736f8b8..000000000 --- a/doc/hook/contact_edit_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]contact_edit_post[/h2] diff --git a/doc/hook/contact_select_options.bb b/doc/hook/contact_select_options.bb deleted file mode 100644 index 65f9154ff..000000000 --- a/doc/hook/contact_select_options.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]contact_select_options[/h2] diff --git a/doc/hook/content_security_policy.bb b/doc/hook/content_security_policy.bb deleted file mode 100644 index 96b8095ae..000000000 --- a/doc/hook/content_security_policy.bb +++ /dev/null @@ -1,39 +0,0 @@ -[h2]content_security_policy[/h2] - -Called to modify CSP settings prior to the output of the Content-Security-Policy header. - -This hook permits addons to modify the content-security-policy if necessary to allow loading of foreign js libraries or css styles. - -[code] -if(App::$config['system']['content_security_policy']) { - $cspsettings = Array ( - 'script-src' => Array ("'self'","'unsafe-inline'","'unsafe-eval'"), - 'style-src' => Array ("'self'","'unsafe-inline'") - ); - call_hooks('content_security_policy',$cspsettings); - - // Legitimate CSP directives (cxref: https://content-security-policy.com/) - $validcspdirectives=Array( - "default-src", "script-src", "style-src", - "img-src", "connect-src", "font-src", - "object-src", "media-src", 'frame-src', - 'sandbox', 'report-uri', 'child-src', - 'form-action', 'frame-ancestors', 'plugin-types' - ); - $cspheader = "Content-Security-Policy:"; - foreach ($cspsettings as $cspdirective => $csp) { - if (!in_array($cspdirective,$validcspdirectives)) { - logger("INVALID CSP DIRECTIVE: ".$cspdirective,LOGGER_DEBUG); - continue; - } - $cspsettingsarray=array_unique($cspsettings[$cspdirective]); - $cspsetpolicy = implode(' ',$cspsettingsarray); - if ($cspsetpolicy) { - $cspheader .= " ".$cspdirective." ".$cspsetpolicy.";"; - } - } - header($cspheader); -} -[/code] - -see: boot.php diff --git a/doc/hook/conversation_start.bb b/doc/hook/conversation_start.bb deleted file mode 100644 index 7208c8d8f..000000000 --- a/doc/hook/conversation_start.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]conversation_start[/h2] diff --git a/doc/hook/create_identity.bb b/doc/hook/create_identity.bb deleted file mode 100644 index 5c1da2d43..000000000 --- a/doc/hook/create_identity.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]create_identity[/h2] diff --git a/doc/hook/cron.bb b/doc/hook/cron.bb deleted file mode 100644 index 55120b6c2..000000000 --- a/doc/hook/cron.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]cron[/h2] - -Called when cron task (include/poller.php) is executed. The hook data is a string representing the current time (UTC). - - diff --git a/doc/hook/cron_daily.bb b/doc/hook/cron_daily.bb deleted file mode 100644 index 802bea5e4..000000000 --- a/doc/hook/cron_daily.bb +++ /dev/null @@ -1,3 +0,0 @@ -[h2]cron_daily[/h2] - -Called when cron task (include/poller.php) performs a cron_daily operation. The hook data is a string representing the current time (UTC). diff --git a/doc/hook/cron_weekly.bb b/doc/hook/cron_weekly.bb deleted file mode 100644 index c01bf9611..000000000 --- a/doc/hook/cron_weekly.bb +++ /dev/null @@ -1,3 +0,0 @@ -[h2]cron_weekly[/h2] - -Called when cron task (include/poller.php) performs a cron_weekly operation. The hook data is a string representing the current time (UTC). diff --git a/doc/hook/crypto_methods.bb b/doc/hook/crypto_methods.bb deleted file mode 100644 index 1b16f567d..000000000 --- a/doc/hook/crypto_methods.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]crypto_mthods[/h2] - -Passed an array of crypto methods in local priority order. - -You may change the order and add new methods or disable existing methods. 'aes256cbc' is always supported as a fallback and currently removing this has no effect. \ No newline at end of file diff --git a/doc/hook/daemon_addon.bb b/doc/hook/daemon_addon.bb deleted file mode 100644 index b60b25748..000000000 --- a/doc/hook/daemon_addon.bb +++ /dev/null @@ -1,15 +0,0 @@ -[h2]daemon_addon[/h2] - - -A foreground plugin can create a background process by invoking: - -[code] -\Zotlabs\Daemon\Master::Summon([ 'Addon', 'myplugin', 'something' ]); -[/code] - -This starts up a background process (called 'Addon') specifically for addons to use. - -Then if your plugin is also catching the daemon_addon hook that handler will be called with the -argv array of the background process. In this case [ 'myplugin', 'something' ]; - -We recommend using this convention so that plugins can share this hook without causing conflicts; that is check to see if your plugin is the first array argument and if not, return from the hook. Otherwise you can initiate background processing. Something to remember is that during background processes there is no session. You are detached from the web page which created the background process. \ No newline at end of file diff --git a/doc/hook/daemon_master_release.bb b/doc/hook/daemon_master_release.bb deleted file mode 100644 index a17216d48..000000000 --- a/doc/hook/daemon_master_release.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]daemon_master_release[/h2] - -Permit filtering or alternate methods of processing of background processes when [code] \Zotlabs\Daemon\Master::Release() [/code] is called. - -Default behavior is for a new PHP process to fire immediately upon a call to Master::Summon(). This hook permits pre-emption and the ability to provide queuing or other alternatives to this procedure. diff --git a/doc/hook/directory_item.bb b/doc/hook/directory_item.bb deleted file mode 100644 index cb710e0b4..000000000 --- a/doc/hook/directory_item.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]directory_item[/h2] diff --git a/doc/hook/discover_channel_webfinger.bb b/doc/hook/discover_channel_webfinger.bb deleted file mode 100644 index b0eb5f2c4..000000000 --- a/doc/hook/discover_channel_webfinger.bb +++ /dev/null @@ -1,14 +0,0 @@ -[h2]discover_channel_webfinger[/h2] - -Called after performing channel discovery using RFC7033 webfinger and where the channel is not recognised as zot. - -Passed an array: - - address: URL or address that is being discovered - success: set to true if the plugin discovers something - webfinger: array of webfinger links (output of webfinger_rfc7033()) - - - if your plugin indicates success you are expected to generate and populate an xchan (and hubloc) record prior to returning. - - \ No newline at end of file diff --git a/doc/hook/display_item.bb b/doc/hook/display_item.bb deleted file mode 100644 index a6bfd621d..000000000 --- a/doc/hook/display_item.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]display_item[/h2] diff --git a/doc/hook/display_settings.bb b/doc/hook/display_settings.bb deleted file mode 100644 index 1f1e0b491..000000000 --- a/doc/hook/display_settings.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]display_settings[/h2] diff --git a/doc/hook/display_settings_post.bb b/doc/hook/display_settings_post.bb deleted file mode 100644 index d3bb39359..000000000 --- a/doc/hook/display_settings_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]display_settings_post[/h2] diff --git a/doc/hook/donate_contributors.bb b/doc/hook/donate_contributors.bb deleted file mode 100644 index f97c77efa..000000000 --- a/doc/hook/donate_contributors.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]donate_contributors[/h2] diff --git a/doc/hook/donate_plugin.bb b/doc/hook/donate_plugin.bb deleted file mode 100644 index db4a6f113..000000000 --- a/doc/hook/donate_plugin.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]donate_plugin[/h2] diff --git a/doc/hook/donate_sponsors.bb b/doc/hook/donate_sponsors.bb deleted file mode 100644 index 3abd46d42..000000000 --- a/doc/hook/donate_sponsors.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]donate_sponsors[/h2] diff --git a/doc/hook/dreport_is_storable.bb b/doc/hook/dreport_is_storable.bb deleted file mode 100644 index 9ca99b896..000000000 --- a/doc/hook/dreport_is_storable.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]dreport_is_storable[/h2] diff --git a/doc/hook/dreport_process.bb b/doc/hook/dreport_process.bb deleted file mode 100644 index 3ad331f41..000000000 --- a/doc/hook/dreport_process.bb +++ /dev/null @@ -1,7 +0,0 @@ -[h2]dreport_process[/h2] - -Called for each delivery report received - -Passed a delivery_report array. - -see: include/zot.php diff --git a/doc/hook/drop_item.bb b/doc/hook/drop_item.bb deleted file mode 100644 index 35bb80f82..000000000 --- a/doc/hook/drop_item.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]drop_item[/h2] diff --git a/doc/hook/dropdown_extras.bb b/doc/hook/dropdown_extras.bb deleted file mode 100644 index 6d7110a76..000000000 --- a/doc/hook/dropdown_extras.bb +++ /dev/null @@ -1,17 +0,0 @@ -[h2]dropdown_extras[/h2] - -Modify the dropdown menu available through the cog of items as displayed by conv_item.tpl - -This hook allows plugins to add arbitrary html to the cog dropdown of thread items displayed with the conv_item.tpl template. - -It is fed an array of ['item' => $item, 'dropdown_extras' => '']. Any additions to the cog menu should be prepended/appended to -the ['dropdown_extras'] element. - -[code] -$dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ]; -call_hooks('dropdown_extras',$dropdown_extras_arr); -$dropdown_extras = $dropdown_extras_arr['dropdown_extras']; -[/code] - -see: Zotlabs/Lib/ThreadItem.php -see: view/tpl/conv_item.tpl diff --git a/doc/hook/encode_object.bb b/doc/hook/encode_object.bb deleted file mode 100644 index 0c8e86458..000000000 --- a/doc/hook/encode_object.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]encode_object[/h2] diff --git a/doc/hook/enotify.bb b/doc/hook/enotify.bb deleted file mode 100644 index 703a3ffa0..000000000 --- a/doc/hook/enotify.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]enotify[/h2] diff --git a/doc/hook/enotify_mail.bb b/doc/hook/enotify_mail.bb deleted file mode 100644 index adeb8bd30..000000000 --- a/doc/hook/enotify_mail.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]enotify_mail[/h2] diff --git a/doc/hook/enotify_store.bb b/doc/hook/enotify_store.bb deleted file mode 100644 index dc44cc320..000000000 --- a/doc/hook/enotify_store.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]enotify_store[/h2] diff --git a/doc/hook/event_created.bb b/doc/hook/event_created.bb deleted file mode 100644 index 222602e77..000000000 --- a/doc/hook/event_created.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]event_created[/h2] diff --git a/doc/hook/event_store_event.bb b/doc/hook/event_store_event.bb deleted file mode 100644 index 7015a8322..000000000 --- a/doc/hook/event_store_event.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h2]event_store_event[/h2] - -Called from event_store_event() when an event record is being stored. - -Hook info is an array - -'event' => the passed event details, ready for storage -'existing_event' => If the event already exists, a copy of the original event record from the database -'cancel' => false - set to true to cancel the operation. - - diff --git a/doc/hook/event_updated.bb b/doc/hook/event_updated.bb deleted file mode 100644 index 69e3c72c1..000000000 --- a/doc/hook/event_updated.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]event_updated[/h2] diff --git a/doc/hook/externals_url_select.bb b/doc/hook/externals_url_select.bb deleted file mode 100644 index a542dcb29..000000000 --- a/doc/hook/externals_url_select.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]externals_url_select[/h2] diff --git a/doc/hook/feature_enabled.bb b/doc/hook/feature_enabled.bb deleted file mode 100644 index 5630cc768..000000000 --- a/doc/hook/feature_enabled.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]feature_enabled[/h2] diff --git a/doc/hook/feature_settings.bb b/doc/hook/feature_settings.bb deleted file mode 100644 index d1691eb38..000000000 --- a/doc/hook/feature_settings.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]feature_settings[/h2] diff --git a/doc/hook/feature_settings_post.bb b/doc/hook/feature_settings_post.bb deleted file mode 100644 index eecf941ff..000000000 --- a/doc/hook/feature_settings_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]feature_settings_post[/h2] diff --git a/doc/hook/fetch_and_store.bb b/doc/hook/fetch_and_store.bb deleted file mode 100644 index afece11a6..000000000 --- a/doc/hook/fetch_and_store.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]fetch_and_store[/h2] diff --git a/doc/hook/follow.bb b/doc/hook/follow.bb deleted file mode 100644 index a97632b06..000000000 --- a/doc/hook/follow.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]follow[/h2] diff --git a/doc/hook/follow_allow.bb b/doc/hook/follow_allow.bb deleted file mode 100644 index fdab1865c..000000000 --- a/doc/hook/follow_allow.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]follow_allow[/h2] diff --git a/doc/hook/gender_selector.bb b/doc/hook/gender_selector.bb deleted file mode 100644 index 0b56b5c9b..000000000 --- a/doc/hook/gender_selector.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]gender_selector[/h2] diff --git a/doc/hook/gender_selector_min.bb b/doc/hook/gender_selector_min.bb deleted file mode 100644 index 9d143855a..000000000 --- a/doc/hook/gender_selector_min.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]gender_selector_min[/h2] diff --git a/doc/hook/generate_map.bb b/doc/hook/generate_map.bb deleted file mode 100644 index 33672d552..000000000 --- a/doc/hook/generate_map.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]generate_map[/h2] diff --git a/doc/hook/generate_named_map.bb b/doc/hook/generate_named_map.bb deleted file mode 100644 index 5bacb846d..000000000 --- a/doc/hook/generate_named_map.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]generate_named_map[/h2] diff --git a/doc/hook/get_all_api_perms.bb b/doc/hook/get_all_api_perms.bb deleted file mode 100644 index eb41f8a02..000000000 --- a/doc/hook/get_all_api_perms.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]get_all_api_perms[/h2] diff --git a/doc/hook/get_all_perms.bb b/doc/hook/get_all_perms.bb deleted file mode 100644 index 149f8c78c..000000000 --- a/doc/hook/get_all_perms.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]get_all_perms[/h2] diff --git a/doc/hook/get_default_export_sections b/doc/hook/get_default_export_sections deleted file mode 100644 index 09b146643..000000000 --- a/doc/hook/get_default_export_sections +++ /dev/null @@ -1,10 +0,0 @@ -[h3]get_default_export_sections[/h3] - -The get_default_export_sections call returns the basic functional groups of data to export using channel_export_basic(). - -The hook is passed an array - [ - 'sections' => [ 'channel', 'connections', 'config', 'apps', 'chatrooms', 'events', 'webpages', 'mail', 'wikis' ] - ] - -If you desire the export to contain three months of items, add 'items' to the 'sections' array diff --git a/doc/hook/get_features.bb b/doc/hook/get_features.bb deleted file mode 100644 index 66e81f13c..000000000 --- a/doc/hook/get_features.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]get_features[/h2] diff --git a/doc/hook/get_photo.bb b/doc/hook/get_photo.bb deleted file mode 100644 index eaf3beffb..000000000 --- a/doc/hook/get_photo.bb +++ /dev/null @@ -1,14 +0,0 @@ -[h2]get_photo[/h2] - -Called when fetching the content of photos (except for profile photos) in mod_photo. - - -Hook arguments: - -'imgscale' => integer resolution requested -'resource_id' => resource_id of requested photo -'photo' => array of matching photo table rows after querying for the photo -'allowed' => whether or not access to this resource is allowed - - - diff --git a/doc/hook/get_profile_photo.bb b/doc/hook/get_profile_photo.bb deleted file mode 100644 index ab07179ae..000000000 --- a/doc/hook/get_profile_photo.bb +++ /dev/null @@ -1,18 +0,0 @@ -[h2]get_profile_photo[/h2] - -Called when fetching the content of the default profile photo for a local channel in mod_photo. - - -Hook arguments: - -'imgscale' => integer resolution requested (4, 5, or 6) -'channel_id' => channel_id of requested profile photo -'default' => filename of default profile photo of this imgscale -'data' => empty string -'mimetype' => empty string - - -If 'data' is set, this data will be used instead of the data obtained from the database search for the profile photo. -If 'mimetype' is set, this mimetype will be used instead of the mimetype obtained from the database or the default profile photo mimetype. - - diff --git a/doc/hook/get_role_perms.bb b/doc/hook/get_role_perms.bb deleted file mode 100644 index 87830f8e3..000000000 --- a/doc/hook/get_role_perms.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]get_role_perms[/h2] diff --git a/doc/hook/global_permissions.bb b/doc/hook/global_permissions.bb deleted file mode 100644 index fe998ee9c..000000000 --- a/doc/hook/global_permissions.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]global_permissions[/h2] diff --git a/doc/hook/home_content.bb b/doc/hook/home_content.bb deleted file mode 100644 index 7f32b3547..000000000 --- a/doc/hook/home_content.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]home_content[/h2] diff --git a/doc/hook/home_init.bb b/doc/hook/home_init.bb deleted file mode 100644 index 25dd72792..000000000 --- a/doc/hook/home_init.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]home_init[/h2] diff --git a/doc/hook/hostxrd.bb b/doc/hook/hostxrd.bb deleted file mode 100644 index 2b67320cf..000000000 --- a/doc/hook/hostxrd.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]hostxrd[/h2] diff --git a/doc/hook/html2bbcode.bb b/doc/hook/html2bbcode.bb deleted file mode 100644 index 3061f05f0..000000000 --- a/doc/hook/html2bbcode.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]html2bbcode[/h2] diff --git a/doc/hook/identity_basic_export.bb b/doc/hook/identity_basic_export.bb deleted file mode 100644 index 71329ba1e..000000000 --- a/doc/hook/identity_basic_export.bb +++ /dev/null @@ -1,10 +0,0 @@ -[h2]identity_basic_export[/h2] - -Called when exporting data for a channel -Passed array contains - - [ - 'channel_id' => channel_id being exported - 'sections' => array of functional export sections which are being exported - 'data' => the export data array which has been generated - ] diff --git a/doc/hook/import_author_xchan.bb b/doc/hook/import_author_xchan.bb deleted file mode 100644 index e2340469d..000000000 --- a/doc/hook/import_author_xchan.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]import_author_xchan[/h2] diff --git a/doc/hook/import_channel.bb b/doc/hook/import_channel.bb deleted file mode 100644 index b220b7415..000000000 --- a/doc/hook/import_channel.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]import_channel[/h2] diff --git a/doc/hook/import_directory_profile.bb b/doc/hook/import_directory_profile.bb deleted file mode 100644 index e2fac59bc..000000000 --- a/doc/hook/import_directory_profile.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]import_directory_profile[/h2] diff --git a/doc/hook/import_xchan.bb b/doc/hook/import_xchan.bb deleted file mode 100644 index 40e0783ce..000000000 --- a/doc/hook/import_xchan.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]import_xchan[/h2] diff --git a/doc/hook/item_custom.bb b/doc/hook/item_custom.bb deleted file mode 100644 index d20c7d76c..000000000 --- a/doc/hook/item_custom.bb +++ /dev/null @@ -1,24 +0,0 @@ -[h2]item_custom[/h2] - -Allow addons to create and process custom item types. - -Addon authors will need to use iconfig meta data (with sharing on) or some other method -to specify and determine whether the custom item is destined for their addon. - -It is fed an array of ['item' => ${item_array}, 'allow_exec' => {true/false}] - -By default $arr['item']['cancel'] is set to TRUE which will abort storage of the -custom item in the item table unless the addon unsets it or sets it to false. - -[code] - if ($arr['item_type']==ITEM_TYPE_CUSTOM) { - /* Custom items are not stored by default - because they require an addon to process. */ - $d['item']['cancel']=true; - - call_hooks('item_custom',$d); - } - -[/code] - -see: include/items.php diff --git a/doc/hook/item_photo_menu.bb b/doc/hook/item_photo_menu.bb deleted file mode 100644 index 8f9860a90..000000000 --- a/doc/hook/item_photo_menu.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]item_photo_menu[/h2] diff --git a/doc/hook/item_store.bb b/doc/hook/item_store.bb deleted file mode 100644 index 5d49b725c..000000000 --- a/doc/hook/item_store.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]item_store[/h2] diff --git a/doc/hook/item_store_update.bb b/doc/hook/item_store_update.bb deleted file mode 100644 index a7c58939a..000000000 --- a/doc/hook/item_store_update.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]item_store_update[/h2] diff --git a/doc/hook/item_stored.bb b/doc/hook/item_stored.bb deleted file mode 100644 index 8d706cb4e..000000000 --- a/doc/hook/item_stored.bb +++ /dev/null @@ -1,18 +0,0 @@ -[h2]item_stored[/h2] - -Allow addons to continue processing after an item has been stored in the event -that they need access to the item_id or other data that gets assigned during -the storage process. - -It is fed an array of type item (including terms and iconfig data). - -[code] - /** - * @hooks item_stored - * Called after new item is stored in the database. - * (By this time we have an item_id and other frequently needed info.) - */ - call_hooks('item_stored',$arr); -[/code] - -see: include/items.php diff --git a/doc/hook/item_stored_update.bb b/doc/hook/item_stored_update.bb deleted file mode 100644 index 4532a347c..000000000 --- a/doc/hook/item_stored_update.bb +++ /dev/null @@ -1,15 +0,0 @@ -[h2]item_stored_update[/h2] - -Allow addons to continue processing after an item update has been stored - -It is fed an array of type item (including terms and iconfig data). - -[code] - /** - * @hooks item_stored_update - * Called after updated item is stored in the database. - */ - call_hooks('item_stored_update',$arr); -[/code] - -see: include/items.php diff --git a/doc/hook/item_translate.bb b/doc/hook/item_translate.bb deleted file mode 100644 index 695494b9c..000000000 --- a/doc/hook/item_translate.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]item_translate[/h2] diff --git a/doc/hook/jot_header_tpl_filter.bb b/doc/hook/jot_header_tpl_filter.bb deleted file mode 100644 index b17d81d03..000000000 --- a/doc/hook/jot_header_tpl_filter.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]jot_header_tpl_filter[/h2] - -Allows addon developers to modify the values of replacements fed into jot-header.tpl - -cxref: include/conversation.php diff --git a/doc/hook/jot_networks.bb b/doc/hook/jot_networks.bb deleted file mode 100644 index 4c1629ba7..000000000 --- a/doc/hook/jot_networks.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]jot_networks[/h2] diff --git a/doc/hook/jot_tool.bb b/doc/hook/jot_tool.bb deleted file mode 100644 index 22ba9701e..000000000 --- a/doc/hook/jot_tool.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]jot_tool[/h2] diff --git a/doc/hook/jot_tpl_filter.bb b/doc/hook/jot_tpl_filter.bb deleted file mode 100644 index 426da3c56..000000000 --- a/doc/hook/jot_tpl_filter.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]jot_tpl_filter[/h2] - -Allows addon developers to alter the macro replacements prior to being fed into jot.tpl - -cxref: include/conversation.php diff --git a/doc/hook/legal_webbie.bb b/doc/hook/legal_webbie.bb deleted file mode 100644 index 8c7d32d56..000000000 --- a/doc/hook/legal_webbie.bb +++ /dev/null @@ -1,10 +0,0 @@ -[h2]legal_webbie[/h2] - -Called when validating a channel address. By default the valid characters are -a-z,0-9,-,_, and . Uppercase ASCII characters are folded to lower and any invalid characters are stripped. - -Some federated networks require more restrictive rules. - -The hook is called with an array [ 'input' => (supplied text), 'output' => (validated text) ] - -A plugin will generally perform a regex filter or text operation on 'input' and provide the results in 'output'. \ No newline at end of file diff --git a/doc/hook/legal_webbie_text.bb b/doc/hook/legal_webbie_text.bb deleted file mode 100644 index 32c74c93b..000000000 --- a/doc/hook/legal_webbie_text.bb +++ /dev/null @@ -1,7 +0,0 @@ -[h2]legal_webbie_text[/h2] - -Returns a string describing the text rules applied to legal_webbie(). - -Called with an array [ 'text' => (descriptive text describing text character limitations) ] - -A plugin should return the description of the allowed characters and operation performed in the 'legal_webbie' hook to assist people when creating a new channel. \ No newline at end of file diff --git a/doc/hook/load_pdl.bb b/doc/hook/load_pdl.bb deleted file mode 100644 index 149a3e766..000000000 --- a/doc/hook/load_pdl.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]load_pdl[/h2] diff --git a/doc/hook/local_dir_update.bb b/doc/hook/local_dir_update.bb deleted file mode 100644 index d0b0f8ac1..000000000 --- a/doc/hook/local_dir_update.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]local_dir_update[/h2] diff --git a/doc/hook/logged_in.bb b/doc/hook/logged_in.bb deleted file mode 100644 index b01041576..000000000 --- a/doc/hook/logged_in.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]logged_in[/h2] diff --git a/doc/hook/logger.bb b/doc/hook/logger.bb deleted file mode 100644 index 8fe989abd..000000000 --- a/doc/hook/logger.bb +++ /dev/null @@ -1,16 +0,0 @@ -[h2]logger[/h2] - -Called when making an entry to the application logfile - -Hook data: - - array( - 'filename' => name of logfile relative to application basedir. String. - 'loglevel' => the log level of this log entry, if this is higher than the configured maximum loglevel - this hook will not be called. Integer. - 'message' => The formatted log message, ready for logging. String. - 'logged' => boolean, default is false. Set to true to prevent the normal logfile entry to be made - (e.g. if the plugin is configured to handle this aspect of the function, or if it is determined - that this log entry should not be made) - ) - diff --git a/doc/hook/logging_out.bb b/doc/hook/logging_out.bb deleted file mode 100644 index d47b9f1df..000000000 --- a/doc/hook/logging_out.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]logging_out[/h2] diff --git a/doc/hook/login_hook.bb b/doc/hook/login_hook.bb deleted file mode 100644 index 156a0afcd..000000000 --- a/doc/hook/login_hook.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]login_hook[/h2] diff --git a/doc/hook/magic_auth.bb b/doc/hook/magic_auth.bb deleted file mode 100644 index 80d6edb27..000000000 --- a/doc/hook/magic_auth.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]magic_auth[/h2] diff --git a/doc/hook/magic_auth_openid_success.bb b/doc/hook/magic_auth_openid_success.bb deleted file mode 100644 index 810f2e06d..000000000 --- a/doc/hook/magic_auth_openid_success.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]magic_auth_openid_success[/h2] diff --git a/doc/hook/magic_auth_success.bb b/doc/hook/magic_auth_success.bb deleted file mode 100644 index d795e43e5..000000000 --- a/doc/hook/magic_auth_success.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]magic_auth_success[/h2] diff --git a/doc/hook/main_slider.bb b/doc/hook/main_slider.bb deleted file mode 100644 index a63c2170a..000000000 --- a/doc/hook/main_slider.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]main_slider[/h2] diff --git a/doc/hook/marital_selector.bb b/doc/hook/marital_selector.bb deleted file mode 100644 index 0f76c3f5a..000000000 --- a/doc/hook/marital_selector.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]marital_selector[/h2] diff --git a/doc/hook/marital_selector_min.bb b/doc/hook/marital_selector_min.bb deleted file mode 100644 index f02d21f20..000000000 --- a/doc/hook/marital_selector_min.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]marital_selector_min[/h2] diff --git a/doc/hook/markdown_to_bb.bb b/doc/hook/markdown_to_bb.bb deleted file mode 100644 index 8af637c8c..000000000 --- a/doc/hook/markdown_to_bb.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]markdown_to_bb[/h2] - -Called when processing markdown to bbcode conversion such as when importing Diaspora protocol source or other markdown sources. The plugin is called post conversion. - -The function takes one argument which is the string being converted. It may be additionally processed by the plugin. diff --git a/doc/hook/module_loaded.bb b/doc/hook/module_loaded.bb deleted file mode 100644 index cb0d2302d..000000000 --- a/doc/hook/module_loaded.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]module_loaded[/h2] diff --git a/doc/hook/module_mod_aftercontent.bb b/doc/hook/module_mod_aftercontent.bb deleted file mode 100644 index 04e3c8d88..000000000 --- a/doc/hook/module_mod_aftercontent.bb +++ /dev/null @@ -1,12 +0,0 @@ -[h2]module_mod_aftercontent[/h2] - - - -The hook data for this call consists of an array - - $arr['content'] - -This element contains the HTML content which was prepared for this page by calling the module_content() function. It is invoked after the content has been created. It does not contain the result of AJAX or asynchronous page load calls. - - The current module may be determined by lookin at App::$module - diff --git a/doc/hook/module_mod_content.bb b/doc/hook/module_mod_content.bb deleted file mode 100644 index eef5b7ba5..000000000 --- a/doc/hook/module_mod_content.bb +++ /dev/null @@ -1,10 +0,0 @@ -[h2]module_mod_content[/h2] - -The hook data for this call consists of an array - - $arr['content'] - -This element contains the HTML content before calling the module_content() function. It is invoked before the content region has been populated. This may or may not be empty as there may be other processes or addons generating content prior to your hook handler is run. Be certain to preserve any current content. Typically anything you add here will be placed at the top of the content region of the page, but in any event prior to the main content region being generated. - - The current module may be determined by lookin at App::$module - diff --git a/doc/hook/module_mod_init.bb b/doc/hook/module_mod_init.bb deleted file mode 100644 index 52fe5a616..000000000 --- a/doc/hook/module_mod_init.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]module_mod_init[/h2] diff --git a/doc/hook/module_mod_post.bb b/doc/hook/module_mod_post.bb deleted file mode 100644 index 3adb0e737..000000000 --- a/doc/hook/module_mod_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]module_mod_post[/h2] diff --git a/doc/hook/mood_verbs.bb b/doc/hook/mood_verbs.bb deleted file mode 100644 index 67fb719dd..000000000 --- a/doc/hook/mood_verbs.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]mood_verbs[/h2] diff --git a/doc/hook/nav.bb b/doc/hook/nav.bb deleted file mode 100644 index b52f90602..000000000 --- a/doc/hook/nav.bb +++ /dev/null @@ -1,28 +0,0 @@ -[h2]nav[/h2] - -Called when generating the main navigation bar and menu for a page - -Hook data: - - array( - 'usermenu' => array( 'icon' => photo URL, 'name' => channel name ) - 'nav' => array( - 'usermenu' => usermenu (photo menu) link array - (channel home, profiles, photos, cloud, chats, webapges ...) - 'loginmenu' => login menu link array - 'network' => grid link and grid-notify - 'home' => home link and home-notify - 'intros' => intros link and intros-notify - 'notifications' => notifications link and notifications-notify - 'messages' => PM link and PM-notify - 'all_events' => events link and events notfiy - 'manage' => manage channels link - 'settings' => settings link - 'register' => registration link - 'help' => help/doc link - 'apps' => apps link - 'search' => search link and form - 'directory' => directory link - ) - - diff --git a/doc/hook/network_content_init.bb b/doc/hook/network_content_init.bb deleted file mode 100644 index 224da393a..000000000 --- a/doc/hook/network_content_init.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]network_content_init[/h2] diff --git a/doc/hook/network_ping.bb b/doc/hook/network_ping.bb deleted file mode 100644 index 78deefe78..000000000 --- a/doc/hook/network_ping.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]network_ping[/h2] diff --git a/doc/hook/network_to_name.bb b/doc/hook/network_to_name.bb deleted file mode 100644 index eea4a1841..000000000 --- a/doc/hook/network_to_name.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]network_to_name[/h2] diff --git a/doc/hook/notifier_end.bb b/doc/hook/notifier_end.bb deleted file mode 100644 index df9d852bd..000000000 --- a/doc/hook/notifier_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]notifier_end[/h2] diff --git a/doc/hook/notifier_hub.bb b/doc/hook/notifier_hub.bb deleted file mode 100644 index 4255ce446..000000000 --- a/doc/hook/notifier_hub.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]notifier_hub[/h2] diff --git a/doc/hook/notifier_normal.bb b/doc/hook/notifier_normal.bb deleted file mode 100644 index 0059baa47..000000000 --- a/doc/hook/notifier_normal.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]notifier_normal[/h2] diff --git a/doc/hook/obj_verbs.bb b/doc/hook/obj_verbs.bb deleted file mode 100644 index ca98229aa..000000000 --- a/doc/hook/obj_verbs.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]obj_verbs[/h2] diff --git a/doc/hook/oembed_probe.bb b/doc/hook/oembed_probe.bb deleted file mode 100644 index 4f32ac267..000000000 --- a/doc/hook/oembed_probe.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]oembed_probe[/h2] diff --git a/doc/hook/other_encapsulate.bb b/doc/hook/other_encapsulate.bb deleted file mode 100644 index ea0cdf622..000000000 --- a/doc/hook/other_encapsulate.bb +++ /dev/null @@ -1,7 +0,0 @@ -[h2]other_encapsulate[/h2] - -Passed an array of 'data', 'pubkey', 'alg', 'result' when encrypting data with an algorithm (alg) which is unknown to the system. Hooks are expected to identify their algorithm, encrypt data with pubkey and place the result in 'result'. - - - - diff --git a/doc/hook/other_unencapsulate.bb b/doc/hook/other_unencapsulate.bb deleted file mode 100644 index c8b0b617f..000000000 --- a/doc/hook/other_unencapsulate.bb +++ /dev/null @@ -1,5 +0,0 @@ -[h2]other_unencapsulate[/h2] - -Passed an array of 'data', 'prvkey', 'alg', 'result' when decrypting data with an algorithm (alg) which is unknown to the system. Hooks are expected to identify their algorithm, decrypt data with prvkey and place the result in 'result'. - - diff --git a/doc/hook/page_content_top.bb b/doc/hook/page_content_top.bb deleted file mode 100644 index 137e3abfd..000000000 --- a/doc/hook/page_content_top.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]page_content_top[/h2] diff --git a/doc/hook/page_end.bb b/doc/hook/page_end.bb deleted file mode 100644 index 09293cf50..000000000 --- a/doc/hook/page_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]page_end[/h2] diff --git a/doc/hook/page_header.bb b/doc/hook/page_header.bb deleted file mode 100644 index ffaa791c9..000000000 --- a/doc/hook/page_header.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]page_header[/h2] diff --git a/doc/hook/page_meta.bb b/doc/hook/page_meta.bb deleted file mode 100644 index 30a8f9440..000000000 --- a/doc/hook/page_meta.bb +++ /dev/null @@ -1,13 +0,0 @@ -[h2]page_meta[/h2] - -Called before generating the page header. - -[code] - $pagemeta = [ 'og:title' => self::$page['title'] ]; - - call_hooks('page_meta',$pagemeta); - foreach ($pagemeta as $metaproperty => $metavalue) { - self::$meta->set($metaproperty,$metavalue); - } - -[/code] diff --git a/doc/hook/parse_atom.bb b/doc/hook/parse_atom.bb deleted file mode 100644 index c8037317f..000000000 --- a/doc/hook/parse_atom.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]parse_atom[/h2] diff --git a/doc/hook/parse_link.bb b/doc/hook/parse_link.bb deleted file mode 100644 index 1c328059c..000000000 --- a/doc/hook/parse_link.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]parse_link[/h2] diff --git a/doc/hook/pdl_selector.bb b/doc/hook/pdl_selector.bb deleted file mode 100644 index bee01c843..000000000 --- a/doc/hook/pdl_selector.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]pdl_selector[/h2] diff --git a/doc/hook/perm_is_allowed.bb b/doc/hook/perm_is_allowed.bb deleted file mode 100644 index aac647609..000000000 --- a/doc/hook/perm_is_allowed.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]perm_is_allowed[/h2] diff --git a/doc/hook/permissions_create.bb b/doc/hook/permissions_create.bb deleted file mode 100644 index 22f80a80e..000000000 --- a/doc/hook/permissions_create.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]permissions_create[/h2] diff --git a/doc/hook/permissions_update.bb b/doc/hook/permissions_update.bb deleted file mode 100644 index 40366b33d..000000000 --- a/doc/hook/permissions_update.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]permissions_update[/h2] diff --git a/doc/hook/permit_hook.bb b/doc/hook/permit_hook.bb deleted file mode 100644 index e69de29bb..000000000 diff --git a/doc/hook/personal_xrd.bb b/doc/hook/personal_xrd.bb deleted file mode 100644 index 71d4bd8dd..000000000 --- a/doc/hook/personal_xrd.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]personal_xrd[/h2] diff --git a/doc/hook/photo_post_end.bb b/doc/hook/photo_post_end.bb deleted file mode 100644 index 8a3291763..000000000 --- a/doc/hook/photo_post_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]photo_post_end[/h2] diff --git a/doc/hook/photo_upload_begin.bb b/doc/hook/photo_upload_begin.bb deleted file mode 100644 index 5e441a12a..000000000 --- a/doc/hook/photo_upload_begin.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]photo_upload_begin[/h2] diff --git a/doc/hook/photo_upload_end.bb b/doc/hook/photo_upload_end.bb deleted file mode 100644 index 956175f1d..000000000 --- a/doc/hook/photo_upload_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]photo_upload_end[/h2] diff --git a/doc/hook/photo_upload_file.bb b/doc/hook/photo_upload_file.bb deleted file mode 100644 index 726622ac0..000000000 --- a/doc/hook/photo_upload_file.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]photo_upload_file[/h2] diff --git a/doc/hook/photo_upload_form.bb b/doc/hook/photo_upload_form.bb deleted file mode 100644 index 70b8318b8..000000000 --- a/doc/hook/photo_upload_form.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]photo_upload_form[/h2] diff --git a/doc/hook/photo_view_filter.bb b/doc/hook/photo_view_filter.bb deleted file mode 100644 index 0780c1edc..000000000 --- a/doc/hook/photo_view_filter.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]photo_view_filter[/h2] diff --git a/doc/hook/poke_verbs.bb b/doc/hook/poke_verbs.bb deleted file mode 100644 index 54d68c3a2..000000000 --- a/doc/hook/poke_verbs.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]poke_verbs[/h2] diff --git a/doc/hook/post_local.bb b/doc/hook/post_local.bb deleted file mode 100644 index 5aa723cb9..000000000 --- a/doc/hook/post_local.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_local[/h2] diff --git a/doc/hook/post_local_end.bb b/doc/hook/post_local_end.bb deleted file mode 100644 index 380166fdb..000000000 --- a/doc/hook/post_local_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_local_end[/h2] diff --git a/doc/hook/post_local_start.bb b/doc/hook/post_local_start.bb deleted file mode 100644 index 2f684f67a..000000000 --- a/doc/hook/post_local_start.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_local_start[/h2] diff --git a/doc/hook/post_mail.bb b/doc/hook/post_mail.bb deleted file mode 100644 index 8f67ad4f0..000000000 --- a/doc/hook/post_mail.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_mail[/h2] diff --git a/doc/hook/post_mail_end.bb b/doc/hook/post_mail_end.bb deleted file mode 100644 index 7f0085773..000000000 --- a/doc/hook/post_mail_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_mail_end[/h2] diff --git a/doc/hook/post_remote.bb b/doc/hook/post_remote.bb deleted file mode 100644 index f8e087eee..000000000 --- a/doc/hook/post_remote.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_remote[/h2] diff --git a/doc/hook/post_remote_end.bb b/doc/hook/post_remote_end.bb deleted file mode 100644 index 0fef20cbf..000000000 --- a/doc/hook/post_remote_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_remote_end[/h2] diff --git a/doc/hook/post_remote_update.bb b/doc/hook/post_remote_update.bb deleted file mode 100644 index fd358db28..000000000 --- a/doc/hook/post_remote_update.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_remote_update[/h2] diff --git a/doc/hook/post_remote_update_end.bb b/doc/hook/post_remote_update_end.bb deleted file mode 100644 index 95f1e6f78..000000000 --- a/doc/hook/post_remote_update_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]post_remote_update_end[/h2] diff --git a/doc/hook/prepare_body.bb b/doc/hook/prepare_body.bb deleted file mode 100644 index 3f1eaef85..000000000 --- a/doc/hook/prepare_body.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]prepare_body[/h2] diff --git a/doc/hook/prepare_body_final.bb b/doc/hook/prepare_body_final.bb deleted file mode 100644 index 96d1ae389..000000000 --- a/doc/hook/prepare_body_final.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]prepare_body_final[/h2] diff --git a/doc/hook/prepare_body_init.bb b/doc/hook/prepare_body_init.bb deleted file mode 100644 index f3de79970..000000000 --- a/doc/hook/prepare_body_init.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]prepare_body_init[/h2] diff --git a/doc/hook/privacygroup_extras.bb b/doc/hook/privacygroup_extras.bb deleted file mode 100644 index bd67f2470..000000000 --- a/doc/hook/privacygroup_extras.bb +++ /dev/null @@ -1,12 +0,0 @@ -[h2]privacygroup_extras[/h2] - -Add items to the Privacy Group edit form - -[code] - $hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(1) ]; - call_hooks ('privacygroup_extras',$hookinfo); - $pgrp_extras = $hookinfo['pgrp_extras']; -[/code] - -see: Zotlabs/Module/Group.php -see: view/tpl/privacy_groups.tpl diff --git a/doc/hook/privacygroup_extras_drop.bb b/doc/hook/privacygroup_extras_drop.bb deleted file mode 100644 index fd27ab255..000000000 --- a/doc/hook/privacygroup_extras_drop.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h2]privacygroup_extras_drop[/h2] - -Called after privacy group is dropped - -[code] - $hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(2) ]; - call_hooks ('privacygroup_extras_drop',$hookinfo); -[/code] - -see: Zotlabs/Module/Group.php -see: view/tpl/privacy_groups.tpl diff --git a/doc/hook/privacygroup_extras_post.bb b/doc/hook/privacygroup_extras_post.bb deleted file mode 100644 index 704db1997..000000000 --- a/doc/hook/privacygroup_extras_post.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h2]privacygroup_extras_post[/h2] - -Called as privacy group edit form is edited. - -[code] - $hookinfo = [ 'pgrp_extras' => '', 'group'=>$group['id'] ]; - call_hooks ('privacygroup_extras_post',$hookinfo); -[/code] - -see: Zotlabs/Module/Group.php -see: view/tpl/privacy_groups.tpl diff --git a/doc/hook/proc_run.bb b/doc/hook/proc_run.bb deleted file mode 100644 index a3759794a..000000000 --- a/doc/hook/proc_run.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]proc_run[/h2] diff --git a/doc/hook/process_channel_sync_delivery.bb b/doc/hook/process_channel_sync_delivery.bb deleted file mode 100644 index c0416c8cb..000000000 --- a/doc/hook/process_channel_sync_delivery.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]process_channel_sync_delivery[/h2] diff --git a/doc/hook/profile_advanced.bb b/doc/hook/profile_advanced.bb deleted file mode 100644 index 65e56afd6..000000000 --- a/doc/hook/profile_advanced.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]profile_advanced[/h2] diff --git a/doc/hook/profile_edit.bb b/doc/hook/profile_edit.bb deleted file mode 100644 index e60663d4a..000000000 --- a/doc/hook/profile_edit.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]profile_edit[/h2] diff --git a/doc/hook/profile_photo_content_end.bb b/doc/hook/profile_photo_content_end.bb deleted file mode 100644 index 518415c4d..000000000 --- a/doc/hook/profile_photo_content_end.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]profile_photo_content_end[/h2] diff --git a/doc/hook/profile_post.bb b/doc/hook/profile_post.bb deleted file mode 100644 index d22d8fbc7..000000000 --- a/doc/hook/profile_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]profile_post[/h2] diff --git a/doc/hook/profile_sidebar.bb b/doc/hook/profile_sidebar.bb deleted file mode 100644 index bfd059e4b..000000000 --- a/doc/hook/profile_sidebar.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]profile_sidebar[/h2] diff --git a/doc/hook/profile_sidebar_enter.bb b/doc/hook/profile_sidebar_enter.bb deleted file mode 100644 index 9d6726a30..000000000 --- a/doc/hook/profile_sidebar_enter.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]profile_sidebar_enter[/h2] diff --git a/doc/hook/register_account.bb b/doc/hook/register_account.bb deleted file mode 100644 index df4de2b30..000000000 --- a/doc/hook/register_account.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]register_account[/h2] diff --git a/doc/hook/render_location.bb b/doc/hook/render_location.bb deleted file mode 100644 index 41501c087..000000000 --- a/doc/hook/render_location.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]render_location[/h2] diff --git a/doc/hook/replace_macros.bb b/doc/hook/replace_macros.bb deleted file mode 100644 index fac39dd7b..000000000 --- a/doc/hook/replace_macros.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]replace_macros[/h2] diff --git a/doc/hook/reverse_magic_auth.bb b/doc/hook/reverse_magic_auth.bb deleted file mode 100644 index 4cbd84b93..000000000 --- a/doc/hook/reverse_magic_auth.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]reverse_magic_auth[/h2] diff --git a/doc/hook/settings_form.bb b/doc/hook/settings_form.bb deleted file mode 100644 index d65341181..000000000 --- a/doc/hook/settings_form.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]settings_form[/h2] diff --git a/doc/hook/settings_post.bb b/doc/hook/settings_post.bb deleted file mode 100644 index f72546c11..000000000 --- a/doc/hook/settings_post.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]settings_post[/h2] diff --git a/doc/hook/sexpref_selector.bb b/doc/hook/sexpref_selector.bb deleted file mode 100644 index b4dad6b38..000000000 --- a/doc/hook/sexpref_selector.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]sexpref_selector[/h2] diff --git a/doc/hook/sexpref_selector_min.bb b/doc/hook/sexpref_selector_min.bb deleted file mode 100644 index 6f49946af..000000000 --- a/doc/hook/sexpref_selector_min.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]sexpref_selector_min[/h2] diff --git a/doc/hook/smilie.bb b/doc/hook/smilie.bb deleted file mode 100644 index 575acc178..000000000 --- a/doc/hook/smilie.bb +++ /dev/null @@ -1,19 +0,0 @@ -[h2]smilie[/h2] - - -Called when processing translation of emoticons. It is passed an array containing two sub-arrays: - - array( - 'texts' => array('text1','text2',...), - 'icons' => array('icon1','icon2',...) - ); - - texts is the emoticon text - for example ':-)' for a traditional smile face. - icons is the HTML used as a replacement. For example - '<img class="smiley" src="https://localhost/images/smiley-smile.gif" alt=":-)" />' - - If adding or removing an entry from either array, the corresponding element from the matching array must also - be added or removed. Emoticons less than three characters in length or not recommended as they get triggered - incorrectly quite often. Extended emoticons are indicated by convention using a preceding colon, for example - - :walrus_kissing_a_baby \ No newline at end of file diff --git a/doc/hook/status_editor.bb b/doc/hook/status_editor.bb deleted file mode 100644 index 00e97a7c9..000000000 --- a/doc/hook/status_editor.bb +++ /dev/null @@ -1,31 +0,0 @@ -[h2]status_editor[/h2] - -Replace the default status_editor (jot). - -Allow plugins to replace the default status editor in a context dependent manner. - -It is fed an array of ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]. - -All calls to the status_editor at the time of the creation of this hook have been updated -to set $module at invocation. This allows addon developers to have a context dependent editor -based on the Hubzilla module/addon. - -Calls to status_editor() are in the form of: - status_editor($a, $x, $popup, $module). - -Future module/addon developers are encouraged to set $popup and $module when invoking the -status_editor. - - -[code] - $hook_info = ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]; - call_hooks('status_editor',$hook_info); - if ($hook_info['editor_html'] == '') { - return hz_status_editor($a, $x, $popup); - } else { - return $hook_info['editor_html']; - } - -[/code] - -see: include/conversation.php diff --git a/doc/hook/stream_item.bb b/doc/hook/stream_item.bb deleted file mode 100644 index 30086961d..000000000 --- a/doc/hook/stream_item.bb +++ /dev/null @@ -1,13 +0,0 @@ -[h2]stream_item[/h2] - - -Called for each item processed for viewing by conversation(); - -The hook data consists of an array - - array( - 'mode' => current mode of conversation() - 'item' => item being processed - ); - - Set item['blocked'] to block the item from viewing. This action will not affect comment or sub-thread counts, so if there are three comments in a conversation and you block one, three comments will still be reported even though only two are visible. diff --git a/doc/hook/system_app_installed_filter.bb b/doc/hook/system_app_installed_filter.bb deleted file mode 100644 index a269a79a8..000000000 --- a/doc/hook/system_app_installed_filter.bb +++ /dev/null @@ -1,18 +0,0 @@ -[h2]system_app_installed_filter[/h2] - -Allow plugins to filter the result of system_app_installed. - -Code excerpt: - -[code] - $filter_arr = [ - 'uid'=>$uid, - 'app'=>$app, - 'installed'=>$r - ]; - call_hooks('system_app_installed_filter',$filter_arr); - $r = $filter_arr['installed']; -[/code] - -cxref: Zotlabs/Lib/Apps.php - diff --git a/doc/hook/tagged.bb b/doc/hook/tagged.bb deleted file mode 100644 index 05d081d07..000000000 --- a/doc/hook/tagged.bb +++ /dev/null @@ -1,16 +0,0 @@ -[h2]tagged[/h2] - - -This hook is called when a delivery is made which results in the recipient being tagged. - -The hook data is an array containing - - array( - 'channel_id' => int, - 'item' => item structure of the delivered item from database, - 'body' => the body of the referenced item - - ); - - Note: This hook is called before secondary delivery chains are invoked in the case of tagging a forum. This means that permissions and some item attributes will be those of the item before being re-packaged and before ownership of this item is given to the forum. - diff --git a/doc/hook/update_unseen.bb b/doc/hook/update_unseen.bb deleted file mode 100644 index 8fb02c239..000000000 --- a/doc/hook/update_unseen.bb +++ /dev/null @@ -1,9 +0,0 @@ -[h3]update_unseen[/h3] - -Called prior to automatically marking items 'seen'; allowing a plugin the choice to not perform this action. - -hook data - -[ 'channel_id' => local_channel(), 'update' => 'unset' ]; - -If 'update' is set to 0 or false on return, the update operation is not performed. \ No newline at end of file diff --git a/doc/hook/validate_channelname.bb b/doc/hook/validate_channelname.bb deleted file mode 100644 index 2ab12bbec..000000000 --- a/doc/hook/validate_channelname.bb +++ /dev/null @@ -1,23 +0,0 @@ -[h2]validate_channelname[/h2] - -Called when creating a new channel or changing the channel name in mod/settings.php - -Hook data consists of an array - - array( - 'name' => supplied name - ); - - If the hook handler determines the name is valid, do nothing. If there is an issue with the name, - set $hook_data['message'] to the message text which should be displayed to the member - and the name will - not be accepted. - - - Example: - [code] - if(mb_strlen($hook_data['name']) < 3) - $hook_data['message'] = t('Name too short.'); - [/code] - - - \ No newline at end of file diff --git a/doc/hook/webfinger.bb b/doc/hook/webfinger.bb deleted file mode 100644 index 7cc24322f..000000000 --- a/doc/hook/webfinger.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]webfinger[/h2] diff --git a/doc/hook/well_known.bb b/doc/hook/well_known.bb deleted file mode 100644 index 778b27a02..000000000 --- a/doc/hook/well_known.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]well_known[/h2] diff --git a/doc/hook/wiki_preprocess.bb b/doc/hook/wiki_preprocess.bb deleted file mode 100644 index 913b601ba..000000000 --- a/doc/hook/wiki_preprocess.bb +++ /dev/null @@ -1,11 +0,0 @@ -[h3]wiki_preprocess[/h3] - -Called before markdown/bbcode processors are run for wiki pages - -Passed parameter array: - - 'content' => wiki page content - 'mimetype' => page mimetype - - -see: Zotlabs/Module/Wiki.php diff --git a/doc/hook/zid.bb b/doc/hook/zid.bb deleted file mode 100644 index 2210c1342..000000000 --- a/doc/hook/zid.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]zid[/h2] diff --git a/doc/hook/zid_init.bb b/doc/hook/zid_init.bb deleted file mode 100644 index 131dd8f72..000000000 --- a/doc/hook/zid_init.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]zid_init[/h2] diff --git a/doc/hook/zot_best_algorithm.bb b/doc/hook/zot_best_algorithm.bb deleted file mode 100644 index ccde505cb..000000000 --- a/doc/hook/zot_best_algorithm.bb +++ /dev/null @@ -1,3 +0,0 @@ -[h2]zot_best_algorithm[/h2] - - diff --git a/doc/hook/zot_finger.bb b/doc/hook/zot_finger.bb deleted file mode 100644 index 9383b4c31..000000000 --- a/doc/hook/zot_finger.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]zot_finger[/h2] diff --git a/doc/hooklist.bb b/doc/hooklist.bb deleted file mode 100644 index 7231cd185..000000000 --- a/doc/hooklist.bb +++ /dev/null @@ -1,698 +0,0 @@ -[h2]Hooks[/h2] - -Hooks allow plugins/addons to "hook into" the code at many points and alter the behaviour or otherwise perform independent actions when an activity takes place or when certain data structures are accessed. There are many hooks which allow you to tie into the software at most any point and do something slightly different than the default thing. These hooks are passed two variables. The first is the App structure which contains details about the entire state of the page request as we build the resulting page. The second is unique to the specific hook that is called and provides specific detail about what is happening in the software at the time the hook is invoked. - -[zrl=[baseurl]/help/hooks]Generated index of all hooks and the files which call them[/zrl] - -[zrl=[baseurl]/help/hook/module_mod_aftercontent]module_mod_aftercontent[/zrl] - General purpose hook for any module, executed after mod_content(). Replace 'module' with module name, e.g. 'photos_mod_aftercontent'. - -[zrl=[baseurl]/help/hook/module_mod_content]module_mod_content[/zrl] - General purpose hook for any module, executed before mod_content(). Replace 'module' with module name, e.g. 'photos_mod_content'. - -[zrl=[baseurl]/help/hook/module_mod_init]module_mod_init[/zrl] - General purpose hook for any module, executed before mod_init(). Replace 'module' with module name, e.g. 'photos_mod_init'. - -[zrl=[baseurl]/help/hook/module_mod_post]module_mod_post[/zrl] - General purpose hook for any module, executed before mod_post(). Replace 'module' with module name, e.g. 'photos_mod_post'. - -[zrl=[baseurl]/help/hook/about_hook]about_hook[/zrl] - Called from the siteinfo page - -[zrl=[baseurl]/help/hook/accept_follow]accept_follow[/zrl] - Called when accepting a connection (friend request) - -[zrl=[baseurl]/help/hook/account_downgrade]account_downgrade[/zrl] - Called when an account has expired, indicating a potential downgrade to "basic" service class - -[zrl=[baseurl]/help/hook/account_settings]account_settings[/zrl] - Called when generating the account settings form - -[zrl=[baseurl]/help/hook/account_settings_post]account_settings_post[/zrl] - Called when posting from the account settings form - -[zrl=[baseurl]/help/hook/activity_filter]activity_filter[/zrl] - Called when generating the list of filters for the network page - -[zrl=[baseurl]/help/hook/activity_filter]activity_mapper[/zrl] - Called when determining the activity type for transmission. - -[zrl=[baseurl]/help/hook/activity_filter]activity_decode_mapper[/zrl] - Called when determining the activity type for transmission. - -[zrl=[baseurl]/help/hook/activity_filter]activity_obj_mapper[/zrl] - Called when determining the object type for transmission. - -[zrl=[baseurl]/help/hook/activity_filter]activity_obj_decode_mapper[/zrl] - Called when determining the object type for transmission. - -[zrl=[baseurl]/help/hook/activity_order]activity_order[/zrl] - Called when generating the list of order options for the network page - -[zrl=[baseurl]/help/hook/addon_app_installed_filter]addon_app_installed_filter[/zrl] - Called when determining whether an addon_app is installed - -[zrl=[baseurl]/help/hook/activity_received]activity_received[/zrl] - Called when an activity (post, comment, like, etc.) has been received from a zot source - -[zrl=[baseurl]/help/hook/admin_aside]admin_aside[/zrl] - Called when generating the admin page sidebar widget - -[zrl=[baseurl]/help/hook/affinity_labels]affinity_labels[/zrl] - Used to generate alternate labels for the affinity slider. - -[zrl=[baseurl]/help/hook/api_perm_is_allowed]api_perm_is_allowed[/zrl] - Called when perm_is_allowed() is executed from an API call. - -[zrl=[baseurl]/help/hook/app_destroy]app_destroy[/zrl] - Called when an app is deleted - -[zrl=[baseurl]/help/hook/app_installed_filter]app_installed_filter[/zrl] - Called when determining whether an app is installed - -[zrl=[baseurl]/help/hook/app_menu]app_menu[/zrl] - Called when generating the app_menu dropdown (may be obsolete) - -[zrl=[baseurl]/help/hook/attach_delete]attach_delete[/zrl] - Called when attachments are deleted from the attach table - -[zrl=[baseurl]/help/hook/atom_author]atom_author[/zrl] - Called when generating an author or owner element for an Atom ActivityStream feed - -[zrl=[baseurl]/help/hook/atom_entry]atom_entry[/zrl] - Called when generating each item entry of an Atom ActivityStreams feed - -[zrl=[baseurl]/help/hook/atom_feed]atom_feed[/zrl] - Called when generating an Atom ActivityStreams feed - -[zrl=[baseurl]/help/hook/atom_feed_end]atom_feed_end[/zrl] - Called when generation of an Atom ActivityStreams feed is completed - -[zrl=[baseurl]/help/hook/attach_upload_file]attach_upload_file[/zrl] - Called when uploading a file - -[zrl=[baseurl]/help/hook/authenticate]authenticate[/zrl] - Can provide alternate authentication mechanisms - -[zrl=[baseurl]/help/hook/author_is_pmable]author_is_pmable[/zrl] - Called from the thread action menu to determine if we can send private mail to the post author - -[zrl=[baseurl]/help/hook/bb2diaspora]bb2diaspora[/zrl] - called when converting bbcode to markdown - -[zrl=[baseurl]/help/hook/bbcode]bbcode[/zrl] - Called at end of converting bbcode to HTML - -[zrl=[baseurl]/help/hook/bbcode_filter]bbcode_filter[/zrl] - Called when beginning to convert bbcode to HTML - -[zrl=[baseurl]/help/hook/bb_translate_video]bb_translate_video[/zrl] - Called when extracting embedded services from bbcode video elements (rarely used) - -[zrl=[baseurl]/help/hook/build_pagehead]build_pagehead[/zrl] - Called when creating the HTML page header - -[zrl=[baseurl]/help/hook/can_comment_on_post]can_comment_on_post[/zrl] - Called when deciding whether or not to present a comment box for a post - -[zrl=[baseurl]/help/hook/change_channel]change_channel[/zrl] - Called when logging in to a channel (either during login or afterward through the channel manager) - -[zrl=[baseurl]/help/hook/channel_remove]channel_remove[/zrl] - Called when removing a channel - -[zrl=[baseurl]/help/hook/channel_links]channel_links[/zrl] - Called when generating the Link: HTTP header for a channel - -[zrl=[baseurl]/help/hook/channel_settings]channel_settings[/zrl] - Called when displaying the channel settings page - -[zrl=[baseurl]/help/hook/chat_message]chat_message[/zrl] - Called to create a chat message. - -[zrl=[baseurl]/help/hook/chat_post]chat_post[/zrl] - Called when a chat message has been posted - -[zrl=[baseurl]/help/hook/check_account_email]check_account_email[/zrl] - Validate the email provided in an account registration - -[zrl=[baseurl]/help/hook/check_account_invite]check_account_invite[/zrl] - Validate an invitation code when using site invitations - -[zrl=[baseurl]/help/hook/check_account_password]check_account_password[/zrl] - Used to provide policy control over account passwords (minimum length, character set inclusion, etc.) - -[zrl=[baseurl]/help/hook/check_channelallowed]check_channelallowed[/zrl] - Used to over-ride or bypass the channel black/white block lists - -[zrl=[baseurl]/help/hook/check_siteallowed]check_siteallowed[/zrl] - Used to over-ride or bypass the site black/white block lists - -[zrl=[baseurl]/help/hook/collect_public_recipients]collect_public_recipients[/zrl] - Used to establish a list of recipients to send a public message to. - -[zrl=[baseurl]/help/hook/comment_buttons]comment_buttons[/zrl] - Called when rendering the edit buttons for comments - -[zrl=[baseurl]/help/hook/comments_are_now_closed]comments_are_now_closed[/zrl] - Called when deciding whether or not to present a comment box for a post - -[zrl=[baseurl]/help/hook/connect_premium]connect_premium[/zrl] - Called when connecting to a premium channel - -[zrl=[baseurl]/help/hook/connection_remove]connection_remove[/zrl] - Called when deleting/removing a connection - -[zrl=[baseurl]/help/hook/connector_settings]connector_settings[/zrl] - Called when posting to the features/addon settings page - -[zrl=[baseurl]/help/hook/construct_page]construct_page[/zrl] - General purpose hook to provide content to certain page regions. Called when constructing the Comanche page. - -[zrl=[baseurl]/help/hook/contact_block_end]contact_block_end[/zrl] - Called when generating the sidebar "Connections" widget - -[zrl=[baseurl]/help/hook/contact_edit]contact_edit[/zrl] - Called when editing a connection via connedit - -[zrl=[baseurl]/help/hook/contact_edit_post]contact_edit_post[/zrl] - Called when posting to connedit - -[zrl=[baseurl]/help/hook/contact_select_options]contact_select_options[/zrl] - Deprecated/unused - -[zrl=[baseurl]/help/hook/content_security_policy]content_security_policy[/zrl] - Called prior to output of the Content-Security-Policy header - -[zrl=[baseurl]/help/hook/conversation_start]conversation_start[/zrl] - Called in the beginning of rendering a conversation (message or message collection or stream) - -[zrl=[baseurl]/help/hook/cover_photo_content_end]cover_photo_content_end[/zrl] - Called after a cover photo has been uplaoded - -[zrl=[baseurl]/help/hook/create_identity]create_identity[/zrl] - Called when creating a channel - -[zrl=[baseurl]/help/hook/cron]cron[/zrl] - Called when scheduled tasks (poller) is executed - -[zrl=[baseurl]/help/hook/cron_daily]cron_daily[/zrl] - Called when daily scheduled tasks are executed - -[zrl=[baseurl]/help/hook/cron_weekly]cron_weekly[/zrl] - Called when weekly scheduled tasks are executed - -[zrl=[baseurl]/help/hook/crypto_methods]crypto_methods[/zrl] - Called when generating a list of crypto algorithms in the locally preferred order - -[zrl=[baseurl]/help/hook/daemon_addon]daemon_addon[/zrl] - Called when invoking the extensible background daemon - -[zrl=[baseurl]/help/hook/daemon_master_release]daemon_master_release[/zrl] - Called at the start of processing \Zotlabs\Daemon\Master::Release() - -[zrl=[baseurl]/help/hook/directory_item]directory_item[/zrl] - Called when generating a directory listing for display - -[zrl=[baseurl]/help/hook/discover_channel_webfinger]discover_channel_webfinger[/zrl] - Called when performing a webfinger lookup - -[zrl=[baseurl]/help/hook/display_item]display_item[/zrl] - Called for each item being displayed in a conversation thread - -[zrl=[baseurl]/help/hook/display_settings]display_settings[/zrl] - Called from settings module when displaying the 'display settings' section - -[zrl=[baseurl]/help/hook/display_settings_post]display_settings_post[/zrl] - Called when posting from the settings module 'display settings' form - -[zrl=[baseurl]/help/hook/donate_contributors]donate_contributors[/zrl] - called by the 'donate' addon when generating a list of donation recipients - -[zrl=[baseurl]/help/hook/donate_plugin]donate_plugin[/zrl] - called by the 'donate' addon - -[zrl=[baseurl]/help/hook/donate_sponsors]donate_sponsors[/zrl] - called by the 'donate' addon - -[zrl=[baseurl]/help/hook/dreport_is_storable]dreport_is_storable[/zrl] - called before storing a dreport record to determine whether to store it - -[zrl=[baseurl]/help/hook/dreport_process]dreport_process[/zrl] - called for each valid delivery report - -[zrl=[baseurl]/help/hook/dropdown_extras]dropdown_extras[/zrl] - Add additional items to the dropdown cog when item/threads are displayed. - -[zrl=[baseurl]/help/hook/drop_item]drop_item[/zrl] - called when an 'item' is removed - -[zrl=[baseurl]/help/hook/encode_object]encode_object[/zrl] - called when encoding an object for transmission. - -[zrl=[baseurl]/help/hook/enotify]enotify[/zrl] - called before any notification - -[zrl=[baseurl]/help/hook/enotify_mail]enotify_mail[/zrl] - called when sending a notification email - -[zrl=[baseurl]/help/hook/enotify_store]enotify_store[/zrl] - called when storing a notification record - -[zrl=[baseurl]/help/hook/enotify_store_end]enotify_store_end[/zrl] - called after a notification record has been stored - -[zrl=[baseurl]/help/hook/event_created]event_created[/zrl] - called when an event record is created - -[zrl=[baseurl]/help/hook/event_store_event]event_store_event[/zrl] - called when an event record is created or updated - -[zrl=[baseurl]/help/hook/event_updated]event_updated[/zrl] - called when an event record is modified - -[zrl=[baseurl]/help/hook/externals_url_select]externals_url_select[/zrl] - called when generating a list of random sites to pull public posts from - -[zrl=[baseurl]/help/hook/feature_enabled]feature_enabled[/zrl] - called when 'feature_enabled()' is used - -[zrl=[baseurl]/help/hook/feature_settings]feature_settings[/zrl] - called from settings page when visiting 'addon/feature settings' - -[zrl=[baseurl]/help/hook/feature_settings_post]feature_settings_post[/zrl] - called from settings page when posting from 'addon/feature settings' - -[zrl=[baseurl]/help/hook/fetch_and_store]fetch_and_store[/zrl] - called to allow filtering of 'decoded' items before storage. - -[zrl=[baseurl]/help/hook/file_thumbnail]file_thumbnail[/zrl] - called when generating thumbnail images for cloud page in 'view tiles' mode - -[zrl=[baseurl]/help/hook/follow]follow[/zrl] - called when a follow operation takes place - -[zrl=[baseurl]/help/hook/follow_from_feed]follow_from_feed[/zrl] - called when a follow operation takes place on an RSS feed - -[zrl=[baseurl]/help/hook/follow_allow]follow_allow[/zrl] - called before storing the results of a follow operation - -[zrl=[baseurl]/help/hook/gender_selector]gender_selector[/zrl] - called when creating the 'gender' drop down list (advanced profile) - -[zrl=[baseurl]/help/hook/gender_selector_min]gender_selector_min[/zrl] - called when creating the 'gender' drop down list (normal profile) - -[zrl=[baseurl]/help/hook/generate_map]generate_map[/zrl] - called to generate the HTML for displaying a map location by coordinates - -[zrl=[baseurl]/help/hook/generate_named_map]generate_named_map[/zrl] - called to generate the HTML for displaying a map location by text location - -[zrl=[baseurl]/help/hook/get_all_api_perms]get_all_api_perms[/zrl] - Called when retrieving the permissions for API uses - -[zrl=[baseurl]/help/hook/get_all_perms]get_all_perms[/zrl] - called when get_all_perms() is used - -[zrl=[baseurl]/help/hook/get_best_language]get_best_language[/zrl] - called when choosing the preferred language for the page - -[zrl=[baseurl]/help/hook/get_default_export_sections]get_default_export_sections[/zrl] - Called to get the default list of functional data groups to export in identity_basic_export() - -[zrl=[baseurl]/help/hook/get_features]get_features[/zrl] - Called when get_features() is called - -[zrl=[baseurl]/help/hook/get_photo]get_photo[/zrl] - Called when photo content (except for profile photos) is fetched in mod_photo - -[zrl=[baseurl]/help/hook/get_profile_photo]get_profile_photo[/zrl] - Called when local profile photo content is fetched in mod_photo - -[zrl=[baseurl]/help/hook/get_role_perms]get_role_perms[/zrl] - Called when get_role_perms() is called to obtain permissions for named permission roles - -[zrl=[baseurl]/help/hook/global_permissions]global_permissions[/zrl] - Called when the global permissions list is generated - -[zrl=[baseurl]/help/hook/home_content]home_content[/zrl] - Called from mod_home to replace the content of the home page - -[zrl=[baseurl]/help/hook/home_init]home_init[/zrl] - Called from the home page home_init() function - -[zrl=[baseurl]/help/hook/hostxrd]hostxrd[/zrl] - Called when generating .well-known/hosts-meta for "old webfinger" (used by Diaspora protocol) - -[zrl=[baseurl]/help/hook/html2bb_video]html2bb_video[/zrl] - Called when using the html2bbcode translation to handle embedded media - -[zrl=[baseurl]/help/hook/html2bbcode]html2bbcode[/zrl] - Called when using the html2bbcode translation - -[zrl=[baseurl]/help/hook/identity_basic_export]identity_basic_export[/zrl] - Called when exporting a channel's basic information for backup or transfer - -[zrl=[baseurl]/help/hook/import_author_xchan]import_author_xchan[/zrl] - Called when looking up an author of a post by xchan_hash to ensure they have an xchan record on our site - -[zrl=[baseurl]/help/hook/import_channel]import_channel[/zrl] - Called when importing a channel from a file or API source - -[zrl=[baseurl]/help/hook/import_directory_profile]import_directory_profile[/zrl] - Called when processing delivery of a profile structure from an external source (usually for directory storage) - -[zrl=[baseurl]/help/hook/import_xchan]import_xchan[/zrl] - Called when processing the result of zot_finger() to store the result - -[zrl=[baseurl]/help/hook/item_photo_menu]item_photo_menu[/zrl] - Called when generating the list of actions associated with a displayed conversation item - -[zrl=[baseurl]/help/hook/item_store]item_store[/zrl] - Called when item_store() stores a record of type item - -[zrl=[baseurl]/help/hook/item_stored]item_stored[/zrl] - Called after item_store() has stored a record of type item in the database. - -[zrl=[baseurl]/help/hook/item_custom]item_custom[/zrl] - Called before item_store() stores a record of type item (allowing addons to process ITEM_TYPE_CUSTOM items). - -[zrl=[baseurl]/help/hook/item_store_update]item_store_update[/zrl] - Called when item_store_update() is called to update a stored item. - -[zrl=[baseurl]/help/hook/item_stored_update]item_stored_update[/zrl] - Called after item_store_update() has updated a stored item. - -[zrl=[baseurl]/help/hook/item_translate]item_translate[/zrl] - Called from item_store and item_store_update after the post language has been autodetected - -[zrl=[baseurl]/help/hook/jot_networks]jot_networks[/zrl] - Called to generate the list of additional post plugins to enable from the ACL form - -[zrl=[baseurl]/help/hook/jot_tool]jot_tool[/zrl] - Deprecated and possibly obsolete. Allows one to add action buttons to the post editor. - -[zrl=[baseurl]/help/hook/jot_tpl_filter]jot_tpl_filter[/zrl] - Called to filter template vars before replacement in jot.tpl. - -[zrl=[baseurl]/help/hook/jot_header_tpl_filter]jot_header_tpl_filter[/zrl] - Called to filter template vars before replacement in jot_header.tpl. - -[zrl=[baseurl]/help/hook/legal_webbie]legal_webbie[/zrl] - Called to validate a channel address - -[zrl=[baseurl]/help/hook/legal_webbie_text]legal_webbie_text[/zrl] - Provides an explanation of text/character restrictions for legal_webbie() - -[zrl=[baseurl]/help/hook/load_pdl]load_pdl[/zrl] - Called when we load a PDL file or description - -[zrl=[baseurl]/help/hook/local_dir_update]local_dir_update[/zrl] - Called when processing a directory update from a channel on the directory server - -[zrl=[baseurl]/help/hook/location_move]location_move[/zrl] - Called when a new location has been provided to a UNO channel (indicating a move rather than a clone) - -[zrl=[baseurl]/help/hook/logged_in]logged_in[/zrl] - Called when authentication by any means has succeeeded - -[zrl=[baseurl]/help/hook/logger]logger[/zrl] - Called when making an entry to the application logfile - -[zrl=[baseurl]/help/hook/logging_out]logging_out[/zrl] - Called when logging out - -[zrl=[baseurl]/help/hook/login_hook]login_hook[/zrl] - Called when generating the login form - -[zrl=[baseurl]/help/hook/magic_auth]magic_auth[/zrl] - Called when processing a magic-auth sequence - -[zrl=[baseurl]/help/hook/markdown_to_bb]markdown_to_bb[/zrl] - Called when processing markdown conversion - -[zrl=[baseurl]/help/hook/match_webfinger_location]match_webfinger_location[/zrl] - Called when processing webfinger requests - -[zrl=[baseurl]/help/hook/magic_auth_openid_success]magic_auth_openid_success[/zrl] - Called when a magic-auth was successful due to openid credentials - -[zrl=[baseurl]/help/hook/magic_auth_success]magic_auth_success[/zrl] - Called when a magic-auth was successful - -[zrl=[baseurl]/help/hook/main_slider]main_slider[/zrl] - Called when generating the affinity tool - -[zrl=[baseurl]/help/hook/marital_selector]marital_selector[/zrl] - Called when generating the list of choices for the 'marital status' profile dropdown (advanced profile) - -[zrl=[baseurl]/help/hook/marital_selector_min]marital_selector_min[/zrl] - Called when generating the list of choices for the 'marital status' profile dropdown (normal profile) - -[zrl=[baseurl]/help/hook/module_loaded]module_loaded[/zrl] - Called when a module has been successfully locate to server a URL request - -[zrl=[baseurl]/help/hook/mood_verbs]mood_verbs[/zrl] - Called when generating the list of moods - -[zrl=[baseurl]/help/hook/nav]nav[/zrl] - Called when generating the navigation bar - -[zrl=[baseurl]/help/hook/network_content_init]network_content_init[/zrl] - Called when loading cntent for the network page - -[zrl=[baseurl]/help/hook/network_ping]network_ping[/zrl] - Called during a ping request - -[zrl=[baseurl]/help/hook/network_to_name]network_to_name[/zrl] - Deprecated - -[zrl=[baseurl]/help/hook/notifier_end]notifier_end[/zrl] - Called when a delivery loop has completed - -[zrl=[baseurl]/help/hook/notifier_hub]notifier_hub[/zrl] - Called when a hub is delivered - -[zrl=[baseurl]/help/hook/notifier_normal]notifier_normal[/zrl] - Called when the notifier is invoked for a 'normal' delivery - -[zrl=[baseurl]/help/hook/notifier_process]notifier_process[/zrl] - Called when the notifier is processing a message/event - -[zrl=[baseurl]/help/hook/obj_verbs]obj_verbs[/zrl] - Called when creating the list of verbs available for profile "things". - -[zrl=[baseurl]/help/hook/oembed_action]oembed_action[/zrl] - Called when deciding if an oembed url is to be filter, blocked, or approved - -[zrl=[baseurl]/help/hook/oembed_probe]oembed_probe[/zrl] - Called when performing an oembed content lookup - -[zrl=[baseurl]/help/hook/other_encapsulate]other_encapsulate[/zrl] - Called when encrypting content for which the algorithm is unknown (see also crypto_methods) - -[zrl=[baseurl]/help/hook/other_unencapsulate]other_unencapsulate[/zrl] - Called when decrypting content for which the algorithm is unknown (see also crypto_methods) - -[zrl=[baseurl]/help/hook/page_content_top]page_content_top[/zrl] - Called when we generate a webpage (before calling the module content function) - -[zrl=[baseurl]/help/hook/page_end]page_end[/zrl] - Called after we have generated the page content - -[zrl=[baseurl]/help/hook/page_header]page_header[/zrl] - Called when generating the navigation bar - -[zrl=[baseurl]/help/hook/page_header]page_meta[/zrl] - Called when generating the meta data in the page header. - -[zrl=[baseurl]/help/hook/parse_atom]parse_atom[/zrl] - Called when parsing an atom/RSS feed item - -[zrl=[baseurl]/help/hook/parse_link]parse_link[/zrl] - Called when probing a URL to generate post content from it - -[zrl=[baseurl]/help/hook/pdl_selector]pdl_selector[/zrl] - Called when creating a layout selection in a form - -[zrl=[baseurl]/help/hook/perm_is_allowed]perm_is_allowed[/zrl] - Called during perm_is_allowed() to determine if a permission is allowed for this channel and observer - -[zrl=[baseurl]/help/hook/permissions_create]permissions_create[/zrl] - Called when an abook entry (connection) is created - -[zrl=[baseurl]/help/hook/permissions_update]permissions_update[/zrl] - Called when a permissions refresh is transmitted - -[zrl=[baseurl]/help/hook/permit_hook]permit_hook[/zrl] - Called before a registered hook is actually executed to determine if it should be allowed or blocked - -[zrl=[baseurl]/help/hook/personal_xrd]personal_xrd[/zrl] - Called when generating the personal XRD for "old webfinger" (Diaspora) - -[zrl=[baseurl]/help/hook/photo_post_end]photo_post_end[/zrl] - Called after uploading a photo - -[zrl=[baseurl]/help/hook/photo_upload_begin]photo_upload_begin[/zrl] - Called when attempting to upload a photo - -[zrl=[baseurl]/help/hook/photo_upload_end]photo_upload_end[/zrl] - Called when a photo upload has been processed - -[zrl=[baseurl]/help/hook/photo_upload_file]photo_upload_file[/zrl] - Called to generate alternate filenames for an upload - -[zrl=[baseurl]/help/hook/photo_upload_form]photo_upload_form[/zrl] - Called when generating a photo upload form - -[zrl=[baseurl]/help/hook/photo_view_filter]photo_view_filter[/zrl] - Called before the data is handed over to the photo_view template - -[zrl=[baseurl]/help/hook/poke_verbs]poke_verbs[/zrl] - Called when generating the list of actions for "poke" module - -[zrl=[baseurl]/help/hook/post_local]post_local[/zrl] - Called when an item has been posted on this machine via mod/item.php (also via API) - -[zrl=[baseurl]/help/hook/post_local_end]post_local_end[/zrl] - Called after a local post operation has completed - -[zrl=[baseurl]/help/hook/post_local_start]post_local_start[/zrl] - Called when a local post operation is commencing - -[zrl=[baseurl]/help/hook/post_mail]post_mail[/zrl] - Called when a mail message has been composed - -[zrl=[baseurl]/help/hook/post_mail_end]post_mail_end[/zrl] - Called when a mail message has been delivered - -[zrl=[baseurl]/help/hook/post_remote]post_remote[/zrl] - Called when an activity arrives from another site - -[zrl=[baseurl]/help/hook/post_remote_end]post_remote_end[/zrl] - Called after processing a remote post - -[zrl=[baseurl]/help/hook/post_remote_update]post_remote_update[/zrl] - Called when processing a remote post that involved an edit or update - -[zrl=[baseurl]/help/hook/post_remote_update_end]post_remote_update_end[/zrl] - Called after processing a remote post that involved an edit or update - -[zrl=[baseurl]/help/hook/prepare_body]prepare_body[/zrl] - Called when generating the HTML for a displayed conversation item - -[zrl=[baseurl]/help/hook/prepare_body_final]prepare_body_final[/zrl] - Called after generating the HTML for a displayed conversation item - -[zrl=[baseurl]/help/hook/prepare_body_init]prepare_body_init[/zrl] - Called before generating the HTML for a displayed conversation item - -[zrl=[baseurl]/help/hook/privacygroup_extras]privacygroup_extras[/zrl] - Called before generating the HTML for the Privacy Group edit options - -[zrl=[baseurl]/help/hook/privacygroup_extras_delete]privacygroup_extras_delete[/zrl] - Called after privacy group is dropped. - -[zrl=[baseurl]/help/hook/privacygroup_extras_post]privacygroup_extras_post[/zrl] - Called when privacy group edit form is submitted. - -[zrl=[baseurl]/help/hook/proc_run]proc_run[/zrl] - Called when invoking PHP sub processes - -[zrl=[baseurl]/help/hook/process_channel_sync_delivery]process_channel_sync_delivery[/zrl] - Called when accepting delivery of a 'sync packet' containing structure and table updates from a channel clone - -[zrl=[baseurl]/help/hook/profile_advanced]profile_advanced[/zrl] - Called when generating an advanced profile page - -[zrl=[baseurl]/help/hook/profile_edit]profile_edit[/zrl] - Called when editing a profile - -[zrl=[baseurl]/help/hook/profile_photo_content_end]profile_photo_content_end[/zrl] - Called when changing a profile photo - -[zrl=[baseurl]/help/hook/profile_post]profile_post[/zrl] - Called when posting an edited profile - -[zrl=[baseurl]/help/hook/profile_sidebar]profile_sidebar[/zrl] - Called when generating the 'channel sidebar' or mini-profile - -[zrl=[baseurl]/help/hook/profile_sidebar_enter]profile_sidebar_enter[/zrl] - Called before generating the 'channel sidebar' or mini-profile - -[zrl=[baseurl]/help/hook/queue_deliver]queue_deliver[/zrl] - Called when delivering a queued message - -[zrl=[baseurl]/help/hook/register_account]register_account[/zrl] - Called when an account has been created - -[zrl=[baseurl]/help/hook/render_location]render_location[/zrl] - Called to generate an ineractive inline map - -[zrl=[baseurl]/help/hook/replace_macros]replace_macros[/zrl] - Called before invoking the template processor - -[zrl=[baseurl]/help/hook/reverse_magic_auth]reverse_magic_auth[/zrl] - Called before invoking reverse magic auth to send you to your own site to authenticate on this site - -[zrl=[baseurl]/help/hook/settings_account]settings_account[/zrl] - Called when generating the account settings form - -[zrl=[baseurl]/help/hook/settings_form]settings_form[/zrl] - Called when generating the channel settings form - -[zrl=[baseurl]/help/hook/settings_post]settings_post[/zrl] - Called when posting from the channel settings form - -[zrl=[baseurl]/help/hook/sexpref_selector]sexpref_selector[/zrl] - Called when generating a dropdown of sexual preference (advanced profile) - -[zrl=[baseurl]/help/hook/sexpref_selector_min]sexpref_selector_min[/zrl] - Called when generating a dropdown of sexual preference (normal profile) - -[zrl=[baseurl]/help/hook/smilie]smilie[/zrl] - Called when translating emoticons - -[zrl=[baseurl]/help/hook/status_editor]status_editor[/zrl] - Called when generating the status_editor. - -[zrl=[baseurl]/help/hook/stream_item]stream_item[/zrl] - Called for each item which is rendered for viewing via conversation() - -[zrl=[baseurl]/help/hook/system_app_installed_filter]system_app_installed_filter[/zrl] - Called when determining whether a system app is installed - -[zrl=[baseurl]/help/hook/tagged]tagged[/zrl] - Called when a delivery is processed which results in you being tagged - -[zrl=[baseurl]/help/hook/thumbnail]thumbnail[/zrl] - Called when generating thumbnails for cloud storage 'tile' view - -[zrl=[baseurl]/help/hook/update_unseen]update_unseen[/zrl] - Called prior to automatically marking items seen which were loaded in the browser - -[zrl=[baseurl]/help/hook/validate_channelname]validate_channelname[/zrl] - Used to validate the names used by a channel - -[zrl=[baseurl]/help/hook/webfinger]webfinger[/zrl] - Called when visiting the webfinger (RFC7033) service - -[zrl=[baseurl]/help/hook/well_known]well_known[/zrl] - Called when accessing the '.well-known' special site addresses - -[zrl=[baseurl]/help/hook/wiki_preprocess]wiki_preprocess[/zrl] - Called before markdown/bbcode processors are run for wiki pages - -[zrl=[baseurl]/help/hook/zot_best_algorithm]zot_best_algorithm[/zrl] - Called when negotiating crypto algorithms with remote sites - -[zrl=[baseurl]/help/hook/zid]zid[/zrl] - Called when adding the observer's zid to a URL - -[zrl=[baseurl]/help/hook/zid_init]zid_init[/zrl] - Called when authenticating a visitor who has used zid - -[zrl=[baseurl]/help/hook/zot_finger]zot_finger[/zrl] - Called when a zot-info packet has been requested (this is our webfinger discovery mechanism) diff --git a/doc/hooks.html b/doc/hooks.html deleted file mode 100644 index a7ee314e7..000000000 --- a/doc/hooks.html +++ /dev/null @@ -1 +0,0 @@ -

      Hooks

      FunctionSource FileArg
      $a->module . _mod_aftercontentindex.php$arr
      $a->module . _mod_contentindex.php$arr
      $a->module . _mod_initindex.php$placeholder
      $a->module . _mod_postindex.php$_POST
      $a->module . _post_ . $selnameinclude/acl_selectors.php$o
      $a->module . _post_ . $selnameinclude/acl_selectors.php$o
      $a->module . _post_ . $selnameinclude/acl_selectors.php$o
      $a->module . _pre_ . $selnameinclude/acl_selectors.php$arr
      $a->module . _pre_ . $selnameinclude/acl_selectors.php$arr
      $a->module . _pre_ . $selnameinclude/acl_selectors.php$arr
      $nameinclude/plugin.php&$data = null
      about_hookmod/siteinfo.php$o
      accept_followmod/connedit.php$arr
      account_downgradeinclude/account.php$ret
      account_downgradeinclude/account.php$ret
      account_settingsmod/settings.php$account_settings
      activity_receivedinclude/zot.php$parr
      affinity_labelsinclude/widgets.php$labels
      affinity_labelsmod/connedit.php$labels
      api_perm_is_allowedinclude/permissions.php$arr
      app_menuindex.php$arr
      atom_authorinclude/items.php$o
      atom_entryinclude/items.php$o
      atom_feedinclude/items.php$atom
      atom_feed_endinclude/items.php$atom
      attach_upload_fileinclude/attach.php$f
      authenticateinclude/auth.php$addon_auth
      avatar_lookupinclude/network.php$avatar
      bb2diasporainclude/markdown.php$Text
      bbcodeinclude/bbcode.php$Text
      channel_removeinclude/Contact.php$r[0]
      chat_messageinclude/chat.php$arr
      chat_postmod/chatsvc.php$arr
      check_account_emailinclude/account.php$arr
      check_account_inviteinclude/account.php$arr
      check_account_passwordinclude/account.php$arr
      connect_premiummod/connect.php$arr
      connector_settingsmod/settings.php$settings_connectors
      construct_pageboot.php$arr
      contact_block_endinclude/text.php$arr
      contact_editmod/connedit.php$arr
      contact_edit_postmod/connedit.php$_POST
      contact_select_optionsinclude/acl_selectors.php$x
      conversation_startinclude/conversation.php$cb
      create_identityinclude/channel.php$newuid
      croninclude/cronhooks.php$d
      cron_dailyinclude/poller.phpdatetime_convert()
      cron_weeklyinclude/poller.phpdatetime_convert()
      directory_itemmod/directory.php$arr
      discover_by_webbieinclude/network.php$arr
      display_iteminclude/ItemObject.php$arr
      display_iteminclude/conversation.php$arr
      display_settingsmod/settings.php$o
      display_settings_postmod/settings.php$_POST
      donate_contributorsextend/addon/matrix/donate/donate.php$contributors
      donate_pluginextend/addon/matrix/donate/donate.php$o
      donate_sponsorsextend/addon/matrix/donate/donate.php$sponsors
      dreport_is_storableinclude/zot.php$dr
      drop_iteminclude/items.php$arr
      enotifyinclude/enotify.php$h
      enotify_mailinclude/enotify.php$datarray
      enotify_storeinclude/enotify.php$datarray
      event_createdinclude/event.php$event[id]
      event_updatedinclude/event.php$event[id]
      externals_url_selectinclude/externals.php$arr
      feature_enabledinclude/features.php$arr
      feature_settingsmod/settings.php$settings_addons
      feature_settings_postmod/settings.php$_POST
      followinclude/follow.php$arr
      followinclude/follow.php$arr
      follow_allowinclude/follow.php$x
      gender_selectorinclude/profile_selectors.php$select
      gender_selector_mininclude/profile_selectors.php$select
      generate_mapinclude/text.php$arr
      generate_named_mapinclude/text.php$arr
      get_all_api_permsinclude/permissions.php$arr
      get_all_permsinclude/permissions.php$arr
      get_featuresinclude/features.php$arr
      get_role_permsinclude/permissions.php$ret
      get_widgetsboot.php$arr
      get_widgetsboot.php$arr
      global_permissionsinclude/permissions.php$ret
      home_contentmod/home.php$o
      home_initmod/home.php$ret
      hostxrdmod/hostxrd.php$arr
      html2bbcodeinclude/html2bbcode.php$message
      identity_basic_exportinclude/channel.php$addon
      import_author_xchaninclude/items.php$arr
      import_channelmod/import.php$addon
      import_directory_profileinclude/zot.php$d
      import_xchaninclude/zot.php$arr
      item_photo_menuinclude/conversation.php$args
      item_storeinclude/items.php$d
      item_storeinclude/items.php$arr
      item_store_updateinclude/items.php$d
      item_translateinclude/items.php$translate
      item_translateinclude/items.php$translate
      jot_networksinclude/acl_selectors.php$jotnets
      jot_networksinclude/conversation.php$jotnets
      jot_networksmod/editblock.php$jotnets
      jot_networksmod/editpost.php$jotnets
      jot_networksmod/editwebpage.php$jotnets
      jot_networksmod/editlayout.php$jotnets
      jot_toolinclude/conversation.php$jotplugins
      jot_toolmod/editblock.php$jotplugins
      jot_toolmod/editpost.php$jotplugins
      jot_toolmod/editwebpage.php$jotplugins
      jot_toolmod/editlayout.php$jotplugins
      load_pdlboot.php$arr
      local_dir_updateinclude/dir_fns.php$arr
      logged_ininclude/oauth.php$a->user
      logged_ininclude/api.php$a->user
      logged_ininclude/security.php$a->account
      logged_ininclude/security.php$user_record
      logging_outinclude/auth.php$args
      login_hookboot.php$o
      magic_authmod/magic.php$arr
      magic_auth_openid_successmod/openid.php$arr
      magic_auth_openid_successmod/openid.php$arr
      magic_auth_successmod/post.php$arr
      main_sliderinclude/widgets.php$arr
      marital_selectorinclude/profile_selectors.php$select
      marital_selector_mininclude/profile_selectors.php$select
      module_loadedindex.php$x
      mood_verbsinclude/text.php$arr
      navinclude/nav.php$x
      network_content_initmod/network.php$arr
      network_pingmod/ping.php$arr
      network_tabsinclude/conversation.php$arr
      network_to_nameinclude/contact_selectors.php$nets
      notifier_endinclude/notifier.php$target_item
      notifier_hubinclude/notifier.php$narr
      notifier_normalinclude/deliver_hooks.php$r[0]
      obj_verbsinclude/taxonomy.php$arr
      oembed_probeinclude/oembed.php$x
      page_content_topindex.php$a->page[content]
      page_endindex.php$a->page[content]
      page_headerinclude/nav.php$a->page[nav]
      parse_atominclude/items.php$arr
      parse_linkmod/linkinfo.php$arr
      pdl_selectorinclude/comanche.php$arr
      perm_is_allowedinclude/permissions.php$arr
      permissions_createinclude/notifier.php$perm_update
      permissions_updateinclude/notifier.php$perm_update
      personal_xrdmod/xrd.php$arr
      photo_post_endinclude/photos.php$ret
      photo_post_endinclude/photos.php$ret
      photo_upload_begininclude/attach.php$arr
      photo_upload_begininclude/photos.php$args
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/attach.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_endinclude/photos.php$ret
      photo_upload_fileinclude/attach.php$f
      photo_upload_fileinclude/photos.php$f
      photo_upload_formmod/photos.php$ret
      poke_verbsinclude/text.php$arr
      post_localinclude/zot.php$arr
      post_localinclude/items.php$arr
      post_localmod/item.php$datarray
      post_local_endinclude/items.php$arr
      post_local_endinclude/attach.php$arr
      post_local_endinclude/attach.php$arr
      post_local_endextend/addon/matrix/randpost/randpost.php$x
      post_local_endextend/addon/matrix/randpost/randpost.php$x
      post_local_endmod/mood.php$arr
      post_local_endmod/like.php$arr
      post_local_endmod/item.php$datarray
      post_local_endmod/subthread.php$arr
      post_local_startmod/item.php$_REQUEST
      post_mailinclude/items.php$arr
      post_mail_endinclude/items.php$arr
      post_remoteinclude/items.php$arr
      post_remote_endinclude/items.php$arr
      post_remote_updateinclude/items.php$arr
      post_remote_update_endinclude/items.php$arr
      prepare_bodyinclude/text.php$prep_arr
      prepare_body_finalinclude/text.php$prep_arr
      prepare_body_initinclude/text.php$item
      probe_well_knowninclude/probe.php$ret
      proc_runboot.php$arr
      process_channel_sync_deliveryinclude/zot.php$addon
      profile_advancedmod/profile.php$o
      profile_editmod/profiles.php$arr
      profile_photo_content_endmod/profile_photo.php$o
      profile_postmod/profiles.php$_POST
      profile_sidebarinclude/channel.php$arr
      profile_sidebar_enterinclude/channel.php$profile
      register_accountinclude/account.php$result
      render_locationinclude/conversation.php$locate
      replace_macrosinclude/text.php$arr
      reverse_magic_authmod/rmagic.php$arr
      settings_accountmod/settings.php$_POST
      settings_formmod/settings.php$o
      settings_postmod/settings.php$_POST
      sexpref_selectorinclude/profile_selectors.php$select
      sexpref_selector_mininclude/profile_selectors.php$select
      smilieinclude/text.php$params
      smilieextend/addon/matrix/smileybutton/smileybutton.php$params
      taggedinclude/items.php$arr
      validate_channelnameinclude/channel.php$arr
      webfingermod/wfinger.php$arr
      well_knownmod/_well_known.php$arr
      zidinclude/channel.php$arr
      zid_initinclude/channel.php$arr
      zot_fingerinclude/zot.php$ret

      Generated Tue Nov 03 21:19:02 PST 2015

      \ No newline at end of file diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb deleted file mode 100644 index 172008b7f..000000000 --- a/doc/intro_for_developers.bb +++ /dev/null @@ -1,113 +0,0 @@ -[b]$Projectname Developer Guide[/b] - -[b]File system layout:[/b] - -[addon] optional addons/plugins - -[boot.php] Every process uses this to bootstrap the application structure - -[doc] Help Files - -[images] core required images - -[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing - -[index.php] The front-end controller for web access - -[install] Installation and upgrade files and DB schema - -[library] Third party modules (must be license compatible) - -[mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php) - -[mod/site/] site-specific mod overrides, excluded from git - -[util] translation tools, main English string database and other miscellaneous utilities - -[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git) - -[view] theming and language files - -[view/(css,js,img,php,tpl)] default theme files - -[view/(en,it,es ...)] language strings and resources - -[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides - -[b]The Database:[/b] - - [li]abook - contact table, replaces Friendica 'contact'[/li] - [li]account - service provider account[/li] - [li]addon - registered plugins[/li] - [li]app - peronal app data[/li] - [li]attach - file attachments[/li] - [li]auth_codes - OAuth usage[/li] - [li]cache - OEmbed cache[/li] - [li]channel - replaces Friendica 'user'[/li] - [li]chat - chat room content[/li] - [li]chatpresence - channel presence information for chat[/li] - [li]chatroom - data for the actual chat room[/li] - [li]clients - OAuth usage[/li] - [li]config - main configuration storage[/li] - [li]conv - Diaspora private messages[/li] - [li]event - Events[/li] - [li]fcontact - friend suggestion stuff[/li] - [li]ffinder - friend suggestion stuff[/li] - [li]fserver - obsolete[/li] - [li]fsuggest - friend suggestion stuff[/li] - [li]pgrp - privacy groups[/li] - [li]pgrp_member - privacy groups[/li] - [li]hook - plugin hook registry[/li] - [li]hubloc - Red location storage, ties a location to an xchan[/li] - [li]item - posts[/li] - [li]item_id - other identifiers on other services for posts[/li] - [li]likes - likes of 'things'[/li] - [li]mail - private messages[/li] - [li]menu - channel menu data[/li] - [li]menu_item - items uses by channel menus[/li] - [li]notify - notifications[/li] - [li]notify-threads - need to factor this out and use item thread info on notifications[/li] - [li]obj - object data for things (x has y)[/li] - [li]outq - output queue[/li] - [li]pconfig - personal (per channel) configuration storage[/li] - [li]photo - photo storage[/li] - [li]poll - data for polls[/li] - [li]poll_elm - data for poll elements[/li] - [li]profdef - custom profile field definitions[/li] - [li]profext - custom profile field data[/li] - [li]profile - channel profiles[/li] - [li]profile_check - DFRN remote auth use, may be obsolete[/li] - [li]register - registrations requiring admin approval[/li] - [li]session - web session storage[/li] - [li]shares - shared item information[/li] - [li[sign - Diaspora signatures. To be phased out.[/li] - [li]site - site table to find directory peers[/li] - [li]source - channel sources data[/li] - [li]spam - unfinished[/li] - [li]sys_perms - extensible permissions for the sys channel[/li] - [li]term - item taxonomy (categories, tags, etc.) table[/li] - [li]tokens - OAuth usage[/li] - [li]updates - directory sync updates[/li] - [li]verify - general purpose verification structure[/li] - [li]vote - vote data for polls[/li] - [li]xchan - replaces 'gcontact', list of known channels in the universe[/li] - [li]xchat - bookmarked chat rooms[/li] - [li]xconfig - as pconfig but for channels with no local account[/li] - [li]xlink - "friends of friends" linkages derived from poco[/li] - [li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li] - [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li] - - -[b]How to theme $Projectname - by Olivier Migeot[/b] - -This is a short documentation on what I found while trying to modify $Projectname's appearance. - -First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it . - -Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init(). - -At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css'). - -Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. - -#include doc/macros/main_footer.bb; diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb deleted file mode 100644 index 32814c59b..000000000 --- a/doc/macros/addons_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl] -Return to the [zrl=[baseurl]/help/main]Main documentation[/zrl] diff --git a/doc/macros/cloud_footer.bb b/doc/macros/cloud_footer.bb deleted file mode 100644 index 798cc9ea6..000000000 --- a/doc/macros/cloud_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Return to the [zrl=[baseurl]/help/cloud]Cloud documentation[/zrl] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/macros/de/addons_footer.bb b/doc/macros/de/addons_footer.bb deleted file mode 100644 index 068bb7ec7..000000000 --- a/doc/macros/de/addons_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Zurück zur [zrl=[baseurl]/help/addons]Addons-Hilfe[/zrl] -Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/cloud_footer.bb b/doc/macros/de/cloud_footer.bb deleted file mode 100644 index 921448a3c..000000000 --- a/doc/macros/de/cloud_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Zurück zur [zrl=[baseurl]/help/cloud]Cloud-Hilfe[/zrl] -Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/main_footer.bb b/doc/macros/de/main_footer.bb deleted file mode 100644 index e71603626..000000000 --- a/doc/macros/de/main_footer.bb +++ /dev/null @@ -1 +0,0 @@ -Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/troubleshooting_footer.bb b/doc/macros/de/troubleshooting_footer.bb deleted file mode 100644 index be8c13a28..000000000 --- a/doc/macros/de/troubleshooting_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Zurück zur [zrl=[baseurl]/help/troubleshooting]Troubleshooting-Startseite[/zrl] -Zurück zur [zrl=[baseurl]/help/troubleshooting]Hilfe-Startseite[/zrl] diff --git a/doc/macros/main_footer.bb b/doc/macros/main_footer.bb deleted file mode 100644 index 08f671ded..000000000 --- a/doc/macros/main_footer.bb +++ /dev/null @@ -1 +0,0 @@ -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/macros/pl/addons_footer.bb b/doc/macros/pl/addons_footer.bb deleted file mode 100644 index 79ac0a71c..000000000 --- a/doc/macros/pl/addons_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Powróć do [zrl=[baseurl]/help/addons]dokumentacji dodatków[/zrl] -Powróć do [zrl=[baseurl]/help/main]głównej strony dokumentacji[/zrl] diff --git a/doc/macros/pl/cloud_footer.bb b/doc/macros/pl/cloud_footer.bb deleted file mode 100644 index 48628ae1a..000000000 --- a/doc/macros/pl/cloud_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -Powróć do [zrl=[baseurl]/help/cloud]dokumentacji chmury[/zrl] -Powróć do [zrl=[baseurl]/help/main]głównej strony dokumentacji[/zrl] diff --git a/doc/macros/pl/main_footer.bb b/doc/macros/pl/main_footer.bb deleted file mode 100644 index 8bf25fed5..000000000 --- a/doc/macros/pl/main_footer.bb +++ /dev/null @@ -1 +0,0 @@ -Powróć do [zrl=[baseurl]/help/main]głównej strony dokumentacji[/zrl] diff --git a/doc/macros/pl/troubleshooting_footer.bb b/doc/macros/pl/troubleshooting_footer.bb deleted file mode 100644 index 19328ad64..000000000 --- a/doc/macros/pl/troubleshooting_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -[zrl=[baseurl]/help/troubleshooting]Dokumentacja dotycząca rozwiązywania problemów[/zrl] -[zrl=[baseurl]/help/troubleshooting]Główna strona dokumentacji[/zrl] diff --git a/doc/macros/troubleshooting_footer.bb b/doc/macros/troubleshooting_footer.bb deleted file mode 100644 index c7603a62b..000000000 --- a/doc/macros/troubleshooting_footer.bb +++ /dev/null @@ -1,2 +0,0 @@ -[zrl=[baseurl]/help/troubleshooting]Troubleshooting documentation[/zrl] -[zrl=[baseurl]/help/troubleshooting]Documentation Main Page[/zrl] diff --git a/doc/member/assets/qr_text_to_post.png b/doc/member/assets/qr_text_to_post.png deleted file mode 100644 index 887c85492..000000000 Binary files a/doc/member/assets/qr_text_to_post.png and /dev/null differ diff --git a/doc/member/assets/zat_dialog.png b/doc/member/assets/zat_dialog.png deleted file mode 100644 index 892964e95..000000000 Binary files a/doc/member/assets/zat_dialog.png and /dev/null differ diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html deleted file mode 100644 index e3e079b4d..000000000 --- a/doc/member/bbcode.html +++ /dev/null @@ -1,337 +0,0 @@ - -

      Text Decoration

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      BBcode syntaxRendered text
      [b]bold[/b]bold
      [i]italic[/i]italic
      [u]underlined[/u]underlined
      [s]strike[/s]strike
      [color=red]red[/color]red
      [hl]highlighted[/hl]highlighted
      [font=courier]some text[/font] some text
      [quote]quote[/quote]
      quote
      [quote=Author]Author? Me? No, no, no...[/quote]Author wrote:
      Author? Me? No, no, no...
      - [size=small]small text[/size]
      - [size=xx-large]xx-large text[/size]
      - [size=20]20px exactly[/size]
      -       - Size options include: xx-small, small, medium, large, xx-large      		small text
      xx-large text
      20px exactly
      Add a horizontal bar -[hr] -Like this - - Add a horizontal bar

      Like this -
      This is -[center]centered[/center] -text - This is
      centered

      text -
      - -

      Code blocks

      -Code can be rendered generically in a block or inline format (depending on if there are new line characters in the text), or you can specify a supported language for enhanced syntax highlighting. Syntax highlighting requires a suitable rendering plugin such as hilite. Supported languages with the hilite plugin include php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh . -

      -If a rendering plugin is not installed or an unsupported language is specified, the output for syntax highlighted code blocks is the same as the block format code tag. -

      - - - - - - - - - - - - - - - -
      BBcode syntaxOutput
      [code]function bbcode() { }[/code]function bbcode() { }
      [code=php]function bbcode() {
      - $variable = true;
      - if( $variable ) {
      - echo "true";
      - }
      -}[/code]
      1.  function bbcode() {
      2.    $variable = true;
      3.    if( $variable ) {
      4.      echo "true";
      5.    }
      6.  }
      [nobb][nobb]This is how [i]you[/i] can -[u]show[/u] how to use -[hl]BBcode[/hl] syntax[/nobb][/nobb][nobb]This is how [i]you[/i] can [u]show[/u] how to use [hl]BBcode[/hl] syntax[/nobb]
      - -

      Lists

      - - - - - - - - - - - - - - - - - - -
      BBcode syntaxRendered list
      [ul]
      -[*] First list element
      -[*] Second list element
      -[/ul]
      • First list element
      • Second list element
      [ol]
      -[*] First list element
      -[*] Second list element
      -[/ol]
      • First list element
      • Second list element
      [list=A]
      -[*] First list element
      -[*] Second list element
      -[/list]       - The list type options are 1, i, I, a, A.
      • First list element
      • Second list element
      [dl terms="b"]
      -[*= First element term] First element description
      -[*= Second element term] Second element description
      -[/dl]       - The terms style options can be any combination of: -
      -
      b
      bold
      -
      i
      italic
      -
      u
      underline
      -
      m
      monospace
      -
      l
      large
      -
      h
      horizontal — like this defintion list
      -
      -
      -
      First element term
      First element description
      -
      Second element term
      Second element description
      - -

      Tables

      - - - - - - - - - - - - - - - - -
      BBcode syntaxRendered table
      [table border=0]
      -[tr]
      -[th]Header 1[/th][th]Header 2[/th]
      -[/tr]
      -[tr][td]Content[/td][td]Content[/td][/tr]
      -[tr][td]Content[/td][td]Content[/td][/tr]
      -[/table]      		 -
      Header 1Header 2
      ContentContent
      ContentContent
      [table border=1]
      -[tr]
      -[th]Header 1[/th][th]Header 2[/th]
      -[/tr]
      -[tr][td]Content[/td][td]Content[/td][/tr]
      -[tr][td]Content[/td][td]Content[/td][/tr]
      -[/table]      		 -
      Header 1Header 2
      ContentContent
      ContentContent
      [table]
      -[tr]
      -[th]Header 1[/th][th]Header 2[/th]
      -[/tr]
      -[tr][td]Content[/td][td]Content[/td][/tr]
      -[tr][td]Content[/td][td]Content[/td][/tr]
      -[/table]
      Header 1Header 2
      ContentContent
      ContentContent
      -
      - -

      Links and Embedded Content

      - - - - - - - - - - - - - - - - -
      BBcode syntaxOutput
      [video]video URL[/video]
      -[audio]audio URL[/audio]
      [url=https://hubzilla.org]Hubzilla[/url]Hubzilla
      An image [img]https://example.org/image.jpg[/img] -in some text - An image Image/photo in some text -
      - - -

      $Projectname specific codes

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      BBcode syntaxOutput
      Magic-auth version of [url] tag - [zrl=https://hubzilla.org]Identity-aware link[/zrl] - https://hubzilla.org/?zid=[observer=1][observer.address][/observer][observer=0]your_channel@your.home.hub[/observer]
      Magic-auth version of [img] tag - [zmg]https://hubzilla.org/some/photo.jpg[/zmg] - Image is only viewable by those authenticated and with permission.
      Observer-dependent output: - [nobb][observer=1]Text to display if observer IS authenticated[/observer][/nobb] -
      - - [nobb][observer=0]Text to display if observer IS NOT authenticated[/observer][/nobb] - -
      - - [nobb][observer.language=en]Text to display if observer language is English[/observer][/nobb] - -
      - - [nobb][observer.language!=de]Text to display if observer language is not German[/observer][/nobb] - -
      - - [nobb][observer.url][/nobb] - - channel URL of observer
      - - [nobb][observer.baseurl][/nobb] - - website of observer
      - - [nobb][observer.name][/nobb] - - name of observer
      - - [nobb][observer.webname][/nobb] - - short name in the url of the observer
      - - [nobb][observer.address][/nobb] - - address (ZOT-id) of observer
      - - [nobb][observer.photo][/nobb] - - profile photo of observer
      What is a spoiler?
      - [spoiler]Text you want to hide.[/spoiler]      		 - What is a spoiler?
      Click to open/close
      -
      [toc data-toc='div.page-body' data-toc-headings='h1,h2']
      -Create a table of content in a webpage or wiki page. Please refer to the original jQuery toc to get more explanations. -
        -
      • Optional param: 'data-toc'. If omitted the default is 'body'
        • -
      • Optional param: 'data-toc-headings'. If omitted the default is 'h1,h2,h3'
        • -
      [nobb][rpost=title]Text to post[/rpost][/nobb]
      -The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional      		[baseurl]/rpost?f=&title=title&body=Text+to+post
      This requires the qrator plugin.
      [qr]text to post[/qr]
      This requires a suitable map plugin such as openstreetmap. - [map]Generate an inline map using the current browser coordinates of the poster, if browser location is enabled
      This requires a suitable map plugin such as openstreetmap. - [map=latitude,longitude]Generate a map using global coordinates.
      This requires a suitable map plugin such as openstreetmap. - [map]Place Name[/map] -Generate a map for a given named location. The first matching location is returned. For instance "Sydney" will usually return Sydney, Australia and not Sydney, Nova Scotia, Canada unless the more precise location is specified. It is highly recommended to use the post preview utility to ensure you have the correct location before submitting the post. -
      [&copy;] ©
      diff --git a/doc/member/member_faq.bb b/doc/member/member_faq.bb deleted file mode 100644 index 9533cb557..000000000 --- a/doc/member/member_faq.bb +++ /dev/null @@ -1,10 +0,0 @@ -[h3]$Projectname FAQ[/h3] -[h4]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/h4] -Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other $Projectname servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to $Projectname posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. -If a posting is public this is even harder, as $Projectname is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. -[h4]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/h4] -Posts and photos/files are provided separately from the channel basic information. This is due to memory limitations dealing with years of conversations and photo archives. Posts and conversations can be synced separately from the basic channel information. Photos and file archives can be transferred using a plugin tool such as 'redfiles', which is currently listed as "experimental". When creating this feature we thought that keeping all your contacts was the most important task. Your friends have already seen your old content. Posts/conversations were next in priority and these may now be synced. Files and photos are the last bit to get completely working. Once we find someone willing to finish implementing this, it will be done. :) -[h4]I can't see private resources[/h4] -You have probably disabled third party cookies. You need to enable them for remote authentication to work. -[h4]There are a lot of foreign language posts. Let's auto-translate them.[/h4] -There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb deleted file mode 100644 index 2b772d1c5..000000000 --- a/doc/member/member_guide.bb +++ /dev/null @@ -1,1068 +0,0 @@ -[h3]Overview[/h3] - -While many features and capabilities of $Projectname are familiar to people who have used social networking sites and blogging software, there are also quite a few new concepts and features that most people have not encountered before. Some of the new ideas are related to the decentralized nature of the grid; others are associated with the advanced permissions system that is necessary to protect your data privacy. The purpose of this guide is to help you understand how to create, configure, and use your nomadic identity. - -[h3]Registration[/h3] - -Not all $Projectname sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all $Projectname sites are linked, it does not matter where your account resides. - -[b]Your Email Address[/b] - -Please provide a valid email address. Your email address is never published. This address will be used to activate your account, to (optionally) send email notifications for incoming messages or items, [i]and to recover lost passwords[/i]. - -[b]Password[/b] - -Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As $Projectname offers a decentralised identity, your account can log you in to many other websites. - -[b]Terms Of Service[/b] - -Click the link to read the site's [zrl=[baseurl]/help/TermsOfService]Terms of Service[/zrl]. Once you've read them, tick the box in the register form to confirm. - -[b]Register[/b] - -Once you have provided the necessary details, click the 'Register' button. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval. - - - -[h3]Channels[/h3] - -[h4]What are channels?[/h4] - -Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be "Me". - -The most important features for a channel that represents "me" are: -[ul] -[*]Secure and private "spam free" communications - -[*]Identity and "single-signon" across the entire network - -[*]Privacy controls and permissions which extend to the entire network - -[*]Directory services (like a phone book) -[/ul] -In short, a channel that represents yourself is "me, on the internet". - - - -[h3]Channel Permission Roles[/h3] - -When you create a new channel, you will be asked to select a permission role based on how you envision using this channel. The most popular permission roles are the Social Networking roles. You have many other choices, providing options which are analagous to Facebook Groups and Pages, collaborative spaces, newsfeeds, and more. These roles automatically configure several different system variables ranging from what permissions are granted to friends, to your default privacy settings and visibility choices. Advanced configurations are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". Thew following describes some of the different roles which are currently available and how they impact your privacy and ability to interact. - -[h4]Social[/h4] - -[b]Federation[/b] - -The channel is a very permissive social networking profile which is compatible with other federated social networks. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. Privacy is a lower priority than ease of access and connecting with others. Anybody in the network can comment on your public posts and send you private mail. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. This mode [i]may[/i] increase your exposure to undesired communications and spam. This role is not generally recommended [i]unless[/i] you need to interact regularly with members of other networks. - -[b]Mostly Public[/b] - -The channel is a typical social networking profile. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. Only your immediate connections can comment on your public posts and send you private mail. The permission policies are similar to Facebook. - - -[b]Restricted[/b] - -By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers. - -[b]Private[/b] - -By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. - - -[h4]Forum[/h4] - -[b]Mostly Public[/b] - -The channel is a typical forum. By default posts and published items are public. Members may post by !mention or wall-to-wall post. Posting photos and other published items is blocked. The channel is visible in the directory. Members are added automatically. - - -[b]Restricted[/b] - -By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by !mention or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner. - -[b]Private[/b] - -By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by !mention is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible. - - -[h4]Feed[/h4] - - -[b]Public[/b] - -Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved. - - -[b]Restricted[/b] - -Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner. - - -[h4]Special[/h4] - -[b]Celebrity/Soapbox[/b] - -Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile. - - -[b]Group Repository[/b] - -A public forum which allows members to post files/photos/webpages. - - -[h4]Custom/Expert Mode[/h4] - -Set all the privacy and permissions manually to suit your specific needs. - - -[h3]Creating channels[/h3] - - -After creating your account, you will be presented with the "Add a channel" screen. Normally, your first channel will be one that represents you - so using your own name (or psuedonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. The "choose a short nickname" box is similar to a "username" field. We will use whatever you enter here to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This looks like an email address, and takes the form nickname@siteyouregisteredat.xyz - -See Also -[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within $Projectname[/zrl] -[zrl=[baseurl]/help/accounts]Accounts[/zrl] -[zrl=[baseurl]/help/profiles]Profiles[/zrl] -[zrl=[baseurl]/help/permissions]Permissions[/zrl] -[zrl=[baseurl]/help/remove_account]Remove Account[/zrl] - - -You can create additonal channels from the "Channel Manager" link. - -Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0][baseurl]/channel/username[/observer] you will find your channel "stream". This is where your recent activity will appear, in reverse chronological order. If you post in the box marked "share", the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The "hamburger" menu in most themes will provide you with navigation to other system components and apps. The Photos page contain photo albums, and the Events page contains events share by both yourself and your contacts. - -[b]Profiles[/b] - -$Projectname has unlimited profiles. You may use different profiles to show different "sides of yourself" to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded "sides" of each channel. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing". - -You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. - -That said, if you want other friends to be able to find you, it helps to have the following information in your public profile... - -[ul][*]Your real name or at least a nickname everybody knows -[*]A photo of you -[*]Your location on the planet, at least to a country level.[/ul] - -In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like. - -To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings > Additional Features[/zrl] and enable "Multiple Profiles" there, otherwise you won't have the ability to use more than just your default profile. - -Then select "Edit Profiles" from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there. - -In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on "Edit visibility" next to the profile in question (only available for the profiles that are not your default profile) and then click on specific connections to add them to or remove them from the group of people who can see this profile. - -Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile. - -There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the "Settings" page. - -If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished. - -[b]Keywords and Directory Search[/b] - -On the directory page, you may search for people with published profiles. Currently, only the name field and the keywords are searched. You may also include such keywords in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page. - -On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance. - -See Also - -[zrl=[baseurl]/help/AdvancedSearch]Advanced Searching[/zrl] - - -[h4]The grid, permissions and delegation[/h4] - -The "Grid" page contains all recent posts from across $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts. - -As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the [zrl=[baseurl]/help/roles]permissions section[/zrl]. - -You can also delegate control of your channels' posts and connections, but not its configurations, to another channel. That is done by editing a connection and assigning it the permission to administer your channel's resources. - -[h3]Connecting To Channels[/h3] - -Connections in $Projectname can take on a great many different meanings. A connection is more accurately defined as a set of permissions that you have granted to somebody else. In traditional social network applications, all connections are granted the same permissions; or at most there two levels (friends and 'followers'). In $Projectname, a range of separate permissions may be set/adjusted depending on the siutation and relationship you have with the other channel. You can allow somebody to view your posts but not your photos. You can also deny them permission to comment on your posts or send private mail to you. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it? - -First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels. - -The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword. - -If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address (for instance bob@example.com) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks. - -To connect with other $Projectname channels: - -Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called "connect". Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes. - -You may also connect with any channel by visiting the "Connections" page of your site or the Directory and typing their "webbie" into the "Add New Connection" field. Use this method if somebody tells you their webbie and you wish to connect with them. The process is the same as connecting via the "Connect" button - you will then be taken to the connection editor to set permissions. - -To connect with channels on other networks: - -The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their "webbie" into the "Add New Connections" box on the "Connections" page. Before you do this however, please visit your Settings page (Feature/Addon Settings) and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, or ActivityPub) is provided on your hub and [b][i]activated[/i] for your channel[/b]. These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails. - -Some communications offer more than one protocol. If you wish to connect with somebody on Mastodon (for instance) they can use either the 'ostatus' or the 'activitypub' protocol for communication. Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but $Projectname will often choose the first protocol it discovers and this may not be the one you want. You may connect with somebody over a specific protocol by prepending the protocol name in square brackets to their "webbie". For example - -[code] -[activitypub]https://foo.bar/foobar -[ostatus]foobar@foo.bar -[diaspora]foobar@foo.bar -[zot]foobar@foo.bar -[feed]https://foo.bar/foobar -[/code] - - -To connect with RSS feeds: - -Your hub admin may allow connecting to RSS feeds. The process for connecting to an RSS feed is the same, exept type (or paste) the URL of the feed into the "Add New Connection" box. Feeds are only processed once or twice per day and your hub admin may impose limits on how many feeds you may add. - -[h4]Block/Ignore/Archive/Hide channels [/h4] - -Channels in your address book can have statuses such as [i]blocked[/i], [i]ignored[/i], [i]archived[/i] and [i]hidden[/i]. From your connections page you can see tabs that display the channels with those statuses. From your edit connection pages you can change the statuses of a channel. - -Here's their meaning: - -[b]Blocked:[/b] the channel can't read your items regardless of permissions, nor can it write to your channel. - -[b]Ignored:[/b] the channel can read your items if it has permission, but can't write to your channel. - -[b]Hidden:[/b] the channel does not show up in your profile's connections list, noone can see you're connected, but beware they may still show up to your other connections, for example in post replies. - -[b]Archived:[/b] if a channel can't be reached for 30 days, it is automatically marked as archived. This keeps all the data but stops polling the channel for new information and removes it from autocomplete. If later you learn the channel has come back online, you may manually unarchive it. - -[h4]Premium Channels[/h4] - -Some channels are designated "Premium Channels" and may require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel. - -[h3]Permissions[/h3] -Permissions in $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere. - -[h4]Permission Roles[/h4] - -When you create a channel we allow you to select different 'roles' for that channel. These create an entire family of permissions and privacy settings that are appropriate for that role. Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public" and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. You can also choose 'Custom/Expert mode' and change any individual permission setting in any way you desire. - - -[h4]Default Permission Limits[/h4] - -There are a large number of individual permissions. These control everything from the ability to view your stream to the ability to chat with you. Every permission has a limit. The scope of these permissions varies from "Only me" to "Everybody on the internet" - though some scopes may not be available for some permissions. The limit applies to any published thing you create which has no privacy or access control. For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit. These limits apply to everything within that permission rule, so you cannot apply a limit to one photo. The limit applies to all your photos. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, [b]all[/b] of your photos will now be visible only to friends. - -[h4]Access Control[/h4] - -Access Control is the preferred method of managing privacy in [i]most[/i] cases, rather than using permission limits. This creates lists of either connections or privacy groups (or both) and uses the access list to decide if a permission is allowed. An access list is attached to everything you publish. Unlike permission limits, if you change the access control list on a single photo, it doesn't affect any of your other photos. You can use privacy groups and a "default access control list" to create and automate the management of access control lists to provide any level of privacy you desire on anything you publish. - -We highly recommend that you use the "typical social network" settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around. - - -[dl terms="l"] -[*= The scopes of permissions are:] -[dl terms="i"] - [*= Nobody Except Yourself ] This is self explanatory. Only you will be allowed access. - - [*= Only those you specifically allow ] By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen. - - [*= Anybody in your address book ] Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions. - - [*= Anybody On This Hub ] Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied. - - [*= Anybody in this network ] Anybody in $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied. - - [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks. - - [*=Guest Access Token] This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be $Projectname members. You can set an expiration for the Access Token. - - [*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all. -[/dl] -[*= The individual permissions are:] -[dl terms="i"] - [*= Can view my "public" stream and posts. ] This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in. - - [*= Can view my "public" channel profile. ] This permission determines who can view your channel's profile. This refers to the "about" tab - - [*= Can view my "public" photo albums. ] This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience. - - [*= Can view my "public" address book. ] This permission determines who can view your contacts. These are the connections displayed in the "View connections" section. - - [*= Can view my "public" file storage. ] This permission determines who can view your public files stored in your cloud. - - [*= Can view my "public" pages. ] This permission determines who can view your public web pages. - - [*= Can send me their channel stream and posts. ] This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery. - - [*= Can post on my channel page ("wall"). ] This permission determines who can write to your wall when clicking through to your channel. - - [*= Can comment on my posts. ] This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission - - [*= Can send me private mail messages. ] This determines who can send you private messages (zotmail). - - [*= Can post photos to my photo albums. ] This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other. - - [*= Can forward to all my channel contacts via post tags. ] Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way. - - [*= Can chat with me (when available). ] This determines who can join the public chat rooms created by your channel. - - [*= Can write to my "public" file storage. ] This determines who can upload files to your public file storage, or 'cloud'. - - [*= Can edit my "public" pages. ] This determines who can edit your webpages. This is useful for wikis or sites with multiple editors. - - [*= Can administer my channel resources. ] This determines who can have full control of your channel. This should normally be set to "nobody except myself". -[/dl][/dl] -[i]Note:[/i] -Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here. - -If you have set any of these permissions to "only those I specifically allow", you may specify individual permissions on the connnection edit screen. - -[h4]Affinity[/h4] - -The connection edit screen offers a slider to select a degree of friendship with the connnection (this tool is enabled through the "Extra Features" tab of your Settings page). Think of this as a measure of how much you like or dislike them. 1 is for people you like, whose posts you want to see all the time. 99 is for people you don't care for, and whose posts you might only wish to look at occasionally. Once you've assigned a value here, you can use the affinity tool on the matrix page to filter content based on this number. - -The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature. - -[h3]Guest Access Tokens[/h3] -Guest access tokens (sometimes called "Zot access tokens") allow you to share a file, folder, photo, album, or channel with a specific person or group of people who are not $Projectname members. These tokens allow you to share individual items by sending a link that includes the token in the URL; alternatively, people can actually [i]log in[/i] using the token credentials, after which they can seamlessly view whatever content has been shared with that token. - -To create and manage guest tokens, open the [zrl=[baseurl]/settings/tokens/]Guest Access Tokens[/zrl] settings page. A random token is generate with each page load, allowing you to create one by inputting an associated login name and optionally specifying an expiration date. Existing tokens are listed below the dialog and can be edited by selecting them or deleted by pressing the trash icon. - -Additional permissions may be granted to the guest token by expanding the [b]Individual Permissions[/b] options and selecting privacy settings such as [b]Can view my channel stream and posts[/b] or [b]Can chat with me[/b]. - -[url=[baseurl]/help/feature/access_tokens]More details can be found here...[/url] - -[img][baseurl]/doc/member/assets/zat_dialog.png[/img] - - -[h3]Markup Languages[/h3] -$Projectname supports several markup languages for advanced formatting of content. The default markup language is a [url=[baseurl]/help/member/bbcode]custom variant of BBcode[/url], tailored for use in $Projectname. [url=[baseurl]/help/member/bbcode]BBcode[/url] is supported for posts, wiki pages, and web page elements. Wiki pages and webpage elements may also be written using standard Markdown. -[table border=0] -[tr][th]Content Type[/th][th]Supported Markup[/th][/tr] -[tr][td]Post[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url][/td][/tr] -[tr][td]Wiki[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url], Markdown[/td][/tr] -[tr][td]Webpage element[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url], Markdown, HTML[/td][/tr] -[/table] - -[h3]Tags And Mentions[/h3] -Like many other platforms, $Projectname uses a special notation inside messages to indicate "tags" or contextual links to other entities. - -[h4]Mentions[/h4] -Channels are tagged by simply preceding their name with the @ character. - -[code] -@Jack -[/code] - -When you start to mention somebody, it will create an auto-complete box to select from your immediate connections. Select one as appropriate. - -If the person mentioned is in the list of recipients for the post, they will receive a tag notification. - -[h4]Deliverable Mentions[/h4] - -The [b]![/b] character designates a deliverable mention to a forum or special channel which allows "re-delivery of mentions". - -[code] -@Gardening - mention the Gardening forum -[/code] - -[code] -!Gardening - mention the Gardening Forum and also post to the Gardening "network" (e.g. send to all the forum members; if you have permission to do so) -[/code] - -Note: In previous releases, forums were delivered by using @forum+ with a plus sign at the end. This mechanism is no longer supported. - -[h4]Private Mentions[/h4] -If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or privacy groups from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to only include them. You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector. - -Forums may be mentioned in the same way. !!dogs will post to the dogs forum privately. The forum will redeliver the post to all the forum members, but your own followers will not see the post unless they are also members of the dogs forum. - -You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it. - -[h4]Mentions and Comments[/h4] -The above mechanisms only apply to "top-level" posts you create. Mentioning a channel with any of the above mechanisms has no effect in comments, except that the mentioned channel may receive a notification if they were already included as a recipient in the conversation. - -[h4]Topical Tags (also known as Hashtags)[/h4] -Topical tags are indicated by preceding the tag name with the # character. This will create a link in the post to a generalised site search for the term provided. For example, #[zrl=[baseurl]/search?tag=cars]cars[/zrl] will provide a search link for all posts mentioning 'cars' on your site. Topical tags are generally a minimum of three characters in length. Shorter search terms are not likely to yield any search results, although this depends on the database configuration. - -Topical tags are also not normally linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections or enclose the entire tag in double quotes (for example #"2012"). Doubles quotes are also required if the tag contains spaces (#"My Tag") and may be required if the tag contains punctuation characters (#"EndsWithPeriod." or #"Exciting!!!"). - -[h4]Bookmarks[/h4] -Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generated automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online, and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks. - -[h4]Manual Mentions[/h4] -Where possible please use the auto-complete window to select tag and mention recipients, because it will generate a coded tag which uniquely identifies one channel. Names are sometimes ambiguous. However, you can "manually" tag a channel by matching the channel name or address. - -[code] -@billy -[/code] - -will tag a connection whose name or network address is 'billy' (exact match). If you have two connections with a name or network address of billy, for instance billy@server1.hubzilla.org and billy@server2.hubzilla2.org, you will need to supply the complete address or the results will be ambiguous and the wrong person may be tagged. - -[code] -@"Robert Johnson" -[/code] - -will tag Robert Johnson. The double quotes are required if the tagged name contains space characters. - - -[h3]Web Pages[/h3] - -$Projectname allows members and allowed connections to create static webpages. To activate this feature, enable the [b]Web Pages[/b] feature in your [b][url=[baseurl]/settings/features/]Additional Features[/url][/b] section. - -Once enabled, a new tab will appear on your channel page labeled "Webpages". Clicking this link will take you to the webpage editor. Pages will be accessible at [b][baseurl]/page/[observer=1][observer.webname][/observer][observer=0]channelname[/observer]/pagelinktitle[/b] - -The "page link title" box allows you to specify the "pagelinktitle" of this URL. If no page link title is set, we will set one for you automatically, using the message ID of the item. - -Beneath the page creation box, a list of existing pages will appear with an "edit" link. Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages. - -[h4]Using Blocks[/h4] - -Blocks can be parts of webpages. The basic HTML of a block looks like this -[code] -
      - Block Content -
      - -[/code] - -If a block has text/html content type it can also contain menu elements. Sample content of -[code] -

      HTML block content

      - [menu]menuname[/menu] - -[/code] -will produce HTML like this -[code] -
      -

      HTML block content

      -
      - -
      -
      - -[/code] - -Via the $content macro a block can also contain the actual webpage content. For this create a block with only -[code] - $content - -[/code]as content. - -To make a block appear in the webpage it must be defined in the page layout inside a region. -[code] - [region=aside] - [block]blockname[/block] - [/region] - -[/code] - -The block appearance can be manipulated in the page layout. - -Custom classes can be assigned -[code] - [region=aside] - [block=myclass]blockname[/block] - [/region] - -[/code] -will produce this HTML -[code] -
      - Block Content -
      - -[/code] - -Via the wrap variable a block can be stripped off its wrapping
      tag -[code] - [region=aside] - [block][var=wrap]none[/var]blockname[/block] - [/region] - -[/code] -will produce this HTML -[code] - Block Content -[/code] - -[h4]Webpage element import tool[/h4] - -There are two methods of importing webpage elements: uploading a zip file or referencing a local cloud files folder. Both methods require that the webpage elements are specified using a specific folder structure. The import tool makes it possible to import all the elements necessary to construct an entire website or set of websites. The goal is to accommodate external development of webpages as well as tools to simplify and automate deployment on a hub. - -[h5] Folder structure [/h5] -Element definitions must be stored in the repo root under folders called -[code] - /pages/ - /blocks/ - /layouts/ -[/code] - -Each element of these types must be defined in an individual subfolder using two files: one JSON-formatted file for the metadata and one plain text file for the element content. - -[h5] Page elements [/h5] -Page element metadata is specified in a JSON-formatted file called [code]page.json[/code] with the following properties: -[list] -[*] title -[*] pagelink -[*] mimetype -[*] layout -[*] contentfile -[/list] -[b]Example[/b] - -Files: -[code] - /pages/my-page/page.json - /pages/my-page/my-page.bbcode -[/code] -Content of [code]page.json[/code]: -[code] - { - "title": "My Page", - "pagelink": "mypage", - "mimetype": "text/bbcode", - "layout": "my-layout", - "contentfile": "my-page.bbcode" - } -[/code] -[h5] Layout elements [/h5] - -Layout element metadata is specified in a JSON-formatted file called [code]layout.json[/code] with the following properties: -[list] -[*] name -[*] description -[*] contentfile -[/list] -[b]Example[/b] - -Files: -[code] - /layouts/my-layout/layout.json - /layouts/my-layout/my-layout.bbcode -[/code] -Content of [code]layout.json[/code]: -[code] - { - "name": "my-layout", - "description": "Layout for my project page", - "contentfile": "my-layout.bbcode" - } -[/code] - -[h5] Block elements [/h5] - -Block element metadata is specified in a JSON-formatted file called [code]block.json[/code] with the following properties: -[list] -[*] name -[*] title -[*] mimetype -[*] contentfile -[/list] -[b]Example[/b] - -Files: -[code] - /blocks/my-block/block.json - /blocks/my-block/my-block.html -[/code] -Content of [code]block.json[/code]: - -[code] - { - "name": "my-block", - "title": "", - "mimetype": "text/html", - "contentfile": "my-block.html" - } -[/code] - -[h3]Comanche Page Description Language[/h3] - -Comanche is a markup language similar to [url=[baseurl]/help/member/bbcode]BBcode[/url] with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages. - -Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose. - -[h4]Page Templates[/h4] -Currently there are five layout templates, unless your site provides additional layouts. - -[dl terms="b"] -[*= default] -The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, -"content" for the main content region, and "footer" for a page footer. - -[*= full] -The full template defines the same as the default template with the exception that there is no "aside" region. - -[*= choklet] -The choklet template provides a number of fluid layout styles which can be specified by flavour: -[list] -[*] (default flavour) - a two column layout similar to the "default" template, but more fluid -[*] bannertwo - a two column layout with a banner region, compatible with the "default" template on small displays -[*] three - three column layout (adds a "right_aside" region to the default template) -[*] edgestwo - two column layout with fixed side margins -[*] edgesthree - three column layout with fixed side margins -[*] full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar -[/list] - -[*= redable] -A template for reading longer texts full screen (so without navigation bar). Three columns: aside, content and right_aside. -For maximum readability it is advised to only use the middle content column. - -[*= zen] -Gives you the freedom to do everything yourself. Just a blank page with a content region. -[/dl] - -To choose a layout template, use the 'template' tag. - -[code] - [template]full[/template] - -[/code] - -To choose the "choklet" template with the "three" flavour: - -[code] - [template=three]choklet[/template] - -[/code] - -The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions. - -Three "macros" have been defined for your use. -[code] - $htmlhead - replaced with the site head content. - $nav - replaced with the site navigation bar content. - $content - replaced with the main page content. - -[/code] - -By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions. - - -To select a theme for your page, use the 'theme' tag. -[code] - [theme]suckerberg[/theme] - -[/code] -This will select the theme named "suckerberg". By default your channel's preferred theme will be used. - -[code] - [theme=passion]suckerberg[/theme] - -[/code] -This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. - -[code] - [theme]suckerberg:passion[/theme] - -[/code] - -The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier. - -[h4]Navbar[/h4] - -[code] - [navbar]tucson[/navbar] -[/code] - -Use the 'tucson' navbar template and CSS rules. By default the 'default' navbar template will be used. - - -[h4]Regions[/h4] -Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag. - -[code] - [region=htmlhead]....content goes here....[/region] - [region=aside]....content goes here....[/region] - [region=nav]....content goes here....[/region] - [region=content]....content goes here....[/region] - -[/code] - -[h4]CSS and Javascript[/h4] -We have the possibility to include javascript and css libraries in the htmlhead region. At present we make use of jquery (js), bootstrap (css/js) and foundation (css/js). -This will overwrite the selected themes htmlhead. - -[code] - [region=htmlhead] - [css]bootstrap[/css] - [js]jquery[/js] - [js]bootstrap[/js] - [/region] - -[/code] - -[h4]Menus and Blocks[/h4] -Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created. - -[code] - [menu]mymenu[/menu] - -[/code] -This places the menu called "mymenu" at this location on the page, which must be inside a region. - -[code] - [menu=horizontal]mymenu[/menu] - -[/code] -This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. - -[code] - [menu][var=wrap]none[/var]mymenu[/menu] - -[/code] -The variable [var=wrap]none[/var] in a block removes the wrapping div element from the menu. - -[code] - [block]contributors[/block] -[/code] -This places a block named "contributors" in this region. - -[code] - [block=someclass]contributors[/block] - -[/code] -This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget". - -[code] - [block][var=wrap]none[/var]contributors[/block] - -[/code] -The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block. - -[h4]Widgets[/h4] -Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. System widgets are listed [url=help/Widgets]here[/url]. Widgets can also ve created by plugins, themes, or your site administrator to provide additional functionality. - - -Widgets and arguments are specified with the 'widget' and 'var' tags. -[code] - [widget=recent_visitors][var=count]24[/var][/widget] - -[/code] - -This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". - -[h4]Comments[/h4] -The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page. - -[code] - [comment]This is a comment[/comment] - -[/code] - -[h4]Conditional Execution[/h4] -You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer. - -[code] - [if $config.system.foo] - ... the configuration variable system.foo evaluates to 'true'. - [else] - ... the configuration variable system.foo evaluates to 'false'. - [/if] - - [if $observer] - ... this content will only be show to authenticated viewers - [/if] - -[/code] - - The 'else' clause is optional. - - Several tests are supported besides boolean evaluation. - -[code] - [if $config.system.foo == bar] - ... the configuration variable system.foo is equal to the string 'bar' - [/if] - [if $config.system.foo != bar] - ... the configuration variable system.foo is not equal to the string 'bar' - [/if] - [if $config.system.foo {} bar ] - ... the configuration variable system.foo is a simple array containing a value 'bar' - [/if] - [if $config.system.foo {*} bar] - ... the configuration variable system.foo is a simple array containing a key named 'bar' - [/if] -[/code] - -[h4]Complex Example[/h4] -[code] - [comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment] - - [template]3-column-with-header[/template] - - [comment]Use the "darknight" theme[/comment] - - [theme]darkknight[/theme] - - [comment]Use the existing site navigation menu[/comment] - - [region=nav]$nav[/region] - - [region=side] - - [comment]Use my chosen menu and a couple of widgets[/comment] - - [menu]myfavouritemenu[/menu] - - [widget=recent_visitors] - [var=count]24[/var] - [var=names_only]1[/var] - [/widget] - - [widget=tagcloud][/widget] - [block]donate[/block] - - [/region] - - - - [region=middle] - - [comment]Show the normal page content[/comment] - - $content - - [/region] - - - - [region=right] - - [comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment] - - [widget]channel[/widget] - - [/region] - -[/code] - - -[h3]Personal Cloud Storage[/h3] - -$Projectname provides an ability to store privately and/or share arbitrary files with friends. - -You may either upload files from your computer into your storage area, or copy them directly from the operating system using the WebDAV protocol. - -On many public servers there may be limits on disk usage. - -[h4]File Attachments[/h4] - -The quickest and easiest way to share files is through file attachments. In the row of icons below the status post editor is a tool to upload attachments. Click the tool, select a file and submit. After the file is uploaded, you will see an attachment code placed inside the text region. Do not edit this line or it may break the ability for your friends to see the attachment. You can use the post permissions dialogue box or privacy hashtags to restrict the visibility of the file - which will be set to match the permissions of the post your are sending. - -To delete attachments or change the permissions on the stored files, visit [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username replacing username with the nickname you provided during channel creation[/observer]. - -[h4]Web Access[/h4] - -Your files are visible on the web at the location [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username[/observer] to anybody who is allowed to view them. If the viewer has sufficient privileges, they may also have the ability to create new files and folders/directories. This should only be used for smaller files and photos (up to a few megabytes) as it uses internal memory. For larger files (videos, music, etc.), please upload using WebDAV. These files may still be retrieved via web access. - -[h4]WebDAV access[/h4] - -WebDAV provides a way to copy files directly to or from your computer's operating system, where your cloud files appear as a virtual disk drive. This should be used to upload large files such as video and audio; as it is not limited to available memory. See [zrl=help/member/member_guide#Cloud_Desktop_Clients]Cloud Desktop Clients[/zrl] below. - -[h4]CalDAV and CardDAV access on Android[/h4] - -You can sync you calendar and contacts on Android with your Hub. - -The following steps where tested for [url=https://f-droid.org/en/packages/at.bitfire.davdroid/]DAVdroid[/url] -[list] -[*] install DAVdroid -[*] add account -[*] use "URL" and "user name" to login -[list] -[*] base url is [baseurl]/cdav -[*] user name is [observer=1][observer.webname][/observer][observer=0]username[/observer] -[/list] -[/list] - -To share your calendar visit [observer.baseurl]/cdav/calendar - - -[h4]Permissions[/h4] - -When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username[/observer] select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate privacy groups. - -[h3]Cloud Desktop Clients[/h3] - - -[h4]Cloud Desktop Clients - Windows[/h4] - -WebDAV using Windows 7 graphical user interface wizard: -1. Left-click the Start-button to open the start menu. -2. Right-click the My computer icon to access its menu. -3. Left-click Map network drive... to open the connection dialog wizard. -4. Type '[baseurl]/dav/nickname' in the textbox (replace nickname with your channel nickname) and click the Complete button. -5. Type your $Projectname channel nickname. IMPORTANT - NO at-sign or domain name. -6. Type your $Projectname password - -[h4]Cloud Desktop Clients - Linux[/h4] - -[h5]Mount as a filesystem[/h5] - -[b]Mounting As A Filesystem[/b] - -To install your cloud directory as a filesystem, you first need davfs2 installed. 99% of the time, this will be included in your distributions repositories. In Debian - -[code]apt-get install davfs2[/code] - -If you want to let normal users mount the filesystem - -[code] dpkg-reconfigure davfs2[/code] - -and select "yes" at the prompt. - -Now you need to add any user you want to be able to mount dav to the davfs2 group - -[code]usermod -aG davfs2 <DesktopUser>[/code] - -[b]Note:[/b] on some systems the user group may be different, i.e. - "network" -on Arch Linux. If in doubt, check the davfs documentation for your -particular OS. - -Edit /etc/fstab - -[code]nano /etc/fstab[/code] - - to include your cloud directory by adding - -[code] -[baseurl]/dav/ /mount/point davfs user,noauto,uid=<DesktopUser>,file_mode=600,dir_mode=700 0 1 -[/code] - -Where [baseurl] is the URL of your hub, /mount/point is the location you want to mount the cloud, and <DesktopUser> is the user you log in to one your computer. Note that if you are mounting as a normal user (not root) the mount point must be in your home directory. - -For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be - -[code][baseurl]/dav/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1[/code] - -Now, create the mount point. - -[code]mkdir /home/bob/cloud[/code] - -and also create a directory file to store your credentials - -[code]mkdir /home/bob/.davfs2[/code] - -Create a file called 'secrets' - -[code]nano /home/bob/.davfs2/secrets[/code] - -and add your cloud login credentials - -[code] -[baseurl]/dav <username> <password> -[/code] - -Where <username> and <password> are the username and password [i]for your hub[/i]. - -Don't let this file be writeable by anyone who doesn't need it with - -[code]chmod 600 /home/bob/.davfs2/secrets[/code] - -Finally, mount the drive. - -[code]mount [baseurl]/dav[/code] - -You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves. - -[b]Troubleshooting[/b] - -With some webservers and certain configurations, you may find davfs2 creating files with 0 bytes file size where other clients work just fine. This is generally caused by cache and locks. If you are affected by this issue, you need to edit your davfs2 configuration. - -[code]nano /etc/davfs2/davfs2.conf[/code] - -Your distribution will provide a sample configuration, and this file should already exist, however, most of it will be commented out with a # at the beginning of the line. - -First step is to remove locks. - -Edit the use_locks line so it reads [code]use_locks 0[/code]. - -Unmount your file system, remount your file system, and try copying over a file from the command line. Note you should copy a new file, and not overwrite an old one for this test. Leave it a minute or two then do [code]ls -l -h[/code] and check the file size of your new file is still greater than 0 bytes. If it is, stop there, and do nothing else. - -If that still doesn't work, disable the cache. Note that this has a performance impact so should only be done if disabling locks didn't solve your problem. Edit the cache_size and set it to [code]cache_size 0[/code] and also set file_refresh to [code]file_refresh 0[/code]. Unmount your filesystem, remount your file system, and test it again. - -If it [i]still[/i] doesn't work, there is one more thing you can try. (This one is caused by a bug in older versions of dav2fs itself, so updating to a new version may also help). Enable weak etag dropping by setting [code]drop_weak_etags 1[/code]. Unmount and remount your filesystem to apply the changes. - - -[h5]Dolphin[/h5] -Visit webdavs://example.com/dav where "example.com" is the URL of your hub. - -When prompted for a username and password, enter your channel name (the first part of your webbie - no @ or domain name) and password for your normal account. - -Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication. - -[h5]Konqueror[/h5] - -Simply visit webdavs://example.com/dav after logging in to your hub, where "example.com" is the URL of your hub. - -No further authentication is required if you are logged in to your hub in the normal manner. - -Additionally, if one has authenticated at a different hub during their normal browser session, your identity will be passed to the cloud for these hubs too - meaning you can access any private files on any server, as long as you have permissions to see them, as long as you have visited that site earlier in your session. - -This functionality is normally restricted to the web interface, and is not available to any desktop software other than KDE. - -[h5]Nautilus[/h5] - -1. Open a File browsing window (that's Nautilus) -2. Select File > Connect to server from the menu -3. Type davs://<domain_name>/dav/<your_channelname> and click Connect -4. You will be prompted for your channel name (same as above) and password -5. Your personal DAV directory will be shown in the window - -[h5]Nemo[/h5] - -For (file browser) Nemo 1.8.2 under Linux Mint 15, Cinnamon 1.8.8. Nemo ist the standard file browser there. - -1st way -type "davs://<domain_name>/dav/<your_channelname>" in the address bar. - -2nd way -Menu > file > connect to server -Fill the dialog -- Server: hubzilla_domain_name -- Type: Secure WebDAV (https) -- Folder: /dav -- Username: yourchannelname -- Password: yourpassword - -Once open you can set a bookmark. - -[h5]Server Notes[/h5] - -Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms. - -[h3]Saved Searches[/h3] - -In order to quickly find information, the 'saved search' widget may be used. This widget may be presented as a sidebar tool on your network page and possibly from your channel page. It is differentiated from the 'navigation bar' search tool in that it does not search the entire site, but only the subset of information available to your channel. - -Additionally the search terms you provide may activate a one-time search or be saved in a list for re-use. Saving the search item also invokes the search in addition to adding it to the saved list (which is displayed below the search text entry box). Any item in the list may be discarded if it is no longer needed. - -The saved search widget will provide autocompletion of channels (the results are prefixed with '@'), and hashtags (prefixed with '#'). You do not need to enter these tags; although entering the desired tag will reduce the autocomplete results to only hold the relevant information. The behaviour maps as follows: - -[list] -[*]@name - search your network stream for posts or comments written by 'name'. This will also change the post editor permissions to include only 'name'; as if this was a privacy group. -[*]#hashtag - search you network stream for posts containing #hashtag. -[*]text - search your network stream for posts containing 'text'. -[/list] - - -[h3]Remove Channel or Account[/h3] - -[h4]Remove Channel[/h4] - -Select the 'Remove Channel' link on your channel settings page or visit the URL: - - [baseurl]/removeme - -You will need to confirm your password and the channel you are currently logged into will be removed. - -[hl][i][b]This is irreversible.[/b][/i][/hl] - -If you have identity clones on other hubs this only removes by default the channel instance which exists on this hub. - -[h4]Remove Account[/h4] - -Select 'Remove Account' from your account settings page or visit the URL: - - [baseurl]/removeaccount - -You will need to confirm your password and the account you are currently logged into will be removed. - -[hl][i][b]This is irreversible.[/b][/i][/hl] - -All your channels will be deleted. If you have identity clones on other hubs this only removes by default the channels instances which exists on this hub. - diff --git a/doc/plugins.bb b/doc/plugins.bb deleted file mode 100644 index 3aecc458f..000000000 --- a/doc/plugins.bb +++ /dev/null @@ -1,312 +0,0 @@ -[b]Plugins[/b] - -So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. - - -In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. -[code] - mkdir addon -[/code] -Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters. - -Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files. -[code] - mkdir addon/randplace -[/code] -Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file -[code] - addon/randplace/randplace.php -[/code] -The very first line of this file needs to be -[code] - <?php -[/code] -Then we're going to create a comment block to describe the plugin. There's a special format for this. We use /* ... */ comment-style and some tagged lines consisting of -[code] - /** - * - * Name: Random Place (here you can use better descriptions than you could in the filename) - * Description: Sample $Projectname plugin, Sets a random place when posting. - * Version: 1.0 - * Author: Mike Macgirvin <mike@zothub.com> - * - */ -[/code] -These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'. - -The typical plugin will have at least the following functions: -[code] - pluginname_load() - pluginname_unload() -[/code] -In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named -[code] - pluginname_install() - pluginname_uninstall() -[/code] - -Next we'll talk about [b]hooks[/b]. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. - -We register hook handlers with the 'Zotlabs\Extend\Hook::register()' function. It typically takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. - -[code] - function randplace_load() { - Zotlabs\Extend\Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - - Zotlabs\Extend\Hook::register('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - Zotlabs\Extend\Hook::register('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - - } -[/code] - -So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. - -Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. -[code] - function randplace_unload() { - Zotlabs\Extend\Hook::unregister('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - - Zotlabs\Extend\Hook::unregister('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - Zotlabs\Extend\Hook::unregister('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - } -[/code] - -Hooks are always called with one argument which is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the passed data is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. - -Let's go ahead and add some code to implement our post_local hook handler. -[code] - function randplace_post_hook(&$item) { - - /** - * - * An item was posted on the local system. - * We are going to look for specific items: - * - A status post by a profile owner - * - The profile owner must have allowed our plugin - * - */ - - logger('randplace invoked'); - - if(! local_channel()) /* non-zero if this is a logged in user of this system */ - return; - - if(local_channel() != $item['uid']) /* Does this person own the post? */ - return; - - if(($item['parent']) || (! is_item_normal($item))) { - /* If the item has a parent, or is not "normal", this is a comment or something else, not a status post. */ - return; - } - - /* Retrieve our personal config setting */ - - $active = get_pconfig(local_channel(), 'randplace', 'enable'); - - if(! $active) - return; - /** - * - * OK, we're allowed to do our stuff. - * Here's what we are going to do: - * load the list of timezone names, and use that to generate a list of world cities. - * Then we'll pick one of those at random and put it in the "location" field for the post. - * - */ - - $cities = array(); - $zones = timezone_identifiers_list(); - foreach($zones as $zone) { - if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/'))) - $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1)); - } - - if(! count($cities)) - return; - $city = array_rand($cities,1); - $item['location'] = $cities[$city]; - - return; - } -[/code] - -Now let's add our functions to create and store preference settings. -[code] - /** - * - * Callback from the settings post function. - * $post contains the global $_POST array. - * We will make sure we've got a valid user account - * and that only our own submit button was clicked - * and if so set our configuration setting for this person. - * - */ - - function randplace_settings_post($post) { - if(! local_channel()) - return; - if($_POST['randplace-submit']) - set_pconfig(local_channel(),'randplace','enable',intval($_POST['randplace'])); - } - - - - /** - * - * Called from the Feature Setting form. - * The second argument is a string in this case, the HTML content region of the page. - * Add our own settings info to the string. - * - * For uniformity of settings pages, we use the following convention - * <div class="settings-block"> - * <h3>title</h3> - * .... settings html - many elements will be floated... - * <div class="clear"></div> <!-- generic class which clears all floats --> - * <input type="submit" name="pluginnname-submit" class="settings-submit" ..... /> - * </div> - */ - - - - function randplace_settings(&$s) { - - if(! local_channel()) - return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - head_add_css(/addon/randplace/randplace.css'); - - /* Get the current state of our config variable */ - - $enabled = get_pconfig(local_channel(),'randplace','enable'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= '<div class="settings-block">'; - $s .= '<h3>' . t('Randplace Settings') . '</h3>'; - $s .= '<div id="randplace-enable-wrapper">'; - $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>'; - $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>'; - $s .= '</div><div class="clear"></div>'; - - /* provide a submit button */ - - $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>'; - - } - -[/code] - - - -[h2]Advanced Plugins[/h2] - -Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin. - -There are two ways to accomplish this. To create a module object use the following model: -[code] -/.hidden -[/code] - -***Porting Friendica Plugins*** - -$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: - -[li] Friendica's pluginname_install() is pluginname_load()[/li] - -[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li] - -$Projectname has _install and _uninstall functions but these are used differently. - -[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li] - -[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li] - -Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. - -#include doc/macros/main_footer.bb; diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb deleted file mode 100644 index 7376d6163..000000000 --- a/doc/problems-following-an-update.bb +++ /dev/null @@ -1,38 +0,0 @@ -[b]Problems Following An Update[/b] - -A good 90% of all bugs encountered immediately after updating the code to the latest version are simple cache errors of one sort or another. If you update and find something very obvious is broken - like your matrix page doesn't load, notifications are missing, or comment boxes are missing - the chances are it's not a bug at all. Breaking basic functionality is the kind of thing developers tend to notice. - -If this happens to you, there are a few simple steps to take before resorting to the support forums: - -[b]Browser Cache[/b] - -Symptoms: Menus do not expand, ACL selector does not open, progress indicator does not display (or loops forever), Matrix and channel pages do not load. - -Force reload the page. Shift reload, or ctrl+f5. Occasionally, but very, very rarely, you will also need to clear the session data - which is achieved by restarting the browser. - -[b]FastCGI[/b] - -Symptoms: Incorrect variables. The basic UI mostly works, but displays incorrect content or is missing content entirely. - -If you're using php5-fpm, this problem is usually resolved with [code]service php5-fpm restart[/code] - -[b]Smarty Cache[/b] - -Symptoms: - -1) White Screen Of Death. This is most prevalent on the settings and admin pages. - -2) Missing icons, tabs, menus or features. - -We use the Smarty3 template engine to generate pages. These templates are compiled before they are displayed. Occasionally, a new or modified template will fail to overwrite the old compiled version. To clear the Smarty cache, delete all the files in store/[data]/smarty3/compiled [b]but do not delete the directory itself[/b]. Templates will then be recompiled on their next access. - -[b]Theme Issues[/b] - -There are many themes for $Projectname. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic. - -Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes. This means new features may only work properly in Redbasic. Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there. If the issue goes away, this is not a bug - it's a theme that isn't up to date. - -Should you report an issue with the theme developers then? No. Theme developers use their themes. Chances are, they know. Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed. There are two workarounds for this situation. Firstly, you can temporarily use Redbasic. Secondly, most themes are open source too - open a pull request and make yourself a friend. - -#include doc/macros/troubleshooting_footer.bb; - diff --git a/doc/red2pi.bb b/doc/red2pi.bb deleted file mode 100644 index 8ae087fbf..000000000 --- a/doc/red2pi.bb +++ /dev/null @@ -1,342 +0,0 @@ -[b]How to install $Projectname on a Raspberry Pi[/b] - -You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name? - -Then this page is for you! You will: -[list=1] -[*] Install Raspberry OS (Debian Linux) on a Raspberry -[*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin -[*] Register a free domain (dynamic DNS) and use it for your hub -[*] Install $Projectname -[*] Keep your Raspberry Pi and $Projectname up-to-date -[*] TODO Setting up SSL -[*] TODO Running with SSL -[*] TODO Make the webserver less vulnarable to attacks -[/list] - -[size=large]1. Install Raspberry OS (Debian Linux)[/size] - -instructions under [url=http://www.raspberrypi.org/downloads]http://www.raspberrypi.org/downloads[/url] -This page links to the quick start containing detailed instruction. - -[b]Format SD card[/b] - -using the program gparted under Linux Mint 15 - -format as FAT32 - -[b]Download NOOBS (offline and network install)[/b] - -[url=http://downloads.raspberrypi.org/noobs]http://downloads.raspberrypi.org/noobs[/url] - -unzip - -copy unzipped files to SD card - -[b]Install Raspbian as OS on the Rasperry Pi[/b] - -connect with keyboard via USB - -connect with monitor via HDMI - -Insert SD card into Rasperry Pi - -Connect with power supply to switch on the Rasperry - -choose Raspbian as OS (> installs Raspbian....) - -wait for the coniguration program raspi-config (you can later start it by sudo raspi-config) - -[b]Configure Raspbian[/b] - -in raspi-config > advanced > choose to use ssh (!! You need this to connect to administrate your Pi from your PC !!) - -in raspi-config > change the password (of default user "pi" from "raspberry" to your password) - -in raspi-config (optional) > Internationalisation options > Change Locale > to de_DE.utf-8 utf-8 (for example) - -in raspi-config (optional) > Internationalisation options > Change Timezoe > set your timezone - -in raspi-config (optional) > Overlock > medium - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]More[/b] - -[code]sudo reboot[/code] - -Now its time to connect the Pi to the network. -[ul] -[*] pull out keyboard -[*] pull out monitor -[*] you even can pull out the power supply (USB) -[*] plug-in the network cable to the router -[*] plug-in the power supply again -[*] wait for a minute or to give the Pi time to boot and start ssh... -[/ul] - -On your PC connect to the Pi to administrate (here update it). -Open the console on the PC (Window: Start > cmd, Linux: Shell) - -Hint: use the router admin tool to find out the IP of your PI[code]ssh pi@192.168.178.37 -sudo apt-get update -sudo apt-get dist-upgrade[/code] - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - - -[size=large]2. Install Apache Web Server, PHP, MaySQL, phpMyAdmin[/size] - -[b]Install Apache Webserver[/b] - -[code]sudo bash -sudo groupadd www-data[/code] might exist already - -[code]sudo usermod -a -G www-data www-data -sudo apt-get update -sudo reboot[/code] - -wait... -reconnect via ssh, example: [code]ssh pi@192.168.178.37 -sudo apt-get install apache2 apache2-doc apache2-utils[/code] - -Open webbrowser on PC and check [url=http://192.168.178.37]http://192.168.178.37[/url] -Should show you a page like "It works" - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]Install PHP, MaySQL, phpMyAdmin[/b] - -[code]sudo bash -apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl -apt-get install php5-mysql -apt-get install mysql-server mysql-client[/code] enter and note the mysql passwort - -[code]apt-get install phpmyadmin[/code] - -Configuring phpmyadmin -- Select apache2 -- Configure database for phpmyadmin with dbconfig-common?: Choose Yes - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]Test installation[/b] - -[code]cd /var/www[/code] - -create a php file to test the php installation[code]sudo nano phpinfo.php[/code] - -Insert into the file:[code] -<?php - phpinfo(); -?> -[/code] -(save CTRL+0, ENTER, CTRL+X) - -open webbrowser on PC and try [url=http://192.168.178.37/phpinfo.php]http://192.168.178.37/phpinfo.php[/url] (page shows infos on php) - -connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf[/code] -- CTRL+V... to the end of the file -- Insert at the end of the file: (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code] - -restart apache[code]/etc/init.d/apache2 restart -sudo apt-get update -sudo apt-get upgrade -sudo reboot[/code] - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]phpMyAdmin[/b] - -open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] - -(Source [url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url]) - - -[b]Create an empty database... that is later used by RED[/b] - -open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url] - -Create an empty database - -Note the access details (hostname, username, password, database name). - - -[size=large]3. Selfhost[/size] - -(Source: #^[url=http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html]http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html[/url]) - -[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] - -[b]Step 1[/b] -Register for a Free domain at #^[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url] -(We will take techhome.homenet.org in this guide) - -[b]Step 2[/b] - -Logon to FreeDNS (where you just registered) and goto #^[url=http://freedns.afraid.org/dynamic/]http://freedns.afraid.org/dynamic/[/url] -Right click on "Direct Link" and copy the URL and paste it somewhere. -You should notice a large and unique alpha-numeric key in the URL, make a note of it as shown below: -[code]http://freedns.afraid.org/dynamic/update.php?alphanumeric-key[/code] - - -[b]Step 3[/b] -Install inadyn using the following command:[code]sudo apt-get install inadyn[/code] - -[b]Step 4[/b] -Configure inadyn using the below steps:[code]sudo nano /etc/inadyn.conf[/code] -And add the following contains in it replacing the actual values: -[code] ---username [color=red]techhome[/color] ---password [color=red]mypassword[/color] ---update_period 3600 ---forced_update_period 14400 ---alias [color=red]techhome.homenet.org</b>,[color=red]alphanumeric key[/color] ---background ---dyndns_system default@freedns.afraid.org ---syslog - [/code] - - -[b]Step 5[/b] - -Now, we need to ensure that the DNS updater (Inadyn) runs automatically after every re-boot[code]export EDITOR=gedit && sudo crontab -e[/code] -Add the following line:[code]@reboot /usr/sbin/inadyn[/code] - - -[b]Step 6[/b] - -Reboot system and then run the following command to ensure inadyn is running:[code] -sudo reboot -ps -A | grep inadyn -[/code] -Now your host is ready and up for accessing from internet... -You can trying ssh-ing from another computer over the internet -[code]ssh username@techhome.homenet.org[/code] -Or, if any web server is running, then simply browse to #^[url=http://techhome.homenet.org]http://techhome.homenet.org[/url] -Or, you can just ping it to test ping techhome.homenet.org -To check the logs you can use this: -[code]more /var/log/messages |grep INADYN[/code] - - -[size=large]4. Install $Projectname[/size] - -(Source: [zrl=[baseurl]/help/Install][baseurl]/help/Install[/zrl]) - -Linux Appache document root is /var/www/ -Two files exist there (created by the steps above): index.html, phpinfo.php - - -[b]Install $Projectname and its Addons[/b] - -Cleanup: Remove the directory www/ (Git will not create files and folders in directories that are not empty.) Make sure you are in directory var[code]pi@pi /var $ cd /var[/code] - -Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code] - -Download the sources of $Projectname from GIT -[code]pi@pi /var $ sudo git clone https://framagit.org/hubzilla/core.git www[/code] - -Download the sources of the addons from GIT -[code]pi@pi /var/www $ sudo git clone https://framagit.org/hubzilla/addons.git addon[/code] - -Make user www-data the owner of the whole web directory (including subdirectories and files) -(TODO: This step has to be proofed by the next installation.) -[code]pi@pi /var $ chown -R www-data:www-data /var/www/[/code] - -Check if you can update the sources from git[code] -pi@pi /var $ cd www -pi@pi /var/www $ git pull -[/code] - -Check if you can update the addons -[code]pi@pi /var/www $ cd addon/ -pi@pi /var/www/addon $ sudo git pull[/code] - -Make sure folder store/[data]/smarty3 exists and is writable by the webserver -[code]pi@pi /var/www $ sudo chmod ou+w "store/\[data\]/smarty3"[/code] - -Create .htconfig.php and is writable by the webserver -[code]pi@pi /var/www $ sudo touch .htconfig.php -pi@pi /var/www $ sudo chmod ou+w .htconfig.php[/code] - -[b]First start and initial configuration of your RED Matrix hub[/b] - -In browser open #^[zrl=http://einervonvielen.mooo.com/]http://einervonvielen.mooo.com/[/zrl] -(Replace einervonvielen.mooo.com by your domain, see chapter selfhost. Be patient. It takes time.) -(#^[zrl=http://einervonvielen.mooo.com/index.php?q=setup]http://einervonvielen.mooo.com/index.php?q=setup[/zrl]) - -There might be errors like the following. - -Error: libCURL PHP module required but not installed. -Solution: -apt-get install php5-curl - -Error: Apache webserver mod-rewrite module is required but not installed. -Solution -(Source: [url=http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html]http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html[/url]) -The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load -- pi@pi /var/www $ nano /etc/apache2/mods-available/rewrite.load - (You should find the contendt: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so) -To enable and load mod_rewrite, do the rest of steps. -Create a symbolic link in /etc/apache2/mods-enabled -- pi@pi /var/www $ sudo a2enmod rewrite -Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all". -- pi@pi /var/www $ sudo nano /etc/apache2/sites-available/default -Finally, restart Apache2. -- pi@pi /var/www $ sudo service apache2 restart - -Error store is writable (not checked) -Solution: -(TODO: Make writeable to group www-data only?) -pi@pi /var/www $ sudo mkdir store -pi@pi /var/www $ chown -R www-data:www-data /var/www/red/ -pi@pi /var/www $ sudo chmod ou+w view - -[b]More[/b] - -Set up a cron job to run the poller once every 15 minutes in order to perform background processing. -- pi@pi /var/www $ which php -Make sure you are in the document root directory of the webserver -- pi@pi /var/www $ cd /var/www/ -Try to execute the poller in order to make sure it works -- pi@pi /var/www $ /usr/bin/php include/poller.php -Create the cronjob -- pi@pi /var/www $ crontab -e -Enter -- */15 * * * * cd /var/www/; /usr/bin/php include/poller.php -- Save and exit. - -Prevent search engines from indexing your search pages. Why? This can cause heavy resource use. - -[code] -php util/config system block_public_search 1 -[/code] - - - -[size=large]5. Keep your Raspberry Pi and your $Projectname up-to-date[/size] - -Git update every day at 4 am and addons at 5 am every day -Try if the command is working -- pi@pi /var/www $ sudo git pull -Create the cronjob -- pi@pi /var/www $ crontab -e -Enter the following to update at 4:01 am every day -- 01 04 * * * cd /var/www/; sudo git pull -Enter the following to update the addons at 5:01 am every day -- 01 05 * * * cd /var/www/addon/; sudo git pull -Enter the following to update the Raspberry Pi (Raspbian OS = Debian) at 6:01 am every day -- 01 06 * * * sudo aptitude -y update && sudo aptitude -y safe-upgrade -Save and exit. - -[size=large]6. Running with SSL[/size] - -Follow the instructions here: -[url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url] - -#include doc/macros/main_footer.bb; diff --git a/doc/roadmap.bb b/doc/roadmap.bb deleted file mode 100644 index dce19848a..000000000 --- a/doc/roadmap.bb +++ /dev/null @@ -1,28 +0,0 @@ - -Roadmap - - -Platform - - Convert E2EE and select Javascript resources to dynamic loading using jQuery.getScript() [or other methods]. - -Webpages - - Make webpage building easy, with point-n-click selectors to build PDLs - - -Events - - Recurring events - Integrate Hubzilla events with CalDAV - - -Connections - - CardDAV integration with abook and profiles - - -Issues manager - - Provide easy(easier) channel move (as opposed to channel copy or clone) - diff --git a/doc/schema_development.bb b/doc/schema_development.bb deleted file mode 100644 index 10832684a..000000000 --- a/doc/schema_development.bb +++ /dev/null @@ -1,78 +0,0 @@ -[b]Red Development - A Guide To The Schema System[/b] - -A schema, in a nutshell, is a collection of settings for a bunch of variables to define -certain elements of a theme. A schema is loaded as though it were part of config.php -and has access to all the same information. Importantly, this means it is identity aware, -and can be used to do some interesting things. One could, for example, restrict options -by service class, or present different options to different members. - -By default, we filter only by whether or not expert mode is enabled. If expert mode is -enabled, all options are presented to the member. If it is not, only scheme, background -image, font face, and iconset are available as choices. - -A schema is loaded *after* the member's personal settings. Therefore, to allow a member -to overwrite a particular aspect of a schema you would use the following syntax: -[code] - if (! $foo) - $foo = 'bar'; -[/code] -However, there are circumstances - particularly with positional elements - where it -may be desirable (or necessary) to override a member's settings. In this case, the syntax -is even simpler: -[code] - $foo = 'bar'; -[/code] -Members will not thank you for this, however, so only use it when it is required. - -If no personal options are set, and no schema is selected, we will first try to load a schema -with the file name "default.php". This file should never be included with a theme. If it -is, merge conflicts will occur as people update their code. Rather, this should be defined -by administrators on a site by site basis. -default.php and default.css MUST be symlinks to existing scheme files. - -You schema does not need to - and should not - contain all of these values. Only the values -that differ from the defaults should be listed. This gives you some very powerful options -with very few lines of code. - -Note the options available differ with each theme. The options available with the Redbasic -theme are as follows: - -[li] nav_colour - The colour of the navigation bar. Options are red, black and silver. Alternatively, - one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and - hover effects.[/li] -[li] banner_colour - The font colour of the banner element. Accepts an RGB or Hex value.[/li] -[li] bgcolour - Set the body background colour. Accepts an RGB or Hex value.[/li] -[li] background_image - Sets a background image. Accepts a URL or path.[/li] -[li] item_colour - Set the background colour of items. Accepts an RGB or Hex value.[/li] -[li] item_opacity - Set the opacity of items. Accepts a value from 0.01 to 1[/li] -[li] toolicon_colour - Set the colour of tool icons. Accepts an RGB or Hex value.[/li] -[li] toolicon_activecolour - Set the colour of active or hovered icon tools.[/li] -[li] font_size - Set the size of fonts in items and posts. Accepts px or em.[/li] -[li] body_font_size - Sets the size of fonts at the body level. Accepts px or em.[/li] -[li] font_colour - Sets the font colour. Accepts an RGB or Hex value.[/li] -[li] radius - Set the radius of corners. Accepts a numeral, and is always in px.[/li] -[li] shadow - Set the size of shadows shown with inline images. Accepts a numerical - value. Note shadows are not applied to smileys.[/li] -[li] converse_width - Set the maximum width of the content region in px.[/li] -[li] nav_min_opacity[/li] -[li] top_photo[/li] -[li] reply_photo[/li] - -If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css. -This gives the schem developer the possiblity to override any style component. - -#include doc/macros/main_footer.bb; diff --git a/doc/schemaspy_hubzilla/zot.meta.xml b/doc/schemaspy_hubzilla/zot.meta.xml deleted file mode 100644 index 98a9d370e..000000000 --- a/doc/schemaspy_hubzilla/zot.meta.xml +++ /dev/null @@ -1,283 +0,0 @@ - - - -2015-11-04 - Hubzilla database schema with some corrected cross-table relationships supporting decentralized publishing. Haakon Meland Eriksen. - - - - - - - -
      - -
      - -
      - -
      - - - - - - -
      - -
      - -
      - - - - -
      - - - - -
      - - - - -
      - -
      - -
      - -
      - -
      - - - - -
      - - - - - - - - - -
      - -
      - -
      - -
      - -
      - - - - -
      - - - - - - -
      - -
      - - - - - - -
      - -
      - - - - - - - - - - -
      - -
      - -
      - - - - - - - -
      - - - - -
      - -
      - -
      - - - - - - -
      - -
      - - - - - - -
      - -
      - - - - -
      - -
      - -
      - -
      - - - - - - -
      - -
      - -
      - - - - - - -
      - -
      - - - - -
      - -
      - -
      - - - - - - - -
      - -
      - -
      - - - - - - - - - - - -
      - -
      - - - - - - - -
      - -
      - - - - -
      - - - - - -
      - - - - - -
      - - - - - -
      - - - - - - -
      - - - - - -
      - - -
      - - - - - - - -
      - - - - - - - -
      -       - -       diff --git a/doc/sql_conventions.bb b/doc/sql_conventions.bb deleted file mode 100644 index f6a4e251f..000000000 --- a/doc/sql_conventions.bb +++ /dev/null @@ -1,91 +0,0 @@ -[h1]SQL Conventions[/h1] -[b]Intro[/b] -The following common SQL conventions appear throughout the code in many places. We use a simple DBA (DataBase Abstraction layer) to handle differences between databases. Please be sure to use only standards-compliant SQL. - -[b]Rule One[/b] -Worth Repeating: Don't use non-standard SQL. This goes for addons as well. If you do use non-standard SQL, and the dba funcs are insufficient, do a if()/switch() or similar for all currently supported databases. Currently nothing red# does requires non-standard SQL. - -[b]Using a format string[/b] -[li]Uses sprintf() -To be written -[code]// Example -$r = q("SELECT * FROM profile WHERE uid = %d", - local_channel() -); -[/code][/li] - -[b]Checking bit flags in a where clause[/b] -[li]You must explicitly convert integers to booleans. The easiest way to do this is to compare to 0. -[code]// Example -$r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 ", - intval($uid), - intval(ABOOK_FLAG_SELF) -); -[/code] -[/li] -[li]Turning off a flag -[code]$y = q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'", - intval(XCHAN_FLAGS_ORPHAN), - intval(XCHAN_FLAGS_ORPHAN), - dbesc($rr['hubloc_hash']) -);[/code] -[/li] -[li]Turning on a flag -[code]$y = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'", - intval(XCHAN_FLAGS_ORPHAN), - dbesc($rr['hubloc_hash']) -);[/code] -[/li] - -[b]Using relative times (INTERVALs)[/b] -[li]Sometimes you want to compare something, like less than x days old. -[code]// Example -$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_dob > %s + interval %s and abook_dob < %s + interval %s", - db_utcnow(), db_quoteinterval('7 day'), - db_utcnow(), db_quoteinterval('14 day') -);[/code] -[/li] -[b]Paged results[/b] -[li]To be written -[code]// Example -$r = q("SELECT * FROM mail WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d OFFSET %d", - intval(api_user()), - intval($count), intval($start) -);[/code][/li] - -[b]NULL dates[/b] -[li]To be written -[code]// Example -$r = q("DELETE FROM mail WHERE expires != '%s' AND expires < %s ", - dbesc(NULL_DATE), - db_utcnow() -);[/code][/li] - -[b]Storing binary data[/b] -[li]To be written -[code]// Example -$x = q("update photo set data = '%s', height = %d, width = %d where resource_id = '%s' and uid = %d and scale = 0", - dbescbin($ph->imageString()), - intval($height), - intval($width), - dbesc($resource_id), - intval($page_owner_uid) -);[/code][/li] - -[b]Current timestamp[/b] -[li][code]// Example -$randfunc = db_getfunc('rand'); -$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", - db_utcnow(), db_quoteinterval('30 day') -);[/code][/li] - -[b]SQL Function and Operator Abstraction[/b] -[li]Sometimes the same function or operator has a different name/symbol in each database. You use db_getfunc('funcname') to look them up. The string is [i]not[/i] case-sensitive; do [i]not[/i] include parens. -[code]// Example -$randfunc = db_getfunc('rand'); -$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", - db_utcnow(), db_quoteinterval('30 day') -);[/code][/li] - -#include doc/macros/main_footer.bb; \ No newline at end of file diff --git a/doc/toc.html b/doc/toc.html deleted file mode 100644 index d2f2654a1..000000000 --- a/doc/toc.html +++ /dev/null @@ -1,75 +0,0 @@ -
      -
      -
      -

      - Tutorials -

      -
      - -
      -
      -
      -

      - Members -

      -
      - -
      -
      -
      -

      - Administrators -

      -
      - -
      -
      -
      -

      - Developers -

      -
      - -
      -
      -
      -

      - About -

      -
      - -
      -
      diff --git a/doc/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png b/doc/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png deleted file mode 100644 index d5cf1093f..000000000 Binary files a/doc/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png and /dev/null differ diff --git a/doc/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png b/doc/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png deleted file mode 100644 index d613925aa..000000000 Binary files a/doc/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png and /dev/null differ diff --git a/doc/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png b/doc/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png deleted file mode 100644 index c403bf806..000000000 Binary files a/doc/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png and /dev/null differ diff --git a/doc/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png b/doc/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png deleted file mode 100644 index ca8ba6fb9..000000000 Binary files a/doc/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png and /dev/null differ diff --git a/doc/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png b/doc/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png deleted file mode 100644 index 0da2d96e2..000000000 Binary files a/doc/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png and /dev/null differ diff --git a/doc/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png b/doc/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png deleted file mode 100644 index 2a209b2be..000000000 Binary files a/doc/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png and /dev/null differ diff --git a/doc/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png b/doc/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png deleted file mode 100644 index f992672b0..000000000 Binary files a/doc/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png and /dev/null differ diff --git a/doc/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png b/doc/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png deleted file mode 100644 index b656192dc..000000000 Binary files a/doc/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png and /dev/null differ diff --git a/doc/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png b/doc/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png deleted file mode 100644 index 6129195b6..000000000 Binary files a/doc/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png and /dev/null differ diff --git a/doc/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png b/doc/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png deleted file mode 100644 index 923403fe9..000000000 Binary files a/doc/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png and /dev/null differ diff --git a/doc/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png b/doc/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png deleted file mode 100644 index f158ad5d9..000000000 Binary files a/doc/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png and /dev/null differ diff --git a/doc/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png b/doc/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png deleted file mode 100644 index edc8b01cc..000000000 Binary files a/doc/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png and /dev/null differ diff --git a/doc/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png b/doc/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png deleted file mode 100644 index 5b259058b..000000000 Binary files a/doc/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png and /dev/null differ diff --git a/doc/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png b/doc/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png deleted file mode 100644 index c03ffd18d..000000000 Binary files a/doc/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png and /dev/null differ diff --git a/doc/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png b/doc/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png deleted file mode 100644 index 65d4c5f0a..000000000 Binary files a/doc/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png and /dev/null differ diff --git a/doc/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png b/doc/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png deleted file mode 100644 index 45609a7bb..000000000 Binary files a/doc/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png and /dev/null differ diff --git a/doc/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png b/doc/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png deleted file mode 100644 index d239d6965..000000000 Binary files a/doc/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png and /dev/null differ diff --git a/doc/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png b/doc/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png deleted file mode 100644 index 45ed64d00..000000000 Binary files a/doc/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png and /dev/null differ diff --git a/doc/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png b/doc/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png deleted file mode 100644 index fcaed8bef..000000000 Binary files a/doc/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png and /dev/null differ diff --git a/doc/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png b/doc/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png deleted file mode 100644 index 0ccfc8995..000000000 Binary files a/doc/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png and /dev/null differ diff --git a/doc/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png b/doc/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png deleted file mode 100644 index 1cb4d2d22..000000000 Binary files a/doc/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png and /dev/null differ diff --git a/doc/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png b/doc/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png deleted file mode 100644 index 22e4cb5d5..000000000 Binary files a/doc/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png and /dev/null differ diff --git a/doc/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png b/doc/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png deleted file mode 100644 index 5674f5207..000000000 Binary files a/doc/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png and /dev/null differ diff --git a/doc/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png b/doc/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png deleted file mode 100644 index e6b4a9974..000000000 Binary files a/doc/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png and /dev/null differ diff --git a/doc/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png b/doc/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png deleted file mode 100644 index 8de042ae4..000000000 Binary files a/doc/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png and /dev/null differ diff --git a/doc/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png b/doc/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png deleted file mode 100644 index cec391fb4..000000000 Binary files a/doc/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png and /dev/null differ diff --git a/doc/tutorials/personal_channel.html b/doc/tutorials/personal_channel.html deleted file mode 100644 index bbf367571..000000000 --- a/doc/tutorials/personal_channel.html +++ /dev/null @@ -1,162 +0,0 @@ - -

      This tutorial is intended to be followed in sequence as if you were setting up a -channel for the first time. It introduces some of the tools and features related -to a personal channel in a natural way.

      - -

      Create a new channel

      - -

      When you log in for the first time after registering, you must create a channel. -(Alternatively you can visit https://your_website/new_channel)

      - -

      image

      - -

      Enter your name and a nickname for the channel address, and select a "role". -Typically if this is a personal channel that represents you, select a Social role -with a level of default privacy that you are comfortable with. If you are unsure, -select Social - Mostly public which allows easy interaction and provides privacy when you need it. -Alternatively, Social - Restricted is very popular among privacy advocates, though it may require a bit more -effort to meet people. Whichever setting you choose can be changed later if you decide you require more or less privacy than what is provided.

      - - - -

      Add a profile photo

      - -

      When your new channel is created, you will be directed to a page determined by your site admin. By default this is the Edit Profile page. - -

      From the Profile Tools dropdown menu, select Change profile photo (or just click the profile photo).

      - -

      image

      - -

      Upload your photo and size as necessary using the image editor.

      - -

      image

      - -

      When you press Done Editing you will be redirected back to the profile editor. -(You might need to clear your browser cache if you have trouble seeing the new photo.)

      - -

      image

      - -

      Returning to your channel home page you will see that a post notifying others of your new -profile pic has been automatically posted.

      - -

      image

      - -

      Compose a post

      - -

      Go to your channel home and open the post editor by pressing the Share textbox -at the top of the channel "wall". Enter a message, and then drag-and-drop an image -file into the post editor text area (alternatively you can use the Attach file -tool at the bottom).

      - -

      image

      - -

      Your image file will be automatically uploaded and stored in your cloud files, and -a link will appear in the post window. Pressing the post preview button will allow you to preview your post before publishing it.

      - -

      image

      - -

      Pressing the lock button near the Submit button will open the Access Control List -so you can specify exactly who can access this post.

      - -

      image

      - -

      Use an uploaded image as a channel cover photo

      - -

      One way to add some pizzazz your channel is to add a cover photo that visitors will -see when they load your channel page. The integrated cloud file system -allows you to choose an existing photo for this purpose.

      - -

      Visit your photos in the Photos app

      - -

      image

      - -

      Select the photo you wish to use and select Use as cover photo from the Photo Tools -dropdown menu.

      - -

      image

      - -

      Crop the image using the photo editor and save your changes.

      - -

      image

      - -

      When you load your channel home page, you will first see the cover photo, and your -channel page will fade in as you scroll down.

      - -

      image

      - -

      Make a connection

      - -

      Making connections between channels to share things is what social communications are all about. -Making a connection is simple. If you do not already know how to reach a channel's home -page, you might try a directory search by opening the Directory link from the menu on the right -side of the top navbar.

      - -

      image

      - -

      You can connect directly from the directory entry using the Connect button there, -or you can open the channel page first and press the Connect button below the -profile photo.

      - -

      image

      - -

      After you connect you are immediately taken to the connection editor page, where -you make some important decisions about what you plan to share with this channel.

      - -

      image

      - -

      The two important settings are

      - -
      • The individual permissions for the newly connected channel
        • -
      • The privacy group(s) the connection is a member of
        • -

      The individual permissions are mostly straightforward, but they can be slightly -unclear at first. For example, Can view my file storage and photos does not -mean that the connected channel will be able to view all of your photos and files! -It means that you will have the option to share photos and files with that -channel. It is perfectly possible for you to allow someone to read your posts but -disallow them from seeing photos in that post. This kind of unusual situation is, -as they say, not a bug; it is a feature.

      - -

      Privacy groups allow you to conveniently share items with groups of people. You can -create whatever groups fit your needs by opening the Add privacy group link.

      - -

      image

      - -

      In this editor, you can switch between the existing privacy groups and see at a -glance what channels are and are not members of the group. Selecting the icon of -a channel in either box will move it to the in or out of the group.

      - -

      image

      - -

      When editing an individual channel's settings, you can set their privacy group -membership using the widget on the left:

      - -

      image

      - -

      Connections are a mutual engagement. The channel you connect can choose to approve your -connection. They will receive a notification that you connected

      - -

      image

      - -

      which takes them to their Connections editor page where -they can choose to approve the connection or not.

      - -

      image

      - -

      After you approve a connection, it is a good idea to open the individual connection -editor by pressing the edit button beside the Delete button.

      - -

      image

      - - diff --git a/include/help.php b/include/help.php index 9e4be57f9..12721a30b 100644 --- a/include/help.php +++ b/include/help.php @@ -5,203 +5,6 @@ use CommerceGuys\Intl\Language\LanguageRepository; require_once('include/items.php'); -/** - * @brief - * - * @param string $path - * @param string $suffix (optional) default null - * @return string - */ -function get_help_fullpath($path, $suffix = null) { - - $docroot = (\App::$override_helproot) ? \App::$override_helproot : 'doc/'; - $docroot = (substr($docroot,-1)!='/') ? $docroot .= '/' : $docroot; - - // Determine the language and modify the path accordingly - $x = determine_help_language(); - $lang = $x['language']; - - // The English translation is at the root of /doc/. Other languages are in - // subfolders named by the language code such as "de", "es", etc. - if($lang !== 'en') { - $langpath = $lang . '/' . $path; - } else { - $langpath = $path; - } - - $newpath = (isset(\App::$override_helpfiles[$langpath])) ? \App::$override_helpfiles[$langpath] : $langpath; - $newpath = ($newpath == $langpath) ? $docroot . $newpath : $newpath; - - if ($suffix) { - if (file_exists($newpath . $suffix)) { - return $newpath; - } - } elseif (file_exists($newpath . '.md') || - file_exists($newpath . '.bb') || - file_exists($newpath . '.html')) { - return $newpath; - } - - $newpath = (isset(\App::$override_helpfiles[$path])) ? \App::$override_helpfiles[$path] : null; - - $newpath = (!$newpath) ? $docroot.$path : $newpath; - return $newpath; -} - - -/** - * @brief - * - * @param string $tocpath (optional) default false - * @return string - */ -function get_help_content($tocpath = false) { - - $doctype = 'markdown'; - - $text = ''; - - $path = (($tocpath !== false) ? $tocpath : ''); - $docroot = (\App::$override_helproot) ? \App::$override_helproot : 'doc/'; - $docroot = (substr($docroot,-1)!='/') ? $docroot .= '/' : $docroot; - - if($tocpath === false && argc() > 1) { - $path = ''; - for($x = 1; $x < argc(); $x ++) { - if(strlen($path)) - $path .= '/'; - $path .= argv($x); - } - } - - - if($path) { - $fullpath = get_help_fullpath($path); - $title = basename($path); - if(! $tocpath) - \App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title))); - - // Check that there is a "toc" or "sitetoc" located at the specified path. - // If there is not, then there was not a translation of the table of contents - // available and so default back to the English TOC at /doc/toc.{html,bb,md} - // TODO: This is incompatible with the hierarchical TOC construction - // defined in /Zotlabs/Widget/Helpindex.php. - if($tocpath !== false && - load_doc_file($fullpath . '.md') === '' && - load_doc_file($fullpath . '.bb') === '' && - load_doc_file($fullpath . '.html') === '' - ) { - $path = $title; - } - $fullpath = get_help_fullpath($path); - $text = load_doc_file($fullpath . '.md'); - - if(! $text) { - $text = load_doc_file($fullpath . '.bb'); - if($text) - $doctype = 'bbcode'; - } - if(! $text) { - $text = load_doc_file($fullpath . '.html'); - if($text) - $doctype = 'html'; - } - } - - if(($tocpath) && (! $text)) - return ''; - - if($tocpath === false) { - if(! $text) { - $path = 'Site'; - $fullpath = get_help_fullpath($path,'.md'); - $text = load_doc_file($fullpath . '.md'); - \App::$page['title'] = t('Help'); - } - if(! $text) { - $doctype = 'bbcode'; - $path = 'main'; - $fullpath = get_help_fullpath($path,'.md'); - $text = load_doc_file($fullpath . '.bb'); - goaway('/help/about/about'); - \App::$page['title'] = t('Help'); - } - - if(! $text) { - header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found')); - $tpl = get_markup_template("404.tpl"); - return replace_macros($tpl, array( - '$message' => t('Page not found.') - )); - } - } - - if($doctype === 'html') - $content = parseIdentityAwareHTML($text); - if($doctype === 'markdown') { - # escape #include tags - $text = preg_replace('/#include/ism', '%%include', $text); - $content = MarkdownExtra::defaultTransform($text); - $content = preg_replace('/%%include/ism', '#include', $content); - } - if($doctype === 'bbcode') { - require_once('include/bbcode.php'); - $content = zidify_links(bbcode($text)); - // bbcode retargets external content to new windows. This content is internal. - $content = str_replace(' target="_blank"', '', $content); - } - - $content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content); - - return translate_projectname($content); -} - -function preg_callback_help_include($matches) { - - if($matches[1]) { - $include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); - if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) { - require_once('include/bbcode.php'); - $include = zidify_links(bbcode($include)); - $include = str_replace(' target="_blank"','',$include); - } - elseif(preg_match('/\.md$/', $matches[1])) { - $include = MarkdownExtra::defaultTransform($include); - } - return $include; - } - -} - -/** - * @brief Determines help language. - * - * If the language was specified in the URL, override the language preference - * of the browser. Default to English if both of these are absent. - * - * @return array Associative array with: - * * \e string \b language - 2-letter ISO 639-1 code ("en") - * * \e boolean \b from_url - true if language from URL overrides browser default - */ -function determine_help_language() { - - $language_repository = new LanguageRepository; - $languages = $language_repository->getList(); - - if(array_key_exists(argv(1), $languages)) { - $lang = argv(1); - $from_url = true; - } else { - $lang = \App::$language; - if(! isset($lang)) - $lang = 'en'; - - $from_url = false; - } - - return array('language' => $lang, 'from_url' => $from_url); -} - function load_doc_file($s) { $c = find_doc_file($s); diff --git a/tests/unit/Module/HelpTest.php b/tests/unit/Module/HelpTest.php new file mode 100644 index 000000000..0f1610db5 --- /dev/null +++ b/tests/unit/Module/HelpTest.php @@ -0,0 +1,188 @@ +getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->any()) + ->willReturnCallback( + fn (string $path) => $path === "doc/en/about/help_topic.{$ext}" + ); + + // Use a value map to make the `file_get_contents` stub return the + // correct content for the file types. + $file_content_map = [ + [ 'doc/en/about/help_topic.md', "### Help heading\n\$Projectname help content" ], + [ 'doc/en/about/help_topic.bb', "[h3]Help heading[/h3]\n\n\$Projectname help content" ], + [ 'doc/en/about/help_topic.html', "

      Help heading

      \$Projectname help content

      " ], + ]; + + // Stub `file_get_contents` to plant our own content. + $fgc_stub = $this->getFunctionMock('Zotlabs\Module', 'file_get_contents'); + $fgc_stub + ->expects($this->once()) + ->willReturn($this->returnValueMap($file_content_map)); + + + $this->get("help/about/help_topic"); + + // Check that markdown content was correctly rendered + $this->assertPageContains('

      Help heading

      '); + + // Check that `$Projectname` has been translated properly + $this->assertPageContains('Hubzilla help content'); + + // Check that heading has been set + $this->assertPageContains('Hubzilla Documentation: About'); + + // Check that page title has been set + $this->assertTrue(isset(\App::$page['title']), 'Page title not set'); + $this->assertStringContainsString('Help', \App::$page['title']); + $this->assertStringContainsStringIgnoringCase('Help Topic', \App::$page['title']); + + // Check that nav selection has been set + $this->assertTrue(isset(\App::$nav_sel['raw_name']), 'Nav selection raw name not set'); + $this->assertEquals('Help', \App::$nav_sel['raw_name']); + + $this->assertTrue(isset(\App::$nav_sel['name']), 'Navselection name not set'); + $this->assertEquals('Help', \App::$nav_sel['name']); + } + + public function test_get_request_should_return_404_when_help_file_does_not_exist(): void { + // Stub file exists, to only retur true for the file with the current + // extension + $fe_stub = $this->getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->any()) + ->willReturn(false); + + // Make sure `file_get_contents` is never called by the code. + $fgc_stub = $this->getFunctionMock('Zotlabs\Module', 'file_get_contents'); + $fgc_stub->expects($this->never()); + + $this->get("help/this_topic_does_not_exist"); + + $this->assertPageContains('not found'); + } + + public function test_get_request_without_args_redirects_to_about_page(): void { + $this->stub_goaway(); + $this->expectException(\Zotlabs\Tests\Unit\Module\RedirectException::class); + $this->expectExceptionMessage('about/about'); + + $this->get('help'); + } + + public function test_find_help_file_returns_first_match(): void { + // Stub file exists, to always return true + $fe_stub = $this->getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->once()) + ->willReturn(true); + + // Stub `file_get_contents` to plant our own content. + $fgc_stub = $this->getFunctionMock('Zotlabs\Module', 'file_get_contents'); + $fgc_stub + ->expects($this->once()) + ->with('doc/en/first.md') + ->willReturn('found'); + + $this->get('help/first'); + } + + public function test_includes(): void { + // Stub `file_get_contents` to plant our own content. + $fgc_stub = $this->getFunctionMock('Zotlabs\Module', 'file_get_contents'); + $fgc_stub + ->expects($this->any()) + ->willReturnCallback( + function (string $path): string { + if ($path === 'doc/en/sub.md') { + return "### This is the included file."; + } else { + return "### Main topic\n\n#include doc/en/sub.md;"; + } + } + ); + + // Stub file exists, to always return true + $fe_stub = $this->getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->any()) + ->willReturn(true); + + $this->get('help/main'); + + $this->assertPageContains('

      This is the included file.

      '); + } + + public function test_include_file_of_different_type_than_main_file(): void { + // Stub `file_get_contents` to plant our own content. + $fgc_stub = $this->getFunctionMock('Zotlabs\Module', 'file_get_contents'); + $fgc_stub + ->expects($this->any()) + ->willReturnCallback( + function (string $path): string { + if ($path === 'doc/en/sub.md') { + return "### This is the included file."; + } else { + return "[h3]Main topic[/h3]\n\n#include doc/en/sub.md;"; + } + } + ); + + // Stub file exists, only return true for main.bb and sub.md + $fe_stub = $this->getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->any()) + ->willReturnCallback( + fn (string $path) => ( + $path === 'doc/en/main.bb' || $path === 'doc/en/sub.md' + ) + ); + + $this->get('help/main'); + + $this->assertPageContains('

      This is the included file.

      '); + } + + /** + * Helper to simplify asserting contents in the rendered page. + * + * @param string $needle The expected string to find. + */ + private function assertPageContains(string $needle): void { + $this->assertStringContainsString($needle, \App::$page['content']); + } +} diff --git a/tests/unit/Module/SetupTest.php b/tests/unit/Module/SetupTest.php new file mode 100644 index 000000000..96a5ef932 --- /dev/null +++ b/tests/unit/Module/SetupTest.php @@ -0,0 +1,74 @@ +with_no_accounts_in_db(); + $this->get('setup'); + + $this->assertEquals('setup', \App::$page['page_title']); + + // Assert that result _don't_ match "Permission denied" + $this->assertThat( + \App::$page['content'], + $this->logicalNot( + $this->matchesRegularExpression('/Permission denied/') + ) + ); + } + + public function test_that_setup_is_not_available_if_accounts_in_db(): void { + // The fixtures loaded by default add a couple of accounts. + $this->get('setup'); + + $this->assertEquals('setup', \App::$page['page_title']); + $this->assertMatchesRegularExpression('/Permission denied/', \App::$page['content']); + } + + public function test_that_setup_testrewrite_returns_ok(): void { + // We need to stub the `killme` function, as it is called directly from + // the code under test. + $this->stub_killme(); + + $output = ''; + + // Turn on output buffering, as code under test echoes + // directly to the output + ob_start(); + try { + $this->get('setup/testrewrite'); + } catch (\Zotlabs\Tests\Unit\Module\KillmeException) { + $output = ob_get_contents(); + } + + $this->assertEquals('ok', $output); + + ob_end_clean(); + } + + /** + * Delete all accounts from the database. + * + * This is currently needed because we automatically import the database + * fixtures on test start, which contains a couple of accounts already. + */ + private function with_no_accounts_in_db(): void { + q('DELETE FROM account;'); + } +} diff --git a/tests/unit/Module/TestCase.php b/tests/unit/Module/TestCase.php new file mode 100644 index 000000000..aa09e0596 --- /dev/null +++ b/tests/unit/Module/TestCase.php @@ -0,0 +1,74 @@ +Dispatch(); + } + + /** + * Stub out the `killme` function. + * + * Usefule for modules that call this function directly. + * + * Instead of calling exit, the stub will throw a `KillmeException`, + * that can be caught by the test code to regain control after request + * processing is terminated. + */ + protected function stub_killme(): void { + $killme_stub = $this->getFunctionMock('Zotlabs\Module', 'killme'); + $killme_stub + ->expects($this->once()) + ->willReturnCallback( + function () { + throw new KillmeException(); + } + ); + } + + protected function stub_goaway(): void { + $goaway_stub = $this->getFunctionMock('Zotlabs\Module', 'goaway'); + $goaway_stub + ->expects($this->once()) + ->willReturnCallback( + function (string $uri) { + throw new RedirectException($uri); + } + ); + } +} + +/** + * Exception class for killme stub + */ +class KillmeException extends \Exception {} + +/** + * Exception class for goaway stub. + * + * Takes the goaway uri as an arg, and makes it available as + * the public `$uri` member variable. + */ +class RedirectException extends \Exception { + function __construct(string $uri) { + parent::__construct($uri); + } +} diff --git a/tests/unit/Widget/HelpindexTest.php b/tests/unit/Widget/HelpindexTest.php new file mode 100644 index 000000000..a8b51172b --- /dev/null +++ b/tests/unit/Widget/HelpindexTest.php @@ -0,0 +1,80 @@ +getFunctionMock('Zotlabs\Widget', 'file_get_contents'); + $fgc_stub + ->expects($this->once()) + ->with($this->equalTo('doc/en/toc.html')) + ->willReturn('toc'); + + // Stub `file_exists` to only return true for the english toc file + $fe_stub = $this->getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->any()) + ->willReturnCallback(fn (string $path) => $path === 'doc/en/toc.html' ); + + $this->render_widget(); + $this->assertOutputContains('toc'); + $this->assertOutputContains('Help Content'); + } + + public function test_that_result_is_empty_when_toc_not_present(): void { + // Ensure `file_get_contents` is not called during the test. + $fgc_stub = $this->getFunctionMock('Zotlabs\Widget', 'file_get_contents'); + $fgc_stub->expects($this->never()); + + // Stub `file_exists` to always return false to simulate that we + // can't find the toc file. + $fe_stub = $this->getFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + $fe_stub + ->expects($this->any()) + ->willReturn(false); + + $this->render_widget(); + } + + /** + * Initializes the app and calls the widget code. + */ + private function render_widget(): void { + $_GET['q'] = 'help/en/about/about'; + $_SERVER['REQUEST_METHOD'] = 'GET'; + + \App::init(); + + $widget = new \Zotlabs\Widget\Helpindex(); + $this->output = $widget->widget([]); + } + + private function assertOutputContains(string $needle): void { + $this->assertStringContainsString($needle, $this->output); + } +} diff --git a/tests/unit/includes/LanguageTest.php b/tests/unit/includes/LanguageTest.php index 9525c783d..3367232f3 100644 --- a/tests/unit/includes/LanguageTest.php +++ b/tests/unit/includes/LanguageTest.php @@ -33,54 +33,6 @@ use Text_LanguageDetect; * @author Klaus Weidenbach */ class LanguageTest extends UnitTestCase { - //use PHPMock; - - /** - * @dataProvider languageExamplesProvider - * @coversNothing - */ - public function testDetectLanguage($text, $langCode, $confidence) { - - // php-mock can not mock global functions which is called by a global function. - // 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->expects($this->once())->willReturn(10); - //$this->assertEquals($langCode, detect_language($text)); - - - // Can not unit test detect_language(), therefore test the used library - // only for now to find regressions on library updates. - $l = new Text_LanguageDetect; - // return 2-letter ISO 639-1 (en) language code - $l->setNameMode(2); - $lng = $l->detectConfidence($text); - - $this->assertEquals($langCode, $lng['language']); - $this->assertEquals($confidence, round($lng['confidence'], 6)); - } - - public function languageExamplesProvider() { - return [ - 'English' => [ - 'English is a West Germanic language that was first spoken in early medieval England and is now a global lingua franca.[4][5] Named after the Angles, one of the Germanic tribes that migrated to England, it ultimately derives its name from the Anglia (Angeln) peninsula in the Baltic Sea. It is closely related to the Frisian languages, but its vocabulary has been significantly influenced by other Germanic languages, particularly Norse (a North Germanic language), as well as by Latin and Romance languages, especially French.', - 'en', - 0.078422 - ], - 'German' => [ - 'Deutschland ist ein Bundesstaat in Mitteleuropa. Er besteht aus 16 Ländern und ist als freiheitlich-demokratischer und sozialer Rechtsstaat verfasst. Die Bundesrepublik Deutschland stellt die jüngste Ausprägung des deutschen Nationalstaates dar. Mit rund 82,8 Millionen Einwohnern (31. Dezember 2016) zählt Deutschland zu den dicht besiedelten Flächenstaaten.', - 'de', - 0.134339 - ], - 'Norwegian' => [ - 'Kongeriket Norge er et nordisk, europeisk land og en selvstendig stat vest på Den skandinaviske halvøy. Landet er langt og smalt, og kysten strekker seg langs Nord-Atlanteren, hvor også Norges kjente fjorder befinner seg. Totalt dekker det relativt tynt befolkede landet 385 000 kvadratkilometer med litt over fem millioner innbyggere (2016).', - 'no', - 0.007076 - ] - ]; - } - /** * @covers ::get_language_name diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 5022e7b1b..ba61a43ce 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -13,19 +13,19 @@ -

      {{$title}}: {{$heading}}

      +

      {{$module->get_page_title()}}

      - {{$tocHeading}} + {{$module->get_toc_heading()}}

      - {{$content}} + {{$module->render_content()}}
      diff --git a/view/tpl/widget.tpl b/view/tpl/widget.tpl new file mode 100644 index 000000000..3fb3b1200 --- /dev/null +++ b/view/tpl/widget.tpl @@ -0,0 +1,10 @@ +{{* Generic template for widgets. + * + * To use this template, pass the `$this` object reference of the widget, + * and implement the `title()` and `contents()` functions as public methods + * on the widget class. + *}} +
      +

      {{$widget->title()}}

      + {{$widget->contents()}} +
      -- cgit v1.2.3 From 4d29cffde511a7af0be8057b5f0a680285bc8f4b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 27 Feb 2024 11:06:49 +0100 Subject: Improve docs for UnitTestCase class. --- tests/unit/UnitTestCase.php | 65 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php index a4ea94b13..9ab6a534a 100644 --- a/tests/unit/UnitTestCase.php +++ b/tests/unit/UnitTestCase.php @@ -33,29 +33,30 @@ require_once __DIR__ . '/../../boot.php'; require_once 'include/dba/dba_driver.php' ; /** - * @brief Base class for our Unit Tests. + * Base class for our Unit Tests. * - * Empty class at the moment, but you should extend this class for unit test - * cases, so we could and for sure we will need to implement basic behaviour - * for all of our unit tests. + * Base class for Hubzilla unit/integration tests. This extends the base + * TestCase class from PHPUnit by connecting to a test database, and making the + * database connection available to the code under test via the normal Hubzilla + * mechanisms, i.e the \DBA::$dba global variable. * - * @author Klaus Weidenbach + * It also automatically loads database fixtures from yaml files in the + * tests/unit/includes/dba/_files directory. And wraps each test run in it's + * own database transaction. */ class UnitTestCase extends TestCase { protected array $fixtures = array(); /** - * Override the PHPUnit\Framework\TestCase::run method, so we can - * wrap it in a database transaction. + * Override the run method, so we can wrap it in a database transaction. + * + * The transaction is automatically rolled back when the test completes, to + * leave the test database in a known pristine state. * * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ public function run(TestResult $result = null): TestResult { - // $myclass = get_class($this); - // logger("[*] Running test: {$myclass}::{$this->getName(true)}", LOGGER_DEBUG); - if (! \DBA::$dba) { - //logger('[*] Connecting to test db...'); $this->connect_to_test_db(); } @@ -74,6 +75,22 @@ class UnitTestCase extends TestCase { return $result; } + /** + * Connect to the test database, + * + * By default it will connect to a MySQL database with the following settings: + * + * - HZ_TEST_DB_HOST: db + * - HZ_TEST_DB_PORT: default + * - HZ_TEST_DB_USER: test_user + * - HZ_TEST_DB_PASS: hubzilla + * - HZ_TEST_DB_DATABASE: hubzilla_test_db + * - HZ_TEST_DB_TYPE: mysql (can also be "postgres") + * - HZ_TEST_DB_CHARSET: UTF8 + * + * All of these settings can be overridden by the test runner by setting ENV vars + * named as above with the values you want to override. + */ protected function connect_to_test_db() : void { if ( !\DBA::$dba ) { \DBA::dba_factory( @@ -101,6 +118,14 @@ class UnitTestCase extends TestCase { } } + /** + * Return the database type from a string. + * + * @param string $type The database type, can be either mysql or postgres. + * + * @return The database type constant matching the passed in type, or DBTYPE_MYSQL + * if $type is empty or invalid. + */ private static function dbtype(string $type): int { if (trim(strtolower($type)) === 'postgres') { return DBTYPE_POSTGRES; @@ -109,6 +134,9 @@ class UnitTestCase extends TestCase { } } + /** + * Load database fixtures from the fixture path. + */ private function loadFixtures() : void { $files = glob(__DIR__ . '/includes/dba/_files/*.yml'); if ($files === false || empty($files)) { @@ -117,6 +145,21 @@ class UnitTestCase extends TestCase { array_walk($files, fn($file) => $this->loadFixture($file)); } + /** + * Load database fixtures from a specific file. + * + * The file must be a yaml file named the same as the table in the database + * it should populate. + * + * The file also need to have a root key with the same name as the table. + * Under which it contains an array of rows that should be inserted into + * the db table. + * + * @param string $file The path and filename of the fixture to load. + * The path name is relative to the current working + * directory of the process, which should normally + * be the Hubzilla root directory. + */ private function loadFixture($file) : void { $table_name = basename($file, '.yml'); $this->fixtures[$table_name] = yaml_parse_file($file)[$table_name]; -- cgit v1.2.3 From 630cecd740762cc6111468b46644fcae85a360b3 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 5 Mar 2024 20:52:16 +0100 Subject: Libzot: get_rpost_path was broken for URL's with no port. --- Zotlabs/Lib/Libzot.php | 9 +++++++-- tests/unit/Lib/ZotlibTest.php | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 tests/unit/Lib/ZotlibTest.php diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 89157bf5e..bc944c97c 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -2569,9 +2569,14 @@ class Libzot { if (!$observer) return ''; - $parsed = parse_url($observer['xchan_url']); + $url = $observer['xchan_url']; + if (preg_match('|^https?://|', $url) === 0) { + $url = "https://{$url}"; + } + + $parsed = parse_url($url); - return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f='; + return $parsed['scheme'] . '://' . $parsed['host'] . (isset($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f='; } /** diff --git a/tests/unit/Lib/ZotlibTest.php b/tests/unit/Lib/ZotlibTest.php new file mode 100644 index 000000000..05522678f --- /dev/null +++ b/tests/unit/Lib/ZotlibTest.php @@ -0,0 +1,34 @@ + $xchan_url ]; + + $this->assertEquals($expected, \Zotlabs\Lib\Libzot::get_rpost_path($observer)); + } + + private function get_rpost_path_provider() : array { + return [ + 'xchan_url without port' => [ + 'https://example.com/rpost?f=', + 'https://example.com' + ], + 'xchan_url with port' => [ + 'https://example.com:666/rpost?f=', + 'https://example.com:666' + ], + 'xchan_url ignores path and args' => [ + 'https://example.com/rpost?f=', + 'https://example.com/path?arg1=balle' + ], + 'xchan_url with no scheme should default to https' => [ + 'https://example.com/rpost?f=', + 'example.com', + ], + ]; + } +} -- cgit v1.2.3 From 058c7d6c13e4cb76efd001ca5be39769825587b0 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 13:00:45 +0000 Subject: start removing jgrowl --- view/js/main.js | 23 +++++++++++++++++++++-- view/theme/redbasic/css/style.css | 6 ++++++ view/tpl/hdr.tpl | 1 + view/tpl/notifications_widget.tpl | 8 +++++--- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index c9798dede..f38d9db2d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1305,7 +1305,8 @@ function dropItem(url, object, b64mid) { $(object + ', #pinned-wrapper-' + id).remove(); $('body').css('cursor', 'auto'); - $.jGrowl(aStr.itemdel, { sticky: false, theme: 'info', life: 3000 }); + toast(aStr.itemdel, 'info') + //$.jGrowl(aStr.itemdel, { sticky: false, theme: 'info', life: 3000 }); if (typeof b64mid !== typeof undefined) { $('[data-b64mid=\'' + b64mid + '\']').fadeOut(function() { @@ -1408,7 +1409,8 @@ function submitPoll(id) { $.post('vote/' + id, $('#question-form-' + id).serialize(), function(data) { - $.jGrowl(data.message, { sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: 10000 }); + toast(data.message, ((data.success) ? 'info' : 'danger')); + //$.jGrowl(data.message, { sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: 10000 }); if(timer) clearTimeout(timer); timer = setTimeout(updateInit, 500); } @@ -1815,3 +1817,20 @@ function toggleAside() { $('
      ').appendTo('body').one('click', function() { toggleAside(); }); } } + +function toast(string, severity) { + let container = document.getElementById('toast-container'); + let toast = document.createElement('div'); + + toast.innerHTML = '
      ' + string + '
      '; + toast.classList.add('toast', 'p-2', 'm-3', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity,); + container.prepend(toast); + + let toastInstance = bootstrap.Toast.getOrCreateInstance(toast); + + if (severity === 'danger') { + toastInstance._config.autohide = false; + } + + toastInstance.show(); +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 56194c735..05cd75422 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -168,6 +168,11 @@ input[type=text], textarea { color: #FF0000; } +#toast-container { + z-index: 1030; + width: 300px; +} + #powered-by { font-size: 0.5rem; position: absolute; @@ -719,6 +724,7 @@ div.jGrowl div.info { color: #ffffff; padding-left: 58px; } + #jGrowl.top-right { top: 4.5rem; right: .25rem; diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index e69de29bb..7d20633bc 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -0,0 +1 @@ +
      diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 9ea5ffec6..aa53905ad 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -337,17 +337,19 @@ sse_setNotificationsStatus(); // notice and info - $.jGrowl.defaults.closerTemplate = '
      [ ' + aStr.closeAll + ']
      '; + //$.jGrowl.defaults.closerTemplate = '
      [ ' + aStr.closeAll + ']
      '; if(obj.notice) { $(obj.notice.notifications).each(function() { - $.jGrowl(this, { sticky: true, theme: 'notice' }); + toast(this, 'danger'); + //$.jGrowl(this, { sticky: true, theme: 'notice' }); }); } if(obj.info) { $(obj.info.notifications).each(function(){ - $.jGrowl(this, { sticky: false, theme: 'info', life: 10000 }); + toast(this, 'info'); + //$.jGrowl(this, { sticky: false, theme: 'info', life: 10000 }); }); } -- cgit v1.2.3 From 2e575dee526305f1c0c2b8184179167f1b0756ec Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 14:09:09 +0000 Subject: css fix --- view/tpl/hdr.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index 7d20633bc..ba63830eb 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1 +1 @@ -
      +
      -- cgit v1.2.3 From 483221e2a87b36c85662fd2a941f436be6067ac9 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 14:15:31 +0000 Subject: remove redundant comma --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index f38d9db2d..8904f8b4c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1823,7 +1823,7 @@ function toast(string, severity) { let toast = document.createElement('div'); toast.innerHTML = '
      ' + string + '
      '; - toast.classList.add('toast', 'p-2', 'm-3', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity,); + toast.classList.add('toast', 'p-2', 'm-3', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity); container.prepend(toast); let toastInstance = bootstrap.Toast.getOrCreateInstance(toast); -- cgit v1.2.3 From 98c3e2f93f18554364e26e9cf25473d36641a173 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 14:44:16 +0000 Subject: remove jgrowl --- Zotlabs/Module/Lockview.php | 2 +- library/jgrowl/.gitignore | 5 - library/jgrowl/Gruntfile.js | 61 ----- library/jgrowl/LICENSE | 7 - library/jgrowl/README.md | 75 ------ library/jgrowl/bower.json | 32 --- library/jgrowl/examples/appendTo.html | 103 -------- library/jgrowl/examples/bootstrap.html | 91 ------- library/jgrowl/examples/jgrowl.html | 171 ------------- library/jgrowl/jgrowl.jquery.json | 40 --- library/jgrowl/jquery.jgrowl.css | 100 -------- library/jgrowl/jquery.jgrowl.js | 399 ------------------------------ library/jgrowl/jquery.jgrowl.map | 1 - library/jgrowl/jquery.jgrowl.min.css | 1 - library/jgrowl/jquery.jgrowl.min.js | 2 - library/jgrowl/less/jgrowl.core.less | 101 -------- library/jgrowl/less/jgrowl.less | 2 - library/jgrowl/less/jgrowl.variables.less | 8 - library/jgrowl/package.json | 23 -- view/js/mod_cloud.js | 4 +- view/php/theme_init.php | 2 - view/theme/redbasic/css/narrow_navbar.css | 5 - view/theme/redbasic/css/style.css | 21 -- view/tpl/cdav_calendar.tpl | 4 +- view/tpl/contact_edit_modal.tpl | 8 +- view/tpl/invite.tpl | 1 - view/tpl/notifications_widget.tpl | 3 - view/tpl/totp_setup.tpl | 4 +- 28 files changed, 11 insertions(+), 1265 deletions(-) delete mode 100644 library/jgrowl/.gitignore delete mode 100644 library/jgrowl/Gruntfile.js delete mode 100644 library/jgrowl/LICENSE delete mode 100644 library/jgrowl/README.md delete mode 100644 library/jgrowl/bower.json delete mode 100644 library/jgrowl/examples/appendTo.html delete mode 100644 library/jgrowl/examples/bootstrap.html delete mode 100644 library/jgrowl/examples/jgrowl.html delete mode 100644 library/jgrowl/jgrowl.jquery.json delete mode 100644 library/jgrowl/jquery.jgrowl.css delete mode 100644 library/jgrowl/jquery.jgrowl.js delete mode 100644 library/jgrowl/jquery.jgrowl.map delete mode 100644 library/jgrowl/jquery.jgrowl.min.css delete mode 100644 library/jgrowl/jquery.jgrowl.min.js delete mode 100644 library/jgrowl/less/jgrowl.core.less delete mode 100644 library/jgrowl/less/jgrowl.less delete mode 100644 library/jgrowl/less/jgrowl.variables.less delete mode 100644 library/jgrowl/package.json diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php index 0c8e23f8c..f3ae07f74 100644 --- a/Zotlabs/Module/Lockview.php +++ b/Zotlabs/Module/Lockview.php @@ -227,7 +227,7 @@ class Lockview extends Controller { $allowed_xchans = array_unique($allowed_xchans); foreach ($atokens as $atoken) { if (in_array($atoken['xchan_hash'], $allowed_xchans)) { - $guest_access_list[] = '
      ' . $atoken['xchan_name'] . '
      '; + $guest_access_list[] = '
      ' . $atoken['xchan_name'] . '
      '; } } } diff --git a/library/jgrowl/.gitignore b/library/jgrowl/.gitignore deleted file mode 100644 index 385e49ef1..000000000 --- a/library/jgrowl/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.DS_Store -node_modules/ -jGrowl.iml -jGrowl.ipr -jGrowl.iws diff --git a/library/jgrowl/Gruntfile.js b/library/jgrowl/Gruntfile.js deleted file mode 100644 index fed0fceee..000000000 --- a/library/jgrowl/Gruntfile.js +++ /dev/null @@ -1,61 +0,0 @@ -module.exports = function(grunt) { - - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - uglify: { - options: { - sourceMap: true, - sourceMapName: 'jquery.jgrowl.map' - }, - jgrowl: { - files: { - 'jquery.jgrowl.min.js': ['jquery.jgrowl.js'] - } - } - }, - less: { - jgrowl: { - files: { - "jquery.jgrowl.css": "less/jgrowl.less" - } - } - }, - cssmin: { - jgrowl: { - expand: true, - src: 'jquery.jgrowl.css', - ext: '.jgrowl.min.css' - } - }, - jshint: { - files: ['Gruntfile.js', 'jquery.jgrowl.js'], - options: { - // options here to override JSHint defaults - globals: { - jQuery: true, - console: true, - module: true, - document: true - } - } - }, - watch: { - scripts: { - files: ['jquery.jgrowl.js', 'less/*'], - tasks: ['jshint', 'less', 'cssmin', 'uglify'], - options: { - spawn: false - } - } - } - }); - - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-cssmin'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-contrib-less'); - - grunt.registerTask('test', ['jshint']); - grunt.registerTask('default', ['jshint', 'uglify', 'less', 'cssmin']); -}; diff --git a/library/jgrowl/LICENSE b/library/jgrowl/LICENSE deleted file mode 100644 index e70a54a58..000000000 --- a/library/jgrowl/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2012 Stan Lemon - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/library/jgrowl/README.md b/library/jgrowl/README.md deleted file mode 100644 index 7dfd85637..000000000 --- a/library/jgrowl/README.md +++ /dev/null @@ -1,75 +0,0 @@ -# jGrowl -jGrowl is a jQuery plugin that raises unobtrusive messages within the browser, similar to the way that OS X's Growl Framework works. The idea is simple, deliver notifications to the end user in a noticeable way that doesn't obstruct the work flow and yet keeps the user informed. - -## Installation -jGrowl can be added to your project using package managers like bower and npm or directly into your html using cdnjs, as well as the good old fashioned copy-paste into your project directory. - -Use cdnjs: - -```html - - -``` - -Install with bower - -``` -bower install jgrowl -``` - -Install with npm - -``` -npm install jgrowl -``` - -```js -// Sample 1 -$.jGrowl("Hello world!"); -// Sample 2 -$.jGrowl("Stick this!", { sticky: true }); -// Sample 3 -$.jGrowl("A message with a header", { header: 'Important' }); -// Sample 4 -$.jGrowl("A message that will live a little longer.", { life: 10000 }); -// Sample 5 -$.jGrowl("A message with a beforeOpen callback and a different opening animation.", { - beforeClose: function(e,m) { - alert('About to close this notification!'); - }, - animateOpen: { - height: 'show' - } -}); -``` - -## Configuration Options -| Option | Default | Description | -|------------------|--------------------------------------|------------------------------------------------------------| -| pool | 0 | Limit the number of messages appearing at a given time to the number in the pool. | -| header | empty | Optional header to prefix the message, this is often helpful for associating messages to each other. | -| group | empty | A css class to be applied to notifications when they are created, useful for 'grouping' notifications by a css selector. | -| sticky | false | When set to true a message will stick to the screen until it is intentionally closed by the user. | -| position | top-right | Designates a class which is applied to the jGrowl container and controls its position on the screen. By Default there are five options available, top-left, top-right, bottom-left, bottom-right, center. This must be changed in the defaults before the startup method is called. | -| appendTo | body | The element where our jGrowl messages are appended to. The default is `body` but feel free to define another one. | -| glue | after | Designates whether a jGrowl notification should be appended to the container after all notifications, or whether it should be prepended to the container before all notifications. Options are after or before. | -| theme | default | A CSS class designating custom styling for this particular message, intended for use with jQuery UI. | -| themeState | highlight | A CSS class designating custom styling for this particular message and its state, intended for use with jQuery UI. | -| corners | 10px | If the corners jQuery plugin is include this option specifies the curvature radius to be used for the notifications as they are created. | -| check | 250 | The frequency that jGrowl should check for messages to be scrubbed from the screen.This must be changed in the defaults before the startup method is called. | -| life | 3000 | The lifespan of a non-sticky message on the screen. | -| closeDuration | normal | The animation speed used to close a notification. | -| openDuration | normal | The animation speed used to open a notification. | -| easing | swing | The easing method to be used with the animation for opening and closing a notification. | -| closer | true | Whether or not the close-all button should be used when more then one notification appears on the screen. Optionally this property can be set to a function which will be used as a callback when the close all button is clicked. This must be changed in the defaults before the startup method is called. | -| closeTemplate | × | This content is used for the individual notification close links that are added to the corner of a notification. This must be changed in the defaults before the startup method is called. | -| closerTemplate | <div>[ close all ]</div> | This content is used for the close-all link that is added to the bottom of a jGrowl container when it contains more than one notification. This must be changed in the defaults before the startup method is called. | -| log | function(e,m,o) {} | Callback to be used before anything is done with the notification. This is intended to be used if the user would like to have some type of logging mechanism for all notifications passed to jGrowl. This callback receives the notification's DOM context, the notification's message and its option object. | -| beforeOpen | function(e,m,o) {} | Callback to be used before a new notification is opened. This callback receives the notification's DOM context, the notification's message and its option object. | -| afterOpen | function(e,m,o) {} | Callback to be used after a new notification is opened. This callback receives the notification's DOM context, the notification's message and its option object. | -| open | function(e,m,o) {} | Callback to be used when a new notification is opened. This callback receives the notification's DOM context, the notifications message and its option object. | -| beforeClose | function(e,m,o) {} | Callback to be used before a new notification is closed. This callback receives the notification's DOM context, the notification's message and its option object. | -| close | function(e,m,o) {} | Callback to be used when a new notification is closed. This callback receives the notification's DOM context, the notification's message and its option object. | -| click | function(e,m,o) {} | Callback to be used when a notification is clicked. This callback receives the notification's DOM context, the notification's message and its option object. | -| animateOpen | { opacity: 'show' } | The animation properties to use when opening a new notification (default to fadeOut). | -| animateClose | { opacity: 'hide' } | The animation properties to use when closing a new notification (defaults to fadeIn). | diff --git a/library/jgrowl/bower.json b/library/jgrowl/bower.json deleted file mode 100644 index 15cfc754b..000000000 --- a/library/jgrowl/bower.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "jGrowl", - "version": "1.4.5", - "homepage": "https://github.com/stanlemon/jGrowl", - "authors": [ - "Stan Lemon " - ], - "description": "jGrowl is an unobtrusive notification system for web applications.", - "main": [ - "jquery.jgrowl.css", - "jquery.jgrowl.js" - ], - "keywords": [ - "growl", - "jgrowl", - "jquery", - "toaster", - "notification", - "message" - ], - "license": "MIT", - "dependencies": { - "jquery": ">=1.4" - }, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ] -} diff --git a/library/jgrowl/examples/appendTo.html b/library/jgrowl/examples/appendTo.html deleted file mode 100644 index 3eb0f4d27..000000000 --- a/library/jgrowl/examples/appendTo.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - jGrowl Examples - - - - - - - -
      I'm the dummy navigation
      - -

      Append To Another DOM-Object

      - - diff --git a/library/jgrowl/examples/bootstrap.html b/library/jgrowl/examples/bootstrap.html deleted file mode 100644 index 6e069a3b9..000000000 --- a/library/jgrowl/examples/bootstrap.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - jGrowl and Bootstrap - - - - - - - - - - - -
      - - - -
      - -
      -

      jGrowl and Bootstrap

      -

      This is a Bootstrap starter template with jGrowl integrated. As you can see it's extremely easy to make jGrowl look and feel like part of Bootstrap.

      -
      -
      -
      - - - - - - - - - - diff --git a/library/jgrowl/examples/jgrowl.html b/library/jgrowl/examples/jgrowl.html deleted file mode 100644 index e10fdd6cb..000000000 --- a/library/jgrowl/examples/jgrowl.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - jGrowl Examples - - - - - - - -

      jGrowl Tests

      - -

      Create a new message.

      - -

      Shutdown bottom-left container.

      - -
      An extra wide node, watch as the jGrowl containers stay put in the corners of the screen..
      - -

      Log:

      - -
      - - diff --git a/library/jgrowl/jgrowl.jquery.json b/library/jgrowl/jgrowl.jquery.json deleted file mode 100644 index c5f0756c9..000000000 --- a/library/jgrowl/jgrowl.jquery.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "jgrowl", - "filename": "jquery.jgrowl.min.js", - "title": "jGrowl", - "description": "jGrowl is a jQuery plugin that raises unobtrusive messages within the browser, similar to the way that OS X's Growl Framework works. The idea is simple, deliver notifications to the end user in a noticeable way that doesn't obstruct the work flow and yet keeps the user informed.", - "keywords": [ - "growl", - "jgrowl", - "jquery", - "toaster", - "notification", - "message" - ], - "version": "1.4.3", - "author": { - "name": "Stan Lemon", - "email": "stosh1985@gmail.com", - "url": "http://stanlemon.net" - }, - "maintainers": [ - { - "name": "Stan Lemon", - "email": "stosh1985@gmail.com", - "url": "http://stanlemon.net" - } - ], - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/stanlemon/jGrowl/blob/master/LICENSE" - } - ], - "bugs": "https://github.com/stanlemon/jGrowl/issues", - "homepage": "https://github.com/stanlemon/jGrowl", - "docs": "https://github.com/stanlemon/jGrowl", - "download": "https://github.com/stanlemon/jGrowl/archive/master.zip", - "dependencies": { - "jquery": ">=1.4" - } -} diff --git a/library/jgrowl/jquery.jgrowl.css b/library/jgrowl/jquery.jgrowl.css deleted file mode 100644 index 4a00b60f7..000000000 --- a/library/jgrowl/jquery.jgrowl.css +++ /dev/null @@ -1,100 +0,0 @@ -.jGrowl { - z-index: 9999; - color: #ffffff; - font-size: 12px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - position: fixed; -} -.jGrowl.top-left { - left: 0px; - top: 0px; -} -.jGrowl.top-right { - right: 0px; - top: 0px; -} -.jGrowl.bottom-left { - left: 0px; - bottom: 0px; -} -.jGrowl.bottom-right { - right: 0px; - bottom: 0px; -} -.jGrowl.center { - top: 0px; - width: 50%; - left: 25%; -} -.jGrowl.center .jGrowl-notification, -.jGrowl.center .jGrowl-closer { - margin-left: auto; - margin-right: auto; -} -.jGrowl-notification { - background-color: #000000; - opacity: 0.9; - filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); - -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); - zoom: 1; - width: 250px; - padding: 10px; - margin: 10px; - text-align: left; - display: none; - border-radius: 5px; - min-height: 40px; -} -.jGrowl-notification .ui-state-highlight, -.jGrowl-notification .ui-widget-content .ui-state-highlight, -.jGrowl-notification .ui-widget-header .ui-state-highlight { - border: 1px solid #000; - background: #000; - color: #fff; -} -.jGrowl-notification .jGrowl-header { - font-weight: bold; - font-size: .85em; -} -.jGrowl-notification .jGrowl-close { - background-color: transparent; - color: inherit; - border: none; - z-index: 99; - float: right; - font-weight: bold; - font-size: 1em; - cursor: pointer; -} -.jGrowl-closer { - background-color: #000000; - opacity: 0.9; - filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); - -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); - zoom: 1; - width: 250px; - padding: 10px; - margin: 10px; - text-align: left; - display: none; - border-radius: 5px; - padding-top: 4px; - padding-bottom: 4px; - cursor: pointer; - font-size: .9em; - font-weight: bold; - text-align: center; -} -.jGrowl-closer .ui-state-highlight, -.jGrowl-closer .ui-widget-content .ui-state-highlight, -.jGrowl-closer .ui-widget-header .ui-state-highlight { - border: 1px solid #000; - background: #000; - color: #fff; -} -/** Hide jGrowl when printing **/ -@media print { - .jGrowl { - display: none; - } -} diff --git a/library/jgrowl/jquery.jgrowl.js b/library/jgrowl/jquery.jgrowl.js deleted file mode 100644 index d5444d438..000000000 --- a/library/jgrowl/jquery.jgrowl.js +++ /dev/null @@ -1,399 +0,0 @@ -/** - * jGrowl 1.4.5 - * - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * - * Written by Stan Lemon - * Last updated: 2015.02.01 - * - * jGrowl is a jQuery plugin implementing unobtrusive userland notifications. These - * notifications function similarly to the Growl Framework available for - * Mac OS X (http://growl.info). - * - * To Do: - * - Move library settings to containers and allow them to be changed per container - * - * Changes in 1.4.5 - * - Fixed arguement list for click callback, thanks @timotheeg - * - * Changes in 1.4.4 - * - Revert word-break changes, thanks @curtisgibby - * - * Changes in 1.4.3 - * - Fixed opactiy in LESS for older version of IE - * - * Changes in 1.4.2 - * - Added word-break to less/css - * - * Changes in 1.4.1 - * - Added appendTo option - * - jQuery compatibility updates - * - Add check for closing a notification before it opens - * - * Changes in 1.4.0 - * - Removed IE6 support - * - Added LESS support - * - * Changes in 1.3.0 - * - Added non-vendor border-radius to stylesheet - * - Added grunt for generating minified js and css - * - Added npm package info - * - Added bower package info - * - Updates for jshint - * - * Changes in 1.2.13 - * - Fixed clearing interval when the container shuts down - * - * Changes in 1.2.12 - * - Added compressed versions using UglifyJS and Sqwish - * - Improved README with configuration options explanation - * - Added a source map - * - * Changes in 1.2.11 - * - Fix artifacts left behind by the shutdown method and text-cleanup - * - * Changes in 1.2.10 - * - Fix beforeClose to be called in click event - * - * Changes in 1.2.9 - * - Fixed BC break in jQuery 2.0 beta - * - * Changes in 1.2.8 - * - Fixes for jQuery 1.9 and the MSIE6 check, note that with jQuery 2.0 support - * jGrowl intends to drop support for IE6 altogether - * - * Changes in 1.2.6 - * - Fixed js error when a notification is opening and closing at the same time - * - * Changes in 1.2.5 - * - Changed wrapper jGrowl's options usage to "o" instead of $.jGrowl.defaults - * - Added themeState option to control 'highlight' or 'error' for jQuery UI - * - Ammended some CSS to provide default positioning for nested usage. - * - Changed some CSS to be prefixed with jGrowl- to prevent namespacing issues - * - Added two new options - openDuration and closeDuration to allow - * better control of notification open and close speeds, respectively - * Patch contributed by Jesse Vincet. - * - Added afterOpen callback. Patch contributed by Russel Branca. - * - * Changes in 1.2.4 - * - Fixed IE bug with the close-all button - * - Fixed IE bug with the filter CSS attribute (special thanks to gotwic) - * - Update IE opacity CSS - * - Changed font sizes to use "em", and only set the base style - * - * Changes in 1.2.3 - * - The callbacks no longer use the container as context, instead they use the actual notification - * - The callbacks now receive the container as a parameter after the options parameter - * - beforeOpen and beforeClose now check the return value, if it's false - the notification does - * not continue. The open callback will also halt execution if it returns false. - * - Fixed bug where containers would get confused - * - Expanded the pause functionality to pause an entire container. - * - * Changes in 1.2.2 - * - Notification can now be theme rolled for jQuery UI, special thanks to Jeff Chan! - * - * Changes in 1.2.1 - * - Fixed instance where the interval would fire the close method multiple times. - * - Added CSS to hide from print media - * - Fixed issue with closer button when div { position: relative } is set - * - Fixed leaking issue with multiple containers. Special thanks to Matthew Hanlon! - * - * Changes in 1.2.0 - * - Added message pooling to limit the number of messages appearing at a given time. - * - Closing a notification is now bound to the notification object and triggered by the close button. - * - * Changes in 1.1.2 - * - Added iPhone styled example - * - Fixed possible IE7 bug when determining if the ie6 class shoudl be applied. - * - Added template for the close button, so that it's content could be customized. - * - * Changes in 1.1.1 - * - Fixed CSS styling bug for ie6 caused by a mispelling - * - Changes height restriction on default notifications to min-height - * - Added skinned examples using a variety of images - * - Added the ability to customize the content of the [close all] box - * - Added jTweet, an example of using jGrowl + Twitter - * - * Changes in 1.1.0 - * - Multiple container and instances. - * - Standard $.jGrowl() now wraps $.fn.jGrowl() by first establishing a generic jGrowl container. - * - Instance methods of a jGrowl container can be called by $.fn.jGrowl(methodName) - * - Added glue preferenced, which allows notifications to be inserted before or after nodes in the container - * - Added new log callback which is called before anything is done for the notification - * - Corner's attribute are now applied on an individual notification basis. - * - * Changes in 1.0.4 - * - Various CSS fixes so that jGrowl renders correctly in IE6. - * - * Changes in 1.0.3 - * - Fixed bug with options persisting across notifications - * - Fixed theme application bug - * - Simplified some selectors and manipulations. - * - Added beforeOpen and beforeClose callbacks - * - Reorganized some lines of code to be more readable - * - Removed unnecessary this.defaults context - * - If corners plugin is present, it's now customizable. - * - Customizable open animation. - * - Customizable close animation. - * - Customizable animation easing. - * - Added customizable positioning (top-left, top-right, bottom-left, bottom-right, center) - * - * Changes in 1.0.2 - * - All CSS styling is now external. - * - Added a theme parameter which specifies a secondary class for styling, such - * that notifications can be customized in appearance on a per message basis. - * - Notification life span is now customizable on a per message basis. - * - Added the ability to disable the global closer, enabled by default. - * - Added callbacks for when a notification is opened or closed. - * - Added callback for the global closer. - * - Customizable animation speed. - * - jGrowl now set itself up and tears itself down. - * - * Changes in 1.0.1: - * - Removed dependency on metadata plugin in favor of .data() - * - Namespaced all events - */ -(function($) { - /** jGrowl Wrapper - Establish a base jGrowl Container for compatibility with older releases. **/ - $.jGrowl = function( m , o ) { - // To maintain compatibility with older version that only supported one instance we'll create the base container. - if ( $('#jGrowl').length === 0 ) - $('
      ').addClass( (o && o.position) ? o.position : $.jGrowl.defaults.position ).appendTo( (o && o.appendTo) ? o.appendTo : $.jGrowl.defaults.appendTo ); - - // Create a notification on the container. - $('#jGrowl').jGrowl(m,o); - }; - - - /** Raise jGrowl Notification on a jGrowl Container **/ - $.fn.jGrowl = function( m , o ) { - // Short hand for passing in just an object to this method - if ( o === undefined && $.isPlainObject(m) ) { - o = m; - m = o.message; - } - - if ( $.isFunction(this.each) ) { - var args = arguments; - - return this.each(function() { - /** Create a jGrowl Instance on the Container if it does not exist **/ - if ( $(this).data('jGrowl.instance') === undefined ) { - $(this).data('jGrowl.instance', $.extend( new $.fn.jGrowl(), { notifications: [], element: null, interval: null } )); - $(this).data('jGrowl.instance').startup( this ); - } - - /** Optionally call jGrowl instance methods, or just raise a normal notification **/ - if ( $.isFunction($(this).data('jGrowl.instance')[m]) ) { - $(this).data('jGrowl.instance')[m].apply( $(this).data('jGrowl.instance') , $.makeArray(args).slice(1) ); - } else { - $(this).data('jGrowl.instance').create( m , o ); - } - }); - } - }; - - $.extend( $.fn.jGrowl.prototype , { - - /** Default JGrowl Settings **/ - defaults: { - pool: 0, - header: '', - group: '', - sticky: false, - position: 'top-right', - appendTo: 'body', - glue: 'after', - theme: 'default', - themeState: 'highlight', - corners: '10px', - check: 250, - life: 3000, - closeDuration: 'normal', - openDuration: 'normal', - easing: 'swing', - closer: true, - closeTemplate: '×', - closerTemplate: '
      [ close all ]
      ', - log: function() {}, - beforeOpen: function() {}, - afterOpen: function() {}, - open: function() {}, - beforeClose: function() {}, - close: function() {}, - click: function() {}, - animateOpen: { - opacity: 'show' - }, - animateClose: { - opacity: 'hide' - } - }, - - notifications: [], - - /** jGrowl Container Node **/ - element: null, - - /** Interval Function **/ - interval: null, - - /** Create a Notification **/ - create: function( message , options ) { - var o = $.extend({}, this.defaults, options); - - /* To keep backward compatibility with 1.24 and earlier, honor 'speed' if the user has set it */ - if (typeof o.speed !== 'undefined') { - o.openDuration = o.speed; - o.closeDuration = o.speed; - } - - this.notifications.push({ message: message , options: o }); - - o.log.apply( this.element , [this.element,message,o] ); - }, - - render: function( n ) { - var self = this; - var message = n.message; - var o = n.options; - - // Support for jQuery theme-states, if this is not used it displays a widget header - o.themeState = (o.themeState === '') ? '' : 'ui-state-' + o.themeState; - - var notification = $('
      ') - .addClass('jGrowl-notification alert ' + o.themeState + ' ui-corner-all' + ((o.group !== undefined && o.group !== '') ? ' ' + o.group : '')) - .append($('
      '; - toast.classList.add('toast', 'p-2', 'm-3', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity); + toast.classList.add('toast', 'p-2', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity); container.prepend(toast); let toastInstance = bootstrap.Toast.getOrCreateInstance(toast); diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index ba63830eb..f4f346fb7 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1 +1 @@ -
      +
      -- cgit v1.2.3 From ba4773a61e6a406dcea92a7251c17709b97dcfdc Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 17:51:39 +0000 Subject: add some deduplication --- view/js/main.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 5d273ee39..4280284ae 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1820,11 +1820,16 @@ function toggleAside() { function toast(string, severity) { let container = document.getElementById('toast-container'); - let toast = document.createElement('div'); - toast.innerHTML = '
      ' + string + '
      '; - toast.classList.add('toast', 'p-2', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity); - container.prepend(toast); + let toast = document.getElementById(btoa(string)); + + if (!toast) { + toast = document.createElement('div'); + toast.setAttribute('id', btoa(string)); + toast.innerHTML = '
      ' + string + '
      '; + toast.classList.add('toast', 'p-2', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity); + container.prepend(toast); + } let toastInstance = bootstrap.Toast.getOrCreateInstance(toast); -- cgit v1.2.3 From 58033f3255ddd942bba729005d79e6ca4bb146fa Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 17:52:08 +0000 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index e202ad2b0..d8b2953e8 100644 --- a/boot.php +++ b/boot.php @@ -64,7 +64,7 @@ require_once('include/selectors.php'); require_once('include/activities.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.1.2'); +define('STD_VERSION', '9.1.3'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3 From 52e97fe1150e5b1c4e4b6739d2fd54b604d8981b Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 18:36:16 +0000 Subject: some css voodoo for the help menu --- Zotlabs/Widget/Helpindex.php | 2 +- doc/en/toc.html | 56 ++++++++++++++++++++++---------------------- view/css/mod_help.css | 7 ++---- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index a7120b47f..23261ca6f 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -30,7 +30,7 @@ class Helpindex { } public function title(): string { - return t('Help Contents'); + return ''; } public function contents(): string { diff --git a/doc/en/toc.html b/doc/en/toc.html index d2f2654a1..b1edef6d2 100644 --- a/doc/en/toc.html +++ b/doc/en/toc.html @@ -1,74 +1,74 @@
      -
      +

      Tutorials

      -
      +

      Members

      -
      +

      Administrators

      -
      +

      Developers

      -
      +

      About

      diff --git a/view/css/mod_help.css b/view/css/mod_help.css index 1799493b8..3c3bc195f 100644 --- a/view/css/mod_help.css +++ b/view/css/mod_help.css @@ -1,11 +1,11 @@ .doco-list-group-item > a { font-weight: bold; -} +} .sub-menu { margin: 3px 0px 10px 10px; } - + #doco-content h3 { border-bottom: #ccc 3px solid; padding-bottom: 0.3em; @@ -24,6 +24,3 @@ padding-left: 20px; } -#doco-side-toc { - padding-top: 10px; -} -- cgit v1.2.3 From 07696d4bd144be03819122bfa2c78cd8aa3d4770 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 19:24:13 +0000 Subject: fix the test - we do not use a title anymore since it does not make much sense in combination of the sub titles --- tests/unit/Widget/HelpindexTest.php | 2 +- view/tpl/widget.tpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unit/Widget/HelpindexTest.php b/tests/unit/Widget/HelpindexTest.php index a8b51172b..2d984985d 100644 --- a/tests/unit/Widget/HelpindexTest.php +++ b/tests/unit/Widget/HelpindexTest.php @@ -43,7 +43,7 @@ class HelpindexTest extends \Zotlabs\Tests\Unit\Module\TestCase { $this->render_widget(); $this->assertOutputContains('toc'); - $this->assertOutputContains('Help Content'); + //$this->assertOutputContains('Help Content'); } public function test_that_result_is_empty_when_toc_not_present(): void { diff --git a/view/tpl/widget.tpl b/view/tpl/widget.tpl index 3fb3b1200..4bbbb2df9 100644 --- a/view/tpl/widget.tpl +++ b/view/tpl/widget.tpl @@ -5,6 +5,8 @@ * on the widget class. *}}
      + {{if $widget->title()}}

      {{$widget->title()}}

      + {{/if}} {{$widget->contents()}}
      -- cgit v1.2.3 From 47a86f877172fe6cdc44991c0722550e4190cb95 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 3 May 2024 06:52:05 +0000 Subject: make sure to always move the recent notification to the top --- view/js/main.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 4280284ae..7eca7408e 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1819,18 +1819,19 @@ function toggleAside() { } function toast(string, severity) { + let id = btoa(string); let container = document.getElementById('toast-container'); - - let toast = document.getElementById(btoa(string)); + let toast = document.getElementById(id); if (!toast) { toast = document.createElement('div'); - toast.setAttribute('id', btoa(string)); + toast.setAttribute('id', id); toast.innerHTML = '
      ' + string + '
      '; toast.classList.add('toast', 'p-2', 'bg-' + severity + '-subtle', 'text-' + severity + '-emphasis', 'border-' + severity); - container.prepend(toast); } + container.prepend(toast); + let toastInstance = bootstrap.Toast.getOrCreateInstance(toast); if (severity === 'danger') { -- cgit v1.2.3 From b25662e183fa800d13908e707e0a3f33131b9ea8 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 3 May 2024 09:39:58 +0200 Subject: fix nested lists by parsing li before ul or ol and add a test --- include/html2bbcode.php | 3 +-- tests/unit/includes/BBCodeTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 03e09cd62..b7f3ea4e3 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -205,10 +205,9 @@ function html2bbcode($message) node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); // node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); - + node2bbcode($doc, 'li', array(), "[*]", ""); node2bbcode($doc, 'ul', array(), "[list]", "[/list]"); node2bbcode($doc, 'ol', array(), "[list=1]", "[/list]"); - node2bbcode($doc, 'li', array(), "[*]", ""); node2bbcode($doc, 'hr', array(), "[hr]", ""); diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index a8aa8ee2b..e1fba9fbc 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -230,6 +230,14 @@ class BBCodeTest extends UnitTestCase { 'html reshares from streams' => [ '
      image/photo shared something
      something
      ', '[url=https://example.com][img=https://example.com/image.jpg]image/photo[/img][/url] shared something' . "\n" . 'something' + ], + 'list' => [ + '
      • list 1
      • list 2
      • list 3
      ', + '[list][*]list 1[*]list 2[*]list 3[/list]' + ], + 'nested list' => [ + '
      • list 1
      • list 2
      • list 3
        • list 1
        • list 2
        • list 3
      ', + '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list]' ] ]; } -- cgit v1.2.3 From 3a50a0b71572d0f5cc5c5aed1df8592c3e9e4dce Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 3 May 2024 10:23:36 +0200 Subject: deal with li tags earlier seems to be more straight forward also add test for li without closing tag --- include/html2bbcode.php | 18 +++++++++--------- tests/unit/includes/BBCodeTest.php | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index b7f3ea4e3..e95e498c9 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -26,8 +26,12 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb) $xpath = new DomXPath($doc); $list = $xpath->query("//".$oldnode); + foreach ($list as $oldNode) { + if ($oldnode == 'li') + hz_syslog(print_r($oldNode,true)); + $attr = array(); if ($oldNode->attributes->length) foreach ($oldNode->attributes as $attribute) @@ -113,13 +117,6 @@ function html2bbcode($message) $message = str_replace("\r", "", $message); - $message = str_replace(array( - "

    • ", - "

      • "), - array( - "
    • ", - "
      • "), - $message); // remove namespaces $message = preg_replace('=<(\w+):(.+?)>=', '', $message); @@ -129,7 +126,8 @@ function html2bbcode($message) //$message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); $message = mb_encode_numericentity($message, [0x80, 0x10FFFF, 0, ~0], 'UTF-8'); - + $message = str_replace(['

    • ', '

    • '], '[*]', $message); + $message = str_replace(['

      • ', ''], '', $message); if(!$message) return; @@ -149,6 +147,9 @@ function html2bbcode($message) node2bbcode($doc, 'html', array(), "", ""); node2bbcode($doc, 'body', array(), "", ""); + node2bbcode($doc, 'li', array(), "[*]", ""); + + // Outlook-Quote - Variant 1 node2bbcode($doc, 'p', array('class'=>'MsoNormal', 'style'=>'margin-left:35.4pt'), '[quote]', '[/quote]'); @@ -205,7 +206,6 @@ function html2bbcode($message) node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); // node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); - node2bbcode($doc, 'li', array(), "[*]", ""); node2bbcode($doc, 'ul', array(), "[list]", "[/list]"); node2bbcode($doc, 'ol', array(), "[list=1]", "[/list]"); diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index e1fba9fbc..2697c5069 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -238,6 +238,14 @@ class BBCodeTest extends UnitTestCase { 'nested list' => [ '
      • list 1
      • list 2
      • list 3
        • list 1
        • list 2
        • list 3
      ', '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list]' + ], + 'list without closing li' => [ + '
      • list 1
      • list 2
      • list 3
      ', + '[list][*]list 1[*]list 2[*]list 3[/list]' + ], + 'nested list without closing li' => [ + '
      • list 1
      • list 2
      • list 3
        • list 1
        • list 2
        • list 3
      ', + '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list]' ] ]; } -- cgit v1.2.3 From 219f0dfeca0cccc1870ca9da608d5004d43e67fb Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 3 May 2024 12:04:19 +0200 Subject: also deal with ol and ul tags earlier and add test for double nested lists --- include/html2bbcode.php | 9 +++------ tests/unit/includes/BBCodeTest.php | 8 ++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index e95e498c9..e1c0572f5 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -126,6 +126,9 @@ function html2bbcode($message) //$message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); $message = mb_encode_numericentity($message, [0x80, 0x10FFFF, 0, ~0], 'UTF-8'); + $message = preg_replace('/\/', '[list]', $message); + $message = preg_replace('/\/', '[list=1]', $message); + $message = str_replace(['
    ', ''], '[/list]', $message); $message = str_replace(['

  • ', '

  • '], '[*]', $message); $message = str_replace(['

    • ', ''], '', $message); @@ -147,9 +150,6 @@ function html2bbcode($message) node2bbcode($doc, 'html', array(), "", ""); node2bbcode($doc, 'body', array(), "", ""); - node2bbcode($doc, 'li', array(), "[*]", ""); - - // Outlook-Quote - Variant 1 node2bbcode($doc, 'p', array('class'=>'MsoNormal', 'style'=>'margin-left:35.4pt'), '[quote]', '[/quote]'); @@ -206,9 +206,6 @@ function html2bbcode($message) node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); // node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); - node2bbcode($doc, 'ul', array(), "[list]", "[/list]"); - node2bbcode($doc, 'ol', array(), "[list=1]", "[/list]"); - node2bbcode($doc, 'hr', array(), "[hr]", ""); // node2bbcode($doc, 'table', array(), "", ""); diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index 2697c5069..34e127a30 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -239,6 +239,10 @@ class BBCodeTest extends UnitTestCase { '
    • list 1
    • list 2
    • list 3
      • list 1
      • list 2
      • list 3
    ', '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list]' ], + 'double nested list' => [ + '
    • list 1
    • list 2
    • list 3
      • list 1
      • list 2
      • list 3
        • list 1
        • list 2
        • list 3
    ', + '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list][/list]' + ], 'list without closing li' => [ '
    • list 1
    • list 2
    • list 3
    ', '[list][*]list 1[*]list 2[*]list 3[/list]' @@ -246,6 +250,10 @@ class BBCodeTest extends UnitTestCase { 'nested list without closing li' => [ '
    • list 1
    • list 2
    • list 3
      • list 1
      • list 2
      • list 3
    ', '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list]' + ], + 'double nested list without closing li' => [ + '
    • list 1
    • list 2
    • list 3
      • list 1
      • list 2
      • list 3
        • list 1
        • list 2
        • list 3
    ', + '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list][/list]' ] ]; } -- cgit v1.2.3 From bfa81490c1085978f6431e06025e2794f7232768 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 3 May 2024 13:00:14 +0200 Subject: Rename HelpHelper to HelpHelperTrait. PHPCS prefers traits to be suffixed with "Trait", and I think I agree. --- Zotlabs/Lib/Traits/HelpHelper.php | 68 ---------------------------------- Zotlabs/Lib/Traits/HelpHelperTrait.php | 68 ++++++++++++++++++++++++++++++++++ Zotlabs/Module/Help.php | 2 +- Zotlabs/Widget/Helpindex.php | 2 +- 4 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 Zotlabs/Lib/Traits/HelpHelper.php create mode 100644 Zotlabs/Lib/Traits/HelpHelperTrait.php diff --git a/Zotlabs/Lib/Traits/HelpHelper.php b/Zotlabs/Lib/Traits/HelpHelper.php deleted file mode 100644 index f0dca35d0..000000000 --- a/Zotlabs/Lib/Traits/HelpHelper.php +++ /dev/null @@ -1,68 +0,0 @@ -getList(); - - if(array_key_exists(argv(1), $languages)) { - $lang = argv(1); - $from_url = true; - } else { - $lang = \App::$language; - if(! isset($lang)) - $lang = 'en'; - - $from_url = false; - } - - $this->lang = array('language' => $lang, 'from_url' => $from_url); - } - - /** - * Find the full path name of the file, given it's base path and - * the language of the request. - * - * @param string $base_path The path of the file to find, relative to the - * doc root path, and without the extension. - */ - private function find_help_file(string $base_path, string $lang): void { - - // Use local variable until we can use trait constants. - $valid_file_ext = ['md', 'bb', 'html']; - - $base_path = "doc/{$lang}/${base_path}"; - - foreach ($valid_file_ext as $ext) { - $path = "{$base_path}.{$ext}"; - if (file_exists($path)) { - $this->file_name = $path; - $this->file_type = $ext; - - break; - } - } - } -} diff --git a/Zotlabs/Lib/Traits/HelpHelperTrait.php b/Zotlabs/Lib/Traits/HelpHelperTrait.php new file mode 100644 index 000000000..b7711bbd5 --- /dev/null +++ b/Zotlabs/Lib/Traits/HelpHelperTrait.php @@ -0,0 +1,68 @@ +getList(); + + if(array_key_exists(argv(1), $languages)) { + $lang = argv(1); + $from_url = true; + } else { + $lang = \App::$language; + if(! isset($lang)) + $lang = 'en'; + + $from_url = false; + } + + $this->lang = array('language' => $lang, 'from_url' => $from_url); + } + + /** + * Find the full path name of the file, given it's base path and + * the language of the request. + * + * @param string $base_path The path of the file to find, relative to the + * doc root path, and without the extension. + */ + private function find_help_file(string $base_path, string $lang): void { + + // Use local variable until we can use trait constants. + $valid_file_ext = ['md', 'bb', 'html']; + + $base_path = "doc/{$lang}/${base_path}"; + + foreach ($valid_file_ext as $ext) { + $path = "{$base_path}.{$ext}"; + if (file_exists($path)) { + $this->file_name = $path; + $this->file_type = $ext; + + break; + } + } + } +} diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index 00946368f..5d52440a5 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -14,7 +14,7 @@ use Michelf\MarkdownExtra; */ class Help extends \Zotlabs\Web\Controller { - use \Zotlabs\Lib\Traits\HelpHelper; + use \Zotlabs\Lib\Traits\HelpHelperTrait; private string $heading_slug = ''; diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index 23261ca6f..5264e1947 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -12,7 +12,7 @@ namespace Zotlabs\Widget; class Helpindex { - use \Zotlabs\Lib\Traits\HelpHelper; + use \Zotlabs\Lib\Traits\HelpHelperTrait; private string $contents = ''; -- cgit v1.2.3 From 262cebb5688ae6b73db38badc6d7a66db460a70c Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 3 May 2024 13:38:45 +0200 Subject: make parsing of li slightly more robust --- include/html2bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index e1c0572f5..e0a9a630a 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -128,9 +128,9 @@ function html2bbcode($message) $message = preg_replace('/\/', '[list]', $message); $message = preg_replace('/\/', '[list=1]', $message); + $message = preg_replace('/\/', '[*]', $message); $message = str_replace(['
', ''], '[/list]', $message); - $message = str_replace(['

  • ', '

  • '], '[*]', $message); - $message = str_replace(['

    • ', ''], '', $message); + $message = str_replace('', '', $message); if(!$message) return; -- cgit v1.2.3 From 605aa37ad35387cbd84d1efd7bd744b5f1eb166c Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 3 May 2024 11:50:29 +0000 Subject: apply li fixes to html2plain --- include/html2plain.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/html2plain.php b/include/html2plain.php index 5cb7ee35d..88dce577d 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -129,6 +129,8 @@ function html2plain($html, $wraplength = 75, $compact = false) if(!$message) return; + $message = preg_replace('/\/', "\n*", $message); + $message = str_replace('', '', $message); $doc = new DOMDocument(); $doc->preserveWhiteSpace = false; @@ -178,7 +180,7 @@ function html2plain($html, $wraplength = 75, $compact = false) //node2bbcode($doc, 'ul', array(), "\n[list]", "[/list]\n"); //node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n"); - node2bbcode($doc, 'li', array(), "\n* ", "\n"); + //node2bbcode($doc, 'li', array(), "\n* ", "\n"); node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", ""); -- cgit v1.2.3 From f74922db39df383d205fdcd0f25f6690af5b6c2f Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 7 May 2024 08:52:05 +0000 Subject: add bbcode support for the HTML5 del tag --- include/bbcode.php | 2 +- include/html2bbcode.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 844717572..5b97c1d9b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1408,7 +1408,7 @@ function bbcode($text, $options = []) { } // Check for strike-through text if (strpos($text,'[s]') !== false) { - $text = preg_replace("(\[s\](.*?)\[\/s\])ism", '$1', $text); + $text = preg_replace("(\[s\](.*?)\[\/s\])ism", '$1', $text); } // Check for over-line text if (strpos($text,'[o]') !== false) { diff --git a/include/html2bbcode.php b/include/html2bbcode.php index e0a9a630a..db8f3a8e0 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -186,7 +186,11 @@ function html2bbcode($message) node2bbcode($doc, 'b', array(), '[b]', '[/b]'); node2bbcode($doc, 'i', array(), '[i]', '[/i]'); node2bbcode($doc, 'u', array(), '[u]', '[/u]'); + // The s tag is deprecated in HTML5 node2bbcode($doc, 's', array(), '[s]', '[/s]'); + node2bbcode($doc, 'del', [], '[s]', '[/s]'); + + node2bbcode($doc, 'mark', array(), '[mark]', '[/mark]'); node2bbcode($doc, 'span', array(), "", ""); -- cgit v1.2.3 From 9dd63db736819ba15fd75821a8ea520f68a54ee3 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 7 May 2024 08:56:25 +0000 Subject: add tests --- tests/unit/includes/BBCodeTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index 34e127a30..887374c13 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -134,6 +134,10 @@ class BBCodeTest extends UnitTestCase { 'list with linebreaks \r\n in text' => [ "some text\r\n[list]\r\n[*] item1\r\nsome text[*] item2\r\nsome text[/list]\r\nsome more text", 'some text
    • item1
      some text
    • item2
      some text
    some more text' + ], + 'del tag' => [ + 'some [s]strike through[/s] text', + 'some strike through text' ] ]; } @@ -254,6 +258,10 @@ class BBCodeTest extends UnitTestCase { 'double nested list without closing li' => [ '
    • list 1
    • list 2
    • list 3
      • list 1
      • list 2
      • list 3
        • list 1
        • list 2
        • list 3
    ', '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list][/list]' + ], + 'del tag' => [ + 'some strike through text', + 'some [s]strike through[/s] text' ] ]; } -- cgit v1.2.3 From 7a5bb99d87f85a4ea93c270beaa27ecee0c0b853 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 May 2024 12:18:00 +0200 Subject: make sure the hcard addon markup will be available even if other profile entries are missing --- view/tpl/profile_vcard.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index dd372beac..de08cfc19 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -99,8 +99,11 @@ {{/if}} + {{/if}} + {{if $details}}
    {{/if}} + {{if $details}} {{$chanmenu}} -- cgit v1.2.3 From 76ce4705e23f286cf6b568191840404e5cb94e9f Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 May 2024 14:34:44 +0000 Subject: more fixes for issue #1843 --- include/bbcode.php | 4 +--- include/oembed.php | 13 ++++++------- view/tpl/oembed_video.tpl | 5 +---- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 5b97c1d9b..15a75ce3f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1745,10 +1745,8 @@ function bbcode($text, $options = []) { // oembed tag if (strpos($text,'[/embed]') !== false) { + $text = str_replace(["[/embed]\r", "[/embed]\n"], '[/embed]', $text); $text = oembed_bbcode2html($text); - - // Avoid triple linefeeds through oembed - $text = str_replace("


    ", "
    ", $text); } // If we found an event earlier, strip out all the event code and replace with a reformatted version. diff --git a/include/oembed.php b/include/oembed.php index 1b6157241..f52f73225 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -328,7 +328,7 @@ function oembed_format_object($j){ $jhtml = oembed_iframe($j['embedurl'],(isset($j['width']) ? $j['width'] : null), (isset($j['height']) ? $j['height'] : null)); - $ret=""; + $ret=""; switch ($j['type']) { case "video": { if (isset($j['thumbnail_url'])) { @@ -351,7 +351,6 @@ function oembed_format_object($j){ } else { $ret=$jhtml; } - $ret.="
    "; }; break; case "photo": { $ret.= ""; @@ -386,15 +385,15 @@ function oembed_format_object($j){ // 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 .= "$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 .= "$embedurl"; } - $ret.="
    "; + $ret.="    "; // mb_convert_encoding() is deprecated // return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret)); @@ -414,8 +413,8 @@ function oembed_iframe($src,$width,$height) { } // try and leave some room for the description line. - $height = intval($height) + 80; - $width = intval($width) + 40; + $height = intval($height); + $width = intval($width); $s = z_root() . '/oembed/' . base64url_encode($src); diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl index d821ebdb2..f1513a5d5 100644 --- a/view/tpl/oembed_video.tpl +++ b/view/tpl/oembed_video.tpl @@ -1,4 +1 @@ - - -
    -     + -- cgit v1.2.3 From 481e08b904313b768305d82b67f5f8602713b329 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 May 2024 15:41:54 +0000 Subject: remove p tags from li. otherwise we will get unwanted new lines in the list. add test. --- include/html2bbcode.php | 5 +++++ tests/unit/includes/BBCodeTest.php | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index db8f3a8e0..8c35cdf03 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -126,8 +126,13 @@ function html2bbcode($message) //$message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8"); $message = mb_encode_numericentity($message, [0x80, 0x10FFFF, 0, ~0], 'UTF-8'); + // TODO: It would be better to do the list parsing with node2bbcode() but it has serious issues when + // parsing nested lists. Especially if the li tag has no closing tag (which is valid). + $message = preg_replace('/\/', '[list]', $message); $message = preg_replace('/\/', '[list=1]', $message); + + $message = str_replace(['

  • ', '

    • '], ['
  • ', '
    • '], $message); $message = preg_replace('/\/', '[*]', $message); $message = str_replace(['', ''], '[/list]', $message); $message = str_replace('', '', $message); diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index 887374c13..94cad1367 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -239,6 +239,10 @@ class BBCodeTest extends UnitTestCase { '
    • list 1
    • list 2
    • list 3
    ', '[list][*]list 1[*]list 2[*]list 3[/list]' ], + 'list with paragraph' => [ + '

    • list 1

    • list 2

    • list 3

    ', + '[list][*]list 1[*]list 2[*]list 3[/list]' + ], 'nested list' => [ '
    • list 1
    • list 2
    • list 3
      • list 1
      • list 2
      • list 3
    ', '[list][*]list 1[*]list 2[*]list 3[list][*]list 1[*]list 2[*]list 3[/list][/list]' -- cgit v1.2.3 From 960354b16cab06915a2f85fcc5e55d380765d858 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 May 2024 19:27:48 +0000 Subject: make mod regate return to system.workflow_channel_next and show register message field only if registration is set to register_approve --- Zotlabs/Module/Profiles.php | 11 +++++++---- Zotlabs/Module/Regate.php | 2 +- Zotlabs/Module/Register.php | 4 ++-- view/tpl/register.tpl | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 58e5857ed..a06193e12 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -620,14 +620,16 @@ class Profiles extends \Zotlabs\Web\Controller { $profile_fields_advanced = get_profile_fields_advanced(); if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) { - if(feature_enabled(local_channel(),'multi_profiles')) + if (feature_enabled(local_channel(), 'multi_profiles')) { $id = \App::$argv[1]; + } else { $x = q("select id from profile where uid = %d and is_default = 1", intval(local_channel()) ); - if($x) + if ($x) { $id = $x[0]['id']; + } } $r = q("SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1", @@ -635,7 +637,7 @@ class Profiles extends \Zotlabs\Web\Controller { intval(local_channel()) ); - if(! $r) { + if (!$r) { notice( t('Profile not found.') . EOL); return; } @@ -827,7 +829,8 @@ class Profiles extends \Zotlabs\Web\Controller { else { $r = q("SELECT * FROM profile WHERE uid = %d", - local_channel()); + intval(local_channel()) + ); if($r) { $tpl = get_markup_template('profile_entry.tpl'); diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 8158416bd..c67f45a88 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -207,7 +207,7 @@ class Regate extends \Zotlabs\Web\Controller { } change_channel($channel_id); - $nextpage = 'profiles/' . $channel_id; + $nextpage = Config::Get('system', 'workflow_channel_next', 'profiles'); $msg_code = 'ZAR1239I'; $msg = t('Channel successfull created') . ' ' . $did2; } diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 428b68178..f0163768c 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -429,6 +429,7 @@ class Register extends Controller { function get() { $registration_is = ''; + $register_msg = ''; $other_sites = ''; if(intval(Config::Get('system','register_policy')) === REGISTER_CLOSED) { @@ -442,6 +443,7 @@ class Register extends Controller { } if(intval(Config::Get('system','register_policy')) == REGISTER_APPROVE) { + $register_msg = ['register_msg', t('Why do you want to join this hub?'), ((x($_REQUEST,'register_msg')) ? $_REQUEST['register_msg'] : ''), t('This will help to review your registration')]; $registration_is = t('Registration on this hub is by approval only.'); $other_sites = '' . t('Register at another affiliated hub in case when prefered') . ''; } @@ -512,8 +514,6 @@ class Register extends Controller { $tos = array('tos', $label_tos, ((x($_REQUEST,'tos')) ? $_REQUEST['tos'] : ''), '', [t('No'),t('Yes')], $duty['atform']); - $register_msg = ['register_msg', t('Why do you want to join this hub?'), ((x($_REQUEST,'register_msg')) ? $_REQUEST['register_msg'] : ''), t('This will help to review your registration')]; - require_once('include/bbcode.php'); $o = replace_macros(get_markup_template('register.tpl'), array( diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 8e1530eb4..cc2b8e47b 100644 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -47,7 +47,7 @@ {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$pass1}} {{include file="field_password.tpl" field=$pass2}} - {{if $reg_is}} + {{if $register_msg}} {{include file="field_textarea.tpl" field=$register_msg}} {{/if}} {{if $enable_tos}} -- cgit v1.2.3 From 430347a2952e22f13ec1e05ef13618df456ad99f Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 13 May 2024 07:42:17 +0000 Subject: Remove unused Toggle_(safesearch|mobile) modules. --- Zotlabs/Module/Toggle_mobile.php | 23 ----------------------- Zotlabs/Module/Toggle_safesearch.php | 31 ------------------------------- 2 files changed, 54 deletions(-) delete mode 100644 Zotlabs/Module/Toggle_mobile.php delete mode 100644 Zotlabs/Module/Toggle_safesearch.php diff --git a/Zotlabs/Module/Toggle_mobile.php b/Zotlabs/Module/Toggle_mobile.php deleted file mode 100644 index 9d90c0821..000000000 --- a/Zotlabs/Module/Toggle_mobile.php +++ /dev/null @@ -1,23 +0,0 @@ - Date: Tue, 14 May 2024 09:00:43 +0000 Subject: php warnings/errors --- Zotlabs/Lib/Activity.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 75d2ffbe9..b819ef0f7 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1727,9 +1727,12 @@ class Activity { foreach ($links as $link) { if (is_array($link) && array_key_exists('mediaType', $link) && $link['mediaType'] === 'text/html') { $profile = $link['href']; + } elseif (is_string($link)) { + $profile = $link; + break; } } - if (!$profile) { + if (!$profile && isset($links[0]['href'])) { $profile = $links[0]['href']; } } -- cgit v1.2.3 From f086dfd8ca2508816c688aaaf5e9b0633605b9d9 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 14 May 2024 09:05:02 +0000 Subject: missing semicolon and code readability --- view/es-es/hstrings.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 31f5de315..d10e40ed0 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -1,8 +1,11 @@ Date: Wed, 15 May 2024 07:38:07 +0000 Subject: deal with inReplyTo array --- Zotlabs/Lib/ActivityStreams.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 9f028bb46..55a1de5dd 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -148,7 +148,7 @@ class ActivityStreams { // Determine if this is a followup or response activity - $this->parent_id = $this->get_property_obj('inReplyTo'); + $this->parent_id = ((is_array($this->get_property_obj('inReplyTo'))) ? $this->get_property_obj('inReplyTo')['id'] : $this->get_property_obj('inReplyTo')); if (!$this->parent_id && isset($this->obj['inReplyTo'])) { $this->parent_id = ((is_array($this->obj['inReplyTo'])) ? $this->obj['inReplyTo']['id'] : $this->obj['inReplyTo']); -- cgit v1.2.3 From 5da0cc138f4330fd07e9c117b3f4261dc1bcbc19 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 15 May 2024 08:28:19 +0000 Subject: Refactor and cleanup Rbmark module + add tests --- Zotlabs/Module/Rbmark.php | 77 +++++++++++++++----------------------- tests/unit/Module/HelpTest.php | 9 ----- tests/unit/Module/RbmarkTest.php | 80 ++++++++++++++++++++++++++++++++++++++++ tests/unit/Module/TestCase.php | 20 +++++++++- view/tpl/field_input.tpl | 17 +++++++-- 5 files changed, 143 insertions(+), 60 deletions(-) create mode 100644 tests/unit/Module/RbmarkTest.php diff --git a/Zotlabs/Module/Rbmark.php b/Zotlabs/Module/Rbmark.php index 87b774495..b1aea2590 100644 --- a/Zotlabs/Module/Rbmark.php +++ b/Zotlabs/Module/Rbmark.php @@ -1,5 +1,5 @@ escape_tags($_REQUEST['url']),'term' => escape_tags($_REQUEST['title'])); + bookmark_add($channel,$channel,$t,((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0), array('menu_id' => ((x($_REQUEST,'menu_id')) ? intval($_REQUEST['menu_id']) : 0), - 'menu_name' => ((x($_REQUEST,'menu_name')) ? escape_tags($_REQUEST['menu_name']) : ''), - 'ischat' => ((x($_REQUEST['ischat'])) ? intval($_REQUEST['ischat']) : 0) + 'menu_name' => ((x($_REQUEST,'menu_name')) ? escape_tags($_REQUEST['menu_name']) : ''), + 'ischat' => ((x($_REQUEST['ischat'])) ? intval($_REQUEST['ischat']) : 0) )); goaway(z_root() . '/bookmarks'); - } - function get() { + public function get(): string { - $o = ''; - - if(! local_channel()) { + $channel_id = local_channel(); + if($channel_id === false) { // The login procedure is going to bugger our $_REQUEST variables // so save them in the session. @@ -62,59 +59,45 @@ class Rbmark extends \Zotlabs\Web\Controller { return login(); } - // If we have saved rbmark session variables, but nothing in the current $_REQUEST, recover the saved variables + // If we have saved rbmark session variables, but nothing in the + // current $_REQUEST, recover the saved variables if((! array_key_exists('url',$_REQUEST)) && (array_key_exists('bookmark',$_SESSION))) { $_REQUEST = $_SESSION['bookmark']; unset($_SESSION['bookmark']); } - 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() . '/bookmarks'); - } - - $channel = \App::get_channel(); - - - $m = menu_list($channel['channel_id'],'',MENU_BOOKMARK); - - $menus = array(); - if($m) { - $menus = array(0 => ''); - foreach($m as $n) { - $menus[$n['menu_id']] = $n['menu_name']; - } - } - $menu_select = array('menu_id',t('Select a bookmark folder'),false,'',$menus); - - - $o .= replace_macros(get_markup_template('rbmark.tpl'), array( + $menu_select = [ + 'menu_id', + t('Select a bookmark folder'), + false, + '', + $this->get_bookmark_folders(intval($channel_id)), + ]; + return replace_macros(get_markup_template('rbmark.tpl'), array( '$header' => t('Save Bookmark'), - '$url' => array('url',t('URL of bookmark'),escape_tags($_REQUEST['url'])), - '$title' => array('title',t('Description'),escape_tags($_REQUEST['title'])), + '$url' => array('url',t('URL of bookmark'),$_REQUEST['url']), + '$title' => array('title',t('Description'),$_REQUEST['title']), '$ischat' => ((x($_REQUEST,'ischat')) ? intval($_REQUEST['ischat']) : 0), '$private' => ((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0), '$submit' => t('Save'), '$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'',''), '$menus' => $menu_select - )); + } + private function get_bookmark_folders(int $channel_id): array { + $menu_list = menu_list($channel_id, '', MENU_BOOKMARK); + $menus = [ 0 => '' ]; + if ($menu_list !== false) { + foreach($menu_list as $n) { + $menus[$n['menu_id']] = $n['menu_name']; + } + } - - - return $o; - + return $menus; } - - - } diff --git a/tests/unit/Module/HelpTest.php b/tests/unit/Module/HelpTest.php index 0f1610db5..3fb7687d3 100644 --- a/tests/unit/Module/HelpTest.php +++ b/tests/unit/Module/HelpTest.php @@ -176,13 +176,4 @@ class HelpTest extends \Zotlabs\Tests\Unit\Module\TestCase { $this->assertPageContains('

    This is the included file.

    '); } - - /** - * Helper to simplify asserting contents in the rendered page. - * - * @param string $needle The expected string to find. - */ - private function assertPageContains(string $needle): void { - $this->assertStringContainsString($needle, \App::$page['content']); - } } diff --git a/tests/unit/Module/RbmarkTest.php b/tests/unit/Module/RbmarkTest.php new file mode 100644 index 000000000..594e7369b --- /dev/null +++ b/tests/unit/Module/RbmarkTest.php @@ -0,0 +1,80 @@ +getFunctionMock('Zotlabs\Module', 'local_channel'); + $lc_stub + ->expects($this->once()) + ->willReturn(false); + + $this->get('rbmark', ['url' => 'https://bookmarked.url']); + + $this->assertPageContains('value="login" />'); + + // also check that the original query is saved in the session + $this->assertEquals('https://bookmarked.url', $_SESSION['bookmark']['url']); + $this->assertEquals('rbmark', $_SESSION['bookmark']['q']); + } + + public function test_authenticated_get_request_returns_save_bookmark_form(): void { + $lc_stub = $this->getFunctionMock('Zotlabs\Module', 'local_channel'); + $lc_stub + ->expects($this->once()) + ->willReturn(42); + + $this->get('rbmark', [ + 'url' => 'https://bookmarked.url', + 'title' => 'My bookmark', + ]); + + $this->assertPageContains('
    assertPageContains('URL of bookmark'); + $this->assertPageContains('value="https://bookmarked.url"'); + $this->assertPageContains('value="My bookmark"'); + } + + public function test_that_params_are_escaped_in_save_bookmark_form(): void { + $lc_stub = $this->getFunctionMock('Zotlabs\Module', 'local_channel'); + $lc_stub + ->expects($this->once()) + ->willReturn(42); + + $this->get('rbmark', [ + 'url' => 'https://bookmarked.url" onload="alert(/boom/)', + 'title' => 'My bookmark">", diff --git a/tests/unit/Lib/ActivityTest.php b/tests/unit/Lib/ActivityTest.php index c9ce79d8c..0e2703f2b 100644 --- a/tests/unit/Lib/ActivityTest.php +++ b/tests/unit/Lib/ActivityTest.php @@ -19,7 +19,7 @@ class ActivityTest extends UnitTestCase { /** * Dataprovider for test_get_textfield. */ - private function get_textfield_provider(): array { + public static function get_textfield_provider(): array { return [ 'get content field' => [ ['content' => 'Some content'], diff --git a/tests/unit/Lib/ZotlibTest.php b/tests/unit/Lib/ZotlibTest.php index 05522678f..0ab89dc2f 100644 --- a/tests/unit/Lib/ZotlibTest.php +++ b/tests/unit/Lib/ZotlibTest.php @@ -1,5 +1,9 @@ assertEquals($expected, \Zotlabs\Lib\Libzot::get_rpost_path($observer)); } - private function get_rpost_path_provider() : array { + public static function get_rpost_path_provider() : array { return [ 'xchan_url without port' => [ 'https://example.com/rpost?f=', diff --git a/tests/unit/Module/HelpTest.php b/tests/unit/Module/HelpTest.php index 3fb7687d3..c345d5e52 100644 --- a/tests/unit/Module/HelpTest.php +++ b/tests/unit/Module/HelpTest.php @@ -52,7 +52,7 @@ class HelpTest extends \Zotlabs\Tests\Unit\Module\TestCase { $fgc_stub = $this->getFunctionMock('Zotlabs\Module', 'file_get_contents'); $fgc_stub ->expects($this->once()) - ->willReturn($this->returnValueMap($file_content_map)); + ->willReturnMap($file_content_map); $this->get("help/about/help_topic"); diff --git a/tests/unit/Module/SetupTest.php b/tests/unit/Module/SetupTest.php index 96a5ef932..3575dd477 100644 --- a/tests/unit/Module/SetupTest.php +++ b/tests/unit/Module/SetupTest.php @@ -6,6 +6,8 @@ * SPDX-License-Identifier: MIT */ +namespace Zotlabs\Tests\Unit\Module; + /** * SetupModuleTest * @@ -16,7 +18,7 @@ * This is a complex module, so expect the tests to grow as more of it will be * covered. */ -class SetupModuleTest extends \Zotlabs\Tests\Unit\Module\TestCase { +class SetupTest extends TestCase { public function test_that_setup_is_available_if_no_accounts_in_db(): void { $this->with_no_accounts_in_db(); diff --git a/tests/unit/Module/TestCase.php b/tests/unit/Module/TestCase.php index 5ad213e81..e7051e001 100644 --- a/tests/unit/Module/TestCase.php +++ b/tests/unit/Module/TestCase.php @@ -24,6 +24,7 @@ class TestCase extends \Zotlabs\Tests\Unit\UnitTestCase { } $_SERVER['REQUEST_METHOD'] = 'GET'; + $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_REQUEST = $_GET; \App::init(); diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php index 9ab6a534a..844746a51 100644 --- a/tests/unit/UnitTestCase.php +++ b/tests/unit/UnitTestCase.php @@ -22,8 +22,8 @@ namespace Zotlabs\Tests\Unit; +use PHPUnit\Framework\Attributes\{Before, After}; use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\TestResult; /* * Make sure global constants and the global App object is available to the @@ -46,33 +46,44 @@ require_once 'include/dba/dba_driver.php' ; */ class UnitTestCase extends TestCase { protected array $fixtures = array(); + protected ?\DbaTransaction $db_transacton = null; /** - * Override the run method, so we can wrap it in a database transaction. + * Connect to the test db, load fixtures and global config. * - * The transaction is automatically rolled back when the test completes, to - * leave the test database in a known pristine state. + * This function is executed before every test. * - * @SuppressWarnings(PHPMD.UnusedLocalVariable) + * The transaction is rolled back in the `cleanup_test_db()` function + * that's executed after every test. */ - public function run(TestResult $result = null): TestResult { + #[Before] + protected function setup_test_db(): void { if (! \DBA::$dba) { $this->connect_to_test_db(); } // The $transactuion variable is needed to hold the transaction until the // function returns. - $transaction = new \DbaTransaction(\DBA::$dba); + $this->db_transaction = new \DbaTransaction(\DBA::$dba); $this->loadFixtures(); // Make sure app config is reset and loaded from fixtures \App::$config = array(); \Zotlabs\Lib\Config::Load('system'); + } - $result = parent::run($result); - - return $result; + /** + * Roll back test database to it's original state, cleaning up + * any changes from the test. + * + * This function is executes after evert tests. + */ + #[After] + protected function cleanup_test_db(): void { + // Setting the transaction to `null`, runs the destructor + // which rolls backk the transacton. + $this->db_transaction = null; } /** diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php index c01e4f6a3..d705be4ff 100644 --- a/tests/unit/Web/HttpSigTest.php +++ b/tests/unit/Web/HttpSigTest.php @@ -46,7 +46,7 @@ class HttpSigTest extends UnitTestCase { HTTPSig::generate_digest_header($text) ); } - public function generate_digestProvider() { + public static function generate_digestProvider() { return [ 'empty body text' => [ '', diff --git a/tests/unit/Widget/HelpindexTest.php b/tests/unit/Widget/HelpindexTest.php index 2d984985d..26aa34104 100644 --- a/tests/unit/Widget/HelpindexTest.php +++ b/tests/unit/Widget/HelpindexTest.php @@ -23,8 +23,8 @@ class HelpindexTest extends \Zotlabs\Tests\Unit\Module\TestCase { * @beforeClass */ public static function define_stubs(): void { - \phpmock\phpunit\PHPMock::defineFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); - \phpmock\phpunit\PHPMock::defineFunctionMock('Zotlabs\Widget', 'file_get_contents'); + self::defineFunctionMock('Zotlabs\Lib\Traits', 'file_exists'); + self::defineFunctionMock('Zotlabs\Widget', 'file_get_contents'); } public function test_loading_toc(): void { diff --git a/tests/unit/includes/AccountTest.php b/tests/unit/includes/AccountTest.php index af5bcd3c1..3978f9d04 100644 --- a/tests/unit/includes/AccountTest.php +++ b/tests/unit/includes/AccountTest.php @@ -19,7 +19,7 @@ class AccountTest extends Zotlabs\Tests\Unit\UnitTestCase { $this->assertEquals($expected, check_account_email($email)); } - function check_account_email_provider() : array { + public static function check_account_email_provider() : array { return [ // Empty and valid emails return the same result ['', ['error' => false, 'message' => '']], diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php index 94cad1367..daa66bf72 100644 --- a/tests/unit/includes/BBCodeTest.php +++ b/tests/unit/includes/BBCodeTest.php @@ -101,7 +101,7 @@ class BBCodeTest extends UnitTestCase { * * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ - private function bbcode_to_html_provider(): array { + public static function bbcode_to_html_provider(): array { return [ 'code block' => [ "[code]\ntestvar = \"this is a test\"\necho \"the message is \$testvar\"\n[/code]", @@ -153,7 +153,7 @@ class BBCodeTest extends UnitTestCase { * * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ - private function bbcode_observer_provider(): array { + public static function bbcode_observer_provider(): array { return [ 'authenticated observer' => [ '[observer=1]This should be visible[/observer][observer=0]but not this[/observer]', @@ -205,7 +205,7 @@ class BBCodeTest extends UnitTestCase { * * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ - private function html2bbcode_provider(): array { + public static function html2bbcode_provider(): array { return [ 'paragraph over multiple lines' => [ "

    A paragraph over\nmultiple lines\nshould be unwrapped

    ", diff --git a/tests/unit/includes/FeedutilsTest.php b/tests/unit/includes/FeedutilsTest.php index bda0bf425..05bff06a3 100644 --- a/tests/unit/includes/FeedutilsTest.php +++ b/tests/unit/includes/FeedutilsTest.php @@ -47,7 +47,7 @@ class FeedutilsTest extends UnitTestCase { public function test_atom_author() { $this->assertEquals('', atom_author('', 'nick', 'name', 'uri', 72, 72, 'png', 'photourl')); - $a = ' + $expected = ' uri nick uri @@ -57,7 +57,10 @@ class FeedutilsTest extends UnitTestCase { name '; - $this->assertXmlStringEqualsXmlString($a, atom_author('tag', 'nick', 'name', 'uri', 72, 72, 'png', 'http://photourl')); + $this->assertAtomAuthorMatches( + $expected, + atom_author('tag', 'nick', 'name', 'uri', 72, 72, 'png', 'http://photourl') + ); } /** @@ -86,6 +89,63 @@ class FeedutilsTest extends UnitTestCase { Chan '; - $this->assertXmlStringEqualsXmlString($a, atom_render_author('tag', $xchan)); + $this->assertAtomAuthorMatches($a, atom_render_author('tag', $xchan)); + } + + /** + * Helper method to assert that the generated author tag matches + * what we expect. + * + * Calling `assertXmlStringEqualsXmlString` directly on the fragments + * does not work anymore in PHPUnit >= 10.x, as t will throw an XMLException + * because of undefined namespaces. + * + * To overcome that we wrap the generated tags in the proper template, + * and compare the fully generated XML from the template instead. + * + * @param string $expected The expected author XML fragment. + * @param string $actual The actually generated authr XML fragment. + */ + private function assertAtomAuthorMatches(string $expected, string $actual): void { + + // Make sure the template engine is initialized before we try to render + // the template. + // + // This may be problematic, as it will compile the template into the same + // directory as the site. Assuming that nobody is crazy enough to run the + // test suite in a production server, it should probably be fine for now. + $smarty = new \Zotlabs\Render\SmartyTemplate(); + \App::register_template_engine(get_class($smarty)); + + $feed_template = get_markup_template('atom_feed.tpl'); + $expected_xml = replace_macros($feed_template, [ + '$version' => 42, + '$generator' => 'Hubzilla test', + '$generator_uri' => 'https://hubzilla.test', + '$feed_id' => 'test_channel', + '$feed_title' => 'Test channel', + '$feed_updated' => 'Sometime', + '$author' => $expected, + '$owner' => $expected, + '$profile_page' => xmlify('https://hubzilla.test/channel/test'), + ]); + + $expected_xml .= ''; + + $actual_xml = replace_macros($feed_template, [ + '$version' => 42, + '$generator' => 'Hubzilla test', + '$generator_uri' => 'https://hubzilla.test', + '$feed_id' => 'test_channel', + '$feed_title' => 'Test channel', + '$feed_updated' => 'Sometime', + '$author' => $actual, + '$owner' => $actual, + '$profile_page' => xmlify('https://hubzilla.test/channel/test'), + ]); + + $actual_xml .= ''; + + $this->assertXmlStringEqualsXmlString($expected_xml, $actual_xml); } } diff --git a/tests/unit/includes/LanguageTest.php b/tests/unit/includes/LanguageTest.php index 3367232f3..8f62e71e2 100644 --- a/tests/unit/includes/LanguageTest.php +++ b/tests/unit/includes/LanguageTest.php @@ -46,7 +46,7 @@ class LanguageTest extends UnitTestCase { } } - public function getLanguageNameProvider() { + public static function getLanguageNameProvider() { return [ 'empty language code' => [ '', diff --git a/tests/unit/includes/MarkdownTest.php b/tests/unit/includes/MarkdownTest.php index 960c15139..310130bf1 100644 --- a/tests/unit/includes/MarkdownTest.php +++ b/tests/unit/includes/MarkdownTest.php @@ -39,7 +39,7 @@ class MarkdownTest extends UnitTestCase { $this->assertEquals($expected, markdown_to_bb($src)); } - private function markdown_to_bbcode_provider(): array { + public static function markdown_to_bbcode_provider(): array { return [ 'empty text' => [ '', @@ -104,7 +104,7 @@ class MarkdownTest extends UnitTestCase { $this->assertEquals($markdown, html2markdown($html)); } - public function html2markdownProvider(): array { + public static function html2markdownProvider(): array { return [ 'empty text' => [ '', diff --git a/tests/unit/includes/NetworkTest.php b/tests/unit/includes/NetworkTest.php index 9fb00e9d3..5bf175953 100644 --- a/tests/unit/includes/NetworkTest.php +++ b/tests/unit/includes/NetworkTest.php @@ -20,7 +20,7 @@ class NetworkTest extends Zotlabs\Tests\Unit\UnitTestCase { $this->assertEquals($expected, is_local_url($url)); } - public function localUrlTestProvider() : array { + public static function localUrlTestProvider() : array { return [ [ '/some/path', true ], [ 'https://mytest.org/some/path', true ], @@ -47,7 +47,7 @@ class NetworkTest extends Zotlabs\Tests\Unit\UnitTestCase { $this->assertTrue(validate_email($email)); } - function validate_email_provider() : array { + public static function validate_email_provider() : array { return [ // First some invalid email addresses ['', false], diff --git a/tests/unit/includes/TextTest.php b/tests/unit/includes/TextTest.php index b76b15dcf..1e80d71d8 100644 --- a/tests/unit/includes/TextTest.php +++ b/tests/unit/includes/TextTest.php @@ -85,7 +85,7 @@ empty line above'; public function testNotags($string, $expected) { $this->assertEquals($expected, notags($string)); } - public function notagsProvider() { + public static function notagsProvider() { return [ 'empty string' => ['', ''], 'simple tag' => ['', '[value]'], @@ -102,7 +102,7 @@ empty line above'; sanitise_acl($string); $this->assertEquals($expected, $string); } - public function sanitise_aclProvider() { + public static function sanitise_aclProvider() { return [ 'text' => ['value', ''], 'text with angle bracket' => ['', '<[value]>'], diff --git a/tests/unit/includes/dba/TransactionTest.php b/tests/unit/includes/dba/TransactionTest.php index 99e3f459d..0b986c6aa 100644 --- a/tests/unit/includes/dba/TransactionTest.php +++ b/tests/unit/includes/dba/TransactionTest.php @@ -24,8 +24,8 @@ require_once 'tests/fakes/fake_dba.php'; require_once 'include/dba/dba_transaction.php'; -use \PHPUnit\Framework\TestCase; -use \Zotlabs\Tests\Fakes\FakeDba; +use PHPUnit\Framework\TestCase; +use Zotlabs\Tests\Fakes\FakeDba; /** * Test database transactions. @@ -39,7 +39,7 @@ class DbaTransactionTest extends TestCase { private $pdo_stub; public function setUp(): void { - $this->pdo_stub = $this->createStub(PDO::class); + $this->pdo_stub = $this->createMock(PDO::class); } -- cgit v1.2.3 From c009c5f43ae0291d0ce0e44b54cd82d50bd3d72b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 29 May 2024 22:50:02 +0200 Subject: Fix default timeouts for z_(fetch|post)_url. When fetching the default timouts from config, the result is converted to an int via `intval()`, the result of that again is compared strictly to `false`. Since 0 !== false, the default values will never be used, and 0 (no timeout) is passed to curl. This cause requests to hang indefinitely (or until they are killed) when receiving actions that require a lookup or fetch to another site as part of the request processing. (E.g webfinger, or fetching objects that we received an announce action for.) This again cause the request never to return a useful status to the site sending the action, and could cause them to think the Hubzilla site is dead. This patch fixes this by comparing the fetched value from config to 0 instead of false, making the defaults work again if the config is not set (or set to 0). --- include/network.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/network.php b/include/network.php index a7a11ff6e..1978eb868 100644 --- a/include/network.php +++ b/include/network.php @@ -116,7 +116,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { } else { $curl_time = intval(@Config::Get('system','curl_timeout')); - @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); + @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== 0) ? $curl_time : 60)); } if(x($opts,'connecttimeout') && intval($opts['connecttimeout'])) { @@ -124,7 +124,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { } else { $curl_contime = intval(@Config::Get('system','curl_connecttimeout')); - @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (($curl_contime !== false) ? $curl_contime : 30)); + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (($curl_contime !== 0) ? $curl_contime : 30)); } if(x($opts,'http_auth')) { @@ -298,7 +298,7 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) { } else { $curl_time = intval(@Config::Get('system','curl_timeout')); - @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); + @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== 0) ? $curl_time : 60)); } if(x($opts,'http_auth')) { -- cgit v1.2.3 From a4d63ab9a35a3e3c5e128e266e5ddc3c2c6d2e8e Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 4 Jun 2024 09:05:34 +0000 Subject: hotfix to mitigate queueworker crash --- Zotlabs/Lib/Activity.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index b819ef0f7..b628221fb 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -762,7 +762,12 @@ class Activity { $ptr = [$ptr]; } foreach ($ptr as $att) { + if (!is_array($att)) { + continue; + } + $entry = []; + if (array_key_exists('href', $att) && $att['href']) { $entry['href'] = $att['href']; } elseif (array_key_exists('url', $att) && $att['url']) { @@ -1085,12 +1090,16 @@ class Activity { static function encode_person($p, $extended = true) { + $ret = (($extended) ? [] : ''); + + if (!is_array($p)) { + return $ret; + } + $c = ((array_key_exists('channel_id', $p)) ? $p : channelx_by_hash($p['xchan_hash'])); $id = (($c) ? channel_url($c) : ((filter_var($p['xchan_hash'], FILTER_VALIDATE_URL)) ? $p['xchan_hash'] : $p['xchan_url'])); - $ret = (($extended) ? [] : ''); - if (!$id) { return $ret; } -- cgit v1.2.3 From 350f84913a9390ac67f800a51f6c4d319331149c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 5 Jun 2024 07:59:42 +0000 Subject: Skip checking MFA status for WebDAV and CardDAV requests. --- include/auth.php | 37 +++++++++++++- tests/unit/UnitTestCase.php | 1 + tests/unit/includes/AuthTest.php | 81 ++++++++++++++++++++++++++++++ tests/unit/includes/dba/_files/account.yml | 2 + 4 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 tests/unit/includes/AuthTest.php diff --git a/include/auth.php b/include/auth.php index 0cd48bce3..1fc2cc556 100644 --- a/include/auth.php +++ b/include/auth.php @@ -176,6 +176,40 @@ function log_failed_login($errormsg) { @file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $errormsg . PHP_EOL, FILE_APPEND); } + +/** + * Determines if checking for multifactor authentication needs to be checked. + * + * Checks that multi factor authentication is enabled for the given account_id, + * and whether it's already authenticated or not. + * + * Some modules needs to be excluded from the mfa checks for various reasons: + * + * - `totp_check` is used by the mfa module itself. + * - `dav` provides WebDAV access, and has no way of providing a mfa code. + * - `cdav` is accessed both via CardDAV which has the same limitations as + * the `dav` module, but may also be accessed via a web browser over http. + * We only exclude it if it's not being accessed via a web browser. + * + * @param int $account_id The id of the account we're verifying. + * @param string $module The requested module. + * @param string $arg The first arg passed to the module (or empty if none.) + * + * @return bool `true` if mfa status needs to be checked, `false` otherwise. + */ +function requires_mfa_check(int $account_id, string $module, string $arg): bool { + if (in_array($module, ['totp_check', 'dav'], true)) { + return false; + } + + if ($module === 'cdav' && !in_array($arg, ['addressbook', 'calendar'], true)) { + return false; + } + + $multiFactor = AConfig::Get($account_id, 'system', 'mfa_enabled'); + return $multiFactor && empty($_SESSION['2FA_VERIFIED']); +} + /** * Inline - not a function * look for auth parameters or re-validate an existing session @@ -267,8 +301,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && $login_refresh = true; } - $multiFactor = AConfig::Get(App::$account['account_id'], 'system', 'mfa_enabled'); - if ($multiFactor && empty($_SESSION['2FA_VERIFIED']) && App::$module !== 'totp_check') { + if (requires_mfa_check(App::$account['account_id'], App::$module, argv(1))) { $o = new Totp_check; echo $o->get(); killme(); diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php index 844746a51..afc309205 100644 --- a/tests/unit/UnitTestCase.php +++ b/tests/unit/UnitTestCase.php @@ -31,6 +31,7 @@ use PHPUnit\Framework\TestCase; */ require_once __DIR__ . '/../../boot.php'; require_once 'include/dba/dba_driver.php' ; +require_once 'include/dba/dba_transaction.php'; /** * Base class for our Unit Tests. diff --git a/tests/unit/includes/AuthTest.php b/tests/unit/includes/AuthTest.php new file mode 100644 index 000000000..fa9726fe8 --- /dev/null +++ b/tests/unit/includes/AuthTest.php @@ -0,0 +1,81 @@ +fixtures['account']['0']['account_id']; + + $_SESSION = [ + 'authenticated' => true, + 'account_id' => $account_id, + + // Trick the code to not warn that $_SESSION['uid'] is not set, + // but also not trigger the code that tries to change to the + // given channel. *Remove when code is fixed!* + 'uid' => 0, + ]; + + $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; + + App::$session = $this->create_session_stub(); + App::$module = $module; + App::$argv = $args; + App::$argc = count($args); + + // Enable multi factor authentication for this account + AConfig::Set($account_id, 'system', 'mfa_enabled', true); + + require 'include/auth.php'; + + $this->assertEquals(1, $_SESSION['authenticated']); + } + + /** + * Data provider for testing modules excluded from mfa + * @SuppressWarnings(PHPMD.UnusedPrivateMethod) + */ + public static function modules_excluded_from_mfa(): array { + return [ + ['totp_check', []], + ['cdav', []], + ['cdav', ['calendar']], + ['cdav', ['addressbook']], + ['dav', []], + ]; + } + + private function create_session_stub(): \Zotlabs\Web\Session { + return $this->createStub('Zotlabs\Web\Session'); + } +} diff --git a/tests/unit/includes/dba/_files/account.yml b/tests/unit/includes/dba/_files/account.yml index 344bdb799..88e59056e 100644 --- a/tests/unit/includes/dba/_files/account.yml +++ b/tests/unit/includes/dba/_files/account.yml @@ -3,7 +3,9 @@ account: account_id: 42 account_email: "hubzilla@example.com" account_language: "no" + account_flags: 0 - account_id: 43 account_email: "hubzilla@example.org" account_language: "de" + account_flags: 1 -- cgit v1.2.3 From d0bb3a7354b91fc797b97f19032e014cbaaa350c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 5 Jun 2024 08:01:04 +0000 Subject: Correct type annotation in comment for Config::Get. --- Zotlabs/Lib/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Lib/Config.php b/Zotlabs/Lib/Config.php index 95df8ed6f..cd8b08991 100644 --- a/Zotlabs/Lib/Config.php +++ b/Zotlabs/Lib/Config.php @@ -115,7 +115,7 @@ class Config { * The category of the configuration value * @param string $key * The configuration key to query - * @param string $default (optional) default false + * @param mixed $default (optional) default false * @return mixed Return value or false on error or if not set */ public static function Get($family, $key, $default = false) { -- cgit v1.2.3 From 5efc6bdd2f85497d0c863551f01236527cc7344f Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 5 Jun 2024 08:09:26 +0000 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index d8b2953e8..a52f27830 100644 --- a/boot.php +++ b/boot.php @@ -64,7 +64,7 @@ require_once('include/selectors.php'); require_once('include/activities.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.1.3'); +define('STD_VERSION', '9.1.4'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3 From 494ff44a6984d2be3a40e276c728a33c124f5196 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 5 Jun 2024 10:04:16 +0000 Subject: adjusting to the wrong direction when exporting ical and do not use Z because timezone is attached --- include/event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/event.php b/include/event.php index ef73fc9b5..3beb15b7a 100644 --- a/include/event.php +++ b/include/event.php @@ -272,9 +272,9 @@ function format_event_ical($ev) { if($ev['adjust']) { if($ev['dtstart']) - $o .= "\r\nDTSTART$tzid:" . datetime_convert($tz,'UTC', $ev['dtstart'],'Ymd\\THis\\Z'); + $o .= "\r\nDTSTART$tzid:" . datetime_convert('UTC', $tz, $ev['dtstart'],'Ymd\\THis'); if($ev['dtend'] && ! $ev['nofinish']) - $o .= "\r\nDTEND$tzid:" . datetime_convert($tz,'UTC', $ev['dtend'],'Ymd\\THis\\Z'); + $o .= "\r\nDTEND$tzid:" . datetime_convert('UTC', $tz, $ev['dtend'],'Ymd\\THis'); } else { if($ev['dtstart']) -- cgit v1.2.3 From 59b8c8ad487e9695d7d85f2529adc9e0b2cd6cc1 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 7 Jun 2024 09:11:09 +0000 Subject: move button class to the right dom --- view/tpl/cal_event.tpl | 2 +- view/tpl/event.tpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/tpl/cal_event.tpl b/view/tpl/cal_event.tpl index d7662786b..0719d5262 100644 --- a/view/tpl/cal_event.tpl +++ b/view/tpl/cal_event.tpl @@ -6,7 +6,7 @@ {{$event.html}}
    - {{if $event.item.plink}}{{/if}} + {{if $event.item.plink}}{{/if}}
    diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index cc0bfc1c7..91dc53421 100644 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -6,9 +6,9 @@ {{$event.html}}
    - {{if $event.item.plink}}{{/if}} - {{if $event.edit}}{{/if}} - {{if $event.drop}}{{/if}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} + {{if $event.drop}}{{/if}}
    -- cgit v1.2.3 From d862a6f0753affa520e8108c9f6814f9ae16c174 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 7 Jun 2024 09:19:50 +0000 Subject: update changelog --- CHANGELOG | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 67f6783a9..cd5c142e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +Hubzilla 9.0.2 (2024-06-07) + - Fix buttons in event viewer + - Fix some PHP warnings and errors + - Fix issue when inReplyTo field is an array + - Fix possible queueworker crash + - Fix missing pdl file for mod home + - Reduced default directory result set + + Hubzilla 9.0.1 (2024-03-26) - Fix an issue where after an update initiated from a modal the modal backdrop would remain - Fix bootstrap namespace in conv list templates -- cgit v1.2.3 From bd5f77dbeb4ec92bdbe3aba3a8ef05c5296edbc0 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 7 Jun 2024 09:21:43 +0000 Subject: update changelog --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cd5c142e4..b5cd098a4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,8 @@ Hubzilla 9.0.2 (2024-06-07) - Fix possible queueworker crash - Fix missing pdl file for mod home - Reduced default directory result set + - Fix fatal error in likebanner addon + - Fix fatal error in hilite addon Hubzilla 9.0.1 (2024-03-26) -- cgit v1.2.3 From 9348bd6ea5bc8573201ed773c1de26949dd1b510 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 08:02:32 +0000 Subject: remove unused variable and superfluous backslash --- Zotlabs/Lib/ThreadItem.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 290a7b0c2..eb1020cd2 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -44,8 +44,6 @@ class ThreadItem { $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); $this->threaded = Config::Get('system','thread_allow'); - $observer = \App::get_observer(); - // Prepare the children if(isset($data['children'])) { @@ -875,7 +873,7 @@ class ThreadItem { '$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false), '$encrypt' => t('Encrypt text'), '$cipher' => $conv->get_cipher(), - '$sourceapp' => \App::$sourcename, + '$sourceapp' => App::$sourcename, '$observer' => get_observer_hash(), '$anoncomments' => ((in_array($conv->get_mode(), ['channel', 'display', 'cards', 'articles']) && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false), '$anonname' => [ 'anonname', t('Your full name (required)') ], -- cgit v1.2.3 From 388e7c88dff956dca9e3498076e9f3cf49a153c8 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 08:22:43 +0000 Subject: remove superfluous param, fix wrong var and declare types for unparse_url() --- Zotlabs/Lib/Activity.php | 4 ++-- include/network.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index b628221fb..5613e6bda 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -70,7 +70,7 @@ class Activity { } if ($items) { - return self::encode_item(array_shift($items), true); + return self::encode_item(array_shift($items)); } return null; @@ -2902,7 +2902,7 @@ class Activity { if (intval($parent[0]['item_private'])) { if (!intval($item['item_private'])) { - $item['item_private'] = intval($parent_item['item_private']); + $item['item_private'] = intval($parent[0]['item_private']); $item['allow_cid'] = '<' . $channel['channel_hash'] . '>'; $item['allow_gid'] = $item['deny_cid'] = $item['deny_gid'] = ''; } diff --git a/include/network.php b/include/network.php index 1978eb868..bb5bc1ce7 100644 --- a/include/network.php +++ b/include/network.php @@ -2146,9 +2146,9 @@ function get_request_string($url) { * * @param array $parsed_url An associative array as produced by `parse_url`. * - * @return The reassembled URL as a string. + * @return string The reassembled URL as a string. */ -function unparse_url($parsed_url) { +function unparse_url(array $parsed_url): string { $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; $port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; @@ -2158,5 +2158,5 @@ function unparse_url($parsed_url) { $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; - return "$scheme$user$pass$host$port$path$query$fragment"; + return $scheme . $user . $pass . $host . $port . $path . $query . $fragment; } -- cgit v1.2.3 From 69862bc6df3ab0a32edbb90ff0e60ffedd03cc4e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 08:26:06 +0000 Subject: docu and declare return type for t() --- include/language.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/language.php b/include/language.php index 22f350aac..538f67d90 100644 --- a/include/language.php +++ b/include/language.php @@ -198,10 +198,10 @@ function load_translation_table($lang, $install = false) { * * @param string $s string that should get translated * @param string $ctx (optional) context to appear in po file - * @return translated string if exists, otherwise return $s + * @return string translated string if exists, otherwise return $s * */ -function t($s, $ctx = '') { +function t($s, $ctx = ''): string { $cs = $ctx ? '__ctx:' . $ctx . '__ ' . $s : $s; if (x(App::$strings, $cs)) { -- cgit v1.2.3 From 43a2c21d8784ed0a5a4968edb91fed818fd993f7 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 08:40:39 +0000 Subject: fix updated not supported in wrapper function --- Zotlabs/Lib/Libsync.php | 2 +- include/config.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index e68fd53f1..a7e33ba6b 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -267,7 +267,7 @@ class Libsync { } if ($cat !== 'hz_delpconfig') { - set_pconfig($channel['channel_id'],$cat,$k,$v,$pconfig_updated[$k]); + set_pconfig($channel['channel_id'], $cat, $k, $v, $pconfig_updated[$k]); } } } diff --git a/include/config.php b/include/config.php index 674d5afe4..4dd40eccf 100644 --- a/include/config.php +++ b/include/config.php @@ -120,8 +120,8 @@ function get_pconfig($uid, $family, $key, $default = false) { return Zlib\PConfig::Get($uid,$family,$key,$default); } -function set_pconfig($uid, $family, $key, $value) { - return Zlib\PConfig::Set($uid,$family,$key,$value); +function set_pconfig($uid, $family, $key, $value, $updated = NULL) { + return Zlib\PConfig::Set($uid, $family, $key, $value, $updated); } function del_pconfig($uid, $family, $key, $updated = NULL) { -- cgit v1.2.3 From 0428a97e00592e20f5a0b6369bd47bb7e10ab437 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 08:56:59 +0000 Subject: docu --- include/attach.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 2283da1c6..556fd362c 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2668,8 +2668,8 @@ function attach_move($channel_id, $resource_id, $new_folder_hash, $newname = '', * @param int $channel_id * @param int $resource_id * @param string $new_folder_hash - * @param (optional) string $newname - * @param (optional) boolean $recurse + * @param string (optional) $newname + * @param boolean (optional) $recurse * @return array Associative array with: * * \e boolean \b success * * \e string \b resource_id of the new resource -- cgit v1.2.3 From 9c62514c1b6a4c320dc8dd0b7f235067f235b8c8 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 08:58:32 +0000 Subject: docu --- include/attach.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 556fd362c..6f474961a 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2467,8 +2467,8 @@ function copy_folder_to_cloudfiles($channel, $observer_hash, $srcpath, $cloudpat * @param int $channel_id * @param int $resource_id * @param string $new_folder_hash - * @param (optional) string $newname - * @param (optional) boolean $recurse + * @param string (optional) $newname + * @param boolean (optional) $recurse * @return array Associative array with: * * \e boolean \b success * * \e string \b resource_id -- cgit v1.2.3 From c5cab3004f76abbd7ba59a3e588f83bdb3692b14 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 09:09:36 +0000 Subject: remove duplicate array key --- Zotlabs/Module/Hq.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index ae6a016fc..7b086b52c 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -98,7 +98,6 @@ class Hq extends \Zotlabs\Web\Controller { 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, - 'profile_uid' => local_channel(), 'return_path' => 'hq', 'expanded' => true, 'editor_autocomplete' => true, -- cgit v1.2.3 From 51fe071c5ee6e7bd6adf532b250f788d3cb2e9cc Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 09:16:21 +0000 Subject: =?UTF-8?q?=C3=83fix=20undefined=20variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zotlabs/Module/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 0324bf662..0b46f2baf 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1654,7 +1654,7 @@ class Item extends Controller { $listener = Libzot::zot_record_preferred($listener); $c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s'", - intval($profile_uid), + intval($item['uid']), dbesc($listener['hubloc_hash']) ); -- cgit v1.2.3 From d9e97a7c1f24ab6f64d60adddb4ddce72105fa72 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 09:35:13 +0000 Subject: remove superfluous backslash --- Zotlabs/Render/SmartyInterface.php | 2 +- Zotlabs/Render/Theme.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php index d80ea3f3a..64c6aa377 100644 --- a/Zotlabs/Render/SmartyInterface.php +++ b/Zotlabs/Render/SmartyInterface.php @@ -20,7 +20,7 @@ class SmartyInterface extends Smarty { $template_dirs = array('theme' => "view/theme/$thname/tpl/"); if ( x(App::$theme_info,"extends") ) { - $template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/"); + $template_dirs = $template_dirs + array('extends' => "view/theme/" . App::$theme_info["extends"] . "/tpl/"); } $template_dirs = $template_dirs + array('base' => 'view/tpl/'); $this->setTemplateDir($template_dirs); diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php index 543bf7a3f..a42b65e03 100644 --- a/Zotlabs/Render/Theme.php +++ b/Zotlabs/Render/Theme.php @@ -24,7 +24,7 @@ class Theme { * * @return array */ - static public function current(){ + static public function current() { self::$system_theme = ((isset(App::$config['system']['theme'])) ? App::$config['system']['theme'] : ''); @@ -37,7 +37,7 @@ class Theme { if(App::$profile_uid) { $r = q("select channel_theme from channel where channel_id = %d limit 1", - intval(\App::$profile_uid) + intval(App::$profile_uid) ); if($r) { $page_theme = $r[0]['channel_theme']; @@ -46,7 +46,7 @@ class Theme { // Themes from Comanche layouts over-ride the channel theme - if(array_key_exists('theme', \App::$layout) && \App::$layout['theme']) { + if(array_key_exists('theme', App::$layout) && App::$layout['theme']) { $page_theme = App::$layout['theme']; } -- cgit v1.2.3 From 8f41d170a557dfd18caab7e7d8b2405b23b7b2e8 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 09:45:33 +0000 Subject: fix wrong variable --- include/event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/event.php b/include/event.php index 3beb15b7a..f8511cbe2 100644 --- a/include/event.php +++ b/include/event.php @@ -797,7 +797,7 @@ function parse_event_object($event_object_json) { $tz = $object['timezone'] ?? 'UTC'; $ev['summary'] = $object['summary'] ?? $object['name'] ?? ''; - $ev['description'] = html2bbcode($content['content']) ?? ''; + $ev['description'] = html2bbcode($object['content']) ?? ''; $ev['dtstart'] = $object['startTime'] ? datetime_convert('UTC', 'UTC', $object['startTime']) : ''; $ev['dtend'] = $object['endTime'] ? datetime_convert('UTC', 'UTC', $object['endTime']) : $ev['dtstart']; $ev['location'] = $object['location']['name'] ?? ''; -- cgit v1.2.3 From 539ae375532a058496468093a88f0b9b20d4a601 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 09:50:06 +0000 Subject: too many args --- include/html2plain.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html2plain.php b/include/html2plain.php index 88dce577d..69fb5193a 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -196,7 +196,7 @@ function html2plain($html, $wraplength = 75, $compact = false) // Problem: there is no reliable way to detect if it is a link to a tag or profile //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true); - node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true); + node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', ''); //node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', ''); //node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', ''); //node2bbcode($doc, 'img', array(), '', ''); @@ -205,7 +205,7 @@ function html2plain($html, $wraplength = 75, $compact = false) else node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '', ''); - node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), ' $1 ', '', true); + node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), ' $1 ', ''); $message = $doc->saveHTML(); -- cgit v1.2.3 From 06183ba01a9f95f905f3797f684526c4576046dc Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 10:00:25 +0000 Subject: duplicate array key --- include/attach.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/attach.php b/include/attach.php index 6f474961a..449721793 100644 --- a/include/attach.php +++ b/include/attach.php @@ -113,7 +113,6 @@ function z_mime_content_type($filename) { 'odf' => 'application/vnd.oasis.opendocument.formula', 'odi' => 'application/vnd.oasis.opendocument.image', 'odm' => 'application/vnd.oasis.opendocument.text-master', - 'odb' => 'application/vnd.oasis.opendocument.base', 'odb' => 'application/vnd.oasis.opendocument.database', 'ott' => 'application/vnd.oasis.opendocument.text-template', 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', -- cgit v1.2.3 From 4ba4b2976e71d3ba61148962eab35bedf50d140a Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Jun 2024 07:42:43 +0000 Subject: pass the force argument to the xchan_photo daemon --- Zotlabs/Daemon/Xchan_photo.php | 9 ++++++--- Zotlabs/Lib/Activity.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Daemon/Xchan_photo.php b/Zotlabs/Daemon/Xchan_photo.php index f90d1d726..662fc967c 100644 --- a/Zotlabs/Daemon/Xchan_photo.php +++ b/Zotlabs/Daemon/Xchan_photo.php @@ -8,14 +8,15 @@ class Xchan_photo { static public function run($argc, $argv) { - if ($argc != 3) { + if ($argc < 3) { return; } $url = hex2bin($argv[1]); $xchan = hex2bin($argv[2]); + $force = $argv[3]; - $photos = import_xchan_photo($url, $xchan); + $photos = import_xchan_photo($url, $xchan, false, $force); if ($photos) { $result = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", dbescdate(datetime_convert()), @@ -27,8 +28,10 @@ class Xchan_photo { ); if (! $result) { - logger("xchan update failed for $url"); + logger("xchan photo update failed for $url"); } } + + return; } } diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 5613e6bda..9178dac39 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1875,7 +1875,7 @@ class Activity { } if ($icon) { - Master::Summon(['Xchan_photo', bin2hex($icon), bin2hex($url)]); + Master::Summon(['Xchan_photo', bin2hex($icon), bin2hex($url), $force]); } } -- cgit v1.2.3 From 64748cf1f176c661e407b6bb2caf5a2cdff03e68 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Jun 2024 08:52:10 +0000 Subject: cleanup unused code --- Zotlabs/Module/Hq.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 7b086b52c..f06900f83 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -116,17 +116,6 @@ class Hq extends \Zotlabs\Web\Controller { nav_set_selected('HQ'); - 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($target_item['mid']); - } - else { - $mid = ''; - } - $o .= '
    ' . "\r\n"; $o .= "\r\n"; -- cgit v1.2.3 From 5110dcb9126a0d21062537f0fb640c3078811f81 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Jun 2024 08:58:35 +0000 Subject: remove not required includes and include security.php in boot.php --- Zotlabs/Module/Hq.php | 8 -------- boot.php | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index f06900f83..c8e6efe38 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -4,14 +4,6 @@ namespace Zotlabs\Module; use App; use Zotlabs\Widget\Messages; - -require_once("include/bbcode.php"); -require_once('include/security.php'); -require_once('include/conversation.php'); -require_once('include/acl_selectors.php'); -require_once('include/items.php'); - - class Hq extends \Zotlabs\Web\Controller { function init() { diff --git a/boot.php b/boot.php index a52f27830..c56e4fabf 100644 --- a/boot.php +++ b/boot.php @@ -62,6 +62,8 @@ require_once('include/conversation.php'); require_once('include/acl_selectors.php'); require_once('include/selectors.php'); require_once('include/activities.php'); +require_once('include/security.php'); + define('PLATFORM_NAME', 'hubzilla'); define('STD_VERSION', '9.1.4'); -- cgit v1.2.3 From 088a87914f7bbe5bb45ea125ae3c1b1a8ef0ed80 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Jun 2024 09:00:43 +0000 Subject: remove not needed namespace --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index c56e4fabf..032bfbc15 100644 --- a/boot.php +++ b/boot.php @@ -1648,7 +1648,7 @@ function fix_system_urls($oldurl, $newurl) { } } - Zotlabs\Daemon\Master::Summon(['Notifier', 'refresh_all', $c[0]['channel_id']]); + Master::Summon(['Notifier', 'refresh_all', $c[0]['channel_id']]); } } @@ -2725,7 +2725,7 @@ function check_cron_broken() { $d = Config::Get('system', 'lastcron'); if ((!$d) || ($d < datetime_convert('UTC', 'UTC', 'now - 4 hours'))) { - Zotlabs\Daemon\Master::Summon(['Cron']); + Master::Summon(['Cron']); Config::Set('system', 'lastcron', datetime_convert()); } -- cgit v1.2.3 From 13c074f8b8f8340efc7c5912c615b6cfa693409d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 19:20:57 +0200 Subject: Module\Setup: Pass all required params for the template. Non-existing keys in the array passed to the template causes a warning. Also make optional parts of the template actually optional by skipping them if the value is empty. --- Zotlabs/Module/Setup.php | 2 ++ view/tpl/install.tpl | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 647415385..a4204afd7 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -215,9 +215,11 @@ class Setup extends \Zotlabs\Web\Controller { $tpl = get_markup_template('install.tpl'); return replace_macros($tpl, array( '$title' => $install_title, + '$icon' => null, '$pass' => '', '$status' => t('Permission denied.'), '$text' => '', + '$what_next' => null, )); } } diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl index 5ab722b12..56faa0527 100644 --- a/view/tpl/install.tpl +++ b/view/tpl/install.tpl @@ -2,7 +2,9 @@

    {{$title}}

    + {{if $icon}}

      {{$pass}}

    + {{/if}}
    {{if $status}} @@ -11,5 +13,5 @@
    {{$text}}

    - {{$what_next}} + {{if $what_next}}{{$what_next}}{{/if}} -- cgit v1.2.3 From 4d5a7ec39f9d036ab6f68e3ca9f9919cc967109c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 19:59:52 +0200 Subject: includes/menu: Fix timestamp handling in menu_create. Referencing undefined array keys are not allowed anymore, so we need to check whether they exist first. --- include/menu.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/menu.php b/include/menu.php index 1f65f987d..2fcf88bca 100644 --- a/include/menu.php +++ b/include/menu.php @@ -166,7 +166,8 @@ function menu_create($arr) { if($r) return false; - $t = datetime_convert(); + $time_created = datetime_convert('UTC', 'UTC', empty($arr['menu_created']) ? 'now' : $arr['menu_created']); + $time_edited = empty($arr['menu_edited']) ? $time_created : datetime_convert('UTC', 'UTC', $arr['menu_edited']); $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' )", @@ -174,8 +175,8 @@ function menu_create($arr) { 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))) + dbesc($time_created), + dbesc($time_edited) ); if(! $r) return false; -- cgit v1.2.3 From c7ec3159ead30c2306a84d060ecc63e60e5c9084 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 20:01:34 +0200 Subject: Module\Rbmark: Specify all fields in the template. The `field_select` sub template wants five elements in the `field` array. --- Zotlabs/Module/Rbmark.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Zotlabs/Module/Rbmark.php b/Zotlabs/Module/Rbmark.php index b1aea2590..8ac23a4e4 100644 --- a/Zotlabs/Module/Rbmark.php +++ b/Zotlabs/Module/Rbmark.php @@ -73,6 +73,7 @@ class Rbmark extends \Zotlabs\Web\Controller { false, '', $this->get_bookmark_folders(intval($channel_id)), + null, ]; return replace_macros(get_markup_template('rbmark.tpl'), array( -- cgit v1.2.3 From 0a818191c1a282768049ecb8f65180a75594afc1 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 20:06:40 +0200 Subject: boot/login: Pass all expected args to sub templates. --- boot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index d8b2953e8..372c26763 100644 --- a/boot.php +++ b/boot.php @@ -1758,9 +1758,9 @@ function login($register = false, $form_id = 'main_login', $hiddens = false, $lo '$login' => t('Login'), '$remote_login' => t('Remote Authentication'), '$form_id' => $form_id, - '$lname' => [$form_id . '_username', $lname_label], - '$lpassword' => [$form_id . '_password', t('Password')], - '$remember_me' => [$form_id . '_remember', t('Remember me'), '', '', [t('No'), t('Yes')]], + '$lname' => [$form_id . '_username', $lname_label, null, null, null, null], + '$lpassword' => [$form_id . '_password', t('Password'), null, null, null, null], + '$remember_me' => [$form_id . '_remember', t('Remember me'), '', '', [t('No'), t('Yes')], null, null], '$hiddens' => $hiddens, '$register' => $reg, '$lostpass' => t('Forgot your password?'), -- cgit v1.2.3 From ffc2455bea61df2fb0ecf1b39bc596541cb84c40 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 20:30:44 +0200 Subject: Module\Rbmark: Pass all fields to input field templates. --- Zotlabs/Module/Rbmark.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Rbmark.php b/Zotlabs/Module/Rbmark.php index 8ac23a4e4..df32a97c2 100644 --- a/Zotlabs/Module/Rbmark.php +++ b/Zotlabs/Module/Rbmark.php @@ -78,12 +78,12 @@ class Rbmark extends \Zotlabs\Web\Controller { return replace_macros(get_markup_template('rbmark.tpl'), array( '$header' => t('Save Bookmark'), - '$url' => array('url',t('URL of bookmark'),$_REQUEST['url']), - '$title' => array('title',t('Description'),$_REQUEST['title']), + '$url' => array('url',t('URL of bookmark'),$_REQUEST['url'], null, null, null), + '$title' => array('title',t('Description'),$_REQUEST['title'], null, null, null), '$ischat' => ((x($_REQUEST,'ischat')) ? intval($_REQUEST['ischat']) : 0), '$private' => ((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0), '$submit' => t('Save'), - '$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'',''), + '$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'','', null, null), '$menus' => $menu_select )); } -- cgit v1.2.3 From ad9fb4d530d02c4e432f14626c1f08fe827255c5 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 20:40:56 +0200 Subject: Module\Help: Only variables can be passed by reference. Introduce an intermediate variable when extracting the file type from the file name. Otherwise we would try to pass a returned value as a reference. --- Zotlabs/Module/Help.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index 5d52440a5..fd5cacee6 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -210,7 +210,8 @@ class Help extends \Zotlabs\Web\Controller { $content = preg_replace_callback( "/#include (.*?)\;/ism", function ($matches) { - $sub_file_type = array_pop(explode('.', $matches[1])); + $parts = explode('.', $matches[1]); + $sub_file_type = array_pop($parts); $included_content = $this->render_help_file($matches[1], $sub_file_type); return str_replace($matches[0], $included_content, $matches[0]); }, -- cgit v1.2.3 From ac1e20b1880d57aab2048e670449768d51dbc0b0 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 20:44:27 +0200 Subject: Module\Setup: Don't access static variable as non static. --- Zotlabs/Module/Setup.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index a4204afd7..7ca3f827c 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -46,9 +46,9 @@ class Setup extends \Zotlabs\Web\Controller { } if(x($_POST, 'pass')) { - $this->install_wizard_pass = intval($_POST['pass']); + self::$install_wizard_pass = intval($_POST['pass']); } else { - $this->install_wizard_pass = 1; + self::$install_wizard_pass = 1; } } @@ -239,7 +239,7 @@ class Setup extends \Zotlabs\Web\Controller { )); } - switch ($this->install_wizard_pass){ + switch (self::$install_wizard_pass){ case 1: { // System check $checks = array(); -- cgit v1.2.3 From 9199a1ba81b6ed2c6dcbc1f842eb31b5f2c7d919 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jun 2024 23:53:20 +0200 Subject: Add config file and rules for PHP Code Sniffer. The rules are based on the "Generic" ruleset included by PHP Code Sniffer, with a significant portion of the rules disabled. This is a tradeoff between getting some useful feedback, and not being overloaded by noise. I've tried to encode a coe style that resembles the existing code as much as possible, but have included some sniffs that requires code changes to satisfy the style. This is meant as a starting point, and we can disable or enable more sniffs as we see fit. PHPCS also has ready rule sets for other common coding standards we may want to gravitate towards, e.g. PSR-12. Others are available from the community. The best way to run PHPCS is to integrate it with your editor, so that it will display diacnostics inline when saving or modifying the code. It can also be run from the command line like this: ./vendor/bin/phpcs -n [] If no file is specified it will try to check the entire project. The `-n` means don't bother with warnings (I recommend that to begin with. Enable the warnings when the errors are taken care of.) --- .phpcs.xml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .phpcs.xml diff --git a/.phpcs.xml b/.phpcs.xml new file mode 100644 index 000000000..0054e4cda --- /dev/null +++ b/.phpcs.xml @@ -0,0 +1,78 @@ + + + + PHP CodeSniffer config for Hubzilla + + app + boot.php + include + index.php + install + library + tests + util + view + Zotlabs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 6e0d0e38321dda6075586c12244c73eff6623565 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 13 Jun 2024 10:17:13 +0000 Subject: docu and remove superfluous break statement after return statement --- include/security.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/security.php b/include/security.php index bc44704d0..545788bcd 100644 --- a/include/security.php +++ b/include/security.php @@ -8,7 +8,7 @@ use Zotlabs\Lib\Config; /** - * @param int $user_record The account_id + * @param array $user_record The account record * @param array $channel * @param bool $login_initial default false * @param bool $interactive default false @@ -908,7 +908,6 @@ function zarIsDuty($wd=NULL, $hhmm=NULL, $op='isOpen') { } } return $dutyis; - break; case 'nextOpen': /** @@ -953,7 +952,6 @@ function zarIsDuty($wd=NULL, $hhmm=NULL, $op='isOpen') { } } return $is1; // false or array - break; default: // -- cgit v1.2.3 From 62aefadc27002f9d47f391b15520a82d5c3d6ecc Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 11:30:29 +0200 Subject: Module\Rpost: Add basic test and fix session access. Just a basic test to ensure that the module `get()` method behaves somewhat reasonable when no query params are given. Had to make a small change to the Rpost module itself. Since the `$_SESSION` superglobal may not always be set (and is not in the test), use `isset` instead of `array_key_exists` to check if we have saved query params in the session. In general, isset is safer than array_key_exists if there's a chance that the array itself may not exist. --- Zotlabs/Module/Rpost.php | 2 +- tests/unit/Module/RpostTest.php | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/unit/Module/RpostTest.php diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 23324ee3a..4979fdd7c 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -140,7 +140,7 @@ class Rpost extends \Zotlabs\Web\Controller { // 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))) { + if((! array_key_exists('body',$_REQUEST)) && isset($_SESSION['rpost'])) { $_REQUEST = $_SESSION['rpost']; unset($_SESSION['rpost']); } diff --git a/tests/unit/Module/RpostTest.php b/tests/unit/Module/RpostTest.php new file mode 100644 index 000000000..796901520 --- /dev/null +++ b/tests/unit/Module/RpostTest.php @@ -0,0 +1,31 @@ +getFunctionMock('Zotlabs\Module', 'local_channel') + ->expects($this->any()) + ->willReturn(42); + + // Set basic access controls to keep AccessList happy. + \App::$channel = [ + 'channel_allow_cid' => null, + 'channel_allow_gid' => null, + 'channel_deny_cid' => null, + 'channel_deny_gid' => null, + ]; + + $this->get('rpost'); + + $this->assertPageContains('assertPageContains(' Date: Sat, 18 May 2024 12:44:19 +0200 Subject: Module\Rpost: Remove unused local variables. --- Zotlabs/Module/Rpost.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 4979fdd7c..1a17c3057 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -152,7 +152,7 @@ class Rpost extends \Zotlabs\Web\Controller { ); if($r) { require_once('include/security.php'); - $change = change_channel($r[0]['channel_id']); + change_channel($r[0]['channel_id']); } } @@ -165,8 +165,6 @@ class Rpost extends \Zotlabs\Web\Controller { goaway(z_root() . '/network'); } - $plaintext = true; - if(isset($_REQUEST['type']) && $_REQUEST['type'] === 'html') { require_once('include/html2bbcode.php'); $_REQUEST['body'] = html2bbcode($_REQUEST['body']); @@ -210,7 +208,6 @@ class Rpost extends \Zotlabs\Web\Controller { 'reset' => t('Reset form') ); - $a = ''; $editor = status_editor($x, false, 'Rpost'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( -- cgit v1.2.3 From 4e9432263adf555b30d49dfd9a731f86b82ad02b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 20:19:44 +0200 Subject: Module\Rpost: Remove obsolete local variable $o. --- Zotlabs/Module/Rpost.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 1a17c3057..ba0588c25 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -28,16 +28,10 @@ require_once('include/conversation.php'); * type= choices are 'html' or 'bbcode', default is 'bbcode' * */ - - - - class Rpost extends \Zotlabs\Web\Controller { function get() { - $o = ''; - if(! local_channel()) { if(remote_channel()) { // redirect to your own site. @@ -210,14 +204,11 @@ class Rpost extends \Zotlabs\Web\Controller { $editor = status_editor($x, false, 'Rpost'); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + return replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), '$cancel' => '', '$editor' => $editor )); - - return $o; - } -- cgit v1.2.3 From d187c0025af98a9db27217569a92ac997c512f77 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 20:58:09 +0200 Subject: tests: Configure system.baseurl for tests. --- tests/unit/includes/NetworkTest.php | 8 +------- tests/unit/includes/dba/_files/config.yml | 4 ++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/unit/includes/NetworkTest.php b/tests/unit/includes/NetworkTest.php index 5bf175953..a41075f25 100644 --- a/tests/unit/includes/NetworkTest.php +++ b/tests/unit/includes/NetworkTest.php @@ -7,12 +7,6 @@ class NetworkTest extends Zotlabs\Tests\Unit\UnitTestCase { - public function setUp() : void { - parent::setUp(); - - \App::set_baseurl("https://mytest.org"); - } - /** * @dataProvider localUrlTestProvider */ @@ -23,7 +17,7 @@ class NetworkTest extends Zotlabs\Tests\Unit\UnitTestCase { public static function localUrlTestProvider() : array { return [ [ '/some/path', true ], - [ 'https://mytest.org/some/path', true ], + [ 'https://hubzilla.test/some/path', true ], [ 'https://other.site/some/path', false ], ]; } diff --git a/tests/unit/includes/dba/_files/config.yml b/tests/unit/includes/dba/_files/config.yml index e93486857..ac3c8acb0 100644 --- a/tests/unit/includes/dba/_files/config.yml +++ b/tests/unit/includes/dba/_files/config.yml @@ -1,5 +1,9 @@ --- config: + - + cat: system + k: baseurl + v: https://hubzilla.test - cat: system k: do_not_check_dns -- cgit v1.2.3 From 93a45be1816b33651fb2138c87aae083cfd480b9 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 20:59:08 +0200 Subject: tests: Set query string in Module\TestCase::get method. --- tests/unit/Module/TestCase.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/Module/TestCase.php b/tests/unit/Module/TestCase.php index e7051e001..f2e19f265 100644 --- a/tests/unit/Module/TestCase.php +++ b/tests/unit/Module/TestCase.php @@ -25,6 +25,7 @@ class TestCase extends \Zotlabs\Tests\Unit\UnitTestCase { $_SERVER['REQUEST_METHOD'] = 'GET'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; + $_SERVER['QUERY_STRING'] = "q={$uri}"; $_REQUEST = $_GET; \App::init(); -- cgit v1.2.3 From 7c688de9cd9bfbccab60d77396f0f879acd4a52d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 21:00:28 +0200 Subject: tests: Add comment to Tests\Unit\Module\RpostTest. --- tests/unit/Module/RpostTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/unit/Module/RpostTest.php b/tests/unit/Module/RpostTest.php index 796901520..115894026 100644 --- a/tests/unit/Module/RpostTest.php +++ b/tests/unit/Module/RpostTest.php @@ -9,6 +9,10 @@ */ class RpostTest extends \Zotlabs\Tests\Unit\Module\TestCase { + + /** + * Basic test of a get request with no args as an authenticated user. + */ public function test_get_with_no_args(): void { // Mock `local_chanel()` to emulate a valid logged in channel $lc_mock = $this->getFunctionMock('Zotlabs\Module', 'local_channel') -- cgit v1.2.3 From 76a92ac2e1ed2d22ad960739e56e5832872cfe23 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 21:08:30 +0200 Subject: tests: Module\Rpost shows login form if not authenticated. --- tests/unit/Module/RpostTest.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/unit/Module/RpostTest.php b/tests/unit/Module/RpostTest.php index 115894026..2f277e66d 100644 --- a/tests/unit/Module/RpostTest.php +++ b/tests/unit/Module/RpostTest.php @@ -32,4 +32,17 @@ class RpostTest extends \Zotlabs\Tests\Unit\Module\TestCase { $this->assertPageContains('assertPageContains('getFunctionMock('Zotlabs\Module', 'local_channel') + ->expects($this->any()) + ->willReturn(false); + + $this->get('rpost'); + + $this->assertPageContains(' Date: Sat, 18 May 2024 21:13:57 +0200 Subject: Module\Rpost: Refactor redirect or login logic. --- Zotlabs/Module/Rpost.php | 63 ++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index ba0588c25..2f1ba98d8 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -33,36 +33,12 @@ class Rpost extends \Zotlabs\Web\Controller { function get() { if(! local_channel()) { - if(remote_channel()) { - // redirect to your own site. - // We can only do this with a GET request so you'll need to keep the text short or risk getting truncated - // by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin - // blocks them. - - $url = Libzot::get_rpost_path(App::get_observer()); - // make sure we're not looping to our own hub - if(($url) && (! stristr($url, App::get_hostname()))) { - foreach($_GET as $key => $arg) { - if($key === 'q') - 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(); + return $this->redirect_or_login(); } nav_set_selected('Post'); - if (local_channel() && array_key_exists('userfile',$_FILES)) { + if (array_key_exists('userfile',$_FILES)) { $channel = App::get_channel(); $observer = App::get_observer(); @@ -211,6 +187,41 @@ class Rpost extends \Zotlabs\Web\Controller { )); } + /** + * Redirect to the observer's instance if not local, or return login form. + * + * The request is saved in the session if there's a `body` request + * param present. (Otherwise not.) + * + * @return string A login form if not redirected. If the session was + * determned to belong to a remote channel, the function does not + * return. + */ + private function redirect_or_login(): string { + if(remote_channel()) { + // redirect to your own site. + // We can only do this with a GET request so you'll need to keep the text short or risk getting truncated + // by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin + // blocks them. + + $url = Libzot::get_rpost_path(App::get_observer()); + // make sure we're not looping to our own hub + if(($url) && (! stristr($url, App::get_hostname()))) { + foreach($_GET as $key => $arg) { + if($key === 'q') + 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(); + } } -- cgit v1.2.3 From 91147d5c5bf9f96f9af121f18d86109c04743c6b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 18 May 2024 21:22:56 +0200 Subject: Module\Rpost: Reuse value of local_chanel. We don't need to call it twice (actually trice in the original code). --- Zotlabs/Module/Rpost.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 2f1ba98d8..3e30e5c72 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -32,7 +32,9 @@ class Rpost extends \Zotlabs\Web\Controller { function get() { - if(! local_channel()) { + $channel_id = local_channel(); + + if(! $channel_id) { return $this->redirect_or_login(); } @@ -165,7 +167,7 @@ class Rpost extends \Zotlabs\Web\Controller { 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, - 'profile_uid' => local_channel(), + 'profile_uid' => $channel_id, 'title' => $_REQUEST['title'] ?? '', 'body' => $_REQUEST['body'] ?? '', 'attachment' => $_REQUEST['attachment'] ?? '', -- cgit v1.2.3 From 8be9b109fd0672e95cc43877af1b71af8bf3ee6c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 19 May 2024 11:06:56 +0200 Subject: Module\Rpost: Refactor handling of attachments. Move to private function for now. --- Zotlabs/Module/Rpost.php | 147 +++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 68 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 3e30e5c72..2feb5a968 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -40,74 +40,8 @@ class Rpost extends \Zotlabs\Web\Controller { nav_set_selected('Post'); - if (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'] . '>', - 'allow_gid' => '', - 'deny_cid' => '', - 'deny_gid' => '' - ]); - - 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) { - $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/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 (! empty($_FILES['userfile'])) { + $this->handle_attachments(); } // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables @@ -226,4 +160,81 @@ class Rpost extends \Zotlabs\Web\Controller { } return login(); } + + /** + * Handle uplads of attachments in the rpost call. + * + * This is only relevant for POST requests. + * + * The function will modify the `$_REQUEST['body']` superglobal + * (or add it if it does not exist). + */ + private function handle_attachments(): void { + $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'] . '>', + 'allow_gid' => '', + 'deny_cid' => '', + 'deny_gid' => '' + ]); + + 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) { + $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/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); + } } -- cgit v1.2.3 From 5abe14982aff9ed2d9817255ffb8d1752519cf95 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 19 May 2024 11:41:45 +0200 Subject: tests: More tests for Module\Rpost. Also refactor the tests a bit to avoid duplicatng code. --- tests/unit/Module/RpostTest.php | 58 +++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/tests/unit/Module/RpostTest.php b/tests/unit/Module/RpostTest.php index 2f277e66d..106f06fde 100644 --- a/tests/unit/Module/RpostTest.php +++ b/tests/unit/Module/RpostTest.php @@ -14,20 +14,7 @@ class RpostTest extends \Zotlabs\Tests\Unit\Module\TestCase { * Basic test of a get request with no args as an authenticated user. */ public function test_get_with_no_args(): void { - // Mock `local_chanel()` to emulate a valid logged in channel - $lc_mock = $this->getFunctionMock('Zotlabs\Module', 'local_channel') - ->expects($this->any()) - ->willReturn(42); - - // Set basic access controls to keep AccessList happy. - \App::$channel = [ - 'channel_allow_cid' => null, - 'channel_allow_gid' => null, - 'channel_deny_cid' => null, - 'channel_deny_gid' => null, - ]; - - $this->get('rpost'); + $this->get_authenticated(); $this->assertPageContains('assertPageContains('assertPageContains('get_authenticated([ + 'title' => 'This is my title', + 'body' => 'The body of the post', + 'source' => 'The temple of the Dagon', + ]); + + $this->assertPageContains('value="This is my title"'); + $this->assertPageContains('>The body of the post'); + $this->assertPageContains('value="The temple of the Dagon"'); + } + + public function test_convert_body_from_html_to_bbcode(): void { + $this->get_authenticated([ + 'body' => "

    Awesome page

    \r\n

    Awesome content!

    ", + 'type' => 'html', + ]); + + $this->assertPageContains(">[h1]Awesome page[/h1]\n\nAwesome content!"); + } + + /** + * Private helper method to perform an authenticated GET request. + * + * @param array $query An associative array of query parameters. + */ + private function get_authenticated(array $query = []): void { + // Mock `local_chanel()` to emulate a valid logged in channel + $lc_mock = $this->getFunctionMock('Zotlabs\Module', 'local_channel') + ->expects($this->any()) + ->willReturn(42); + + // Set basic access controls to keep AccessList happy. + \App::$channel = [ + 'channel_allow_cid' => null, + 'channel_allow_gid' => null, + 'channel_deny_cid' => null, + 'channel_deny_gid' => null, + ]; + + $this->get('rpost', $query); + } } -- cgit v1.2.3 From d02fa7c26805dd485b1d16e99a26a5b9a858deda Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 19 May 2024 23:46:44 +0200 Subject: Module\Rpost: Add return type and visibilty for `get`. --- Zotlabs/Module/Rpost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 2feb5a968..76ff69643 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -30,7 +30,7 @@ require_once('include/conversation.php'); */ class Rpost extends \Zotlabs\Web\Controller { - function get() { + public function get(): string { $channel_id = local_channel(); -- cgit v1.2.3 From fb1c66fbc9705961454d86770511642b97b41c1a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jun 2024 17:08:29 +0200 Subject: Fix warnings exposed by tests. Mainly missing variables for templates, and channel entries. --- Zotlabs/Module/Rpost.php | 3 ++- include/conversation.php | 3 ++- tests/unit/Module/RpostTest.php | 11 +++++++---- view/tpl/jot-header.tpl | 2 -- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 76ff69643..3b64fd2d8 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -119,7 +119,8 @@ class Rpost extends \Zotlabs\Web\Controller { return replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), '$cancel' => '', - '$editor' => $editor + '$editor' => $editor, + '$delete' => null, )); } diff --git a/include/conversation.php b/include/conversation.php index 3992f06f6..c631d53a2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1183,6 +1183,7 @@ function hz_status_editor($x, $popup = false) { '$modalerroralbum' => t('Error getting album'), '$nocomment_enabled' => t('Comments enabled'), '$nocomment_disabled' => t('Comments disabled'), + '$confirmdelete' => t('Confirm delete'), '$auto_save_draft' => $feature_auto_save_draft, '$reset' => $reset, '$popup' => $popup @@ -1263,7 +1264,7 @@ function hz_status_editor($x, $popup = false) { '$poll_option_label' => t('Option'), '$poll_add_option_label' => t('Add option'), '$poll_expire_unit_label' => [t('Minutes'), t('Hours'), t('Days')], - '$multiple_answers' => ['poll_multiple_answers', t("Allow multiple answers"), '', '', [t('No'), t('Yes')]], + '$multiple_answers' => ['poll_multiple_answers', t("Allow multiple answers"), '', '', [t('No'), t('Yes')],null,null], '$consensus' => ((array_key_exists('item',$x)) ? $x['item']['item_consensus'] : 0), '$nocommenttitle' => t('Disable comments'), '$nocommenttitlesub' => t('Toggle comments'), diff --git a/tests/unit/Module/RpostTest.php b/tests/unit/Module/RpostTest.php index 106f06fde..ad94f2f06 100644 --- a/tests/unit/Module/RpostTest.php +++ b/tests/unit/Module/RpostTest.php @@ -67,10 +67,13 @@ class RpostTest extends \Zotlabs\Tests\Unit\Module\TestCase { // Set basic access controls to keep AccessList happy. \App::$channel = [ - 'channel_allow_cid' => null, - 'channel_allow_gid' => null, - 'channel_deny_cid' => null, - 'channel_deny_gid' => null, + 'channel_id' => 42, + 'channel_location' => null, + 'channel_address' => '', + 'channel_allow_cid' => '', + 'channel_allow_gid' => '', + 'channel_deny_cid' => '', + 'channel_deny_gid' => '', ]; $this->get('rpost', $query); diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ca3cabd61..67ba1824b 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -184,7 +184,6 @@ var activeCommentText = ''; } function jotGetExpiry() { - //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); $('#expiryModal').modal('show'); $('#expiry-modal-OKButton').on('click', function() { reply=$('#expiration-date').val(); @@ -196,7 +195,6 @@ var activeCommentText = ''; } function jotGetPubDate() { - //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); $('#createdModal').modal('show'); $('#created-modal-OKButton').on('click', function() { reply=$('#created-date').val(); -- cgit v1.2.3 From 605f9825209584cc79247ef8a45fda956968a19c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jun 2024 21:05:28 +0200 Subject: Module\Rpost: Redirect to submitted post on success. This eliminates a open redirect issue where it was possible to craft a link that when clicked would take the victim to an external site controlled by an attacker. --- Zotlabs/Module/Rpost.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 3b64fd2d8..286eb6459 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -62,15 +62,6 @@ class Rpost extends \Zotlabs\Web\Controller { } } - if(isset($_REQUEST['remote_return']) && $_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() . '/network'); - } - if(isset($_REQUEST['type']) && $_REQUEST['type'] === 'html') { require_once('include/html2bbcode.php'); $_REQUEST['body'] = html2bbcode($_REQUEST['body']); @@ -106,7 +97,7 @@ class Rpost extends \Zotlabs\Web\Controller { 'body' => $_REQUEST['body'] ?? '', 'attachment' => $_REQUEST['attachment'] ?? '', 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), - 'return_path' => 'rpost/return', + 'return_path' => 'hq', 'bbco_autocomplete' => 'bbcode', 'editor_autocomplete' => true, 'bbcode' => true, -- cgit v1.2.3 From fcd657040e90b957068be0c6010faa78020cf05d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jun 2024 21:18:31 +0200 Subject: Module\Rpost: Just a little bit of doc. --- Zotlabs/Module/Rpost.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 286eb6459..45f19d7e7 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -30,6 +30,12 @@ require_once('include/conversation.php'); */ class Rpost extends \Zotlabs\Web\Controller { + /** + * Handle requests. + * + * Despite it's name, this method handles both POST and GET requests + * to the module. + */ public function get(): string { $channel_id = local_channel(); -- cgit v1.2.3 From 20a8da0683dc296860528873f28a8f766c3f328b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 26 Feb 2024 14:08:54 +0100 Subject: tests: Remove obsolete stubs from Permissions tests These stubs are no longer needed, as the tests have a db now. --- tests/unit/Access/PermissionsTest.php | 26 -------------------------- tests/unit/Lib/PermissionDescriptionTest.php | 20 -------------------- 2 files changed, 46 deletions(-) diff --git a/tests/unit/Access/PermissionsTest.php b/tests/unit/Access/PermissionsTest.php index dd001e68a..f9cb25b64 100644 --- a/tests/unit/Access/PermissionsTest.php +++ b/tests/unit/Access/PermissionsTest.php @@ -63,14 +63,6 @@ class PermissionsTest extends UnitTestCase { // There are 17 default perms $permsCount = 17; - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->exactly(2*$permsCount))->willReturnCallback( - function ($string) { - return $string; - } - ); - // static method Perms() $perms = Permissions::Perms(); @@ -97,14 +89,6 @@ class PermissionsTest extends UnitTestCase { // There are 17 default perms $permsCount = 17; - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->exactly(2*$permsCount))->willReturnCallback( - function ($string) { - return $string; - } - ); - $perms = Permissions::Perms('view_'); $this->assertEquals($permsCount, count($perms)); @@ -125,9 +109,6 @@ class PermissionsTest extends UnitTestCase { * @param array $expected The expected result perms array */ public function testFilledPerms($permarr, $expected) { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $this->assertEquals($expected, Permissions::FilledPerms($permarr)); } /** @@ -209,13 +190,6 @@ class PermissionsTest extends UnitTestCase { * @uses ::call_hooks */ public function testFilledPermsNull() { - // Create a stub for global function t() with expectation - $t = $this->getFunctionMock('Zotlabs\Access', 't'); - $t->expects($this->atLeastOnce()); - // Create a stub for global function bt() with expectations - $bt = $this->getFunctionMock('Zotlabs\Access', 'btlogger'); - $bt->expects($this->once())->with($this->equalTo('FilledPerms: null')); - $result = [ 'view_stream' => 0, 'send_stream' => 0, diff --git a/tests/unit/Lib/PermissionDescriptionTest.php b/tests/unit/Lib/PermissionDescriptionTest.php index fdd676f61..1e4b5292c 100644 --- a/tests/unit/Lib/PermissionDescriptionTest.php +++ b/tests/unit/Lib/PermissionDescriptionTest.php @@ -46,16 +46,6 @@ class PermissionDescriptionTest extends UnitTestCase { } public function testFromStandalonePermission() { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Lib', 't'); - $t->expects($this->atLeastOnce())->willReturnCallback( - function ($string) { - return $string; - } - ); - // Create a mock for global function logger() - $this->getFunctionMock('Zotlabs\Lib', 'logger'); - $permDescUnknown = PermissionDescription::fromStandalonePermission(-1); $permDescSelf = PermissionDescription::fromStandalonePermission(0); @@ -113,16 +103,6 @@ class PermissionDescriptionTest extends UnitTestCase { } public function testGetPermissionDescription() { - // Create a stub for global function t() - $t = $this->getFunctionMock('Zotlabs\Lib', 't'); - $t->expects($this->atLeastOnce())->willReturnCallback( - function ($string) { - return $string; - } - ); - // Create a mock for global function logger() - $this->getFunctionMock('Zotlabs\Lib', 'logger'); - // Create a stub for the PermissionDescription class $stub = $this->createMock(PermissionDescription::class); $stub->method('get_permission_description') -- cgit v1.2.3 From d139f2fe87eef3b863b0cbbe810c9bde92fb3ec5 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 26 Feb 2024 14:13:41 +0100 Subject: QueueWorker: Use DbaTransaction class for db transactions. This makes sure that the system knows whether a transaction is active or not, and ensures automatic cleanup if the transaction is not closed before the methods return. It also allows us to run this code in tests. When run within a test, the transaction will be ignored, as the entire test is run within an already existing transaction. Also as each test has their own db connection, this should not have any ill effects, as there should not be any way in which different simultaneous connections can interfere with the db updates. --- Zotlabs/Lib/QueueWorker.php | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/Zotlabs/Lib/QueueWorker.php b/Zotlabs/Lib/QueueWorker.php index ce239809f..ae066cf40 100644 --- a/Zotlabs/Lib/QueueWorker.php +++ b/Zotlabs/Lib/QueueWorker.php @@ -29,18 +29,6 @@ class QueueWorker { 'Expire' ]; - private static function qstart() { - q('START TRANSACTION'); - } - - private static function qcommit() { - q("COMMIT"); - } - - private static function qrollback() { - q("ROLLBACK"); - } - public static function Summon($argv) { if ($argv[0] !== 'Queueworker') { @@ -66,7 +54,7 @@ class QueueWorker { logger('queueworker_stats_summon: cmd:' . $argv[0] . ' ' . 'timestamp:' . time()); - self::qstart(); + $transaction = new \DbaTransaction(\DBA::$dba); $r = q("INSERT INTO workerq (workerq_priority, workerq_data, workerq_uuid, workerq_cmd) VALUES (%d, '%s', '%s', '%s')", intval($priority), $workinfo_json, @@ -74,11 +62,11 @@ class QueueWorker { dbesc($argv[0]) ); if (!$r) { - self::qrollback(); + // Transaction is autmatically rolled back on return logger("INSERT FAILED", LOGGER_DEBUG); return; } - self::qcommit(); + $transaction->commit(); logger('INSERTED: ' . $workinfo_json, LOGGER_DEBUG); } @@ -112,7 +100,7 @@ class QueueWorker { return; } - self::qstart(); + $transaction = new \DbaTransaction(\DBA::$dba); $r = q("INSERT INTO workerq (workerq_priority, workerq_data, workerq_uuid, workerq_cmd) VALUES (%d, '%s', '%s', '%s')", intval($priority), $workinfo_json, @@ -120,11 +108,11 @@ class QueueWorker { dbesc($argv[0]) ); if (!$r) { - self::qrollback(); + // Transaction is automatically rolled back on return logger("Insert failed: " . $workinfo_json, LOGGER_DEBUG); return; } - self::qcommit(); + $transaction->commit(); logger('INSERTED: ' . $workinfo_json, LOGGER_DEBUG); } @@ -141,7 +129,7 @@ class QueueWorker { self::$workermaxage = self::$workermaxage > 120 ? self::$workermaxage : 300; } - self::qstart(); + $transaction = new \DbaTransaction(\DBA::$dba); // skip locked is preferred but is not supported by mariadb < 10.6 which is still used a lot - hence make it optional $sql_quirks = ((Config::Get('system', 'db_skip_locked_supported')) ? 'SKIP LOCKED' : 'NOWAIT'); @@ -159,7 +147,7 @@ class QueueWorker { $u = dbq("update workerq set workerq_reservationid = null where workerq_id in ($ids)"); } - self::qcommit(); + $transaction->commit(); //q("update workerq set workerq_reservationid = null where workerq_reservationid is not null and workerq_processtimeout < %s", //db_utcnow() @@ -197,7 +185,7 @@ class QueueWorker { private static function getWorkId() { self::GetWorkerCount(); - self::qstart(); + $transaction = new \DbaTransaction(\DBA::$dba); // skip locked is preferred but is not supported by mariadb < 10.6 which is still used a lot - hence make it optional $sql_quirks = ((Config::Get('system', 'db_skip_locked_supported')) ? 'SKIP LOCKED' : 'NOWAIT'); @@ -205,7 +193,7 @@ class QueueWorker { $work = dbq("SELECT workerq_id, workerq_cmd FROM workerq WHERE workerq_reservationid IS NULL ORDER BY workerq_priority DESC, workerq_id ASC LIMIT 1 FOR UPDATE $sql_quirks"); if (!$work) { - self::qrollback(); + // Transaction automatically rolled back on return return false; } @@ -225,13 +213,13 @@ class QueueWorker { ); if (!$work) { - self::qrollback(); + // Transaction automatically rolled back on return logger("Could not update workerq.", LOGGER_DEBUG); return false; } logger("GOTWORK: " . json_encode($work), LOGGER_DEBUG); - self::qcommit(); + $transaction->commit(); return $id; } -- cgit v1.2.3 From 1ed8383c33530b221ef34ad1c5e9b3b80eab94fa Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 14 Jun 2024 16:31:42 +0200 Subject: Allow passing callable as array to hooks. --- include/plugin.php | 21 +++++++------- tests/unit/CallHooksTest.php | 65 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 tests/unit/CallHooksTest.php diff --git a/include/plugin.php b/include/plugin.php index 4601cb544..62b643c3e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -488,18 +488,19 @@ function call_hooks($name, &$data = null) { @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_string($hook[1])) { + 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]; $func($data); diff --git a/tests/unit/CallHooksTest.php b/tests/unit/CallHooksTest.php new file mode 100644 index 000000000..0170f31d0 --- /dev/null +++ b/tests/unit/CallHooksTest.php @@ -0,0 +1,65 @@ +assertHookInvoked(); + } + + public function test_static_class_function_as_string(): void { + insert_hook('test_hook', 'Zotlabs\Tests\Unit\CallHooksTest::static_test_hook'); + $this->assertHookInvoked(); + } + + public function test_static_class_function_as_array(): void { + insert_hook('test_hook', ['Zotlabs\Tests\Unit\CallHooksTest', 'static_test_hook']); + $this->assertHookInvoked(); + } + + public function test_static_class_function_as_serialized_array(): void { + insert_hook('test_hook', serialize(['Zotlabs\Tests\Unit\CallHooksTest', 'static_test_hook'])); + $this->assertHookInvoked(); + } + + public function test_instance_function_as_array(): void { + insert_hook('test_hook', [$this, 'instance_test_hook']); + $this->assertHookInvoked(); + } + + + public function assertHookInvoked(): void { + $test_hook_args = ['called' => false]; + call_hooks('test_hook', $test_hook_args); + + $this->assertTrue($test_hook_args['called']); + } + + public function instance_test_hook(array &$args): void { + $args['called'] = true; + } + public static function static_test_hook(array &$args): void { + $args['called'] = true; + } +} + -- cgit v1.2.3 From d7607906430242d45fd1526abd7c2cdc7b49990f Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 14 Jun 2024 16:41:38 +0200 Subject: Add basic test for create_identity function. Not an exhaustive test for now, but does at least excercise some of the code. --- tests/unit/CreateIdentityTest.php | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 tests/unit/CreateIdentityTest.php diff --git a/tests/unit/CreateIdentityTest.php b/tests/unit/CreateIdentityTest.php new file mode 100644 index 000000000..a5e0f278a --- /dev/null +++ b/tests/unit/CreateIdentityTest.php @@ -0,0 +1,65 @@ +assertEquals( + ['success' => false, 'message' => 'No account identifier'], + $result); + + $this->assertFalse($this->queueworker_started); + } + + public function test_create_new_channel_with_valid_account_id(): void { + insert_hook('proc_run', [$this, 'proc_run_hook']); + $result = create_identity([ + 'account_id' => $this->fixtures['account'][0]['account_id'], + 'nickname' => 'testuser', + 'name' => 'Olga Testuser', + ]); + + $this->assertTrue($result['success']); + $this->assertTrue($this->queueworker_started); + } + + public function test_create_new_channel_with_nnexistant_account_id(): void { + insert_hook('proc_run', [$this, 'proc_run_hook']); + $result = create_identity([ + 'account_id' => 666, + 'nickname' => 'testuser', + 'name' => 'Olga Testuser', + ]); + + /* + * We would expect this fo fail, but... + * + * The create_identity function will happily create a new channel with an + * non-existent account_id. The New_channel module will perform a check + * to ensure that only valid (and logged in) accounts can create a new channel. + * + * This is a bit weak, but for now we let it pass... + */ + $this->assertTrue($result['success']); + $this->assertTrue($this->queueworker_started); + } + + public function proc_run_hook(array &$args): void { + $args['run_cmd'] = false; + $this->queueworker_started = + $args['args'] === ['php', 'Zotlabs/Daemon/Master.php', 'Queueworker']; + } +} -- cgit v1.2.3 From 7df701b43467ee4a4cb5039be84d8da172a198d7 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 14 Jun 2024 20:24:52 +0200 Subject: Use empty() to check if array entry exist in create_identity. --- include/channel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/channel.php b/include/channel.php index 568ad052a..22b5bcde1 100644 --- a/include/channel.php +++ b/include/channel.php @@ -199,8 +199,8 @@ function create_identity($arr) { $ret = array('success' => false); - if(! $arr['account_id']) { - $ret['message'] = t('No account identifier'); + if(empty($arr['account_id'])) { + $ret['message'] = t('No account identifier'); return $ret; } $ret = identity_check_service_class($arr['account_id']); -- cgit v1.2.3 From 40a93d92c8d4702da0152e649388885ac583f493 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 15 Jun 2024 13:01:17 +0200 Subject: Missing include in QueueWorker. --- Zotlabs/Lib/QueueWorker.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Lib/QueueWorker.php b/Zotlabs/Lib/QueueWorker.php index ae066cf40..24114438e 100644 --- a/Zotlabs/Lib/QueueWorker.php +++ b/Zotlabs/Lib/QueueWorker.php @@ -6,6 +6,8 @@ use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Exception\UnableToBuildUuidException; use Zotlabs\Lib\Config; +require_once 'include/dba/dba_transaction.php'; + class QueueWorker { public static $queueworker = null; -- cgit v1.2.3 From 66ea277045ef62106051f2614a116234ba4a302a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 13 Jun 2024 20:17:31 +0200 Subject: Refactor is_local_url() and add api doc. --- include/network.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/network.php b/include/network.php index bb5bc1ce7..b3a3d715c 100644 --- a/include/network.php +++ b/include/network.php @@ -556,12 +556,15 @@ function z_dns_check($h,$check_mx = 0) { return((@dns_get_record($h,$opts) || filter_var($h, FILTER_VALIDATE_IP)) ? true : false); } -function is_local_url($url) { - if (str_starts_with($url, z_root()) || str_starts_with($url, '/')) { - return true; - } - - return false; +/** + * Returns whether an URL is local to the site, or not. + * + * @param string $url The URL to check + * + * @return bool True if the URL is local, false otherwise. + */ +function is_local_url(string $url): bool { + return str_starts_with($url, z_root()) || str_starts_with($url, '/'); } /** -- cgit v1.2.3 From 72453c49f8d3467e6599f01cecbf8e5926b6bd65 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 15 Jun 2024 11:37:32 +0200 Subject: tests: Add helper expectRedirectTo to module test class. Just a shorthand for manually stubbing `goaway` and setting the expectations on the test case. --- tests/unit/Module/TestCase.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/unit/Module/TestCase.php b/tests/unit/Module/TestCase.php index f2e19f265..2959eab79 100644 --- a/tests/unit/Module/TestCase.php +++ b/tests/unit/Module/TestCase.php @@ -74,6 +74,12 @@ class TestCase extends \Zotlabs\Tests\Unit\UnitTestCase { } ); } + + protected function expectRedirectTo(string $destination): void { + $this->stub_goaway(); + $this->expectException(RedirectException::class); + $this->expectExceptionMessage($destination); + } } /** -- cgit v1.2.3 From 62cbd87e71591bdd4c04f8cad07d6395d7f206c2 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 15 Jun 2024 13:00:19 +0200 Subject: Update API docs for Module test case base class. --- tests/unit/Module/TestCase.php | 104 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 6 deletions(-) diff --git a/tests/unit/Module/TestCase.php b/tests/unit/Module/TestCase.php index 2959eab79..e92bc7083 100644 --- a/tests/unit/Module/TestCase.php +++ b/tests/unit/Module/TestCase.php @@ -1,8 +1,26 @@ assertStringContainsString($needle, \App::$page['content']); + $this->assertStringContainsString($needle, App::$page['content']); } /** * Stub out the `killme` function. * - * Usefule for modules that call this function directly. + * Useful for testing modules that call this function directly. * * Instead of calling exit, the stub will throw a `KillmeException`, * that can be caught by the test code to regain control after request * processing is terminated. + * + * **Example:** + * + * public function test_something(): void { + * $this->stub_killme(); + * + * try { + * killme(); + * } catch (KillmeException $e) { + * $this->assertSomething(...); + * } + * } + * + * It's also possible to use the builting PHPUnit expecations to verify + * that the function was called. + * + * public function test_something(): void { + * $this->stub_killme(); + * $this->expectException(KillmeException::class); + * + * killme(); + * } + * + * This is useful if you only want to check that processing was terminated + * with the `killme()` function. + * + * @throws KillmeException */ protected function stub_killme(): void { $killme_stub = $this->getFunctionMock('Zotlabs\Module', 'killme'); @@ -64,6 +110,42 @@ class TestCase extends \Zotlabs\Tests\Unit\UnitTestCase { ); } + /** + * Stub out the `goaway` function. + * + * Useful for testing modules that calls this function directly. + * + * Instead of calling `killme()`, the stub will throw a RedirectException + * with the target URL as the exception message. This allows the test code + * to regain control after request processing is terminated. + * + * **Example:** + * + * public function test_redirect(): void { + * $this->stub_goaway(); + * + * try { + * goaway('https://example.com/some_uri'); + * } catch (RedirectException $e) { + * $this->assertEquals('https://example.com/some_uri', $e->getMessage()); + * $this->assertSomethingElse(...); + * } + * } + * It's also possible to use the builting PHPUnit expecations to verify + * that the function was called. + * + * public function test_something(): void { + * $this->stub_goaway(); + * $this->expectException(RedirectException::class); + * $this->expectExceptionMessage('https://example.com/some_uri'); + * + * goaway('https://example.com/some_uri'); + * } + * + * This is useful if you only want to check that the request was redirected. + * + * @throws RedirectException + */ protected function stub_goaway(): void { $goaway_stub = $this->getFunctionMock('Zotlabs\Module', 'goaway'); $goaway_stub @@ -75,6 +157,16 @@ class TestCase extends \Zotlabs\Tests\Unit\UnitTestCase { ); } + /** + * Shorthand function to expect a redirect to a given URL. + * + * **Example:** + * + * public function test_redirect(): void { + * $this->expectRedirectTo('https://example.com/some_uri'); + * goaway('https://example.com/some_uri'); + * } + */ protected function expectRedirectTo(string $destination): void { $this->stub_goaway(); $this->expectException(RedirectException::class); @@ -90,8 +182,8 @@ class KillmeException extends \Exception {} /** * Exception class for goaway stub. * - * Takes the goaway uri as an arg, and makes it available as - * the public `$uri` member variable. + * Takes the goaway uri as an arg, and makes it available to the catch + * site via the `getMessage()` method. */ class RedirectException extends \Exception { function __construct(string $uri) { -- cgit v1.2.3 From 3f5cfc8fa2bbce74dd899b9cee65d1fc3891e8e1 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 18 Jun 2024 07:18:09 +0000 Subject: fix return to blank page after editing post under some circumstances --- Zotlabs/Module/Editpost.php | 2 +- Zotlabs/Module/Item.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 5e405bdbc..6f524cdb8 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -84,7 +84,7 @@ class Editpost extends \Zotlabs\Web\Controller { 'item' => $itm[0], 'editor_autocomplete'=> true, 'bbco_autocomplete'=> 'bbcode', - 'return_path' => $_SESSION['return_url'], + 'return_path' => 'hq', 'button' => t('Submit'), 'hide_voting' => true, 'hide_future' => true, diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 0b46f2baf..3d13655d2 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1262,6 +1262,11 @@ class Item extends Controller { if ((x($_REQUEST, 'return')) && strlen($return_path)) { logger('return: ' . $return_path); + + if ($return_path === 'hq') { + goaway(z_root() . '/hq/' . $datarray['uuid']); + } + goaway(z_root() . "/" . $return_path); } killme(); -- cgit v1.2.3 From 0f02553d129e2bc533cf98a590f3c9e04dc55bf3 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 18 Jun 2024 09:07:05 +0000 Subject: move template to wiki addon --- view/tpl/nwiki_page_history.tpl | 59 ----------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 view/tpl/nwiki_page_history.tpl diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl deleted file mode 100644 index 6926cca2d..000000000 --- a/view/tpl/nwiki_page_history.tpl +++ /dev/null @@ -1,59 +0,0 @@ - - - {{foreach $pageHistory as $commit}} - - {{/foreach}} -
    - - - - - -
    {{$date_lbl}}{{$commit.date}} - {{if $permsWrite}} - -

    - {{/if}} - -
    {{$name_lbl}}{{$commit.name}}
    {{$msg_label}}{{$commit.title}}
    -
    \ No newline at end of file -- cgit v1.2.3 From 1c34c354cf48d73863a1e14691f15e678d939023 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 21 Jun 2024 10:18:40 +0000 Subject: fix issue where event items were parsed multiple times --- Zotlabs/Lib/ThreadItem.php | 3 ++- include/text.php | 13 +++++++++---- view/js/main.js | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index eb1020cd2..1082bf642 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -362,7 +362,8 @@ class ThreadItem { localize_item($item); - $body = prepare_body($item,true); + $opts = (($item['resource_type'] === 'event') ? ['is_event_item' => 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. diff --git a/include/text.php b/include/text.php index b9ec90e92..b03e2d1a9 100644 --- a/include/text.php +++ b/include/text.php @@ -2082,10 +2082,15 @@ function prepare_text($text, $content_type = 'text/bbcode', $opts = false) { default: require_once('include/bbcode.php'); - if(stristr($text, '[nosmile]')) - $s = bbcode($text, ((is_array($opts)) ? $opts : [] )); - else - $s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] ))); + // events are handled in format_event_obj() + if (empty($opts['is_event_item'])) { + if(stristr($text, '[nosmile]')) { + $s = bbcode($text, ((is_array($opts)) ? $opts : [] )); + } + else { + $s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] ))); + } + } $s = zidify_links($s); diff --git a/view/js/main.js b/view/js/main.js index 7eca7408e..6fda3c8d0 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1008,7 +1008,7 @@ function liveUpdate(notify_id) { in_progress = false; liveRecurse ++; if(liveRecurse < 10) { - liveUpdate(); + liveUpdate(notify_id); } else { console.log('Incomplete data. Too many attempts. Giving up.'); -- cgit v1.2.3 From 8ae6e785f3cb8b6e5334e0442ac4a1348e42fc9b Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 25 Jun 2024 09:27:59 +0000 Subject: reflect the censored state in the local xchan and exclude toplevel posts by censored channels in the public stream --- Zotlabs/Module/Admin/Channels.php | 52 ++++++++++++++++++++++++++++----------- Zotlabs/Module/Pubstream.php | 13 ++++++---- 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/Zotlabs/Module/Admin/Channels.php b/Zotlabs/Module/Admin/Channels.php index c6b7ad17a..52b661420 100644 --- a/Zotlabs/Module/Admin/Channels.php +++ b/Zotlabs/Module/Admin/Channels.php @@ -14,7 +14,7 @@ class Channels { */ function post() { - $channels = ( x($_POST, 'channel') ? $_POST['channel'] : Array() ); + $channels = (x($_POST, 'channel') ? $_POST['channel'] : []); check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels'); @@ -22,11 +22,28 @@ class Channels { if(x($_POST, 'page_channels_block')) { foreach($channels as $uid) { - q("UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", - intval(PAGE_CENSORED), - intval( $uid ) + $channel = channelx_by_n($uid); + + if (!$channel) { + notice( t('Channel not found') . EOL); + continue; + } + + $pflags = $channel['channel_pageflags'] ^ PAGE_CENSORED; + + q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), + intval($uid) ); + \Zotlabs\Daemon\Master::Summon(array('Directory', $uid, 'nopush')); + + $censored = (($pflags & PAGE_CENSORED) ? 1 : 0); + + q("UPDATE xchan SET xchan_censored = %d WHERE xchan_hash = '%s'", + intval($censored), + dbesc($channel['channel_hash']) + ); } notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) ); } @@ -57,11 +74,9 @@ class Channels { function get() { if(argc() > 2) { $uid = argv(3); - $channel = q("SELECT * FROM channel WHERE channel_id = %d", - intval($uid) - ); + $channel = channelx_by_n($uid); - if(! $channel) { + if(!$channel) { notice( t('Channel not found') . EOL); goaway(z_root() . '/admin/channels' ); } @@ -72,30 +87,37 @@ class Channels { // delete channel channel_remove($uid,true); - notice( sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL); + notice( sprintf(t("Channel '%s' deleted"), $channel['channel_name']) . EOL); }; break; case "block":{ check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); - $pflags = $channel[0]['channel_pageflags'] ^ PAGE_CENSORED; + $pflags = $channel['channel_pageflags'] ^ PAGE_CENSORED; q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", intval($pflags), - intval( $uid ) + intval($uid) ); \Zotlabs\Daemon\Master::Summon(array('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); + $censored = (($pflags & PAGE_CENSORED) ? 1 : 0); + + q("UPDATE xchan SET xchan_censored = %d WHERE xchan_hash = '%s'", + intval($censored), + dbesc($channel['channel_hash']) + ); + + notice( sprintf( (($censored) ? t("Channel '%s' censored"): t("Channel '%s' uncensored")) , $channel['channel_name'] . ' (' . $channel['channel_address'] . ')' ) . EOL); }; break; case "code":{ check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); - $pflags = $channel[0]['channel_pageflags'] ^ PAGE_ALLOWCODE; + $pflags = $channel['channel_pageflags'] ^ PAGE_ALLOWCODE; q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", intval($pflags), - intval( $uid ) + 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); + notice( sprintf( (($pflags & PAGE_ALLOWCODE) ? t("Channel '%s' code allowed"): t("Channel '%s' code disallowed")) , $channel['channel_name'] . ' (' . $channel['channel_address'] . ')' ) . EOL); }; break; default: diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index d60eb88df..6d8edf4d8 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -185,7 +185,6 @@ class Pubstream extends \Zotlabs\Web\Controller { $thread_top = ''; } - $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : ''); if($update && $_SESSION['loadtime']) @@ -203,10 +202,11 @@ class Pubstream extends \Zotlabs\Web\Controller { if($mid) { $r = q("SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan - $net_query + left join xchan on item.author_xchan = xchan.xchan_hash WHERE item.$identifier = '%s' and item.item_private = 0 $uids $site_firehose_sql $item_normal + and xchan.xchan_censored = 0 and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2", dbesc($mid) @@ -216,10 +216,11 @@ class Pubstream extends \Zotlabs\Web\Controller { // Fetch a page full of parent items for this page $r = dbq("SELECT parent AS item_id FROM item left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) - $net_query + left join xchan on item.author_xchan = xchan.xchan_hash WHERE item.item_private = 0 $thread_top $uids $site_firehose_sql $item_normal + and xchan.xchan_censored = 0 and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2 ORDER BY $ordering DESC $pager_sql " @@ -230,9 +231,10 @@ class Pubstream extends \Zotlabs\Web\Controller { if($mid) { $r = q("SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan - $net_query + left join xchan on item.author_xchan = xchan.xchan_hash WHERE item.$identifier = '%s' and item.item_private = 0 $uids $site_firehose_sql $item_normal_update $simple_update + and xchan.xchan_censored = 0 and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2", dbesc($mid) @@ -241,10 +243,11 @@ class Pubstream extends \Zotlabs\Web\Controller { else { $r = dbq("SELECT parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan - $net_query + left join xchan on item.author_xchan = xchan.xchan_hash WHERE item.item_private = 0 $thread_top $uids $site_firehose_sql $item_normal_update $simple_update + and xchan.xchan_censored = 0 and (abook.abook_blocked = 0 or abook.abook_flags is null) $sql_extra $net_query2" ); -- cgit v1.2.3 From 241d96e9faa77bdbcde8d7a0d7a31bf915180846 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 25 Jun 2024 09:29:08 +0000 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 60e022ba2..9c3697437 100644 --- a/boot.php +++ b/boot.php @@ -66,7 +66,7 @@ require_once('include/security.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.1.4'); +define('STD_VERSION', '9.1.5'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3 From 4cddc3d0dfa67c7416ec2c2881c43c491ccc0db4 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 26 Jun 2024 09:35:53 +0000 Subject: fix php error --- Zotlabs/Module/Sources.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php index ef665e727..177ae1f1a 100644 --- a/Zotlabs/Module/Sources.php +++ b/Zotlabs/Module/Sources.php @@ -3,6 +3,7 @@ namespace Zotlabs\Module; /** @file */ use App; use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Text; use Zotlabs\Web\Controller; class Sources extends Controller { @@ -15,13 +16,12 @@ class Sources extends Controller { return; $source = intval($_REQUEST['source']); - $xchan = escape_tags($_REQUEST['xchan']); + $xchan = ((isset($_REQUEST['xchan'])) ? Text::escape_tags($_REQUEST['xchan']) : ''); $abook = intval($_REQUEST['abook']); - $words = escape_tags($_REQUEST['words']); + $words = ((isset($_REQUEST['words'])) ? Text::escape_tags($_REQUEST['words']) : ''); $resend = intval($_REQUEST['resend']); - $frequency = $_REQUEST['frequency']; - $name = escape_tags($_REQUEST['name']); - $tags = escape_tags($_REQUEST['tags']); + $name = ((isset($_REQUEST['name'])) ? Text::escape_tags($_REQUEST['name']) : ''); + $tags = ((isset($_REQUEST['tags'])) ? Text::escape_tags($_REQUEST['tags']) : ''); $channel = \App::get_channel(); -- cgit v1.2.3 From de992452ee3f6392fa7eb8d3dbac0c1dd2e32b00 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 26 Jun 2024 10:12:22 +0000 Subject: use the doubleleft template by default for admin pages to work around some display issues. Also notifications, etc. are not really useful there --- view/pdl/mod_admin.pdl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/view/pdl/mod_admin.pdl b/view/pdl/mod_admin.pdl index 3c9633a69..f5e46baed 100644 --- a/view/pdl/mod_admin.pdl +++ b/view/pdl/mod_admin.pdl @@ -1,10 +1,7 @@ +[template]doubleleft[/template] [region=aside] [widget=admin][/widget] [/region] [region=content] $content [/region] -[region=right_aside] -[widget=notifications][/widget] -[widget=newmember][/widget] -[/region] -- cgit v1.2.3 From a50b3181ad76f682fcb4ff60c4cc5ae2083f9c28 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 26 Jun 2024 10:27:13 +0000 Subject: make sure we get a scrollbar if everything else breaks and remove some unused css --- view/theme/redbasic/css/style.css | 19 ------------------- view/tpl/admin_accounts.tpl | 2 +- view/tpl/admin_channels.tpl | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0fc158108..53d164482 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -895,25 +895,6 @@ a .drop-icons:hover { list-style-type: none; } -table { - border-spacing: 2px; - max-width: 100%; -} - -th,td { - padding: 3px; -} - -#channels > tbody > tr > td, #users > tbody > tr > td { - max-width: 19.4em; - overflow: hidden; -} - -/* mail */ - -img.mail-conv-sender-photo { - border-radius: var(--bs-border-radius); -} /* jot */ diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index 1f5617f00..4e2b79876 100644 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -1,4 +1,4 @@ -
    +

    {{$title}} - {{$page}}

    diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 75db77593..19b3c292f 100644 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -10,7 +10,7 @@ return false; } -
    +

    {{$title}} - {{$page}}

    -- cgit v1.2.3 From 3e57f150bc1f151a3d9227291875e2e87953c7b2 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jun 2024 07:44:05 +0000 Subject: version 9.2RC1, strings and dump composer autoload files --- boot.php | 2 +- util/hmessages.po | 3744 ++++++++++++++++----------------- vendor/composer/autoload_classmap.php | 3 +- vendor/composer/autoload_static.php | 3 +- 4 files changed, 1873 insertions(+), 1879 deletions(-) diff --git a/boot.php b/boot.php index 9c3697437..9191600fb 100644 --- a/boot.php +++ b/boot.php @@ -66,7 +66,7 @@ require_once('include/security.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.1.5'); +define('STD_VERSION', '9.2RC1'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); diff --git a/util/hmessages.po b/util/hmessages.po index 6ffa2e7f8..4e9ac503d 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 9.0RC\n" +"Project-Id-Version: 9.2RC1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-15 18:45+0000\n" +"POT-Creation-Date: 2024-06-27 07:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,12 +21,12 @@ msgstr "" msgid "Source channel not found." msgstr "" -#: ../../view/theme/redbasic/php/config.php:18 ../../include/text.php:3514 +#: ../../view/theme/redbasic/php/config.php:18 ../../include/text.php:3520 #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 #: ../../addon/cart/submodules/orderoptions.php:459 -#: ../../Zotlabs/Module/Admin/Site.php:231 +#: ../../Zotlabs/Module/Admin/Site.php:232 msgid "Default" msgstr "" @@ -36,9 +36,8 @@ msgid "Focus (Hubzilla default)" msgstr "" #: ../../view/theme/redbasic/php/config.php:188 ../../include/js_strings.php:23 -#: ../../addon/irc/irc.php:45 ../../addon/smileybutton/Mod_Smileybutton.php:53 -#: ../../addon/socialauth/Mod_SocialAuth.php:341 -#: ../../addon/hubwall/hubwall.php:95 +#: ../../addon/irc/irc.php:45 ../../addon/socialauth/Mod_SocialAuth.php:341 +#: ../../addon/hubwall/hubwall.php:96 #: ../../addon/openclipatar/openclipatar.php:54 #: ../../addon/hzfiles/hzfiles.php:86 ../../addon/piwik/piwik.php:95 #: ../../addon/redphotos/redphotos.php:136 @@ -79,7 +78,7 @@ msgstr "" #: ../../addon/rtof/Mod_Rtof.php:70 ../../addon/nofed/Mod_Nofed.php:51 #: ../../addon/photocache/Mod_Photocache.php:63 #: ../../addon/likebanner/likebanner.php:57 -#: ../../Zotlabs/Lib/ThreadItem.php:862 ../../Zotlabs/Storage/Browser.php:385 +#: ../../Zotlabs/Lib/ThreadItem.php:862 ../../Zotlabs/Storage/Browser.php:386 #: ../../Zotlabs/Module/Oauth.php:109 ../../Zotlabs/Module/Import_items.php:125 #: ../../Zotlabs/Module/Thing.php:357 ../../Zotlabs/Module/Thing.php:409 #: ../../Zotlabs/Module/Tokens.php:294 ../../Zotlabs/Module/Pdledit.php:137 @@ -91,44 +90,44 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Defperms.php:262 #: ../../Zotlabs/Module/Locs.php:125 #: ../../Zotlabs/Module/Admin/Accounts.php:309 -#: ../../Zotlabs/Module/Admin/Themes.php:173 -#: ../../Zotlabs/Module/Admin/Addons.php:445 +#: ../../Zotlabs/Module/Admin/Themes.php:174 +#: ../../Zotlabs/Module/Admin/Addons.php:446 #: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Profs.php:178 -#: ../../Zotlabs/Module/Admin/Channels.php:147 +#: ../../Zotlabs/Module/Admin/Profs.php:179 +#: ../../Zotlabs/Module/Admin/Channels.php:169 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 -#: ../../Zotlabs/Module/Admin/Logs.php:84 -#: ../../Zotlabs/Module/Admin/Site.php:401 -#: ../../Zotlabs/Module/Admin/Security.php:129 +#: ../../Zotlabs/Module/Admin/Logs.php:85 +#: ../../Zotlabs/Module/Admin/Site.php:402 +#: ../../Zotlabs/Module/Admin/Security.php:130 #: ../../Zotlabs/Module/Affinity.php:84 ../../Zotlabs/Module/Permcats.php:257 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Group.php:150 -#: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Invite.php:563 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Group.php:151 +#: ../../Zotlabs/Module/Group.php:160 ../../Zotlabs/Module/Invite.php:564 #: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Photos.php:1056 #: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1208 #: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:160 -#: ../../Zotlabs/Module/Profiles.php:735 ../../Zotlabs/Module/Chat.php:208 -#: ../../Zotlabs/Module/Chat.php:247 ../../Zotlabs/Module/Regate.php:407 -#: ../../Zotlabs/Module/Setup.php:316 ../../Zotlabs/Module/Setup.php:356 +#: ../../Zotlabs/Module/Profiles.php:738 ../../Zotlabs/Module/Chat.php:208 +#: ../../Zotlabs/Module/Chat.php:247 ../../Zotlabs/Module/Regate.php:408 +#: ../../Zotlabs/Module/Setup.php:319 ../../Zotlabs/Module/Setup.php:359 #: ../../Zotlabs/Module/Editpost.php:88 ../../Zotlabs/Module/Oauth2.php:114 -#: ../../Zotlabs/Module/Settings/Display.php:187 +#: ../../Zotlabs/Module/Settings/Display.php:188 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Channel_home.php:91 -#: ../../Zotlabs/Module/Settings/Account.php:107 +#: ../../Zotlabs/Module/Settings/Account.php:109 #: ../../Zotlabs/Module/Settings/Editor.php:42 #: ../../Zotlabs/Module/Settings/Features.php:48 #: ../../Zotlabs/Module/Settings/Directory.php:42 #: ../../Zotlabs/Module/Settings/Manage.php:43 -#: ../../Zotlabs/Module/Settings/Privacy.php:122 +#: ../../Zotlabs/Module/Settings/Privacy.php:123 #: ../../Zotlabs/Module/Settings/Events.php:42 #: ../../Zotlabs/Module/Settings/Photos.php:42 #: ../../Zotlabs/Module/Settings/Conversation.php:49 -#: ../../Zotlabs/Module/Settings/Channel.php:229 +#: ../../Zotlabs/Module/Settings/Channel.php:230 #: ../../Zotlabs/Module/Settings/Profiles.php:52 #: ../../Zotlabs/Module/Settings/Connections.php:42 #: ../../Zotlabs/Module/Settings/Calendar.php:42 #: ../../Zotlabs/Module/Settings/Multifactor.php:85 -#: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Import.php:611 +#: ../../Zotlabs/Module/Email_validation.php:41 +#: ../../Zotlabs/Module/Import.php:616 msgid "Submit" msgstr "" @@ -184,8 +183,7 @@ msgstr "" #: ../../view/theme/redbasic/php/config.php:202 #: ../../view/theme/redbasic/php/config.php:203 #: ../../view/theme/redbasic/php/config.php:215 -#: ../../include/conversation.php:1265 -#: ../../addon/smileybutton/Mod_Smileybutton.php:42 +#: ../../include/conversation.php:1267 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ijpost/Mod_Ijpost.php:61 ../../addon/redred/Mod_Redred.php:61 #: ../../addon/libertree/Mod_Libertree.php:57 @@ -225,39 +223,39 @@ msgstr "" #: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 #: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/nofed/Mod_Nofed.php:40 -#: ../../boot.php:1751 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 -#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:310 -#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:392 -#: ../../Zotlabs/Storage/Browser.php:394 ../../Zotlabs/Storage/Browser.php:558 +#: ../../boot.php:1765 ../../Zotlabs/Lib/Libzotdir.php:166 +#: ../../Zotlabs/Lib/Libzotdir.php:167 ../../Zotlabs/Lib/Libzotdir.php:169 +#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311 +#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:393 +#: ../../Zotlabs/Storage/Browser.php:395 ../../Zotlabs/Storage/Browser.php:559 #: ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 #: ../../Zotlabs/Module/Contactedit.php:270 #: ../../Zotlabs/Module/Contactedit.php:315 -#: ../../Zotlabs/Module/Register.php:512 ../../Zotlabs/Module/Connedit.php:622 -#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Register.php:515 ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:101 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Admin/Site.php:305 -#: ../../Zotlabs/Module/Permcats.php:247 ../../Zotlabs/Module/Group.php:137 -#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:147 -#: ../../Zotlabs/Module/Group.php:249 ../../Zotlabs/Module/Group.php:301 -#: ../../Zotlabs/Module/Group.php:302 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Permcats.php:247 ../../Zotlabs/Module/Group.php:138 +#: ../../Zotlabs/Module/Group.php:139 ../../Zotlabs/Module/Group.php:148 +#: ../../Zotlabs/Module/Group.php:250 ../../Zotlabs/Module/Group.php:302 +#: ../../Zotlabs/Module/Group.php:303 ../../Zotlabs/Module/Mitem.php:176 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Photos.php:666 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 -#: ../../Zotlabs/Module/Profiles.php:671 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:693 -#: ../../Zotlabs/Module/Settings/Display.php:86 -#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Profiles.php:674 ../../Zotlabs/Module/Profiles.php:684 +#: ../../Zotlabs/Module/Profiles.php:692 ../../Zotlabs/Module/Profiles.php:696 +#: ../../Zotlabs/Module/Settings/Display.php:87 #: ../../Zotlabs/Module/Settings/Privacy.php:133 #: ../../Zotlabs/Module/Settings/Privacy.php:134 #: ../../Zotlabs/Module/Settings/Privacy.php:135 #: ../../Zotlabs/Module/Settings/Privacy.php:136 #: ../../Zotlabs/Module/Settings/Privacy.php:137 -#: ../../Zotlabs/Module/Settings/Channel.php:224 +#: ../../Zotlabs/Module/Settings/Privacy.php:138 +#: ../../Zotlabs/Module/Settings/Channel.php:225 #: ../../Zotlabs/Module/Settings/Multifactor.php:82 -#: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 -#: ../../Zotlabs/Module/Import.php:605 +#: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Import.php:609 +#: ../../Zotlabs/Module/Import.php:610 msgid "No" msgstr "" @@ -265,8 +263,7 @@ msgstr "" #: ../../view/theme/redbasic/php/config.php:202 #: ../../view/theme/redbasic/php/config.php:203 #: ../../view/theme/redbasic/php/config.php:215 -#: ../../include/conversation.php:1265 -#: ../../addon/smileybutton/Mod_Smileybutton.php:42 +#: ../../include/conversation.php:1267 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ijpost/Mod_Ijpost.php:61 ../../addon/redred/Mod_Redred.php:61 #: ../../addon/libertree/Mod_Libertree.php:57 @@ -306,37 +303,37 @@ msgstr "" #: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 #: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/nofed/Mod_Nofed.php:40 -#: ../../boot.php:1751 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 -#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:310 -#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:392 -#: ../../Zotlabs/Storage/Browser.php:394 ../../Zotlabs/Storage/Browser.php:558 +#: ../../boot.php:1765 ../../Zotlabs/Lib/Libzotdir.php:166 +#: ../../Zotlabs/Lib/Libzotdir.php:167 ../../Zotlabs/Lib/Libzotdir.php:169 +#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311 +#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:393 +#: ../../Zotlabs/Storage/Browser.php:395 ../../Zotlabs/Storage/Browser.php:559 #: ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 #: ../../Zotlabs/Module/Contactedit.php:270 -#: ../../Zotlabs/Module/Register.php:512 ../../Zotlabs/Module/Defperms.php:195 -#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Menu.php:163 -#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Admin/Site.php:307 -#: ../../Zotlabs/Module/Permcats.php:247 ../../Zotlabs/Module/Group.php:137 -#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:147 -#: ../../Zotlabs/Module/Group.php:249 ../../Zotlabs/Module/Group.php:301 -#: ../../Zotlabs/Module/Group.php:302 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Register.php:515 ../../Zotlabs/Module/Defperms.php:195 +#: ../../Zotlabs/Module/Api.php:100 ../../Zotlabs/Module/Menu.php:163 +#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Permcats.php:247 ../../Zotlabs/Module/Group.php:138 +#: ../../Zotlabs/Module/Group.php:139 ../../Zotlabs/Module/Group.php:148 +#: ../../Zotlabs/Module/Group.php:250 ../../Zotlabs/Module/Group.php:302 +#: ../../Zotlabs/Module/Group.php:303 ../../Zotlabs/Module/Mitem.php:176 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Photos.php:666 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 -#: ../../Zotlabs/Module/Profiles.php:671 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:693 -#: ../../Zotlabs/Module/Settings/Display.php:86 -#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Profiles.php:674 ../../Zotlabs/Module/Profiles.php:684 +#: ../../Zotlabs/Module/Profiles.php:692 ../../Zotlabs/Module/Profiles.php:696 +#: ../../Zotlabs/Module/Settings/Display.php:87 #: ../../Zotlabs/Module/Settings/Privacy.php:133 #: ../../Zotlabs/Module/Settings/Privacy.php:134 #: ../../Zotlabs/Module/Settings/Privacy.php:135 #: ../../Zotlabs/Module/Settings/Privacy.php:136 #: ../../Zotlabs/Module/Settings/Privacy.php:137 -#: ../../Zotlabs/Module/Settings/Channel.php:224 +#: ../../Zotlabs/Module/Settings/Privacy.php:138 +#: ../../Zotlabs/Module/Settings/Channel.php:225 #: ../../Zotlabs/Module/Settings/Multifactor.php:82 -#: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 -#: ../../Zotlabs/Module/Import.php:605 +#: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Import.php:609 +#: ../../Zotlabs/Module/Import.php:610 msgid "Yes" msgstr "" @@ -427,23 +424,23 @@ msgstr "" msgid "This is the home page of %s." msgstr "" -#: ../../include/auth.php:197 +#: ../../include/auth.php:232 msgid "Delegation session ended." msgstr "" -#: ../../include/auth.php:201 +#: ../../include/auth.php:236 msgid "Logged out." msgstr "" -#: ../../include/auth.php:308 +#: ../../include/auth.php:342 msgid "Email validation is incomplete. Please check your email." msgstr "" -#: ../../include/auth.php:324 +#: ../../include/auth.php:358 msgid "Failed authentication" msgstr "" -#: ../../include/auth.php:334 ../../addon/openid/Mod_Openid.php:189 +#: ../../include/auth.php:368 ../../addon/openid/Mod_Openid.php:189 msgid "Login failed." msgstr "" @@ -451,207 +448,207 @@ msgstr "" msgid "View PDF" msgstr "" -#: ../../include/oembed.php:391 +#: ../../include/oembed.php:390 msgid " by " msgstr "" -#: ../../include/oembed.php:392 +#: ../../include/oembed.php:391 msgid " on " msgstr "" -#: ../../include/oembed.php:425 +#: ../../include/oembed.php:424 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:434 +#: ../../include/oembed.php:433 msgid "Embedding disabled" msgstr "" -#: ../../include/event.php:34 ../../include/event.php:132 +#: ../../include/event.php:35 ../../include/event.php:133 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:42 +#: ../../include/event.php:43 msgid "Starts:" msgstr "" -#: ../../include/event.php:52 +#: ../../include/event.php:53 msgid "Finishes:" msgstr "" -#: ../../include/event.php:66 ../../include/event.php:157 -#: ../../include/channel.php:1639 ../../Zotlabs/Module/Directory.php:354 +#: ../../include/event.php:67 ../../include/event.php:158 +#: ../../include/channel.php:1640 ../../Zotlabs/Module/Directory.php:354 msgid "Location:" msgstr "" -#: ../../include/event.php:132 +#: ../../include/event.php:133 msgid "l F d, Y" msgstr "" -#: ../../include/event.php:136 +#: ../../include/event.php:137 msgid "Start:" msgstr "" -#: ../../include/event.php:140 +#: ../../include/event.php:141 msgid "End:" msgstr "" -#: ../../include/event.php:145 ../../addon/openid/MysqlProvider.php:67 +#: ../../include/event.php:146 ../../addon/openid/MysqlProvider.php:67 msgid "Timezone" msgstr "" -#: ../../include/event.php:1245 +#: ../../include/event.php:1246 msgid "This event has been added to your calendar." msgstr "" -#: ../../include/event.php:1399 ../../include/conversation.php:151 -#: ../../include/text.php:2355 ../../Zotlabs/Module/Tagger.php:75 +#: ../../include/event.php:1400 ../../include/conversation.php:152 +#: ../../include/text.php:2361 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Like.php:450 #: ../../Zotlabs/Module/Channel_calendar.php:221 msgid "event" msgstr "" -#: ../../include/event.php:1478 +#: ../../include/event.php:1479 msgid "Not specified" msgstr "" -#: ../../include/event.php:1479 +#: ../../include/event.php:1480 msgid "Needs Action" msgstr "" -#: ../../include/event.php:1480 +#: ../../include/event.php:1481 msgid "Completed" msgstr "" -#: ../../include/event.php:1481 +#: ../../include/event.php:1482 msgid "In Process" msgstr "" -#: ../../include/event.php:1482 +#: ../../include/event.php:1483 msgid "Cancelled" msgstr "" -#: ../../include/event.php:1563 ../../include/connections.php:781 +#: ../../include/event.php:1564 ../../include/connections.php:790 #: ../../Zotlabs/Module/Connedit.php:741 ../../Zotlabs/Module/Cdav.php:1377 msgid "Mobile" msgstr "" -#: ../../include/event.php:1564 ../../include/connections.php:782 +#: ../../include/event.php:1565 ../../include/connections.php:791 #: ../../Zotlabs/Widget/Notifications.php:43 #: ../../Zotlabs/Module/Connedit.php:742 ../../Zotlabs/Module/Cdav.php:1378 msgid "Home" msgstr "" -#: ../../include/event.php:1565 ../../include/connections.php:783 +#: ../../include/event.php:1566 ../../include/connections.php:792 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1566 ../../include/connections.php:784 +#: ../../include/event.php:1567 ../../include/connections.php:793 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1567 ../../include/connections.php:785 +#: ../../include/event.php:1568 ../../include/connections.php:794 #: ../../Zotlabs/Module/Connedit.php:743 ../../Zotlabs/Module/Cdav.php:1379 msgid "Work" msgstr "" -#: ../../include/event.php:1568 ../../include/connections.php:786 +#: ../../include/event.php:1569 ../../include/connections.php:795 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1569 ../../include/connections.php:787 +#: ../../include/event.php:1570 ../../include/connections.php:796 msgid "Work, Fax" msgstr "" -#: ../../include/event.php:1570 ../../include/event.php:1577 +#: ../../include/event.php:1571 ../../include/event.php:1578 #: ../../include/selectors.php:64 ../../include/selectors.php:81 #: ../../include/selectors.php:119 ../../include/selectors.php:155 -#: ../../include/connections.php:788 ../../include/connections.php:795 -#: ../../Zotlabs/Access/PermissionRoles.php:360 +#: ../../include/connections.php:797 ../../include/connections.php:804 +#: ../../Zotlabs/Access/PermissionRoles.php:362 #: ../../Zotlabs/Module/Connedit.php:744 ../../Zotlabs/Module/Cdav.php:1380 msgid "Other" msgstr "" -#: ../../include/feedutils.php:849 ../../include/text.php:1579 +#: ../../include/feedutils.php:851 ../../include/text.php:1580 msgid "unknown" msgstr "" -#: ../../include/items.php:448 ../../addon/hzfiles/hzfiles.php:75 +#: ../../include/items.php:456 ../../addon/hzfiles/hzfiles.php:75 #: ../../addon/redphotos/redphotos.php:119 #: ../../addon/redfiles/redfiles.php:109 #: ../../Zotlabs/Module/Import_items.php:116 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:54 -#: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Group.php:108 -#: ../../Zotlabs/Module/Like.php:344 ../../Zotlabs/Module/Profperm.php:28 +#: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Group.php:109 +#: ../../Zotlabs/Module/Like.php:344 ../../Zotlabs/Module/Profperm.php:29 #: ../../Zotlabs/Web/WebServer.php:118 msgid "Permission denied" msgstr "" -#: ../../include/items.php:1233 +#: ../../include/items.php:1241 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1235 +#: ../../include/items.php:1243 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1237 +#: ../../include/items.php:1245 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1239 +#: ../../include/items.php:1247 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1241 +#: ../../include/items.php:1249 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1243 +#: ../../include/items.php:1251 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1245 +#: ../../include/items.php:1253 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1247 +#: ../../include/items.php:1255 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:3340 ../../Zotlabs/Lib/Activity.php:2177 +#: ../../include/items.php:3348 ../../Zotlabs/Lib/Activity.php:2189 #: ../../Zotlabs/Module/Share.php:118 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" -#: ../../include/items.php:3843 ../../addon/flashcards/Mod_Flashcards.php:291 +#: ../../include/items.php:3851 ../../addon/flashcards/Mod_Flashcards.php:291 #: ../../addon/flashcards/Mod_Flashcards.php:292 -#: ../../Zotlabs/Module/Display.php:58 ../../Zotlabs/Module/Display.php:119 -#: ../../Zotlabs/Module/Display.php:390 ../../Zotlabs/Module/Thing.php:113 +#: ../../Zotlabs/Module/Display.php:59 ../../Zotlabs/Module/Display.php:120 +#: ../../Zotlabs/Module/Display.php:391 ../../Zotlabs/Module/Thing.php:113 #: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Viewsrc.php:25 -#: ../../Zotlabs/Module/Admin/Themes.php:72 -#: ../../Zotlabs/Module/Admin/Addons.php:263 ../../Zotlabs/Module/Admin.php:61 +#: ../../Zotlabs/Module/Admin/Themes.php:73 +#: ../../Zotlabs/Module/Admin/Addons.php:264 ../../Zotlabs/Module/Admin.php:63 msgid "Item not found." msgstr "" -#: ../../include/items.php:3923 ../../include/attach.php:156 +#: ../../include/items.php:3931 ../../include/attach.php:156 #: ../../include/attach.php:205 ../../include/attach.php:278 #: ../../include/attach.php:329 ../../include/attach.php:431 #: ../../include/attach.php:445 ../../include/attach.php:452 #: ../../include/attach.php:534 ../../include/attach.php:1106 #: ../../include/attach.php:1179 ../../include/attach.php:1344 -#: ../../include/photos.php:30 ../../addon/openid/Mod_Id.php:53 +#: ../../include/photos.php:31 ../../addon/openid/Mod_Id.php:53 #: ../../addon/keepout/keepout.php:36 ../../addon/cards/Mod_Cards.php:89 #: ../../addon/cards/Mod_Card_edit.php:51 ../../addon/pumpio/pumpio.php:44 #: ../../addon/articles/Mod_Article_edit.php:51 #: ../../addon/articles/Mod_Articles.php:94 ../../addon/wiki/Mod_Wiki.php:63 #: ../../addon/wiki/Mod_Wiki.php:288 ../../addon/wiki/Mod_Wiki.php:425 #: ../../Zotlabs/Lib/Chatroom.php:135 ../../Zotlabs/Module/Page.php:34 -#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Display.php:386 -#: ../../Zotlabs/Module/Cover_photo.php:298 -#: ../../Zotlabs/Module/Cover_photo.php:311 +#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Display.php:387 +#: ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../Zotlabs/Module/Cover_photo.php:312 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 @@ -665,404 +662,404 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:96 #: ../../Zotlabs/Module/Filestorage.php:119 #: ../../Zotlabs/Module/Filestorage.php:165 -#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Appman.php:163 +#: ../../Zotlabs/Module/Register.php:201 ../../Zotlabs/Module/Appman.php:163 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Item.php:512 #: ../../Zotlabs/Module/Item.php:531 ../../Zotlabs/Module/Item.php:541 -#: ../../Zotlabs/Module/Item.php:1457 ../../Zotlabs/Module/Achievements.php:34 +#: ../../Zotlabs/Module/Item.php:1462 ../../Zotlabs/Module/Achievements.php:34 #: ../../Zotlabs/Module/Connedit.php:299 ../../Zotlabs/Module/Defperms.php:181 #: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Regmod.php:20 -#: ../../Zotlabs/Module/Profile_photo.php:389 -#: ../../Zotlabs/Module/Profile_photo.php:420 +#: ../../Zotlabs/Module/Profile_photo.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:421 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 -#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Api.php:26 ../../Zotlabs/Module/Layouts.php:71 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 #: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Locs.php:98 #: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Attach_edit.php:90 #: ../../Zotlabs/Module/Attach_edit.php:99 -#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Group.php:14 -#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Invite.php:64 -#: ../../Zotlabs/Module/Invite.php:315 ../../Zotlabs/Module/Like.php:242 +#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Group.php:15 +#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Invite.php:65 +#: ../../Zotlabs/Module/Invite.php:316 ../../Zotlabs/Module/Like.php:242 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/New_channel.php:105 -#: ../../Zotlabs/Module/New_channel.php:130 ../../Zotlabs/Module/Photos.php:71 -#: ../../Zotlabs/Module/Channel.php:233 ../../Zotlabs/Module/Channel.php:390 -#: ../../Zotlabs/Module/Channel.php:428 ../../Zotlabs/Module/Profile.php:99 +#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/New_channel.php:106 +#: ../../Zotlabs/Module/New_channel.php:131 ../../Zotlabs/Module/Photos.php:71 +#: ../../Zotlabs/Module/Channel.php:234 ../../Zotlabs/Module/Channel.php:391 +#: ../../Zotlabs/Module/Channel.php:429 ../../Zotlabs/Module/Profile.php:99 #: ../../Zotlabs/Module/Profile.php:114 ../../Zotlabs/Module/Moderate.php:15 -#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Module/Profiles.php:167 -#: ../../Zotlabs/Module/Profiles.php:610 +#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Module/Profiles.php:168 +#: ../../Zotlabs/Module/Profiles.php:611 #: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Authtest.php:13 #: ../../Zotlabs/Module/Channel_calendar.php:232 #: ../../Zotlabs/Module/Chat.php:111 ../../Zotlabs/Module/Chat.php:116 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Settings.php:59 -#: ../../Zotlabs/Module/Setup.php:218 ../../Zotlabs/Module/Editpost.php:17 +#: ../../Zotlabs/Module/Setup.php:220 ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Vote.php:19 #: ../../Zotlabs/Web/WebServer.php:119 msgid "Permission denied." msgstr "" -#: ../../include/items.php:4425 ../../Zotlabs/Module/Group.php:62 -#: ../../Zotlabs/Module/Group.php:206 +#: ../../include/items.php:4433 ../../Zotlabs/Module/Group.php:63 +#: ../../Zotlabs/Module/Group.php:207 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4441 +#: ../../include/items.php:4449 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4448 +#: ../../include/items.php:4456 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4458 +#: ../../include/items.php:4466 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4460 +#: ../../include/items.php:4468 msgid "Connection not found." msgstr "" -#: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 +#: ../../include/features.php:53 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 #: ../../Zotlabs/Module/Settings/Features.php:38 msgid "Off" msgstr "" -#: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 +#: ../../include/features.php:53 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 #: ../../Zotlabs/Module/Settings/Features.php:38 msgid "On" msgstr "" -#: ../../include/features.php:82 ../../include/nav.php:488 -#: ../../include/nav.php:491 ../../Zotlabs/Lib/Apps.php:351 +#: ../../include/features.php:80 ../../include/nav.php:489 +#: ../../include/nav.php:492 ../../Zotlabs/Lib/Apps.php:352 msgid "Calendar" msgstr "" -#: ../../include/features.php:86 +#: ../../include/features.php:84 msgid "Start calendar week on Monday" msgstr "" -#: ../../include/features.php:87 +#: ../../include/features.php:85 msgid "Default is Sunday" msgstr "" -#: ../../include/features.php:94 +#: ../../include/features.php:92 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:95 +#: ../../include/features.php:93 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:104 +#: ../../include/features.php:102 msgid "Channel Home" msgstr "" -#: ../../include/features.php:108 +#: ../../include/features.php:106 msgid "Search by Date" msgstr "" -#: ../../include/features.php:109 +#: ../../include/features.php:107 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:116 +#: ../../include/features.php:114 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:117 +#: ../../include/features.php:115 msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/features.php:124 ../../include/features.php:358 +#: ../../include/features.php:122 ../../include/features.php:356 msgid "Use blog/list mode" msgstr "" -#: ../../include/features.php:125 ../../include/features.php:359 +#: ../../include/features.php:123 ../../include/features.php:357 msgid "Comments will be displayed separately" msgstr "" -#: ../../include/features.php:133 ../../include/text.php:1077 -#: ../../Zotlabs/Lib/Apps.php:338 ../../Zotlabs/Module/Connections.php:399 +#: ../../include/features.php:131 ../../include/text.php:1078 +#: ../../Zotlabs/Lib/Apps.php:339 ../../Zotlabs/Module/Connections.php:399 msgid "Connections" msgstr "" -#: ../../include/features.php:137 +#: ../../include/features.php:135 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:138 +#: ../../include/features.php:136 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:146 +#: ../../include/features.php:144 msgid "Conversation" msgstr "" -#: ../../include/features.php:158 +#: ../../include/features.php:156 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:159 +#: ../../include/features.php:157 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:166 +#: ../../include/features.php:164 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:167 +#: ../../include/features.php:165 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:174 +#: ../../include/features.php:172 msgid "Star Posts" msgstr "" -#: ../../include/features.php:175 +#: ../../include/features.php:173 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:182 +#: ../../include/features.php:180 msgid "Reply on comment" msgstr "" -#: ../../include/features.php:183 +#: ../../include/features.php:181 msgid "Ability to reply on selected comment" msgstr "" -#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:352 +#: ../../include/features.php:190 ../../Zotlabs/Lib/Apps.php:353 msgid "Directory" msgstr "" -#: ../../include/features.php:196 +#: ../../include/features.php:194 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:197 +#: ../../include/features.php:195 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:206 +#: ../../include/features.php:204 msgid "Editor" msgstr "" -#: ../../include/features.php:210 +#: ../../include/features.php:208 msgid "Post Categories" msgstr "" -#: ../../include/features.php:211 +#: ../../include/features.php:209 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:218 +#: ../../include/features.php:216 msgid "Large Photos" msgstr "" -#: ../../include/features.php:219 +#: ../../include/features.php:217 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:226 +#: ../../include/features.php:224 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:227 +#: ../../include/features.php:225 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:234 +#: ../../include/features.php:232 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:235 +#: ../../include/features.php:233 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:242 +#: ../../include/features.php:240 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:243 +#: ../../include/features.php:241 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:250 +#: ../../include/features.php:248 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:251 +#: ../../include/features.php:249 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:258 +#: ../../include/features.php:256 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:259 +#: ../../include/features.php:257 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:266 +#: ../../include/features.php:264 msgid "Auto-save drafts of posts and comments" msgstr "" -#: ../../include/features.php:267 +#: ../../include/features.php:265 msgid "" "Automatically saves post and comment drafts in local browser storage to help " "prevent accidental loss of compositions" msgstr "" -#: ../../include/features.php:276 +#: ../../include/features.php:274 msgid "Manage" msgstr "" -#: ../../include/features.php:280 +#: ../../include/features.php:278 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:281 +#: ../../include/features.php:279 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:290 ../../Zotlabs/Widget/Notifications.php:23 +#: ../../include/features.php:288 ../../Zotlabs/Widget/Notifications.php:23 #: ../../Zotlabs/Module/Connections.php:347 msgid "Network" msgstr "" -#: ../../include/features.php:294 +#: ../../include/features.php:292 msgid "Events Filter" msgstr "" -#: ../../include/features.php:295 +#: ../../include/features.php:293 msgid "Ability to display only events" msgstr "" -#: ../../include/features.php:302 +#: ../../include/features.php:300 msgid "Polls Filter" msgstr "" -#: ../../include/features.php:303 +#: ../../include/features.php:301 msgid "Ability to display only polls" msgstr "" -#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:89 +#: ../../include/features.php:308 ../../Zotlabs/Widget/Savedsearch.php:89 msgid "Saved Searches" msgstr "" -#: ../../include/features.php:311 +#: ../../include/features.php:309 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:318 ../../include/contact_widgets.php:53 +#: ../../include/features.php:316 ../../include/contact_widgets.php:55 #: ../../Zotlabs/Widget/Activity_filter.php:196 #: ../../Zotlabs/Widget/Filer.php:33 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:319 +#: ../../include/features.php:317 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:326 +#: ../../include/features.php:324 msgid "Alternate Stream Order" msgstr "" -#: ../../include/features.php:327 +#: ../../include/features.php:325 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" -#: ../../include/features.php:334 +#: ../../include/features.php:332 msgid "Contact Filter" msgstr "" -#: ../../include/features.php:335 +#: ../../include/features.php:333 msgid "Ability to display only posts of a selected contact" msgstr "" -#: ../../include/features.php:342 +#: ../../include/features.php:340 msgid "Forum Filter" msgstr "" -#: ../../include/features.php:343 +#: ../../include/features.php:341 msgid "Ability to display only posts of a specific forum" msgstr "" -#: ../../include/features.php:350 +#: ../../include/features.php:348 msgid "Personal Posts Filter" msgstr "" -#: ../../include/features.php:351 +#: ../../include/features.php:349 msgid "Ability to display only posts that you've interacted on" msgstr "" -#: ../../include/features.php:368 ../../include/nav.php:469 -#: ../../Zotlabs/Lib/Apps.php:350 +#: ../../include/features.php:366 ../../include/nav.php:470 +#: ../../Zotlabs/Lib/Apps.php:351 #: ../../Zotlabs/Widget/Channel_activities.php:93 #: ../../Zotlabs/Module/Fbrowser.php:29 msgid "Photos" msgstr "" -#: ../../include/features.php:372 +#: ../../include/features.php:370 msgid "Photo Location" msgstr "" -#: ../../include/features.php:373 +#: ../../include/features.php:371 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:380 +#: ../../include/features.php:378 msgid "Flag Adult Photos" msgstr "" -#: ../../include/features.php:381 +#: ../../include/features.php:379 msgid "" "Provide photo edit option to hide inappropriate photos from default album " "view" msgstr "" -#: ../../include/features.php:390 ../../Zotlabs/Lib/Apps.php:366 +#: ../../include/features.php:388 ../../Zotlabs/Lib/Apps.php:367 #: ../../Zotlabs/Module/Contactedit.php:430 msgid "Profiles" msgstr "" -#: ../../include/features.php:394 +#: ../../include/features.php:392 msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:395 +#: ../../include/features.php:393 msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:402 +#: ../../include/features.php:400 msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:403 +#: ../../include/features.php:401 msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:410 +#: ../../include/features.php:408 msgid "Multiple Profiles" msgstr "" -#: ../../include/features.php:411 +#: ../../include/features.php:409 msgid "Ability to create multiple profiles" msgstr "" @@ -1180,12 +1177,12 @@ msgid "Monthly" msgstr "" #: ../../include/selectors.php:64 ../../include/selectors.php:81 -#: ../../include/channel.php:1728 ../../addon/openid/Mod_Id.php:85 +#: ../../include/channel.php:1729 ../../addon/openid/Mod_Id.php:85 msgid "Male" msgstr "" #: ../../include/selectors.php:64 ../../include/selectors.php:81 -#: ../../include/channel.php:1726 ../../addon/openid/Mod_Id.php:87 +#: ../../include/channel.php:1727 ../../addon/openid/Mod_Id.php:87 msgid "Female" msgstr "" @@ -1221,11 +1218,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:64 ../../include/channel.php:1732 +#: ../../include/selectors.php:64 ../../include/channel.php:1733 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:64 ../../include/channel.php:1734 +#: ../../include/selectors.php:64 ../../include/channel.php:1735 msgid "Non-specific" msgstr "" @@ -1321,8 +1318,8 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/selectors.php:138 ../../include/channel.php:464 -#: ../../include/channel.php:467 ../../Zotlabs/Widget/Affinity.php:38 +#: ../../include/selectors.php:138 ../../include/channel.php:465 +#: ../../include/channel.php:468 ../../Zotlabs/Widget/Affinity.php:38 #: ../../Zotlabs/Module/Contactedit.php:283 #: ../../Zotlabs/Module/Connedit.php:581 msgid "Friends" @@ -1423,14 +1420,12 @@ msgstr "" #: ../../include/activities.php:36 ../../include/activities.php:38 #: ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 -#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:364 -#: ../../Zotlabs/Module/Profile_photo.php:226 +#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:227 msgid "Profile Photo" msgstr "" -#: ../../include/activities.php:36 -#: ../../store/[data]/smarty3/compiled/2cbde885645602969010e846a38817a1297aafb9_0.file.cover_photo.tpl.php:127 -#: ../../Zotlabs/Module/Cover_photo.php:229 +#: ../../include/activities.php:36 ../../Zotlabs/Module/Cover_photo.php:230 msgid "Cover Photo" msgstr "" @@ -1448,80 +1443,80 @@ msgstr "" msgid "%1$s updated the %2$s. Changed %3$s." msgstr "" -#: ../../include/contact_widgets.php:11 +#: ../../include/contact_widgets.php:13 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145 -#: ../../Zotlabs/Module/Admin/Site.php:405 +#: ../../include/contact_widgets.php:18 ../../include/acl_selectors.php:145 +#: ../../Zotlabs/Module/Admin/Site.php:406 msgid "Advanced" msgstr "" -#: ../../include/contact_widgets.php:19 +#: ../../include/contact_widgets.php:21 msgid "Find Channels" msgstr "" -#: ../../include/contact_widgets.php:20 +#: ../../include/contact_widgets.php:22 msgid "Enter name or interest" msgstr "" -#: ../../include/contact_widgets.php:21 +#: ../../include/contact_widgets.php:23 msgid "Connect/Follow" msgstr "" -#: ../../include/contact_widgets.php:22 +#: ../../include/contact_widgets.php:24 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:435 +#: ../../include/contact_widgets.php:25 ../../Zotlabs/Module/Directory.php:435 #: ../../Zotlabs/Module/Directory.php:440 #: ../../Zotlabs/Module/Connections.php:407 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Suggest.php:77 +#: ../../include/contact_widgets.php:26 ../../Zotlabs/Module/Suggest.php:77 #: ../../Zotlabs/Module/Directory.php:439 msgid "Channel Suggestions" msgstr "" -#: ../../include/contact_widgets.php:26 +#: ../../include/contact_widgets.php:28 msgid "Random Profile" msgstr "" -#: ../../include/contact_widgets.php:27 +#: ../../include/contact_widgets.php:29 msgid "Invite Friends" msgstr "" -#: ../../include/contact_widgets.php:29 +#: ../../include/contact_widgets.php:31 msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:118 -#: ../../include/contact_widgets.php:152 +#: ../../include/contact_widgets.php:58 ../../include/contact_widgets.php:121 +#: ../../include/contact_widgets.php:155 #: ../../addon/cards/Widget/Cards_categories.php:83 #: ../../addon/articles/Widget/Articles_categories.php:83 #: ../../Zotlabs/Widget/Appcategories.php:52 ../../Zotlabs/Widget/Filer.php:36 msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:115 ../../include/contact_widgets.php:149 -#: ../../include/taxonomy.php:423 ../../include/taxonomy.php:505 -#: ../../include/taxonomy.php:525 ../../include/taxonomy.php:546 +#: ../../include/contact_widgets.php:118 ../../include/contact_widgets.php:152 +#: ../../include/taxonomy.php:425 ../../include/taxonomy.php:507 +#: ../../include/taxonomy.php:527 ../../include/taxonomy.php:548 #: ../../addon/cards/Widget/Cards_categories.php:80 #: ../../addon/articles/Widget/Articles_categories.php:80 -#: ../../Zotlabs/Storage/Browser.php:292 ../../Zotlabs/Storage/Browser.php:391 -#: ../../Zotlabs/Storage/Browser.php:406 ../../Zotlabs/Module/Cdav.php:1062 +#: ../../Zotlabs/Storage/Browser.php:293 ../../Zotlabs/Storage/Browser.php:392 +#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Module/Cdav.php:1062 msgid "Categories" msgstr "" -#: ../../include/contact_widgets.php:182 +#: ../../include/contact_widgets.php:185 msgid "Common Connections" msgstr "" -#: ../../include/contact_widgets.php:186 +#: ../../include/contact_widgets.php:189 #, php-format msgid "View all %d common connections" msgstr "" @@ -1535,10 +1530,10 @@ msgid "Summary: " msgstr "" #: ../../include/cdav.php:158 ../../include/cdav.php:159 -#: ../../include/cdav.php:167 ../../include/conversation.php:999 -#: ../../Zotlabs/Lib/Apps.php:1167 ../../Zotlabs/Lib/Apps.php:1251 -#: ../../Zotlabs/Lib/Activity.php:1675 ../../Zotlabs/Widget/Album.php:90 -#: ../../Zotlabs/Widget/Pinned.php:255 ../../Zotlabs/Widget/Portfolio.php:99 +#: ../../include/cdav.php:167 ../../include/conversation.php:1000 +#: ../../Zotlabs/Lib/Apps.php:1168 ../../Zotlabs/Lib/Apps.php:1252 +#: ../../Zotlabs/Lib/Activity.php:1684 ../../Zotlabs/Widget/Album.php:90 +#: ../../Zotlabs/Widget/Pinned.php:257 ../../Zotlabs/Widget/Portfolio.php:99 #: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:788 #: ../../Zotlabs/Module/Photos.php:1246 msgid "Unknown" @@ -1576,8 +1571,8 @@ msgid "edit" msgstr "" #: ../../include/group.php:327 ../../include/acl_selectors.php:87 -#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Widget/Activity_filter.php:95 -#: ../../Zotlabs/Module/Group.php:143 +#: ../../Zotlabs/Lib/Apps.php:368 ../../Zotlabs/Widget/Activity_filter.php:95 +#: ../../Zotlabs/Module/Group.php:144 msgid "Privacy Groups" msgstr "" @@ -1597,52 +1592,52 @@ msgstr "" msgid "add" msgstr "" -#: ../../include/taxonomy.php:324 +#: ../../include/taxonomy.php:326 msgid "Trending" msgstr "" -#: ../../include/taxonomy.php:324 ../../include/taxonomy.php:463 -#: ../../include/taxonomy.php:484 ../../Zotlabs/Widget/Tagcloud.php:27 +#: ../../include/taxonomy.php:326 ../../include/taxonomy.php:465 +#: ../../include/taxonomy.php:486 ../../Zotlabs/Widget/Tagcloud.php:27 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:564 +#: ../../include/taxonomy.php:566 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:585 +#: ../../include/taxonomy.php:587 msgid "have" msgstr "" -#: ../../include/taxonomy.php:585 +#: ../../include/taxonomy.php:587 msgid "has" msgstr "" -#: ../../include/taxonomy.php:586 +#: ../../include/taxonomy.php:588 msgid "want" msgstr "" -#: ../../include/taxonomy.php:586 +#: ../../include/taxonomy.php:588 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:587 ../../Zotlabs/Lib/ThreadItem.php:333 +#: ../../include/taxonomy.php:589 ../../Zotlabs/Lib/ThreadItem.php:332 msgid "like" msgstr "" -#: ../../include/taxonomy.php:587 +#: ../../include/taxonomy.php:589 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:588 ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../include/taxonomy.php:590 ../../Zotlabs/Lib/ThreadItem.php:333 msgid "dislike" msgstr "" -#: ../../include/taxonomy.php:588 +#: ../../include/taxonomy.php:590 msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:675 ../../include/conversation.php:1550 +#: ../../include/taxonomy.php:677 ../../include/conversation.php:1552 #: ../../Zotlabs/Module/Photos.php:1129 msgctxt "noun" msgid "Like" @@ -1650,130 +1645,108 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/photo/photo_driver.php:457 -#: ../../Zotlabs/Module/Profile_photo.php:167 -#: ../../Zotlabs/Module/Profile_photo.php:336 +#: ../../include/photo/photo_driver.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:168 +#: ../../Zotlabs/Module/Profile_photo.php:337 msgid "Profile Photos" msgstr "" -#: ../../include/account.php:38 +#: ../../include/account.php:39 msgid "The provided email address is not valid" msgstr "" -#: ../../include/account.php:41 +#: ../../include/account.php:42 msgid "The provided email domain is not among those allowed on this site" msgstr "" -#: ../../include/account.php:48 +#: ../../include/account.php:49 msgid "The provided email address is already registered at this site" msgstr "" -#: ../../include/account.php:55 +#: ../../include/account.php:56 msgid "" "There is a pending registration for this address - click \"Register\" to " "continue verification" msgstr "" -#: ../../include/account.php:94 +#: ../../include/account.php:95 msgid "An invitation is required." msgstr "" -#: ../../include/account.php:103 +#: ../../include/account.php:104 msgid "Invitation could not be verified." msgstr "" -#: ../../include/account.php:191 +#: ../../include/account.php:192 msgid "Please enter the required information." msgstr "" -#: ../../include/account.php:258 ../../include/account.php:366 +#: ../../include/account.php:259 ../../include/account.php:367 msgid "Failed to store account information." msgstr "" -#: ../../include/account.php:435 ../../include/account.php:503 -#: ../../Zotlabs/Module/Register.php:328 +#: ../../include/account.php:436 ../../include/account.php:504 +#: ../../Zotlabs/Module/Register.php:329 #, php-format msgid "Registration confirmation for %s" msgstr "" -#: ../../include/account.php:578 +#: ../../include/account.php:579 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../include/account.php:600 +#: ../../include/account.php:601 msgid "your registration password" msgstr "" -#: ../../include/account.php:606 ../../include/account.php:695 +#: ../../include/account.php:607 ../../include/account.php:696 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../include/account.php:706 +#: ../../include/account.php:707 msgid "Account approved." msgstr "" -#: ../../include/account.php:762 +#: ../../include/account.php:763 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../include/account.php:769 +#: ../../include/account.php:770 #, php-format msgid "Could not revoke registration for %s" msgstr "" -#: ../../include/account.php:1186 ../../include/account.php:1188 +#: ../../include/account.php:1187 ../../include/account.php:1189 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:1194 +#: ../../include/account.php:1195 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:1199 +#: ../../include/account.php:1200 msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/account.php:1259 +#: ../../include/account.php:1260 msgid "open" msgstr "" -#: ../../include/account.php:1259 +#: ../../include/account.php:1260 msgid "closed" msgstr "" -#: ../../include/account.php:1266 +#: ../../include/account.php:1267 msgid "Registration is currently" msgstr "" -#: ../../include/account.php:1275 +#: ../../include/account.php:1276 msgid "please come back" msgstr "" -#: ../../include/help.php:82 -msgid "Help:" -msgstr "" - -#: ../../include/help.php:119 ../../include/help.php:127 -#: ../../include/nav.php:193 ../../include/nav.php:340 -#: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Module/Layouts.php:184 -msgid "Help" -msgstr "" - -#: ../../include/help.php:131 -msgid "Not Found" -msgstr "" - -#: ../../include/help.php:134 ../../addon/cards/cards.php:104 -#: ../../addon/articles/articles.php:105 -#: ../../addon/wiki/Lib/NativeWikiPage.php:545 -#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:154 -#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Web/Router.php:186 -msgid "Page not found." -msgstr "" - #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" @@ -1811,7 +1784,7 @@ msgstr "" msgid "Password too short" msgstr "" -#: ../../include/js_strings.php:13 ../../Zotlabs/Module/Register.php:161 +#: ../../include/js_strings.php:13 ../../Zotlabs/Module/Register.php:162 msgid "Passwords do not match" msgstr "" @@ -1860,8 +1833,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" #: ../../include/js_strings.php:26 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Pubsites.php:54 ../../Zotlabs/Module/Profiles.php:475 -#: ../../Zotlabs/Module/Profiles.php:746 ../../Zotlabs/Module/Cdav.php:1006 +#: ../../Zotlabs/Module/Pubsites.php:55 ../../Zotlabs/Module/Profiles.php:476 +#: ../../Zotlabs/Module/Profiles.php:749 ../../Zotlabs/Module/Cdav.php:1006 msgid "Location" msgstr "" @@ -1920,7 +1893,7 @@ msgid "Pin to the top" msgstr "" #: ../../include/js_strings.php:40 ../../Zotlabs/Lib/ThreadItem.php:494 -#: ../../Zotlabs/Widget/Pinned.php:149 +#: ../../Zotlabs/Widget/Pinned.php:151 msgid "Unpin from the top" msgstr "" @@ -2007,19 +1980,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:75 ../../include/text.php:1502 +#: ../../include/js_strings.php:75 ../../include/text.php:1503 msgid "January" msgstr "" -#: ../../include/js_strings.php:76 ../../include/text.php:1502 +#: ../../include/js_strings.php:76 ../../include/text.php:1503 msgid "February" msgstr "" -#: ../../include/js_strings.php:77 ../../include/text.php:1502 +#: ../../include/js_strings.php:77 ../../include/text.php:1503 msgid "March" msgstr "" -#: ../../include/js_strings.php:78 ../../include/text.php:1502 +#: ../../include/js_strings.php:78 ../../include/text.php:1503 msgid "April" msgstr "" @@ -2028,31 +2001,31 @@ msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:80 ../../include/text.php:1502 +#: ../../include/js_strings.php:80 ../../include/text.php:1503 msgid "June" msgstr "" -#: ../../include/js_strings.php:81 ../../include/text.php:1502 +#: ../../include/js_strings.php:81 ../../include/text.php:1503 msgid "July" msgstr "" -#: ../../include/js_strings.php:82 ../../include/text.php:1502 +#: ../../include/js_strings.php:82 ../../include/text.php:1503 msgid "August" msgstr "" -#: ../../include/js_strings.php:83 ../../include/text.php:1502 +#: ../../include/js_strings.php:83 ../../include/text.php:1503 msgid "September" msgstr "" -#: ../../include/js_strings.php:84 ../../include/text.php:1502 +#: ../../include/js_strings.php:84 ../../include/text.php:1503 msgid "October" msgstr "" -#: ../../include/js_strings.php:85 ../../include/text.php:1502 +#: ../../include/js_strings.php:85 ../../include/text.php:1503 msgid "November" msgstr "" -#: ../../include/js_strings.php:86 ../../include/text.php:1502 +#: ../../include/js_strings.php:86 ../../include/text.php:1503 msgid "December" msgstr "" @@ -2105,31 +2078,31 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:99 ../../include/text.php:1498 +#: ../../include/js_strings.php:99 ../../include/text.php:1499 msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:100 ../../include/text.php:1498 +#: ../../include/js_strings.php:100 ../../include/text.php:1499 msgid "Monday" msgstr "" -#: ../../include/js_strings.php:101 ../../include/text.php:1498 +#: ../../include/js_strings.php:101 ../../include/text.php:1499 msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:102 ../../include/text.php:1498 +#: ../../include/js_strings.php:102 ../../include/text.php:1499 msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:103 ../../include/text.php:1498 +#: ../../include/js_strings.php:103 ../../include/text.php:1499 msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:104 ../../include/text.php:1498 +#: ../../include/js_strings.php:104 ../../include/text.php:1499 msgid "Friday" msgstr "" -#: ../../include/js_strings.php:105 ../../include/text.php:1498 +#: ../../include/js_strings.php:105 ../../include/text.php:1499 msgid "Saturday" msgstr "" @@ -2199,126 +2172,126 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:358 #: ../../addon/cart/submodules/orderoptions.php:434 #: ../../addon/cart/submodules/orderoptions.php:458 -#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:218 -#: ../../Zotlabs/Module/Appman.php:219 ../../Zotlabs/Module/Profiles.php:757 -#: ../../Zotlabs/Module/Profiles.php:761 +#: ../../Zotlabs/Module/Register.php:501 ../../Zotlabs/Module/Appman.php:218 +#: ../../Zotlabs/Module/Appman.php:219 ../../Zotlabs/Module/Profiles.php:760 +#: ../../Zotlabs/Module/Profiles.php:764 #: ../../Zotlabs/Module/Settings/Multifactor.php:84 msgid "Required" msgstr "" -#: ../../include/zid.php:410 +#: ../../include/zid.php:411 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" -#: ../../include/conversation.php:147 ../../include/text.php:2352 +#: ../../include/conversation.php:148 ../../include/text.php:2358 #: ../../addon/redphotos/redphotohelper.php:71 #: ../../addon/diaspora/Receiver.php:1693 #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Tagger.php:71 msgid "photo" msgstr "" -#: ../../include/conversation.php:155 ../../Zotlabs/Module/Like.php:183 +#: ../../include/conversation.php:156 ../../Zotlabs/Module/Like.php:183 msgid "channel" msgstr "" -#: ../../include/conversation.php:178 ../../include/markdown.php:208 -#: ../../include/text.php:2358 ../../include/bbcode.php:571 +#: ../../include/conversation.php:179 ../../include/markdown.php:208 +#: ../../include/text.php:2364 ../../include/bbcode.php:572 #: ../../Zotlabs/Module/Tagger.php:79 msgid "post" msgstr "" -#: ../../include/conversation.php:180 ../../include/text.php:2360 +#: ../../include/conversation.php:181 ../../include/text.php:2366 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "" -#: ../../include/conversation.php:194 ../../addon/diaspora/Receiver.php:1628 +#: ../../include/conversation.php:195 ../../addon/diaspora/Receiver.php:1628 #: ../../Zotlabs/Module/Like.php:483 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:196 +#: ../../include/conversation.php:197 #, php-format msgid "likes %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:199 ../../Zotlabs/Module/Like.php:485 +#: ../../include/conversation.php:200 ../../Zotlabs/Module/Like.php:485 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:200 +#: ../../include/conversation.php:201 #, php-format msgid "doesn't like %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:203 +#: ../../include/conversation.php:204 #, php-format msgid "%1$s repeated %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:204 +#: ../../include/conversation.php:205 #, php-format msgid "repeated %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:332 ../../Zotlabs/Lib/ThreadItem.php:532 +#: ../../include/conversation.php:333 ../../Zotlabs/Lib/ThreadItem.php:532 msgid "This is an unsaved preview" msgstr "" -#: ../../include/conversation.php:464 ../../Zotlabs/Module/Photos.php:1110 +#: ../../include/conversation.php:465 ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:465 ../../Zotlabs/Module/Photos.php:1110 +#: ../../include/conversation.php:466 ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:466 ../../Zotlabs/Widget/Pinned.php:71 +#: ../../include/conversation.php:467 ../../Zotlabs/Widget/Pinned.php:73 #: ../../Zotlabs/Module/Photos.php:1111 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:467 ../../Zotlabs/Widget/Pinned.php:72 +#: ../../include/conversation.php:468 ../../Zotlabs/Widget/Pinned.php:74 #: ../../Zotlabs/Module/Photos.php:1111 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:468 ../../Zotlabs/Widget/Pinned.php:73 +#: ../../include/conversation.php:469 ../../Zotlabs/Widget/Pinned.php:75 #: ../../Zotlabs/Module/Photos.php:1111 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:470 +#: ../../include/conversation.php:471 msgctxt "title" msgid "Repeats" msgstr "" -#: ../../include/conversation.php:539 +#: ../../include/conversation.php:540 msgid "Select" msgstr "" -#: ../../include/conversation.php:540 ../../include/conversation.php:601 +#: ../../include/conversation.php:541 ../../include/conversation.php:602 #: ../../addon/cards/Mod_Card_edit.php:130 -#: ../../addon/articles/Mod_Article_edit.php:128 ../../Zotlabs/Lib/Apps.php:617 -#: ../../Zotlabs/Lib/ThreadItem.php:184 ../../Zotlabs/Lib/ThreadItem.php:540 -#: ../../Zotlabs/Storage/Browser.php:387 +#: ../../addon/articles/Mod_Article_edit.php:128 ../../Zotlabs/Lib/Apps.php:618 +#: ../../Zotlabs/Lib/ThreadItem.php:183 ../../Zotlabs/Lib/ThreadItem.php:540 +#: ../../Zotlabs/Storage/Browser.php:388 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Module/Oauth.php:172 #: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Tokens.php:295 #: ../../Zotlabs/Module/Contactedit.php:651 #: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Connedit.php:749 #: ../../Zotlabs/Module/Admin/Accounts.php:320 -#: ../../Zotlabs/Module/Admin/Profs.php:176 -#: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Permcats.php:261 ../../Zotlabs/Module/Group.php:251 +#: ../../Zotlabs/Module/Admin/Profs.php:177 +#: ../../Zotlabs/Module/Admin/Channels.php:171 +#: ../../Zotlabs/Module/Permcats.php:261 ../../Zotlabs/Module/Group.php:252 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Photos.php:1173 #: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Cdav.php:1047 #: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Oauth2.php:193 @@ -2326,317 +2299,321 @@ msgstr "" msgid "Delete" msgstr "" -#: ../../include/conversation.php:546 ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../include/conversation.php:547 ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Toggle Star Status" msgstr "" -#: ../../include/conversation.php:552 +#: ../../include/conversation.php:553 msgid "Private Message" msgstr "" -#: ../../include/conversation.php:561 ../../Zotlabs/Lib/ThreadItem.php:296 -#: ../../Zotlabs/Widget/Pinned.php:82 +#: ../../include/conversation.php:562 ../../Zotlabs/Lib/ThreadItem.php:295 +#: ../../Zotlabs/Widget/Pinned.php:84 msgid "Message signature validated" msgstr "" -#: ../../include/conversation.php:562 ../../Zotlabs/Lib/ThreadItem.php:297 -#: ../../Zotlabs/Widget/Pinned.php:83 +#: ../../include/conversation.php:563 ../../Zotlabs/Lib/ThreadItem.php:296 +#: ../../Zotlabs/Widget/Pinned.php:85 msgid "Message signature incorrect" msgstr "" -#: ../../include/conversation.php:600 ../../Zotlabs/Lib/ThreadItem.php:539 +#: ../../include/conversation.php:601 ../../Zotlabs/Lib/ThreadItem.php:539 #: ../../Zotlabs/Module/Admin/Accounts.php:318 #: ../../Zotlabs/Module/Connections.php:358 #: ../../Zotlabs/Module/Connections.php:409 msgid "Approve" msgstr "" -#: ../../include/conversation.php:606 +#: ../../include/conversation.php:607 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:628 +#: ../../include/conversation.php:629 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:629 +#: ../../include/conversation.php:630 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:635 ../../Zotlabs/Lib/ThreadItem.php:451 -#: ../../Zotlabs/Widget/Pinned.php:126 +#: ../../include/conversation.php:636 ../../Zotlabs/Lib/ThreadItem.php:451 +#: ../../Zotlabs/Widget/Pinned.php:128 #, php-format msgid "from %s" msgstr "" -#: ../../include/conversation.php:638 ../../Zotlabs/Lib/ThreadItem.php:454 -#: ../../Zotlabs/Widget/Pinned.php:129 +#: ../../include/conversation.php:639 ../../Zotlabs/Lib/ThreadItem.php:454 +#: ../../Zotlabs/Widget/Pinned.php:131 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:639 ../../Zotlabs/Lib/ThreadItem.php:455 -#: ../../Zotlabs/Widget/Pinned.php:130 +#: ../../include/conversation.php:640 ../../Zotlabs/Lib/ThreadItem.php:455 +#: ../../Zotlabs/Widget/Pinned.php:132 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:654 ../../addon/cards/cards.php:82 +#: ../../include/conversation.php:655 ../../addon/cards/cards.php:82 #: ../../addon/articles/articles.php:83 msgid "View in context" msgstr "" -#: ../../include/conversation.php:656 ../../Zotlabs/Lib/ThreadItem.php:533 +#: ../../include/conversation.php:657 ../../Zotlabs/Lib/ThreadItem.php:533 #: ../../Zotlabs/Module/Photos.php:1077 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:757 +#: ../../include/conversation.php:758 msgid "remove" msgstr "" -#: ../../include/conversation.php:761 +#: ../../include/conversation.php:762 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:762 ../../Zotlabs/Lib/ThreadItem.php:313 +#: ../../include/conversation.php:763 ../../Zotlabs/Lib/ThreadItem.php:312 msgid "Conversation Features" msgstr "" -#: ../../include/conversation.php:763 +#: ../../include/conversation.php:764 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:799 +#: ../../include/conversation.php:800 msgid "View Source" msgstr "" -#: ../../include/conversation.php:809 +#: ../../include/conversation.php:810 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:818 +#: ../../include/conversation.php:819 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:895 ../../include/nav.php:126 -#: ../../addon/openclipatar/openclipatar.php:58 ../../Zotlabs/Lib/Apps.php:349 +#: ../../include/conversation.php:896 ../../include/nav.php:127 +#: ../../addon/openclipatar/openclipatar.php:58 ../../Zotlabs/Lib/Apps.php:350 #: ../../Zotlabs/Module/Connedit.php:480 msgid "View Profile" msgstr "" -#: ../../include/conversation.php:907 ../../Zotlabs/Module/Connedit.php:501 +#: ../../include/conversation.php:908 ../../Zotlabs/Module/Connedit.php:501 msgid "Recent Activity" msgstr "" -#: ../../include/conversation.php:919 ../../include/connections.php:141 -#: ../../include/channel.php:1624 ../../Zotlabs/Widget/Suggestions.php:51 +#: ../../include/conversation.php:920 ../../include/connections.php:150 +#: ../../include/channel.php:1625 ../../Zotlabs/Widget/Suggestions.php:51 #: ../../Zotlabs/Widget/Follow.php:37 ../../Zotlabs/Module/Suggest.php:69 #: ../../Zotlabs/Module/Directory.php:371 #: ../../Zotlabs/Module/Connections.php:365 msgid "Connect" msgstr "" -#: ../../include/conversation.php:931 +#: ../../include/conversation.php:932 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1002 msgid "Approve this item" msgstr "" -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1002 msgid "Delete this item" msgstr "" -#: ../../include/conversation.php:1055 +#: ../../include/conversation.php:1056 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1055 +#: ../../include/conversation.php:1056 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1059 +#: ../../include/conversation.php:1060 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1061 +#: ../../include/conversation.php:1062 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1067 +#: ../../include/conversation.php:1068 msgid "and" msgstr "" -#: ../../include/conversation.php:1070 +#: ../../include/conversation.php:1071 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1071 +#: ../../include/conversation.php:1072 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1071 +#: ../../include/conversation.php:1072 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1122 ../../addon/hsse/hsse.php:82 +#: ../../include/conversation.php:1123 ../../addon/hsse/hsse.php:82 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1123 ../../addon/hsse/hsse.php:83 +#: ../../include/conversation.php:1124 ../../addon/hsse/hsse.php:83 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1135 ../../addon/cards/Mod_Card_edit.php:101 +#: ../../include/conversation.php:1136 ../../addon/cards/Mod_Card_edit.php:101 #: ../../addon/articles/Mod_Article_edit.php:99 ../../addon/hsse/hsse.php:95 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:219 #: ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1139 ../../addon/hsse/hsse.php:99 +#: ../../include/conversation.php:1140 ../../addon/hsse/hsse.php:99 msgid "Embed (existing) photo from your photo albums" msgstr "" -#: ../../include/conversation.php:1172 ../../addon/hsse/hsse.php:134 +#: ../../include/conversation.php:1173 ../../addon/hsse/hsse.php:134 #: ../../Zotlabs/Module/Chat.php:217 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1173 ../../addon/hsse/hsse.php:135 +#: ../../include/conversation.php:1174 ../../addon/hsse/hsse.php:135 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1174 ../../addon/hsse/hsse.php:136 +#: ../../include/conversation.php:1175 ../../addon/hsse/hsse.php:136 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1177 ../../addon/wiki/Mod_Wiki.php:400 -#: ../../addon/hsse/hsse.php:139 ../../Zotlabs/Module/Cover_photo.php:387 -#: ../../Zotlabs/Module/Profile_photo.php:554 +#: ../../include/conversation.php:1178 ../../addon/wiki/Mod_Wiki.php:400 +#: ../../addon/hsse/hsse.php:139 ../../Zotlabs/Module/Cover_photo.php:388 +#: ../../Zotlabs/Module/Profile_photo.php:555 msgid "Choose images to embed" msgstr "" -#: ../../include/conversation.php:1178 ../../addon/wiki/Mod_Wiki.php:401 -#: ../../addon/hsse/hsse.php:140 ../../Zotlabs/Module/Cover_photo.php:388 -#: ../../Zotlabs/Module/Profile_photo.php:555 +#: ../../include/conversation.php:1179 ../../addon/wiki/Mod_Wiki.php:401 +#: ../../addon/hsse/hsse.php:140 ../../Zotlabs/Module/Cover_photo.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:556 msgid "Choose an album" msgstr "" -#: ../../include/conversation.php:1179 ../../addon/hsse/hsse.php:141 +#: ../../include/conversation.php:1180 ../../addon/hsse/hsse.php:141 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1180 ../../addon/wiki/Mod_Wiki.php:403 -#: ../../addon/hsse/hsse.php:142 ../../Zotlabs/Module/Cover_photo.php:390 -#: ../../Zotlabs/Module/Profile_photo.php:557 +#: ../../include/conversation.php:1181 ../../addon/wiki/Mod_Wiki.php:403 +#: ../../addon/hsse/hsse.php:142 ../../Zotlabs/Module/Cover_photo.php:391 +#: ../../Zotlabs/Module/Profile_photo.php:558 msgid "Error getting album list" msgstr "" -#: ../../include/conversation.php:1181 ../../addon/wiki/Mod_Wiki.php:404 -#: ../../addon/hsse/hsse.php:143 ../../Zotlabs/Module/Cover_photo.php:391 -#: ../../Zotlabs/Module/Profile_photo.php:558 +#: ../../include/conversation.php:1182 ../../addon/wiki/Mod_Wiki.php:404 +#: ../../addon/hsse/hsse.php:143 ../../Zotlabs/Module/Cover_photo.php:392 +#: ../../Zotlabs/Module/Profile_photo.php:559 msgid "Error getting photo link" msgstr "" -#: ../../include/conversation.php:1182 ../../addon/wiki/Mod_Wiki.php:405 -#: ../../addon/hsse/hsse.php:144 ../../Zotlabs/Module/Cover_photo.php:392 -#: ../../Zotlabs/Module/Profile_photo.php:559 +#: ../../include/conversation.php:1183 ../../addon/wiki/Mod_Wiki.php:405 +#: ../../addon/hsse/hsse.php:144 ../../Zotlabs/Module/Cover_photo.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:560 msgid "Error getting album" msgstr "" -#: ../../include/conversation.php:1183 ../../addon/hsse/hsse.php:145 +#: ../../include/conversation.php:1184 ../../addon/hsse/hsse.php:145 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1184 ../../addon/hsse/hsse.php:146 +#: ../../include/conversation.php:1185 ../../addon/hsse/hsse.php:146 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1201 ../../addon/hsse/hsse.php:153 +#: ../../include/conversation.php:1186 +msgid "Confirm delete" +msgstr "" + +#: ../../include/conversation.php:1203 ../../addon/hsse/hsse.php:153 #: ../../Zotlabs/Lib/ThreadItem.php:872 ../../Zotlabs/Module/Webpages.php:257 #: ../../Zotlabs/Module/Photos.php:1096 msgid "Preview" msgstr "" -#: ../../include/conversation.php:1234 ../../addon/wiki/Mod_Wiki.php:304 -#: ../../addon/hsse/hsse.php:186 ../../Zotlabs/Lib/ThreadItem.php:341 +#: ../../include/conversation.php:1236 ../../addon/wiki/Mod_Wiki.php:304 +#: ../../addon/hsse/hsse.php:186 ../../Zotlabs/Lib/ThreadItem.php:340 #: ../../Zotlabs/Widget/Cdav.php:142 ../../Zotlabs/Module/Webpages.php:251 #: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Blocks.php:159 #: ../../Zotlabs/Module/Photos.php:1076 msgid "Share" msgstr "" -#: ../../include/conversation.php:1243 ../../addon/hsse/hsse.php:195 +#: ../../include/conversation.php:1245 ../../addon/hsse/hsse.php:195 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1246 ../../addon/hsse/hsse.php:198 +#: ../../include/conversation.php:1248 ../../addon/hsse/hsse.php:198 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1248 ../../addon/hsse/hsse.php:200 +#: ../../include/conversation.php:1250 ../../addon/hsse/hsse.php:200 #: ../../Zotlabs/Lib/ThreadItem.php:863 msgid "Bold" msgstr "" -#: ../../include/conversation.php:1249 ../../addon/hsse/hsse.php:201 +#: ../../include/conversation.php:1251 ../../addon/hsse/hsse.php:201 #: ../../Zotlabs/Lib/ThreadItem.php:864 msgid "Italic" msgstr "" -#: ../../include/conversation.php:1250 ../../addon/hsse/hsse.php:202 +#: ../../include/conversation.php:1252 ../../addon/hsse/hsse.php:202 #: ../../Zotlabs/Lib/ThreadItem.php:865 msgid "Underline" msgstr "" -#: ../../include/conversation.php:1251 ../../addon/hsse/hsse.php:203 +#: ../../include/conversation.php:1253 ../../addon/hsse/hsse.php:203 #: ../../Zotlabs/Lib/ThreadItem.php:866 msgid "Quote" msgstr "" -#: ../../include/conversation.php:1252 ../../addon/hsse/hsse.php:204 +#: ../../include/conversation.php:1254 ../../addon/hsse/hsse.php:204 #: ../../Zotlabs/Lib/ThreadItem.php:867 msgid "Code" msgstr "" -#: ../../include/conversation.php:1253 ../../addon/hsse/hsse.php:205 +#: ../../include/conversation.php:1255 ../../addon/hsse/hsse.php:205 #: ../../Zotlabs/Lib/ThreadItem.php:869 msgid "Attach/Upload file" msgstr "" -#: ../../include/conversation.php:1256 ../../addon/wiki/Mod_Wiki.php:397 +#: ../../include/conversation.php:1258 ../../addon/wiki/Mod_Wiki.php:397 #: ../../addon/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "" -#: ../../include/conversation.php:1257 ../../include/conversation.php:1312 +#: ../../include/conversation.php:1259 ../../include/conversation.php:1314 #: ../../addon/cards/Mod_Card_edit.php:132 #: ../../addon/articles/Mod_Article_edit.php:130 #: ../../addon/wiki/Mod_Wiki.php:365 ../../addon/wiki/Mod_Wiki.php:398 #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../Zotlabs/Storage/Browser.php:386 -#: ../../Zotlabs/Module/Cover_photo.php:385 +#: ../../Zotlabs/Storage/Browser.php:387 +#: ../../Zotlabs/Module/Cover_photo.php:386 #: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Oauth.php:110 #: ../../Zotlabs/Module/Oauth.php:136 ../../Zotlabs/Module/Connedit.php:750 -#: ../../Zotlabs/Module/Profile_photo.php:552 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Admin/Addons.php:430 +#: ../../Zotlabs/Module/Profile_photo.php:553 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Admin/Addons.php:431 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Editlayout.php:140 #: ../../Zotlabs/Module/Editpost.php:114 ../../Zotlabs/Module/Cdav.php:1049 @@ -2646,344 +2623,349 @@ msgstr "" msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1258 ../../include/conversation.php:1311 +#: ../../include/conversation.php:1260 ../../include/conversation.php:1313 #: ../../addon/wiki/Mod_Wiki.php:399 ../../addon/hsse/hsse.php:210 -#: ../../addon/hsse/hsse.php:257 ../../Zotlabs/Module/Cover_photo.php:386 -#: ../../Zotlabs/Module/Profile_photo.php:553 +#: ../../addon/hsse/hsse.php:257 ../../Zotlabs/Module/Cover_photo.php:387 +#: ../../Zotlabs/Module/Profile_photo.php:554 msgid "OK" msgstr "" -#: ../../include/conversation.php:1260 ../../addon/hsse/hsse.php:212 +#: ../../include/conversation.php:1262 ../../addon/hsse/hsse.php:212 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1261 +#: ../../include/conversation.php:1263 msgid "Toggle poll" msgstr "" -#: ../../include/conversation.php:1262 +#: ../../include/conversation.php:1264 msgid "Option" msgstr "" -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1265 msgid "Add option" msgstr "" -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1266 msgid "Minutes" msgstr "" -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1266 msgid "Hours" msgstr "" -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1266 msgid "Days" msgstr "" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1267 msgid "Allow multiple answers" msgstr "" -#: ../../include/conversation.php:1267 ../../addon/hsse/hsse.php:215 +#: ../../include/conversation.php:1269 ../../addon/hsse/hsse.php:215 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1268 ../../addon/hsse/hsse.php:216 +#: ../../include/conversation.php:1270 ../../addon/hsse/hsse.php:216 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1274 ../../addon/cards/Mod_Card_edit.php:118 +#: ../../include/conversation.php:1276 ../../addon/cards/Mod_Card_edit.php:118 #: ../../addon/articles/Mod_Article_edit.php:116 ../../addon/hsse/hsse.php:221 #: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1042 #: ../../Zotlabs/Module/Editblock.php:129 msgid "Title (optional)" msgstr "" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1277 msgid "Summary (optional)" msgstr "" -#: ../../include/conversation.php:1278 ../../addon/hsse/hsse.php:224 +#: ../../include/conversation.php:1280 ../../addon/hsse/hsse.php:224 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1279 ../../addon/hsse/hsse.php:225 +#: ../../include/conversation.php:1281 ../../addon/hsse/hsse.php:225 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1301 ../../addon/hsse/hsse.php:247 +#: ../../include/conversation.php:1303 ../../addon/hsse/hsse.php:247 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1304 ../../addon/hsse/hsse.php:250 +#: ../../include/conversation.php:1306 ../../addon/hsse/hsse.php:250 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1307 ../../addon/hsse/hsse.php:253 +#: ../../include/conversation.php:1309 ../../addon/hsse/hsse.php:253 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1309 ../../addon/hsse/hsse.php:255 +#: ../../include/conversation.php:1311 ../../addon/hsse/hsse.php:255 #: ../../Zotlabs/Lib/ThreadItem.php:875 ../../Zotlabs/Module/Chat.php:218 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1553 +#: ../../include/conversation.php:1555 msgctxt "noun" msgid "Repeat" msgid_plural "Repeats" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1556 ../../Zotlabs/Module/Photos.php:1134 +#: ../../include/conversation.php:1558 ../../Zotlabs/Module/Photos.php:1134 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1559 +#: ../../include/conversation.php:1561 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1562 +#: ../../include/conversation.php:1564 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1565 +#: ../../include/conversation.php:1567 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/nav.php:108 +#: ../../include/nav.php:109 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:108 +#: ../../include/nav.php:109 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:114 ../../Zotlabs/Widget/Channel_activities.php:239 +#: ../../include/nav.php:115 ../../Zotlabs/Widget/Channel_activities.php:239 #: ../../Zotlabs/Widget/Admin.php:29 -#: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:116 +#: ../../Zotlabs/Module/Admin/Channels.php:168 +#: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:118 msgid "Channels" msgstr "" -#: ../../include/nav.php:114 +#: ../../include/nav.php:115 msgid "Manage your channels" msgstr "" -#: ../../include/nav.php:117 ../../Zotlabs/Lib/Apps.php:344 -#: ../../Zotlabs/Widget/Newmember.php:58 +#: ../../include/nav.php:118 ../../Zotlabs/Lib/Apps.php:345 +#: ../../Zotlabs/Widget/Newmember.php:60 #: ../../Zotlabs/Widget/Settings_menu.php:71 -#: ../../Zotlabs/Module/Admin/Themes.php:140 -#: ../../Zotlabs/Module/Admin/Addons.php:348 +#: ../../Zotlabs/Module/Admin/Themes.php:141 +#: ../../Zotlabs/Module/Admin/Addons.php:349 msgid "Settings" msgstr "" -#: ../../include/nav.php:117 +#: ../../include/nav.php:118 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:123 ../../include/nav.php:153 -#: ../../include/nav.php:174 ../../boot.php:1745 +#: ../../include/nav.php:124 ../../include/nav.php:154 +#: ../../include/nav.php:175 ../../boot.php:1759 msgid "Logout" msgstr "" -#: ../../include/nav.php:123 ../../include/nav.php:153 +#: ../../include/nav.php:124 ../../include/nav.php:154 msgid "End this session" msgstr "" -#: ../../include/nav.php:126 +#: ../../include/nav.php:127 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:129 ../../include/channel.php:1538 -#: ../../Zotlabs/Module/Profiles.php:847 +#: ../../include/nav.php:130 ../../include/channel.php:1539 +#: ../../Zotlabs/Module/Profiles.php:851 msgid "Edit Profiles" msgstr "" -#: ../../include/nav.php:129 +#: ../../include/nav.php:130 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:131 ../../include/channel.php:1542 +#: ../../include/nav.php:132 ../../include/channel.php:1543 #: ../../addon/openclipatar/openclipatar.php:59 msgid "Edit Profile" msgstr "" -#: ../../include/nav.php:131 ../../Zotlabs/Widget/Newmember.php:40 +#: ../../include/nav.php:132 ../../Zotlabs/Widget/Newmember.php:42 msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:138 ../../include/nav.php:142 ../../boot.php:1746 -#: ../../Zotlabs/Lib/Apps.php:341 +#: ../../include/nav.php:139 ../../include/nav.php:143 ../../boot.php:1760 +#: ../../Zotlabs/Lib/Apps.php:342 msgid "Login" msgstr "" -#: ../../include/nav.php:138 ../../include/nav.php:142 +#: ../../include/nav.php:139 ../../include/nav.php:143 msgid "Sign in" msgstr "" -#: ../../include/nav.php:172 +#: ../../include/nav.php:173 msgid "Take me home" msgstr "" -#: ../../include/nav.php:174 +#: ../../include/nav.php:175 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:179 ../../boot.php:1723 -#: ../../Zotlabs/Module/Register.php:542 +#: ../../include/nav.php:180 ../../boot.php:1737 +#: ../../Zotlabs/Module/Register.php:543 msgid "Register" msgstr "" -#: ../../include/nav.php:179 +#: ../../include/nav.php:180 msgid "Create an account" msgstr "" -#: ../../include/nav.php:193 +#: ../../include/nav.php:194 ../../include/nav.php:341 +#: ../../Zotlabs/Lib/Apps.php:354 ../../Zotlabs/Module/Layouts.php:184 +msgid "Help" +msgstr "" + +#: ../../include/nav.php:194 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:207 ../../include/acl_selectors.php:149 -#: ../../include/text.php:1189 ../../include/text.php:1201 -#: ../../Zotlabs/Lib/Apps.php:356 ../../Zotlabs/Widget/Sitesearch.php:37 +#: ../../include/nav.php:208 ../../include/acl_selectors.php:149 +#: ../../include/text.php:1190 ../../include/text.php:1202 +#: ../../Zotlabs/Lib/Apps.php:357 ../../Zotlabs/Widget/Sitesearch.php:37 #: ../../Zotlabs/Widget/Activity_filter.php:210 -#: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:403 +#: ../../Zotlabs/Module/Search.php:47 ../../Zotlabs/Module/Connections.php:403 msgid "Search" msgstr "" -#: ../../include/nav.php:207 +#: ../../include/nav.php:208 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:213 ../../Zotlabs/Widget/Admin.php:61 +#: ../../include/nav.php:214 ../../Zotlabs/Widget/Admin.php:61 msgid "Admin" msgstr "" -#: ../../include/nav.php:213 +#: ../../include/nav.php:214 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:344 ../../Zotlabs/Widget/Notifications.php:175 +#: ../../include/nav.php:345 ../../Zotlabs/Widget/Notifications.php:175 #: ../../Zotlabs/Widget/Messages.php:36 ../../Zotlabs/Module/Defperms.php:254 -#: ../../Zotlabs/Module/New_channel.php:157 -#: ../../Zotlabs/Module/New_channel.php:164 +#: ../../Zotlabs/Module/New_channel.php:158 +#: ../../Zotlabs/Module/New_channel.php:165 msgid "Loading" msgstr "" -#: ../../include/nav.php:349 +#: ../../include/nav.php:350 msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:350 +#: ../../include/nav.php:351 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:356 ../../Zotlabs/Lib/Apps.php:328 +#: ../../include/nav.php:357 ../../Zotlabs/Lib/Apps.php:329 msgid "Apps" msgstr "" -#: ../../include/nav.php:357 +#: ../../include/nav.php:358 msgid "Channel Apps" msgstr "" -#: ../../include/nav.php:358 +#: ../../include/nav.php:359 msgid "System Apps" msgstr "" -#: ../../include/nav.php:359 +#: ../../include/nav.php:360 msgid "Pinned Apps" msgstr "" -#: ../../include/nav.php:360 +#: ../../include/nav.php:361 msgid "Featured Apps" msgstr "" -#: ../../include/nav.php:446 ../../Zotlabs/Lib/Apps.php:348 -#: ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../include/nav.php:447 ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Module/Admin/Channels.php:176 msgid "Channel" msgstr "" -#: ../../include/nav.php:449 +#: ../../include/nav.php:450 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:459 ../../Zotlabs/Module/Help.php:85 +#: ../../include/nav.php:460 ../../Zotlabs/Module/Help.php:242 msgid "About" msgstr "" -#: ../../include/nav.php:462 +#: ../../include/nav.php:463 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:472 ../../include/photos.php:721 +#: ../../include/nav.php:473 ../../include/photos.php:722 msgid "Photo Albums" msgstr "" -#: ../../include/nav.php:477 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/nav.php:478 ../../Zotlabs/Lib/Apps.php:346 #: ../../Zotlabs/Widget/Notifications.php:108 #: ../../Zotlabs/Widget/Channel_activities.php:125 -#: ../../Zotlabs/Storage/Browser.php:350 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../Zotlabs/Storage/Browser.php:351 ../../Zotlabs/Module/Fbrowser.php:85 msgid "Files" msgstr "" -#: ../../include/nav.php:480 +#: ../../include/nav.php:481 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:502 ../../include/nav.php:505 -#: ../../Zotlabs/Lib/Apps.php:335 ../../Zotlabs/Widget/Chatroom_list.php:22 +#: ../../include/nav.php:503 ../../include/nav.php:506 +#: ../../Zotlabs/Lib/Apps.php:336 ../../Zotlabs/Widget/Chatroom_list.php:22 msgid "Chatrooms" msgstr "" -#: ../../include/nav.php:515 ../../Zotlabs/Lib/Apps.php:334 +#: ../../include/nav.php:516 ../../Zotlabs/Lib/Apps.php:335 #: ../../Zotlabs/Module/Bookmarks.php:90 msgid "Bookmarks" msgstr "" -#: ../../include/nav.php:518 +#: ../../include/nav.php:519 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:526 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/nav.php:527 ../../Zotlabs/Lib/Apps.php:347 #: ../../Zotlabs/Widget/Channel_activities.php:168 #: ../../Zotlabs/Module/Webpages.php:247 msgid "Webpages" msgstr "" -#: ../../include/nav.php:529 +#: ../../include/nav.php:530 msgid "View Webpages" msgstr "" -#: ../../include/nav.php:537 ../../addon/wiki/Mod_Wiki.php:209 +#: ../../include/nav.php:538 ../../addon/wiki/Mod_Wiki.php:209 #: ../../addon/wiki/Widget/Wiki_list.php:23 ../../addon/wiki/wiki.php:72 msgid "Wikis" msgstr "" -#: ../../include/nav.php:540 ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:541 ../../Zotlabs/Lib/Apps.php:348 msgid "Wiki" msgstr "" -#: ../../include/security.php:633 +#: ../../include/security.php:635 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:56 -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:58 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Miscellaneous" msgstr "" @@ -2999,7 +2981,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 ../../boot.php:2752 +#: ../../include/datetime.php:238 ../../boot.php:2760 msgid "never" msgstr "" @@ -3072,88 +3054,88 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/photos.php:152 +#: ../../include/photos.php:153 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/photos.php:163 +#: ../../include/photos.php:164 msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:197 ../../Zotlabs/Module/Cover_photo.php:239 -#: ../../Zotlabs/Module/Profile_photo.php:274 +#: ../../include/photos.php:198 ../../Zotlabs/Module/Cover_photo.php:240 +#: ../../Zotlabs/Module/Profile_photo.php:275 msgid "Unable to process image" msgstr "" -#: ../../include/photos.php:323 +#: ../../include/photos.php:324 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:372 +#: ../../include/photos.php:373 msgid "a new photo" msgstr "" -#: ../../include/photos.php:376 +#: ../../include/photos.php:377 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:722 ../../Zotlabs/Module/Photos.php:1339 +#: ../../include/photos.php:723 ../../Zotlabs/Module/Photos.php:1339 #: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1353 msgid "Recent Photos" msgstr "" -#: ../../include/photos.php:726 +#: ../../include/photos.php:727 msgid "Upload New Photos" msgstr "" -#: ../../include/connections.php:165 +#: ../../include/connections.php:174 msgid "New window" msgstr "" -#: ../../include/connections.php:166 +#: ../../include/connections.php:175 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/network.php:412 +#: ../../include/network.php:413 msgid "url: " msgstr "" -#: ../../include/network.php:413 +#: ../../include/network.php:414 msgid "error_code: " msgstr "" -#: ../../include/network.php:414 +#: ../../include/network.php:415 msgid "error_string: " msgstr "" -#: ../../include/network.php:415 +#: ../../include/network.php:416 msgid "content-type: " msgstr "" -#: ../../include/network.php:1770 ../../include/network.php:1771 +#: ../../include/network.php:1774 ../../include/network.php:1775 msgid "Friendica" msgstr "" -#: ../../include/network.php:1772 +#: ../../include/network.php:1776 msgid "OStatus" msgstr "" -#: ../../include/network.php:1773 +#: ../../include/network.php:1777 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1774 +#: ../../include/network.php:1778 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1779 msgid "ActivityPub" msgstr "" -#: ../../include/network.php:1776 ../../addon/openid/MysqlProvider.php:56 +#: ../../include/network.php:1780 ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:69 #: ../../addon/rtof/Mod_Rtof.php:55 ../../Zotlabs/Module/Connedit.php:736 #: ../../Zotlabs/Module/Admin/Accounts.php:316 @@ -3162,59 +3144,59 @@ msgstr "" msgid "Email" msgstr "" -#: ../../include/network.php:1777 +#: ../../include/network.php:1781 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1778 +#: ../../include/network.php:1782 msgid "Facebook" msgstr "" -#: ../../include/network.php:1779 +#: ../../include/network.php:1783 msgid "Zot" msgstr "" -#: ../../include/network.php:1780 +#: ../../include/network.php:1784 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1781 +#: ../../include/network.php:1785 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1782 +#: ../../include/network.php:1786 msgid "MySpace" msgstr "" -#: ../../include/markdown.php:206 ../../include/bbcode.php:575 +#: ../../include/markdown.php:206 ../../include/bbcode.php:576 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/markdown.php:259 ../../include/bbcode.php:660 +#: ../../include/markdown.php:278 ../../include/bbcode.php:661 msgid "spoiler" msgstr "" -#: ../../include/language.php:422 ../../include/text.php:2193 +#: ../../include/language.php:423 ../../include/text.php:2199 msgid "default" msgstr "" -#: ../../include/language.php:435 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "" -#: ../../include/menu.php:120 ../../include/channel.php:1538 -#: ../../include/channel.php:1542 ../../addon/cards/cards.php:74 +#: ../../include/menu.php:120 ../../include/channel.php:1539 +#: ../../include/channel.php:1543 ../../addon/cards/cards.php:74 #: ../../addon/cards/Mod_Card_edit.php:99 #: ../../addon/articles/Mod_Article_edit.php:97 #: ../../addon/articles/articles.php:75 ../../addon/wiki/Mod_Wiki.php:214 -#: ../../addon/wiki/Mod_Wiki.php:381 ../../Zotlabs/Lib/Apps.php:616 -#: ../../Zotlabs/Lib/ThreadItem.php:163 ../../Zotlabs/Widget/Cdav.php:144 +#: ../../addon/wiki/Mod_Wiki.php:381 ../../Zotlabs/Lib/Apps.php:617 +#: ../../Zotlabs/Lib/ThreadItem.php:162 ../../Zotlabs/Widget/Cdav.php:144 #: ../../Zotlabs/Widget/Cdav.php:181 ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Oauth.php:171 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Layouts.php:191 -#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Admin/Profs.php:175 -#: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Blocks.php:158 +#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Group.php:246 ../../Zotlabs/Module/Blocks.php:158 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Connections.php:338 #: ../../Zotlabs/Module/Connections.php:387 @@ -3246,7 +3228,7 @@ msgstr "" #: ../../include/acl_selectors.php:136 #: ../../Zotlabs/Lib/PermissionDescription.php:107 -#: ../../Zotlabs/Module/Settings/Privacy.php:65 +#: ../../Zotlabs/Module/Settings/Privacy.php:66 msgid "Only me" msgstr "" @@ -3281,7 +3263,7 @@ msgid "Permissions" msgstr "" #: ../../include/acl_selectors.php:156 ../../Zotlabs/Lib/ThreadItem.php:527 -#: ../../Zotlabs/Widget/Pinned.php:152 ../../Zotlabs/Storage/Browser.php:414 +#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Storage/Browser.php:415 #: ../../Zotlabs/Module/Photos.php:1266 msgid "Close" msgstr "" @@ -3293,102 +3275,102 @@ msgid "" "permissions set who is allowed to view the post." msgstr "" -#: ../../include/text.php:561 +#: ../../include/text.php:562 msgid "prev" msgstr "" -#: ../../include/text.php:563 +#: ../../include/text.php:564 msgid "first" msgstr "" -#: ../../include/text.php:592 +#: ../../include/text.php:593 msgid "last" msgstr "" -#: ../../include/text.php:595 +#: ../../include/text.php:596 msgid "next" msgstr "" -#: ../../include/text.php:613 +#: ../../include/text.php:614 msgid "older" msgstr "" -#: ../../include/text.php:615 +#: ../../include/text.php:616 msgid "newer" msgstr "" -#: ../../include/text.php:1085 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../include/text.php:1086 ../../Zotlabs/Module/Viewconnections.php:80 #: ../../Zotlabs/Module/Connections.php:306 msgid "Accepts" msgstr "" -#: ../../include/text.php:1088 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../include/text.php:1089 ../../Zotlabs/Module/Viewconnections.php:83 #: ../../Zotlabs/Module/Connections.php:309 msgid "Comments" msgstr "" -#: ../../include/text.php:1093 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../include/text.php:1094 ../../Zotlabs/Module/Viewconnections.php:88 #: ../../Zotlabs/Module/Connections.php:314 msgid "Stream items" msgstr "" -#: ../../include/text.php:1098 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../include/text.php:1099 ../../Zotlabs/Module/Viewconnections.php:93 #: ../../Zotlabs/Module/Connections.php:319 msgid "Wall posts" msgstr "" -#: ../../include/text.php:1102 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../include/text.php:1103 ../../Zotlabs/Module/Viewconnections.php:97 #: ../../Zotlabs/Module/Connections.php:323 msgid "Nothing" msgstr "" -#: ../../include/text.php:1115 +#: ../../include/text.php:1116 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1178 +#: ../../include/text.php:1179 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1190 ../../include/text.php:1202 +#: ../../include/text.php:1191 ../../include/text.php:1203 #: ../../addon/cards/Mod_Cards.php:116 #: ../../addon/articles/Mod_Articles.php:120 -#: ../../Zotlabs/Module/Admin/Queueworker.php:114 -#: ../../Zotlabs/Module/Admin/Profs.php:94 -#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:31 -#: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Module/Filer.php:54 +#: ../../Zotlabs/Module/Admin/Queueworker.php:115 +#: ../../Zotlabs/Module/Admin/Profs.php:95 +#: ../../Zotlabs/Module/Admin/Profs.php:115 ../../Zotlabs/Module/Rbmark.php:29 +#: ../../Zotlabs/Module/Rbmark.php:85 ../../Zotlabs/Module/Filer.php:54 msgid "Save" msgstr "" -#: ../../include/text.php:1502 +#: ../../include/text.php:1503 msgid "May" msgstr "" -#: ../../include/text.php:1576 +#: ../../include/text.php:1577 msgid "Unknown attachment" msgstr "" -#: ../../include/text.php:1579 ../../Zotlabs/Storage/Browser.php:382 +#: ../../include/text.php:1580 ../../Zotlabs/Storage/Browser.php:383 #: ../../Zotlabs/Module/Sharedwithme.php:109 msgid "Size" msgstr "" -#: ../../include/text.php:1622 +#: ../../include/text.php:1623 msgid "remove category" msgstr "" -#: ../../include/text.php:1700 +#: ../../include/text.php:1701 msgid "remove from file" msgstr "" -#: ../../include/text.php:1887 +#: ../../include/text.php:1888 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1945 ../../include/text.php:1954 -#: ../../include/text.php:1981 ../../include/text.php:1990 +#: ../../include/text.php:1946 ../../include/text.php:1955 +#: ../../include/text.php:1982 ../../include/text.php:1991 #, php-format msgctxt "noun" msgid "%d Vote" @@ -3396,7 +3378,7 @@ msgid_plural "%d Votes" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:1997 +#: ../../include/text.php:1998 #, php-format msgctxt "noun" msgid "%d Vote in total" @@ -3404,208 +3386,208 @@ msgid_plural "%d Votes in total" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:2003 +#: ../../include/text.php:2004 msgid "Poll has ended" msgstr "" -#: ../../include/text.php:2006 +#: ../../include/text.php:2007 #, php-format msgid "Poll ends in %s" msgstr "" -#: ../../include/text.php:2013 ../../Zotlabs/Lib/ThreadItem.php:467 +#: ../../include/text.php:2014 ../../Zotlabs/Lib/ThreadItem.php:467 msgid "Vote" msgstr "" -#: ../../include/text.php:2168 +#: ../../include/text.php:2174 msgid "Link to Source" msgstr "" -#: ../../include/text.php:2201 +#: ../../include/text.php:2207 msgid "Page layout" msgstr "" -#: ../../include/text.php:2201 +#: ../../include/text.php:2207 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:2211 ../../addon/wiki/Mod_Wiki.php:220 +#: ../../include/text.php:2217 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 #: ../../addon/wiki/Widget/Wiki_pages.php:68 msgid "BBcode" msgstr "" -#: ../../include/text.php:2212 +#: ../../include/text.php:2218 msgid "HTML" msgstr "" -#: ../../include/text.php:2213 ../../addon/wiki/Mod_Wiki.php:220 +#: ../../include/text.php:2219 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 #: ../../addon/wiki/Widget/Wiki_pages.php:68 ../../addon/mdpost/mdpost.php:41 msgid "Markdown" msgstr "" -#: ../../include/text.php:2214 ../../addon/wiki/Mod_Wiki.php:220 +#: ../../include/text.php:2220 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:903 ../../addon/wiki/Widget/Wiki_pages.php:68 msgid "Text" msgstr "" -#: ../../include/text.php:2215 +#: ../../include/text.php:2221 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:2220 +#: ../../include/text.php:2226 msgid "PHP" msgstr "" -#: ../../include/text.php:2232 +#: ../../include/text.php:2238 msgid "Page content type" msgstr "" -#: ../../include/text.php:2365 +#: ../../include/text.php:2371 msgid "activity" msgstr "" -#: ../../include/text.php:2368 +#: ../../include/text.php:2374 msgid "poll" msgstr "" -#: ../../include/text.php:2481 +#: ../../include/text.php:2487 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2789 +#: ../../include/text.php:2795 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2792 ../../Zotlabs/Module/Blocks.php:152 +#: ../../include/text.php:2798 ../../Zotlabs/Module/Blocks.php:152 msgid "Blocks" msgstr "" -#: ../../include/text.php:2793 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2799 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "" -#: ../../include/text.php:2794 ../../Zotlabs/Module/Layouts.php:182 +#: ../../include/text.php:2800 ../../Zotlabs/Module/Layouts.php:182 msgid "Layouts" msgstr "" -#: ../../include/text.php:2795 +#: ../../include/text.php:2801 msgid "Pages" msgstr "" -#: ../../include/text.php:2807 +#: ../../include/text.php:2813 msgid "Import" msgstr "" -#: ../../include/text.php:2808 +#: ../../include/text.php:2814 msgid "Import website..." msgstr "" -#: ../../include/text.php:2809 +#: ../../include/text.php:2815 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2810 +#: ../../include/text.php:2816 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2811 +#: ../../include/text.php:2817 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2812 +#: ../../include/text.php:2818 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2813 +#: ../../include/text.php:2819 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2814 +#: ../../include/text.php:2820 msgid "Select folder" msgstr "" -#: ../../include/text.php:2815 +#: ../../include/text.php:2821 msgid "Export website..." msgstr "" -#: ../../include/text.php:2816 +#: ../../include/text.php:2822 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2817 +#: ../../include/text.php:2823 msgid "website.zip" msgstr "" -#: ../../include/text.php:2818 +#: ../../include/text.php:2824 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2819 +#: ../../include/text.php:2825 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2820 +#: ../../include/text.php:2826 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2821 +#: ../../include/text.php:2827 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2822 +#: ../../include/text.php:2828 msgid "Specify folder" msgstr "" -#: ../../include/channel.php:49 +#: ../../include/channel.php:50 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/channel.php:82 +#: ../../include/channel.php:83 msgid "Empty name" msgstr "" -#: ../../include/channel.php:85 +#: ../../include/channel.php:86 msgid "Name too long" msgstr "" -#: ../../include/channel.php:202 +#: ../../include/channel.php:203 msgid "No account identifier" msgstr "" -#: ../../include/channel.php:214 ../../Zotlabs/Module/Register.php:95 +#: ../../include/channel.php:215 ../../Zotlabs/Module/Register.php:96 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:228 ../../include/channel.php:667 -#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46 +#: ../../include/channel.php:229 ../../include/channel.php:668 +#: ../../Zotlabs/Module/Register.php:101 ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/channel.php:233 ../../include/channel.php:672 -#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51 +#: ../../include/channel.php:234 ../../include/channel.php:673 +#: ../../Zotlabs/Module/Register.php:106 ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/channel.php:299 +#: ../../include/channel.php:300 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:410 +#: ../../include/channel.php:411 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:600 ../../include/channel.php:689 +#: ../../include/channel.php:601 ../../include/channel.php:690 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1381 +#: ../../include/channel.php:1382 msgid "Requested channel is not available" msgstr "" -#: ../../include/channel.php:1435 ../../addon/cards/Mod_Cards.php:42 +#: ../../include/channel.php:1436 ../../addon/cards/Mod_Cards.php:42 #: ../../addon/articles/Mod_Articles.php:46 #: ../../addon/gallery/Mod_Gallery.php:49 #: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Webpages.php:39 @@ -3617,268 +3599,268 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/channel.php:1531 ../../Zotlabs/Module/Profiles.php:740 +#: ../../include/channel.php:1532 ../../Zotlabs/Module/Profiles.php:743 msgid "Change profile photo" msgstr "" -#: ../../include/channel.php:1539 +#: ../../include/channel.php:1540 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1557 ../../Zotlabs/Module/Profiles.php:837 +#: ../../include/channel.php:1558 ../../Zotlabs/Module/Profiles.php:841 msgid "Profile Image" msgstr "" -#: ../../include/channel.php:1560 +#: ../../include/channel.php:1561 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1561 ../../Zotlabs/Module/Profiles.php:737 -#: ../../Zotlabs/Module/Profiles.php:841 +#: ../../include/channel.php:1562 ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:845 msgid "Edit visibility" msgstr "" -#: ../../include/channel.php:1643 ../../include/channel.php:1771 +#: ../../include/channel.php:1644 ../../include/channel.php:1772 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1644 ../../include/channel.php:1817 +#: ../../include/channel.php:1645 ../../include/channel.php:1818 msgid "Status:" msgstr "" -#: ../../include/channel.php:1645 ../../include/channel.php:1841 +#: ../../include/channel.php:1646 ../../include/channel.php:1842 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1646 ../../include/channel.php:1843 +#: ../../include/channel.php:1647 ../../include/channel.php:1844 #: ../../Zotlabs/Module/Directory.php:368 msgid "Hometown:" msgstr "" -#: ../../include/channel.php:1647 +#: ../../include/channel.php:1648 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1696 +#: ../../include/channel.php:1697 msgid "This channel has not added a profile description yet" msgstr "" -#: ../../include/channel.php:1698 +#: ../../include/channel.php:1699 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1730 +#: ../../include/channel.php:1731 msgid "Trans" msgstr "" -#: ../../include/channel.php:1769 +#: ../../include/channel.php:1770 msgid "Full Name:" msgstr "" -#: ../../include/channel.php:1802 +#: ../../include/channel.php:1803 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1803 +#: ../../include/channel.php:1804 msgid "j F" msgstr "" -#: ../../include/channel.php:1810 +#: ../../include/channel.php:1811 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1814 ../../Zotlabs/Module/Directory.php:349 +#: ../../include/channel.php:1815 ../../Zotlabs/Module/Directory.php:349 msgid "Age:" msgstr "" -#: ../../include/channel.php:1823 +#: ../../include/channel.php:1824 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1835 +#: ../../include/channel.php:1836 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1839 +#: ../../include/channel.php:1840 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1845 +#: ../../include/channel.php:1846 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1847 +#: ../../include/channel.php:1848 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1849 ../../Zotlabs/Module/Directory.php:370 +#: ../../include/channel.php:1850 ../../Zotlabs/Module/Directory.php:370 msgid "About:" msgstr "" -#: ../../include/channel.php:1851 +#: ../../include/channel.php:1852 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1853 +#: ../../include/channel.php:1854 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1855 +#: ../../include/channel.php:1856 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1857 +#: ../../include/channel.php:1858 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1859 +#: ../../include/channel.php:1860 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1861 +#: ../../include/channel.php:1862 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1863 +#: ../../include/channel.php:1864 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1865 +#: ../../include/channel.php:1866 msgid "Television:" msgstr "" -#: ../../include/channel.php:1867 +#: ../../include/channel.php:1868 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1869 +#: ../../include/channel.php:1870 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1871 +#: ../../include/channel.php:1872 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1873 +#: ../../include/channel.php:1874 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1894 ../../Zotlabs/Lib/Apps.php:365 -#: ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1895 ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Module/Profperm.php:114 msgid "Profile" msgstr "" -#: ../../include/channel.php:1896 +#: ../../include/channel.php:1897 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:1897 +#: ../../include/channel.php:1898 msgid "Export" msgstr "" -#: ../../include/channel.php:2350 +#: ../../include/channel.php:2351 msgid "cover photo" msgstr "" -#: ../../include/channel.php:2631 ../../boot.php:1747 +#: ../../include/channel.php:2632 ../../boot.php:1761 #: ../../Zotlabs/Module/Rmagic.php:96 msgid "Remote Authentication" msgstr "" -#: ../../include/channel.php:2632 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2633 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/channel.php:2633 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2634 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "" -#: ../../include/channel.php:2793 ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../include/channel.php:2794 ../../Zotlabs/Module/Admin/Accounts.php:184 #, php-format msgid "Account '%s' deleted" msgstr "" -#: ../../include/bbcode.php:233 ../../include/bbcode.php:993 -#: ../../include/bbcode.php:1613 ../../include/bbcode.php:1621 +#: ../../include/bbcode.php:234 ../../include/bbcode.php:994 +#: ../../include/bbcode.php:1659 ../../include/bbcode.php:1667 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:285 +#: ../../include/bbcode.php:286 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:341 +#: ../../include/bbcode.php:342 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:345 +#: ../../include/bbcode.php:346 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -#: ../../include/bbcode.php:355 ../../Zotlabs/Module/Impel.php:47 +#: ../../include/bbcode.php:356 ../../Zotlabs/Module/Impel.php:47 msgid "webpage" msgstr "" -#: ../../include/bbcode.php:358 ../../Zotlabs/Module/Impel.php:57 +#: ../../include/bbcode.php:359 ../../Zotlabs/Module/Impel.php:57 msgid "layout" msgstr "" -#: ../../include/bbcode.php:361 ../../Zotlabs/Module/Impel.php:52 +#: ../../include/bbcode.php:362 ../../Zotlabs/Module/Impel.php:52 msgid "block" msgstr "" -#: ../../include/bbcode.php:364 ../../Zotlabs/Module/Impel.php:64 +#: ../../include/bbcode.php:365 ../../Zotlabs/Module/Impel.php:64 msgid "menu" msgstr "" -#: ../../include/bbcode.php:567 +#: ../../include/bbcode.php:568 msgid "card" msgstr "" -#: ../../include/bbcode.php:569 +#: ../../include/bbcode.php:570 msgid "article" msgstr "" -#: ../../include/bbcode.php:652 ../../include/bbcode.php:660 +#: ../../include/bbcode.php:653 ../../include/bbcode.php:661 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:673 +#: ../../include/bbcode.php:674 msgid "View article" msgstr "" -#: ../../include/bbcode.php:673 +#: ../../include/bbcode.php:674 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1117 ../../include/bbcode.php:1299 +#: ../../include/bbcode.php:1127 ../../include/bbcode.php:1312 #: ../../addon/wiki/Lib/NativeWikiPage.php:630 msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/bbcode.php:1589 +#: ../../include/bbcode.php:1635 msgid "$1 wrote:" msgstr "" -#: ../../include/import.php:30 +#: ../../include/import.php:31 msgid "Unable to import a removed channel." msgstr "" -#: ../../include/import.php:56 +#: ../../include/import.php:57 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:77 ../../addon/diaspora/import_diaspora.php:43 +#: ../../include/import.php:78 ../../addon/diaspora/import_diaspora.php:43 msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/import.php:128 +#: ../../include/import.php:129 msgid "Cloned channel not found. Import failed." msgstr "" @@ -3906,14 +3888,6 @@ msgstr "" msgid "IRC Chatroom" msgstr "" -#: ../../addon/smileybutton/Mod_Smileybutton.php:42 -msgid "Hide the button and show the smilies directly." -msgstr "" - -#: ../../addon/smileybutton/Mod_Smileybutton.php:50 -msgid "Smileybutton Settings" -msgstr "" - #: ../../addon/fediquest/fediquest.php:211 msgid "ERROR: word length is not correct!" msgstr "" @@ -4062,7 +4036,7 @@ msgstr "" msgid "Send email to all members" msgstr "" -#: ../../addon/hubwall/hubwall.php:33 ../../Zotlabs/Lib/Enotify.php:65 +#: ../../addon/hubwall/hubwall.php:33 ../../Zotlabs/Lib/Enotify.php:66 #, php-format msgid "%s Administrator" msgstr "" @@ -4071,24 +4045,24 @@ msgstr "" msgid "No recipients found." msgstr "" -#: ../../addon/hubwall/hubwall.php:73 +#: ../../addon/hubwall/hubwall.php:74 #, php-format msgid "%1$d of %2$d messages sent." msgstr "" -#: ../../addon/hubwall/hubwall.php:81 +#: ../../addon/hubwall/hubwall.php:82 msgid "Send email to all hub members." msgstr "" -#: ../../addon/hubwall/hubwall.php:92 ../../addon/mailtest/mailtest.php:96 +#: ../../addon/hubwall/hubwall.php:93 ../../addon/mailtest/mailtest.php:96 msgid "Message subject" msgstr "" -#: ../../addon/hubwall/hubwall.php:93 +#: ../../addon/hubwall/hubwall.php:94 msgid "Sender Email address" msgstr "" -#: ../../addon/hubwall/hubwall.php:94 +#: ../../addon/hubwall/hubwall.php:95 msgid "Test mode (only send to hub administrator)" msgstr "" @@ -4132,7 +4106,7 @@ msgid "Last Name" msgstr "" #: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:73 -#: ../../boot.php:1740 +#: ../../boot.php:1754 msgid "Nickname" msgstr "" @@ -4165,11 +4139,11 @@ msgid "Profile Photo 128px" msgstr "" #: ../../addon/openid/MysqlProvider.php:68 -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Homepage URL" msgstr "" -#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:362 +#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:363 msgid "Language" msgstr "" @@ -4190,7 +4164,7 @@ msgid "Birthdate" msgstr "" #: ../../addon/openid/MysqlProvider.php:74 -#: ../../Zotlabs/Module/Profiles.php:452 +#: ../../Zotlabs/Module/Profiles.php:453 msgid "Gender" msgstr "" @@ -4294,7 +4268,7 @@ msgid "Unknown error. Please try again later." msgstr "" #: ../../addon/openclipatar/openclipatar.php:299 -#: ../../Zotlabs/Module/Profile_photo.php:268 +#: ../../Zotlabs/Module/Profile_photo.php:269 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." @@ -4381,10 +4355,10 @@ msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Lib/Enotify.php:66 -#: ../../Zotlabs/Module/Home.php:87 ../../Zotlabs/Module/Home.php:95 -#: ../../Zotlabs/Module/Invite.php:238 ../../Zotlabs/Module/Invite.php:507 -#: ../../Zotlabs/Module/Invite.php:521 +#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Lib/Enotify.php:67 +#: ../../Zotlabs/Module/Home.php:88 ../../Zotlabs/Module/Home.php:96 +#: ../../Zotlabs/Module/Invite.php:239 ../../Zotlabs/Module/Invite.php:508 +#: ../../Zotlabs/Module/Invite.php:522 msgid "$Projectname" msgstr "" @@ -4501,7 +4475,7 @@ msgstr "" #: ../../addon/faces/faces.php:291 ../../addon/twitter/twitter.php:493 #: ../../addon/openstreetmap/openstreetmap.php:171 #: ../../Zotlabs/Module/Defperms.php:111 -#: ../../Zotlabs/Module/Settings/Channel.php:150 +#: ../../Zotlabs/Module/Settings/Channel.php:151 msgid "Settings updated." msgstr "" @@ -4560,7 +4534,7 @@ msgstr "" msgid "Page Header" msgstr "" -#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:333 +#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:334 msgid "Report Bug" msgstr "" @@ -4585,7 +4559,7 @@ msgid "Insane Journal Crosspost Connector App" msgstr "" #: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/xmpp/Mod_Xmpp.php:35 -#: ../../Zotlabs/Module/Invite.php:69 ../../Zotlabs/Module/Lang.php:20 +#: ../../Zotlabs/Module/Invite.php:70 ../../Zotlabs/Module/Lang.php:20 msgid "Not Installed" msgstr "" @@ -4658,7 +4632,7 @@ msgid "Hubzilla Crosspost Connector" msgstr "" #: ../../addon/cards/cards.php:48 ../../addon/cards/cards.php:160 -#: ../../addon/cards/Mod_Cards.php:209 ../../Zotlabs/Lib/Apps.php:331 +#: ../../addon/cards/Mod_Cards.php:209 ../../Zotlabs/Lib/Apps.php:332 msgid "Cards" msgstr "" @@ -4666,6 +4640,14 @@ msgstr "" msgid "View Cards" msgstr "" +#: ../../addon/cards/cards.php:104 ../../addon/articles/articles.php:105 +#: ../../addon/wiki/Lib/NativeWikiPage.php:545 +#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:155 +#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Module/Help.php:175 +#: ../../Zotlabs/Web/Router.php:188 +msgid "Page not found." +msgstr "" + #: ../../addon/cards/Mod_Cards.php:115 msgid "Add Card" msgstr "" @@ -4780,12 +4762,12 @@ msgstr "" msgid "Activitypub Protocol" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1073 ../../addon/diaspora/diaspora.php:415 +#: ../../addon/pubcrawl/pubcrawl.php:1078 ../../addon/diaspora/diaspora.php:415 #: ../../Zotlabs/Module/Contactedit.php:494 msgid "Refresh failed" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1080 ../../addon/diaspora/diaspora.php:420 +#: ../../addon/pubcrawl/pubcrawl.php:1085 ../../addon/diaspora/diaspora.php:420 #: ../../Zotlabs/Module/Contactedit.php:491 msgid "Refresh succeeded" msgstr "" @@ -4873,7 +4855,7 @@ msgid "Import completed." msgstr "" #: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:346 -#: ../../addon/diaspora/util.php:359 ../../Zotlabs/Lib/Enotify.php:61 +#: ../../addon/diaspora/util.php:359 ../../Zotlabs/Lib/Enotify.php:62 msgid "$projectname" msgstr "" @@ -4970,8 +4952,8 @@ msgid "No channels currently blocked" msgstr "" #: ../../addon/superblock/Mod_Superblock.php:90 -#: ../../Zotlabs/Module/Cover_photo.php:381 ../../Zotlabs/Module/Tagrm.php:137 -#: ../../Zotlabs/Module/Admin/Addons.php:462 +#: ../../Zotlabs/Module/Cover_photo.php:382 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Admin/Addons.php:463 #: ../../Zotlabs/Module/Photos.php:994 msgid "Remove" msgstr "" @@ -5113,9 +5095,9 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:172 ../../addon/wiki/Mod_Wiki.php:221 #: ../../addon/wiki/Lib/NativeWikiPage.php:588 #: ../../addon/wiki/Widget/Wiki_page_history.php:28 -#: ../../Zotlabs/Storage/Browser.php:380 ../../Zotlabs/Module/Oauth.php:111 +#: ../../Zotlabs/Storage/Browser.php:381 ../../Zotlabs/Module/Oauth.php:111 #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Connedit.php:732 -#: ../../Zotlabs/Module/Admin/Channels.php:159 +#: ../../Zotlabs/Module/Admin/Channels.php:181 #: ../../Zotlabs/Module/Sharedwithme.php:107 ../../Zotlabs/Module/Chat.php:256 #: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Oauth2.php:116 #: ../../Zotlabs/Module/Oauth2.php:144 @@ -5125,7 +5107,7 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/hzservices.php:657 #: ../../addon/cart/submodules/manualcat.php:260 -#: ../../Zotlabs/Module/Appman.php:220 ../../Zotlabs/Module/Rbmark.php:100 +#: ../../Zotlabs/Module/Appman.php:220 ../../Zotlabs/Module/Rbmark.php:82 #: ../../Zotlabs/Module/Cdav.php:1005 msgid "Description" msgstr "" @@ -5205,7 +5187,7 @@ msgstr "" msgid "You have no rendezvous. Press the button above to create a rendezvous!" msgstr "" -#: ../../addon/rendezvous/rendezvous.php:401 ../../Zotlabs/Module/Setup.php:748 +#: ../../addon/rendezvous/rendezvous.php:401 ../../Zotlabs/Module/Setup.php:751 msgid "Errors encountered creating database tables." msgstr "" @@ -5314,7 +5296,7 @@ msgid "Edit Article" msgstr "" #: ../../addon/articles/articles.php:48 ../../addon/articles/articles.php:160 -#: ../../addon/articles/Mod_Articles.php:228 ../../Zotlabs/Lib/Apps.php:330 +#: ../../addon/articles/Mod_Articles.php:228 ../../Zotlabs/Lib/Apps.php:331 msgid "Articles" msgstr "" @@ -5351,18 +5333,18 @@ msgstr "" msgid "Error downloading wiki: " msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:215 ../../Zotlabs/Storage/Browser.php:407 +#: ../../addon/wiki/Mod_Wiki.php:215 ../../Zotlabs/Storage/Browser.php:408 msgid "Download" msgstr "" #: ../../addon/wiki/Mod_Wiki.php:216 ../../addon/wiki/Mod_Wiki.php:406 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Layouts.php:196 -#: ../../Zotlabs/Module/Pubsites.php:62 ../../Zotlabs/Module/Blocks.php:164 +#: ../../Zotlabs/Module/Pubsites.php:63 ../../Zotlabs/Module/Blocks.php:164 msgid "View" msgstr "" #: ../../addon/wiki/Mod_Wiki.php:217 ../../Zotlabs/Module/Manage.php:137 -#: ../../Zotlabs/Module/Profiles.php:848 +#: ../../Zotlabs/Module/Profiles.php:852 msgid "Create New" msgstr "" @@ -5374,7 +5356,7 @@ msgstr "" msgid "Content type" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:222 ../../Zotlabs/Storage/Browser.php:381 +#: ../../addon/wiki/Mod_Wiki.php:222 ../../Zotlabs/Storage/Browser.php:382 msgid "Type" msgstr "" @@ -5432,8 +5414,8 @@ msgstr "" msgid "Embed image from photo albums" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:402 ../../Zotlabs/Module/Cover_photo.php:389 -#: ../../Zotlabs/Module/Profile_photo.php:556 +#: ../../addon/wiki/Mod_Wiki.php:402 ../../Zotlabs/Module/Cover_photo.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:557 msgid "Choose a different album" msgstr "" @@ -5704,7 +5686,7 @@ msgid "New registration" msgstr "" #: ../../addon/notifyadmin/notifyadmin.php:40 -#: ../../Zotlabs/Module/Invite.php:265 +#: ../../Zotlabs/Module/Invite.php:266 #, php-format msgid "%s : Message delivery failed." msgstr "" @@ -5719,7 +5701,7 @@ msgid "Post to GNU social" msgstr "" #: ../../addon/statusnet/statusnet.php:593 -#: ../../Zotlabs/Module/Admin/Site.php:409 +#: ../../Zotlabs/Module/Admin/Site.php:410 msgid "Site name" msgstr "" @@ -6420,7 +6402,7 @@ msgstr "" msgid "Brief description or title" msgstr "" -#: ../../addon/workflow/workflow.php:2661 ../../Zotlabs/Lib/Apps.php:373 +#: ../../addon/workflow/workflow.php:2661 ../../Zotlabs/Lib/Apps.php:374 #: ../../Zotlabs/Widget/Notes.php:38 msgid "Notes" msgstr "" @@ -6485,7 +6467,7 @@ msgid "Files imported" msgstr "" #: ../../addon/content_import/Mod_content_import.php:133 -#: ../../Zotlabs/Lib/Apps.php:337 +#: ../../Zotlabs/Lib/Apps.php:338 msgid "Content Import" msgstr "" @@ -6676,509 +6658,509 @@ msgstr "" msgid "I won!" msgstr "" -#: ../../boot.php:1722 +#: ../../boot.php:1736 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1740 +#: ../../boot.php:1754 msgid "Email or nickname" msgstr "" -#: ../../boot.php:1750 +#: ../../boot.php:1764 msgid "Password" msgstr "" -#: ../../boot.php:1751 +#: ../../boot.php:1765 msgid "Remember me" msgstr "" -#: ../../boot.php:1754 +#: ../../boot.php:1768 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1755 ../../Zotlabs/Module/Lostpass.php:91 +#: ../../boot.php:1769 ../../Zotlabs/Module/Lostpass.php:91 msgid "Password Reset" msgstr "" -#: ../../boot.php:2625 +#: ../../boot.php:2633 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2630 +#: ../../boot.php:2638 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2746 +#: ../../boot.php:2754 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2751 +#: ../../boot.php:2759 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:60 +#: ../../Zotlabs/Lib/Enotify.php:61 msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:63 +#: ../../Zotlabs/Lib/Enotify.php:64 msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:66 +#: ../../Zotlabs/Lib/Enotify.php:67 #, php-format msgid "This email was sent by %1$s at %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:67 +#: ../../Zotlabs/Lib/Enotify.php:68 #, php-format msgid "" "To stop receiving these messages, please adjust your Notification Settings " "at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:68 +#: ../../Zotlabs/Lib/Enotify.php:69 #, php-format msgid "To stop receiving these messages, please adjust your %s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:68 -#: ../../Zotlabs/Module/Settings/Channel.php:241 +#: ../../Zotlabs/Lib/Enotify.php:69 +#: ../../Zotlabs/Module/Settings/Channel.php:242 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:123 +#: ../../Zotlabs/Lib/Enotify.php:124 #, php-format msgid "%s " msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:131 +#: ../../Zotlabs/Lib/Enotify.php:132 #, php-format msgid "[$Projectname:Notify] New direct message received at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:133 +#: ../../Zotlabs/Lib/Enotify.php:134 #, php-format msgid "%1$s sent you a new direct message at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:134 +#: ../../Zotlabs/Lib/Enotify.php:135 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:134 +#: ../../Zotlabs/Lib/Enotify.php:135 msgid "a direct message" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:135 +#: ../../Zotlabs/Lib/Enotify.php:136 #, php-format msgid "Please visit %s to view and/or reply to your direct messages." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:148 +#: ../../Zotlabs/Lib/Enotify.php:149 msgid "requested to comment on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:148 +#: ../../Zotlabs/Lib/Enotify.php:149 msgid "commented on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:162 ../../Zotlabs/Lib/Enotify.php:318 msgid "requested to like" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:317 +#: ../../Zotlabs/Lib/Enotify.php:162 ../../Zotlabs/Lib/Enotify.php:318 msgid "liked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:320 +#: ../../Zotlabs/Lib/Enotify.php:165 ../../Zotlabs/Lib/Enotify.php:321 msgid "requested to dislike" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:320 +#: ../../Zotlabs/Lib/Enotify.php:165 ../../Zotlabs/Lib/Enotify.php:321 msgid "disliked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:167 +#: ../../Zotlabs/Lib/Enotify.php:168 msgid "repeated" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:172 +#: ../../Zotlabs/Lib/Enotify.php:173 msgid "voted on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:215 +#: ../../Zotlabs/Lib/Enotify.php:216 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:223 +#: ../../Zotlabs/Lib/Enotify.php:224 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:232 ../../Zotlabs/Lib/Enotify.php:324 +#: ../../Zotlabs/Lib/Enotify.php:233 ../../Zotlabs/Lib/Enotify.php:325 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:244 +#: ../../Zotlabs/Lib/Enotify.php:245 #, php-format msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:246 +#: ../../Zotlabs/Lib/Enotify.php:247 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:247 +#: ../../Zotlabs/Lib/Enotify.php:248 #, php-format msgid "%1$s commented on an item/conversation you have been following" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:250 ../../Zotlabs/Lib/Enotify.php:344 -#: ../../Zotlabs/Lib/Enotify.php:360 ../../Zotlabs/Lib/Enotify.php:384 -#: ../../Zotlabs/Lib/Enotify.php:401 ../../Zotlabs/Lib/Enotify.php:414 +#: ../../Zotlabs/Lib/Enotify.php:251 ../../Zotlabs/Lib/Enotify.php:345 +#: ../../Zotlabs/Lib/Enotify.php:361 ../../Zotlabs/Lib/Enotify.php:385 +#: ../../Zotlabs/Lib/Enotify.php:402 ../../Zotlabs/Lib/Enotify.php:415 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:254 ../../Zotlabs/Lib/Enotify.php:255 +#: ../../Zotlabs/Lib/Enotify.php:255 ../../Zotlabs/Lib/Enotify.php:256 #, php-format msgid "Please visit %s to approve or reject this comment." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:340 +#: ../../Zotlabs/Lib/Enotify.php:341 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:341 +#: ../../Zotlabs/Lib/Enotify.php:342 #, php-format msgid "%1$s liked an item/conversation you created" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:352 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:354 +#: ../../Zotlabs/Lib/Enotify.php:355 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:356 +#: ../../Zotlabs/Lib/Enotify.php:357 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:378 +#: ../../Zotlabs/Lib/Enotify.php:379 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:379 +#: ../../Zotlabs/Lib/Enotify.php:380 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:380 +#: ../../Zotlabs/Lib/Enotify.php:381 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:391 +#: ../../Zotlabs/Lib/Enotify.php:392 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:392 +#: ../../Zotlabs/Lib/Enotify.php:393 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:393 +#: ../../Zotlabs/Lib/Enotify.php:394 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:408 +#: ../../Zotlabs/Lib/Enotify.php:409 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:409 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:410 +#: ../../Zotlabs/Lib/Enotify.php:411 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:421 +#: ../../Zotlabs/Lib/Enotify.php:422 msgid "[$Projectname:Notify] Introduction received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:422 +#: ../../Zotlabs/Lib/Enotify.php:423 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:424 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:426 ../../Zotlabs/Lib/Enotify.php:444 +#: ../../Zotlabs/Lib/Enotify.php:427 ../../Zotlabs/Lib/Enotify.php:445 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:428 +#: ../../Zotlabs/Lib/Enotify.php:429 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:435 +#: ../../Zotlabs/Lib/Enotify.php:436 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:436 +#: ../../Zotlabs/Lib/Enotify.php:437 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:437 +#: ../../Zotlabs/Lib/Enotify.php:438 #, php-format msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:442 +#: ../../Zotlabs/Lib/Enotify.php:443 msgid "Name:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:443 +#: ../../Zotlabs/Lib/Enotify.php:444 msgid "Photo:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:446 +#: ../../Zotlabs/Lib/Enotify.php:447 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:676 +#: ../../Zotlabs/Lib/Enotify.php:677 msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:842 +#: ../../Zotlabs/Lib/Enotify.php:843 msgid "created a new poll" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:842 +#: ../../Zotlabs/Lib/Enotify.php:843 msgid "created a new post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:843 +#: ../../Zotlabs/Lib/Enotify.php:844 #, php-format msgid "voted on %s's poll" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:843 +#: ../../Zotlabs/Lib/Enotify.php:844 #, php-format msgid "commented on %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:847 ../../Zotlabs/Lib/Enotify.php:947 +#: ../../Zotlabs/Lib/Enotify.php:848 ../../Zotlabs/Lib/Enotify.php:948 msgid "shared a file with you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:856 +#: ../../Zotlabs/Lib/Enotify.php:857 #, php-format msgid "edited a post dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:859 +#: ../../Zotlabs/Lib/Enotify.php:860 #, php-format msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:932 +#: ../../Zotlabs/Lib/Enotify.php:933 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:962 +#: ../../Zotlabs/Lib/Enotify.php:963 msgid "sent you a direct message" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:969 +#: ../../Zotlabs/Lib/Enotify.php:970 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:972 +#: ../../Zotlabs/Lib/Enotify.php:973 msgid "[today]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:982 +#: ../../Zotlabs/Lib/Enotify.php:983 msgid "created an event" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:997 +#: ../../Zotlabs/Lib/Enotify.php:998 msgid "status verified" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:329 +#: ../../Zotlabs/Lib/Apps.php:330 msgid "Affinity Tool" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:332 +#: ../../Zotlabs/Lib/Apps.php:333 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:336 +#: ../../Zotlabs/Lib/Apps.php:337 msgid "Content Filter" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:339 +#: ../../Zotlabs/Lib/Apps.php:340 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:340 +#: ../../Zotlabs/Lib/Apps.php:341 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:342 +#: ../../Zotlabs/Lib/Apps.php:343 msgid "Channel Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:343 +#: ../../Zotlabs/Lib/Apps.php:344 msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Lib/Apps.php:358 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:358 +#: ../../Zotlabs/Lib/Apps.php:359 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:360 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Lib/Apps.php:361 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:361 ../../Zotlabs/Widget/Admin.php:31 +#: ../../Zotlabs/Lib/Apps.php:362 ../../Zotlabs/Widget/Admin.php:31 msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:363 ../../Zotlabs/Storage/Browser.php:410 +#: ../../Zotlabs/Lib/Apps.php:364 ../../Zotlabs/Storage/Browser.php:411 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:368 +#: ../../Zotlabs/Lib/Apps.php:369 msgid "Notifications" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Order Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:370 +#: ../../Zotlabs/Lib/Apps.php:371 msgid "CardDAV" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Module/Sources.php:105 +#: ../../Zotlabs/Lib/Apps.php:372 ../../Zotlabs/Module/Sources.php:105 msgid "Channel Sources" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:372 ../../Zotlabs/Module/Tokens.php:288 +#: ../../Zotlabs/Lib/Apps.php:373 ../../Zotlabs/Module/Tokens.php:288 msgid "Guest Access" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Lib/Apps.php:375 msgid "OAuth Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Lib/Apps.php:376 msgid "OAuth2 Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:377 msgid "PDL Editor" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:377 ../../Zotlabs/Module/Permcats.php:248 +#: ../../Zotlabs/Lib/Apps.php:378 ../../Zotlabs/Module/Permcats.php:248 msgid "Contact Roles" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:378 ../../Zotlabs/Widget/Notifications.php:154 -#: ../../Zotlabs/Module/Pubstream.php:108 +#: ../../Zotlabs/Lib/Apps.php:379 ../../Zotlabs/Widget/Notifications.php:154 +#: ../../Zotlabs/Module/Pubstream.php:109 msgid "Public Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:379 +#: ../../Zotlabs/Lib/Apps.php:380 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:380 +#: ../../Zotlabs/Lib/Apps.php:381 msgid "Channel Export" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:561 ../../Zotlabs/Module/Oauth.php:53 +#: ../../Zotlabs/Lib/Apps.php:562 ../../Zotlabs/Module/Oauth.php:53 #: ../../Zotlabs/Module/Oauth.php:135 ../../Zotlabs/Module/Connedit.php:748 -#: ../../Zotlabs/Module/Admin/Addons.php:460 ../../Zotlabs/Module/Cdav.php:1044 +#: ../../Zotlabs/Module/Admin/Addons.php:461 ../../Zotlabs/Module/Cdav.php:1044 #: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:142 msgid "Update" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:561 ../../Zotlabs/Module/Admin/Addons.php:429 +#: ../../Zotlabs/Lib/Apps.php:562 ../../Zotlabs/Module/Admin/Addons.php:430 msgid "Install" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:591 ../../Zotlabs/Lib/Apps.php:613 +#: ../../Zotlabs/Lib/Apps.php:592 ../../Zotlabs/Lib/Apps.php:614 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:618 +#: ../../Zotlabs/Lib/Apps.php:619 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:626 +#: ../../Zotlabs/Lib/Apps.php:627 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:627 +#: ../../Zotlabs/Lib/Apps.php:628 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:628 +#: ../../Zotlabs/Lib/Apps.php:629 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:629 +#: ../../Zotlabs/Lib/Apps.php:630 msgid "Unpin from navbar" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:108 -#: ../../Zotlabs/Access/PermissionRoles.php:384 +#: ../../Zotlabs/Access/PermissionRoles.php:386 msgid "Public" msgstr "" @@ -7236,117 +7218,117 @@ msgctxt "permcat" msgid "Default" msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:67 +#: ../../Zotlabs/Lib/DB_Upgrade.php:68 msgid "Source code of failed update: " msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:88 +#: ../../Zotlabs/Lib/DB_Upgrade.php:89 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:94 +#: ../../Zotlabs/Lib/DB_Upgrade.php:95 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:147 +#: ../../Zotlabs/Lib/Connect.php:45 ../../Zotlabs/Lib/Connect.php:146 msgid "Channel is blocked on this site." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:51 +#: ../../Zotlabs/Lib/Connect.php:50 msgid "Channel location missing." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:105 +#: ../../Zotlabs/Lib/Connect.php:104 msgid "Remote channel or protocol unavailable." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:141 +#: ../../Zotlabs/Lib/Connect.php:140 msgid "Channel discovery failed." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:159 +#: ../../Zotlabs/Lib/Connect.php:158 msgid "Protocol disabled." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:171 +#: ../../Zotlabs/Lib/Connect.php:170 msgid "Cannot connect to yourself." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:276 +#: ../../Zotlabs/Lib/Connect.php:275 msgid "error saving data" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:111 +#: ../../Zotlabs/Lib/ThreadItem.php:110 msgid "Restricted message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:118 +#: ../../Zotlabs/Lib/ThreadItem.php:117 msgid "Direct message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:123 +#: ../../Zotlabs/Lib/ThreadItem.php:122 msgid "Public Policy" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:157 +#: ../../Zotlabs/Lib/ThreadItem.php:156 msgid "Privacy conflict. Discretion advised." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:188 ../../Zotlabs/Storage/Browser.php:372 +#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Storage/Browser.php:373 msgid "Admin Delete" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Lib/ThreadItem.php:190 ../../Zotlabs/Module/Filer.php:55 msgid "Save to Folder" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:216 ../../Zotlabs/Widget/Pinned.php:75 +#: ../../Zotlabs/Lib/ThreadItem.php:215 ../../Zotlabs/Widget/Pinned.php:77 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:216 ../../Zotlabs/Widget/Pinned.php:75 +#: ../../Zotlabs/Lib/ThreadItem.php:215 ../../Zotlabs/Widget/Pinned.php:77 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:216 ../../Zotlabs/Widget/Pinned.php:75 +#: ../../Zotlabs/Lib/ThreadItem.php:215 ../../Zotlabs/Widget/Pinned.php:77 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:333 ../../Zotlabs/Module/Photos.php:1074 +#: ../../Zotlabs/Lib/ThreadItem.php:332 ../../Zotlabs/Module/Photos.php:1074 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:334 ../../Zotlabs/Module/Photos.php:1075 +#: ../../Zotlabs/Lib/ThreadItem.php:333 ../../Zotlabs/Module/Photos.php:1075 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:334 msgid "Reply on this comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:334 msgid "reply" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:334 msgid "Reply to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../Zotlabs/Widget/Pinned.php:93 +#: ../../Zotlabs/Lib/ThreadItem.php:340 ../../Zotlabs/Widget/Pinned.php:95 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:345 +#: ../../Zotlabs/Lib/ThreadItem.php:344 msgid "Repeat" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:345 +#: ../../Zotlabs/Lib/ThreadItem.php:344 msgid "repeat" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:356 +#: ../../Zotlabs/Lib/ThreadItem.php:355 msgid "Delivery Report" msgstr "" @@ -7371,7 +7353,7 @@ msgid "to" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:435 ../../Zotlabs/Widget/Messages.php:146 -#: ../../Zotlabs/Widget/Messages.php:149 ../../Zotlabs/Widget/Pinned.php:121 +#: ../../Zotlabs/Widget/Messages.php:149 ../../Zotlabs/Widget/Pinned.php:123 msgid "via" msgstr "" @@ -7387,11 +7369,11 @@ msgstr "" msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:466 ../../Zotlabs/Widget/Pinned.php:135 +#: ../../Zotlabs/Lib/ThreadItem.php:466 ../../Zotlabs/Widget/Pinned.php:137 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:468 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../Zotlabs/Lib/ThreadItem.php:468 ../../Zotlabs/Widget/Pinned.php:138 msgid "Voting Options" msgstr "" @@ -7399,7 +7381,7 @@ msgstr "" msgid "Go to previous comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:492 ../../Zotlabs/Widget/Pinned.php:148 +#: ../../Zotlabs/Lib/ThreadItem.php:492 ../../Zotlabs/Widget/Pinned.php:150 msgid "Pinned post" msgstr "" @@ -7440,58 +7422,58 @@ msgstr "" msgid "Your website URL (optional)" msgstr "" -#: ../../Zotlabs/Lib/Libzot.php:687 +#: ../../Zotlabs/Lib/Libzot.php:688 msgid "Unable to verify channel signature" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2154 +#: ../../Zotlabs/Lib/Activity.php:2166 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2157 +#: ../../Zotlabs/Lib/Activity.php:2169 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2163 +#: ../../Zotlabs/Lib/Activity.php:2175 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2166 +#: ../../Zotlabs/Lib/Activity.php:2178 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2169 +#: ../../Zotlabs/Lib/Activity.php:2181 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2172 +#: ../../Zotlabs/Lib/Activity.php:2184 #, php-format msgid "May not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Libsync.php:823 +#: ../../Zotlabs/Lib/Libsync.php:824 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:163 +#: ../../Zotlabs/Lib/Libzotdir.php:164 msgid "Directory Options" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Lib/Libzotdir.php:166 msgid "Safe Mode" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:166 +#: ../../Zotlabs/Lib/Libzotdir.php:167 msgid "Public Forums Only" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:168 +#: ../../Zotlabs/Lib/Libzotdir.php:169 msgid "This Website Only" msgstr "" @@ -7551,79 +7533,79 @@ msgstr "" msgid "Select a privacy group" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:337 +#: ../../Zotlabs/Access/PermissionRoles.php:339 msgid "Social Networking" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:338 +#: ../../Zotlabs/Access/PermissionRoles.php:340 msgid "Social - Federation" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:339 +#: ../../Zotlabs/Access/PermissionRoles.php:341 msgid "Social - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:340 +#: ../../Zotlabs/Access/PermissionRoles.php:342 msgid "Social - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:341 +#: ../../Zotlabs/Access/PermissionRoles.php:343 msgid "Social - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:344 +#: ../../Zotlabs/Access/PermissionRoles.php:346 msgid "Community Forum" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:345 +#: ../../Zotlabs/Access/PermissionRoles.php:347 msgid "Forum - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:346 +#: ../../Zotlabs/Access/PermissionRoles.php:348 msgid "Forum - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:347 +#: ../../Zotlabs/Access/PermissionRoles.php:349 msgid "Forum - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:350 +#: ../../Zotlabs/Access/PermissionRoles.php:352 msgid "Feed Republish" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:351 +#: ../../Zotlabs/Access/PermissionRoles.php:353 msgid "Feed - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:352 +#: ../../Zotlabs/Access/PermissionRoles.php:354 msgid "Feed - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:355 +#: ../../Zotlabs/Access/PermissionRoles.php:357 msgid "Special Purpose" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:356 +#: ../../Zotlabs/Access/PermissionRoles.php:358 msgid "Special - Celebrity/Soapbox" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:357 +#: ../../Zotlabs/Access/PermissionRoles.php:359 msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:361 +#: ../../Zotlabs/Access/PermissionRoles.php:363 msgid "Custom/Expert Mode" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:385 +#: ../../Zotlabs/Access/PermissionRoles.php:387 msgid "Personal" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:386 +#: ../../Zotlabs/Access/PermissionRoles.php:388 msgid "Community forum" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:387 +#: ../../Zotlabs/Access/PermissionRoles.php:389 msgid "Custom" msgstr "" @@ -7715,15 +7697,15 @@ msgstr "" msgid "Available Apps" msgstr "" -#: ../../Zotlabs/Widget/Rating.php:57 +#: ../../Zotlabs/Widget/Rating.php:59 msgid "Rating Tools" msgstr "" -#: ../../Zotlabs/Widget/Rating.php:61 ../../Zotlabs/Widget/Rating.php:63 +#: ../../Zotlabs/Widget/Rating.php:63 ../../Zotlabs/Widget/Rating.php:65 msgid "Rate Me" msgstr "" -#: ../../Zotlabs/Widget/Rating.php:66 +#: ../../Zotlabs/Widget/Rating.php:68 msgid "View Ratings" msgstr "" @@ -7865,68 +7847,68 @@ msgstr "" msgid "Guest access" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:36 +#: ../../Zotlabs/Widget/Newmember.php:38 msgid "Profile Creation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:38 +#: ../../Zotlabs/Widget/Newmember.php:40 msgid "Upload profile photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:39 +#: ../../Zotlabs/Widget/Newmember.php:41 msgid "Upload cover photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:43 +#: ../../Zotlabs/Widget/Newmember.php:45 msgid "Find and Connect with others" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:45 +#: ../../Zotlabs/Widget/Newmember.php:47 msgid "View the directory" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:46 ../../Zotlabs/Module/Go.php:38 +#: ../../Zotlabs/Widget/Newmember.php:48 ../../Zotlabs/Module/Go.php:39 msgid "View friend suggestions" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:47 +#: ../../Zotlabs/Widget/Newmember.php:49 msgid "Manage your connections" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:50 +#: ../../Zotlabs/Widget/Newmember.php:52 msgid "Communicate" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:52 +#: ../../Zotlabs/Widget/Newmember.php:54 msgid "View your channel homepage" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:53 +#: ../../Zotlabs/Widget/Newmember.php:55 msgid "View your network stream" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:59 +#: ../../Zotlabs/Widget/Newmember.php:61 msgid "Documentation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:62 +#: ../../Zotlabs/Widget/Newmember.php:64 msgid "Missing Features?" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:64 +#: ../../Zotlabs/Widget/Newmember.php:66 msgid "Pin apps to navigation bar" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:67 msgid "Install more apps" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:76 +#: ../../Zotlabs/Widget/Newmember.php:78 msgid "View public stream" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:80 -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Widget/Newmember.php:82 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "New Member Links" msgstr "" @@ -7987,24 +7969,24 @@ msgstr "" #: ../../Zotlabs/Widget/Album.php:103 ../../Zotlabs/Widget/Portfolio.php:114 #: ../../Zotlabs/Widget/Cdav.php:152 ../../Zotlabs/Widget/Cdav.php:188 -#: ../../Zotlabs/Storage/Browser.php:546 -#: ../../Zotlabs/Module/Cover_photo.php:380 +#: ../../Zotlabs/Storage/Browser.php:547 +#: ../../Zotlabs/Module/Cover_photo.php:381 #: ../../Zotlabs/Module/Embedphotos.php:189 -#: ../../Zotlabs/Module/Profile_photo.php:546 +#: ../../Zotlabs/Module/Profile_photo.php:547 #: ../../Zotlabs/Module/Photos.php:681 msgid "Upload" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:93 +#: ../../Zotlabs/Widget/Pinned.php:95 msgid "Share This" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:116 ../../Zotlabs/Widget/Pinned.php:117 +#: ../../Zotlabs/Widget/Pinned.php:118 ../../Zotlabs/Widget/Pinned.php:119 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:150 +#: ../../Zotlabs/Widget/Pinned.php:152 msgid "Don't show" msgstr "" @@ -8148,7 +8130,7 @@ msgid "Stream Filters" msgstr "" #: ../../Zotlabs/Widget/Channel_activities.php:29 -#: ../../Zotlabs/Module/Go.php:27 +#: ../../Zotlabs/Module/Go.php:28 msgid "Welcome" msgstr "" @@ -8201,14 +8183,14 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Site.php:400 +#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Site.php:401 msgid "Site" msgstr "" #: ../../Zotlabs/Widget/Admin.php:28 #: ../../Zotlabs/Module/Admin/Accounts.php:308 #: ../../Zotlabs/Module/Admin/Accounts.php:327 -#: ../../Zotlabs/Module/Admin.php:95 +#: ../../Zotlabs/Module/Admin.php:97 msgid "Accounts" msgstr "" @@ -8217,17 +8199,17 @@ msgid "Member registrations waiting for confirmation" msgstr "" #: ../../Zotlabs/Widget/Admin.php:30 -#: ../../Zotlabs/Module/Admin/Security.php:106 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "Security" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:32 ../../Zotlabs/Module/Admin/Addons.php:346 -#: ../../Zotlabs/Module/Admin/Addons.php:444 +#: ../../Zotlabs/Widget/Admin.php:32 ../../Zotlabs/Module/Admin/Addons.php:347 +#: ../../Zotlabs/Module/Admin/Addons.php:445 msgid "Addons" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:33 ../../Zotlabs/Module/Admin/Themes.php:138 -#: ../../Zotlabs/Module/Admin/Themes.php:172 +#: ../../Zotlabs/Widget/Admin.php:33 ../../Zotlabs/Module/Admin/Themes.php:139 +#: ../../Zotlabs/Module/Admin/Themes.php:173 msgid "Themes" msgstr "" @@ -8239,7 +8221,7 @@ msgstr "" msgid "Queueworker" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:36 ../../Zotlabs/Module/Admin/Profs.php:168 +#: ../../Zotlabs/Widget/Admin.php:36 ../../Zotlabs/Module/Admin/Profs.php:169 msgid "Profile Fields" msgstr "" @@ -8248,7 +8230,7 @@ msgid "DB updates" msgstr "" #: ../../Zotlabs/Widget/Admin.php:54 ../../Zotlabs/Widget/Admin.php:64 -#: ../../Zotlabs/Module/Admin/Logs.php:83 +#: ../../Zotlabs/Module/Admin/Logs.php:84 msgid "Logs" msgstr "" @@ -8356,10 +8338,10 @@ msgid "Create new CalDAV calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:146 ../../Zotlabs/Widget/Cdav.php:184 -#: ../../Zotlabs/Storage/Browser.php:367 ../../Zotlabs/Storage/Browser.php:544 +#: ../../Zotlabs/Storage/Browser.php:368 ../../Zotlabs/Storage/Browser.php:545 #: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Module/Connedit.php:747 #: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/New_channel.php:189 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/New_channel.php:190 #: ../../Zotlabs/Module/Cdav.php:1050 ../../Zotlabs/Module/Cdav.php:1383 msgid "Create" msgstr "" @@ -8421,129 +8403,129 @@ msgstr "" msgid "Privacy groups" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:291 +#: ../../Zotlabs/Storage/Browser.php:292 msgid "Change filename to" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:308 ../../Zotlabs/Storage/Browser.php:393 +#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:394 msgid "Select a target location" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:394 +#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:395 msgid "Copy to target location" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:392 +#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:393 msgid "Set permissions for all files and sub folders" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:311 +#: ../../Zotlabs/Storage/Browser.php:312 msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:350 +#: ../../Zotlabs/Storage/Browser.php:351 msgid "File category" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:364 +#: ../../Zotlabs/Storage/Browser.php:365 msgid "Total" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:366 +#: ../../Zotlabs/Storage/Browser.php:367 msgid "Shared" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:368 +#: ../../Zotlabs/Storage/Browser.php:369 msgid "Add Files" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:384 #: ../../Zotlabs/Module/Sharedwithme.php:110 msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:384 +#: ../../Zotlabs/Storage/Browser.php:385 msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:389 +#: ../../Zotlabs/Storage/Browser.php:390 #: ../../Zotlabs/Module/Filestorage.php:206 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:390 +#: ../../Zotlabs/Storage/Browser.php:391 #: ../../Zotlabs/Module/Filestorage.php:207 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:402 +#: ../../Zotlabs/Storage/Browser.php:403 msgid "Select All" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:403 +#: ../../Zotlabs/Storage/Browser.php:404 msgid "Bulk Actions" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:404 +#: ../../Zotlabs/Storage/Browser.php:405 msgid "Adjust Permissions" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:405 +#: ../../Zotlabs/Storage/Browser.php:406 msgid "Move or Copy" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:408 +#: ../../Zotlabs/Storage/Browser.php:409 msgid "Info" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:409 +#: ../../Zotlabs/Storage/Browser.php:410 msgid "Rename" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:411 +#: ../../Zotlabs/Storage/Browser.php:412 msgid "Attachment BBcode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:412 +#: ../../Zotlabs/Storage/Browser.php:413 msgid "Embed BBcode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:413 +#: ../../Zotlabs/Storage/Browser.php:414 msgid "Link BBcode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:486 +#: ../../Zotlabs/Storage/Browser.php:487 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:491 +#: ../../Zotlabs/Storage/Browser.php:492 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:502 +#: ../../Zotlabs/Storage/Browser.php:503 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:543 +#: ../../Zotlabs/Storage/Browser.php:544 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:545 +#: ../../Zotlabs/Storage/Browser.php:546 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:557 +#: ../../Zotlabs/Storage/Browser.php:558 msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:558 +#: ../../Zotlabs/Storage/Browser.php:559 #: ../../Zotlabs/Module/Filestorage.php:211 msgid "Show in your contacts shared folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:560 +#: ../../Zotlabs/Storage/Browser.php:561 msgid "" "You can select files via the upload button or drop them right here or into " "an existing folder." @@ -8563,147 +8545,152 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:36 +#: ../../Zotlabs/Module/Import_progress.php:40 msgid "Item sync completed!" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:51 +#: ../../Zotlabs/Module/Import_progress.php:62 +#: ../../Zotlabs/Module/Import_progress.php:111 +msgid "Import host does not seem to be online or compatible" +msgstr "" + +#: ../../Zotlabs/Module/Import_progress.php:73 msgid "Item sync completed but no items were found!" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:68 +#: ../../Zotlabs/Module/Import_progress.php:90 msgid "File sync completed!" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:83 +#: ../../Zotlabs/Module/Import_progress.php:122 msgid "File sync completed but no files were found!" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:98 +#: ../../Zotlabs/Module/Import_progress.php:137 msgid "Channel clone status" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:99 +#: ../../Zotlabs/Module/Import_progress.php:138 msgid "Item sync status" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:100 +#: ../../Zotlabs/Module/Import_progress.php:139 msgid "File sync status" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:107 +#: ../../Zotlabs/Module/Import_progress.php:146 msgid "Channel cloning completed!" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:108 +#: ../../Zotlabs/Module/Import_progress.php:147 msgid "Resume" msgstr "" -#: ../../Zotlabs/Module/Import_progress.php:109 +#: ../../Zotlabs/Module/Import_progress.php:148 msgid "Only resume if sync stalled!" msgstr "" -#: ../../Zotlabs/Module/Display.php:26 ../../Zotlabs/Module/Search.php:23 +#: ../../Zotlabs/Module/Display.php:27 ../../Zotlabs/Module/Search.php:24 #: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Directory.php:77 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Photos.php:511 msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Display.php:52 ../../Zotlabs/Module/Oep.php:82 -#: ../../Zotlabs/Module/Pubstream.php:54 ../../Zotlabs/Module/Channel.php:194 +#: ../../Zotlabs/Module/Display.php:53 ../../Zotlabs/Module/Oep.php:82 +#: ../../Zotlabs/Module/Pubstream.php:55 ../../Zotlabs/Module/Channel.php:195 msgid "Malformed message id." msgstr "" -#: ../../Zotlabs/Module/Display.php:94 ../../Zotlabs/Module/Network.php:213 -#: ../../Zotlabs/Module/Hq.php:108 ../../Zotlabs/Module/Pubstream.php:97 -#: ../../Zotlabs/Module/Channel.php:278 ../../Zotlabs/Module/Rpost.php:210 +#: ../../Zotlabs/Module/Display.php:95 ../../Zotlabs/Module/Network.php:213 +#: ../../Zotlabs/Module/Hq.php:99 ../../Zotlabs/Module/Pubstream.php:98 +#: ../../Zotlabs/Module/Channel.php:279 ../../Zotlabs/Module/Rpost.php:111 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Display.php:319 ../../Zotlabs/Module/Channel.php:500 +#: ../../Zotlabs/Module/Display.php:320 ../../Zotlabs/Module/Channel.php:501 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" -#: ../../Zotlabs/Module/Display.php:339 +#: ../../Zotlabs/Module/Display.php:340 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:383 +#: ../../Zotlabs/Module/Display.php:384 msgid "Item has been removed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:85 -#: ../../Zotlabs/Module/Profile_photo.php:128 +#: ../../Zotlabs/Module/Cover_photo.php:86 +#: ../../Zotlabs/Module/Profile_photo.php:129 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:194 -#: ../../Zotlabs/Module/Cover_photo.php:251 +#: ../../Zotlabs/Module/Cover_photo.php:195 +#: ../../Zotlabs/Module/Cover_photo.php:252 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:210 -#: ../../Zotlabs/Module/Profile_photo.php:184 +#: ../../Zotlabs/Module/Cover_photo.php:211 +#: ../../Zotlabs/Module/Profile_photo.php:185 msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:262 -#: ../../Zotlabs/Module/Profile_photo.php:349 +#: ../../Zotlabs/Module/Cover_photo.php:263 +#: ../../Zotlabs/Module/Profile_photo.php:350 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:279 -#: ../../Zotlabs/Module/Profile_photo.php:369 +#: ../../Zotlabs/Module/Cover_photo.php:280 +#: ../../Zotlabs/Module/Profile_photo.php:370 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:324 -#: ../../Zotlabs/Module/Cover_photo.php:339 -#: ../../Zotlabs/Module/Profile_photo.php:431 -#: ../../Zotlabs/Module/Profile_photo.php:496 +#: ../../Zotlabs/Module/Cover_photo.php:325 +#: ../../Zotlabs/Module/Cover_photo.php:340 +#: ../../Zotlabs/Module/Profile_photo.php:432 +#: ../../Zotlabs/Module/Profile_photo.php:497 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:375 +#: ../../Zotlabs/Module/Cover_photo.php:376 msgid "Your cover photo may be visible to anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:377 +#: ../../Zotlabs/Module/Cover_photo.php:378 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:378 +#: ../../Zotlabs/Module/Cover_photo.php:379 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:379 +#: ../../Zotlabs/Module/Cover_photo.php:380 msgid "Change Cover Photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:383 #: ../../Zotlabs/Module/Cover_photo.php:384 -#: ../../Zotlabs/Module/Profile_photo.php:550 +#: ../../Zotlabs/Module/Cover_photo.php:385 #: ../../Zotlabs/Module/Profile_photo.php:551 +#: ../../Zotlabs/Module/Profile_photo.php:552 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Module/Cover_photo.php:396 msgid "Select existing photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:412 -#: ../../Zotlabs/Module/Profile_photo.php:580 +#: ../../Zotlabs/Module/Cover_photo.php:413 +#: ../../Zotlabs/Module/Profile_photo.php:581 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:413 -#: ../../Zotlabs/Module/Profile_photo.php:581 +#: ../../Zotlabs/Module/Cover_photo.php:414 +#: ../../Zotlabs/Module/Profile_photo.php:582 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:415 +#: ../../Zotlabs/Module/Cover_photo.php:416 msgid "Done Editing" msgstr "" @@ -8715,11 +8702,11 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Sse_bs.php:626 +#: ../../Zotlabs/Module/Sse_bs.php:631 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Sse_bs.php:626 +#: ../../Zotlabs/Module/Sse_bs.php:631 msgid "Public forum" msgstr "" @@ -8830,7 +8817,7 @@ msgstr "" msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Register.php:498 +#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Register.php:501 #: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156 msgid "Optional" msgstr "" @@ -8863,7 +8850,7 @@ msgstr "" msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:172 ../../Zotlabs/Module/Channel.php:245 +#: ../../Zotlabs/Module/Network.php:172 ../../Zotlabs/Module/Channel.php:246 msgid "Search Results For:" msgstr "" @@ -8968,7 +8955,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:60 ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:282 +#: ../../Zotlabs/Module/Settings/Channel.php:283 msgid "Remove Channel" msgstr "" @@ -9005,12 +8992,12 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:123 -#: ../../Zotlabs/Module/Import.php:594 +#: ../../Zotlabs/Module/Import.php:599 msgid "File to Upload" msgstr "" #: ../../Zotlabs/Module/Import_items.php:136 -#: ../../Zotlabs/Module/Import.php:107 +#: ../../Zotlabs/Module/Import.php:108 msgid "Imported file is empty." msgstr "" @@ -9042,7 +9029,7 @@ msgstr "" msgid "Webpages import completed" msgstr "" -#: ../../Zotlabs/Module/Regdir.php:52 ../../Zotlabs/Module/Dirsearch.php:23 +#: ../../Zotlabs/Module/Regdir.php:53 ../../Zotlabs/Module/Dirsearch.php:24 msgid "This site is not a directory server" msgstr "" @@ -9156,7 +9143,7 @@ msgid "This action is permanent and can not be undone!" msgstr "" #: ../../Zotlabs/Module/Removeaccount.php:61 -#: ../../Zotlabs/Module/Settings/Account.php:111 +#: ../../Zotlabs/Module/Settings/Account.php:113 msgid "Remove Account" msgstr "" @@ -9406,15 +9393,15 @@ msgstr "" #: ../../Zotlabs/Module/Contactedit.php:409 #: ../../Zotlabs/Module/Connedit.php:706 -#: ../../Zotlabs/Module/Settings/Channel.php:286 +#: ../../Zotlabs/Module/Settings/Channel.php:287 msgid "Only import posts with this text" msgstr "" #: ../../Zotlabs/Module/Contactedit.php:409 #: ../../Zotlabs/Module/Contactedit.php:410 #: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707 -#: ../../Zotlabs/Module/Admin/Site.php:500 #: ../../Zotlabs/Module/Admin/Site.php:501 +#: ../../Zotlabs/Module/Admin/Site.php:502 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" @@ -9422,7 +9409,7 @@ msgstr "" #: ../../Zotlabs/Module/Contactedit.php:410 #: ../../Zotlabs/Module/Connedit.php:707 -#: ../../Zotlabs/Module/Settings/Channel.php:285 +#: ../../Zotlabs/Module/Settings/Channel.php:286 msgid "Do not import posts with this text" msgstr "" @@ -9608,146 +9595,146 @@ msgstr "" msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Search.php:250 +#: ../../Zotlabs/Module/Search.php:251 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:252 +#: ../../Zotlabs/Module/Search.php:253 #, php-format msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Register.php:112 +#: ../../Zotlabs/Module/Register.php:113 msgid "Email address required" msgstr "" -#: ../../Zotlabs/Module/Register.php:156 +#: ../../Zotlabs/Module/Register.php:157 msgid "No password provided" msgstr "" -#: ../../Zotlabs/Module/Register.php:179 +#: ../../Zotlabs/Module/Register.php:180 msgid "Terms of Service not accepted" msgstr "" -#: ../../Zotlabs/Module/Register.php:241 +#: ../../Zotlabs/Module/Register.php:242 msgid "Invitation code succesfully applied" msgstr "" -#: ../../Zotlabs/Module/Register.php:261 +#: ../../Zotlabs/Module/Register.php:262 msgid "Invitation not in time or too late" msgstr "" -#: ../../Zotlabs/Module/Register.php:267 +#: ../../Zotlabs/Module/Register.php:268 msgid "Invitation email failed" msgstr "" -#: ../../Zotlabs/Module/Register.php:275 +#: ../../Zotlabs/Module/Register.php:276 msgid "Invitation code failed" msgstr "" -#: ../../Zotlabs/Module/Register.php:282 +#: ../../Zotlabs/Module/Register.php:283 msgid "Invitations are not available" msgstr "" -#: ../../Zotlabs/Module/Register.php:292 +#: ../../Zotlabs/Module/Register.php:293 msgid "Registration on this hub is by invitation only" msgstr "" -#: ../../Zotlabs/Module/Register.php:399 +#: ../../Zotlabs/Module/Register.php:400 msgid "New register request" msgstr "" -#: ../../Zotlabs/Module/Register.php:417 +#: ../../Zotlabs/Module/Register.php:418 msgid "Error creating dId A" msgstr "" -#: ../../Zotlabs/Module/Register.php:435 +#: ../../Zotlabs/Module/Register.php:437 msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Register.php:444 +#: ../../Zotlabs/Module/Register.php:446 +msgid "Why do you want to join this hub?" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:446 +msgid "This will help to review your registration" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:447 msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:445 +#: ../../Zotlabs/Module/Register.php:448 msgid "Register at another affiliated hub in case when prefered" msgstr "" -#: ../../Zotlabs/Module/Register.php:458 +#: ../../Zotlabs/Module/Register.php:461 msgid "Registration on this hub is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:459 +#: ../../Zotlabs/Module/Register.php:462 msgid "Register at another affiliated hub" msgstr "" -#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28 +#: ../../Zotlabs/Module/Register.php:476 ../../Zotlabs/Module/Siteinfo.php:29 msgid "Terms of Service" msgstr "" -#: ../../Zotlabs/Module/Register.php:479 +#: ../../Zotlabs/Module/Register.php:482 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:486 +#: ../../Zotlabs/Module/Register.php:489 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:496 +#: ../../Zotlabs/Module/Register.php:499 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:503 +#: ../../Zotlabs/Module/Register.php:506 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:504 +#: ../../Zotlabs/Module/Register.php:507 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:506 +#: ../../Zotlabs/Module/Register.php:509 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:508 +#: ../../Zotlabs/Module/Register.php:511 msgid "Your name" msgstr "" -#: ../../Zotlabs/Module/Register.php:508 +#: ../../Zotlabs/Module/Register.php:511 msgid "Real name is preferred" msgstr "" -#: ../../Zotlabs/Module/Register.php:510 -#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:513 +#: ../../Zotlabs/Module/New_channel.php:178 msgid "Choose a short nickname" msgstr "" -#: ../../Zotlabs/Module/Register.php:510 +#: ../../Zotlabs/Module/Register.php:513 msgid "" "Your nickname will be used to create an easy to remember channel address" msgstr "" -#: ../../Zotlabs/Module/Register.php:514 -msgid "Why do you want to join this hub?" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:514 -msgid "This will help to review your registration" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:520 -#: ../../Zotlabs/Module/Admin/Site.php:402 +#: ../../Zotlabs/Module/Register.php:521 +#: ../../Zotlabs/Module/Admin/Site.php:403 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Register.php:528 +#: ../../Zotlabs/Module/Register.php:529 msgid "I have an invite code" msgstr "" -#: ../../Zotlabs/Module/Register.php:575 +#: ../../Zotlabs/Module/Register.php:576 msgid "" "This site has exceeded the number of allowed daily account registrations." msgstr "" @@ -9835,24 +9822,24 @@ msgstr "" msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1343 +#: ../../Zotlabs/Module/Item.php:1348 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1377 +#: ../../Zotlabs/Module/Item.php:1382 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1514 +#: ../../Zotlabs/Module/Item.php:1519 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1521 +#: ../../Zotlabs/Module/Item.php:1526 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1528 +#: ../../Zotlabs/Module/Item.php:1533 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -10041,8 +10028,8 @@ msgid "Website" msgstr "" #: ../../Zotlabs/Module/Connedit.php:739 ../../Zotlabs/Module/Locs.php:122 -#: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:468 ../../Zotlabs/Module/Cdav.php:1375 +#: ../../Zotlabs/Module/Admin/Channels.php:182 +#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Cdav.php:1375 msgid "Address" msgstr "" @@ -10082,7 +10069,7 @@ msgstr "" msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Connedit.php:757 ../../Zotlabs/Module/Profiles.php:772 #: ../../Zotlabs/Module/Cdav.php:1393 msgid "Country" msgstr "" @@ -10224,35 +10211,35 @@ msgstr "" msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:543 +#: ../../Zotlabs/Module/Profile_photo.php:544 msgid "" "This profile photo will be visible to anybody on the internet and may be " "distributed to other websites." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:543 +#: ../../Zotlabs/Module/Profile_photo.php:544 msgid "" "This profile photo will be visible only to channels with permission to view " "this profile." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:545 +#: ../../Zotlabs/Module/Profile_photo.php:546 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:545 +#: ../../Zotlabs/Module/Profile_photo.php:546 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:547 +#: ../../Zotlabs/Module/Profile_photo.php:548 msgid "Reset to default" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:561 +#: ../../Zotlabs/Module/Profile_photo.php:562 msgid "Select existing" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:583 +#: ../../Zotlabs/Module/Profile_photo.php:584 msgid "Done editing" msgstr "" @@ -10287,19 +10274,19 @@ msgstr "" msgid "View Connections" msgstr "" -#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95 +#: ../../Zotlabs/Module/Api.php:76 ../../Zotlabs/Module/Api.php:97 msgid "Authorize application connection" msgstr "" -#: ../../Zotlabs/Module/Api.php:75 +#: ../../Zotlabs/Module/Api.php:77 msgid "Return to your app and insert this Security Code:" msgstr "" -#: ../../Zotlabs/Module/Api.php:85 +#: ../../Zotlabs/Module/Api.php:87 msgid "Please login to continue." msgstr "" -#: ../../Zotlabs/Module/Api.php:97 +#: ../../Zotlabs/Module/Api.php:99 msgid "" "Do you want to authorize this application to access your posts and contacts, " "and/or create new posts for you?" @@ -10321,7 +10308,7 @@ msgstr "" msgid "The main page content can not be edited!" msgstr "" -#: ../../Zotlabs/Module/Home.php:104 +#: ../../Zotlabs/Module/Home.php:105 #, php-format msgid "Welcome to %s" msgstr "" @@ -10419,11 +10406,11 @@ msgstr "" msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:26 +#: ../../Zotlabs/Module/Pubsites.php:27 msgid "Public Hubs" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:29 +#: ../../Zotlabs/Module/Pubsites.php:30 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 " @@ -10432,31 +10419,31 @@ msgid "" "additional details." msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Pubsites.php:36 msgid "Hub URL" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Pubsites.php:36 msgid "Access Type" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Pubsites.php:36 msgid "Registration Policy" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Pubsites.php:36 msgid "Stats" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Pubsites.php:36 msgid "Software" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:37 +#: ../../Zotlabs/Module/Pubsites.php:38 msgid "Ratings" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:51 +#: ../../Zotlabs/Module/Pubsites.php:52 msgid "Rate" msgstr "" @@ -10612,15 +10599,15 @@ msgid "Expired" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:307 -#: ../../Zotlabs/Module/Admin/Themes.php:137 -#: ../../Zotlabs/Module/Admin/Themes.php:171 -#: ../../Zotlabs/Module/Admin/Addons.php:345 -#: ../../Zotlabs/Module/Admin/Addons.php:443 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Site.php:397 -#: ../../Zotlabs/Module/Admin/Security.php:105 -#: ../../Zotlabs/Module/Admin.php:140 +#: ../../Zotlabs/Module/Admin/Themes.php:138 +#: ../../Zotlabs/Module/Admin/Themes.php:172 +#: ../../Zotlabs/Module/Admin/Addons.php:346 +#: ../../Zotlabs/Module/Admin/Addons.php:444 +#: ../../Zotlabs/Module/Admin/Channels.php:167 +#: ../../Zotlabs/Module/Admin/Logs.php:83 +#: ../../Zotlabs/Module/Admin/Site.php:398 +#: ../../Zotlabs/Module/Admin/Security.php:106 +#: ../../Zotlabs/Module/Admin.php:142 msgid "Administration" msgstr "" @@ -10717,155 +10704,155 @@ msgstr "" msgid "Message" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:65 +#: ../../Zotlabs/Module/Admin/Queueworker.php:66 msgid "Max queueworker threads" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:67 +#: ../../Zotlabs/Module/Admin/Queueworker.php:68 msgid "Minimum 4, default 4" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:77 +#: ../../Zotlabs/Module/Admin/Queueworker.php:78 msgid "Assume workers dead after" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:79 +#: ../../Zotlabs/Module/Admin/Queueworker.php:80 msgid "Minimum 120, default 300 seconds" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:91 +#: ../../Zotlabs/Module/Admin/Queueworker.php:92 msgid "Pause before starting next task" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:93 +#: ../../Zotlabs/Module/Admin/Queueworker.php:94 msgid "Minimum 100, default 100 microseconds" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:102 +#: ../../Zotlabs/Module/Admin/Queueworker.php:103 msgid "Automatically adjust pause before starting next task" msgstr "" -#: ../../Zotlabs/Module/Admin/Queueworker.php:111 +#: ../../Zotlabs/Module/Admin/Queueworker.php:112 msgid "Queueworker Settings" msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:26 +#: ../../Zotlabs/Module/Admin/Themes.php:27 msgid "Theme settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:61 +#: ../../Zotlabs/Module/Admin/Themes.php:62 msgid "No themes found." msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:110 -#: ../../Zotlabs/Module/Admin/Addons.php:314 +#: ../../Zotlabs/Module/Admin/Themes.php:111 +#: ../../Zotlabs/Module/Admin/Addons.php:315 msgid "Disable" msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:112 -#: ../../Zotlabs/Module/Admin/Addons.php:317 +#: ../../Zotlabs/Module/Admin/Themes.php:113 +#: ../../Zotlabs/Module/Admin/Addons.php:318 msgid "Enable" msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:131 +#: ../../Zotlabs/Module/Admin/Themes.php:132 msgid "Screenshot" msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:139 -#: ../../Zotlabs/Module/Admin/Addons.php:347 +#: ../../Zotlabs/Module/Admin/Themes.php:140 +#: ../../Zotlabs/Module/Admin/Addons.php:348 msgid "Toggle" msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:149 -#: ../../Zotlabs/Module/Admin/Addons.php:355 +#: ../../Zotlabs/Module/Admin/Themes.php:150 +#: ../../Zotlabs/Module/Admin/Addons.php:356 msgid "Author: " msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:150 -#: ../../Zotlabs/Module/Admin/Addons.php:356 +#: ../../Zotlabs/Module/Admin/Themes.php:151 +#: ../../Zotlabs/Module/Admin/Addons.php:357 msgid "Maintainer: " msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:177 +#: ../../Zotlabs/Module/Admin/Themes.php:178 msgid "[Experimental]" msgstr "" -#: ../../Zotlabs/Module/Admin/Themes.php:178 +#: ../../Zotlabs/Module/Admin/Themes.php:179 msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:293 +#: ../../Zotlabs/Module/Admin/Addons.php:294 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:298 +#: ../../Zotlabs/Module/Admin/Addons.php:299 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:357 +#: ../../Zotlabs/Module/Admin/Addons.php:358 msgid "Minimum project version: " msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:358 +#: ../../Zotlabs/Module/Admin/Addons.php:359 msgid "Maximum project version: " msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:359 +#: ../../Zotlabs/Module/Admin/Addons.php:360 msgid "Minimum PHP version: " msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:360 +#: ../../Zotlabs/Module/Admin/Addons.php:361 msgid "Compatible Server Roles: " msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:361 +#: ../../Zotlabs/Module/Admin/Addons.php:362 msgid "Requires: " msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:362 -#: ../../Zotlabs/Module/Admin/Addons.php:449 +#: ../../Zotlabs/Module/Admin/Addons.php:363 +#: ../../Zotlabs/Module/Admin/Addons.php:450 msgid "Disabled - version incompatibility" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:418 +#: ../../Zotlabs/Module/Admin/Addons.php:419 msgid "Enter the public git repository URL of the addon repo." msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:419 +#: ../../Zotlabs/Module/Admin/Addons.php:420 msgid "Addon repo git URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:420 +#: ../../Zotlabs/Module/Admin/Addons.php:421 msgid "Custom repo name" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:420 +#: ../../Zotlabs/Module/Admin/Addons.php:421 msgid "(optional)" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:421 +#: ../../Zotlabs/Module/Admin/Addons.php:422 msgid "Download Addon Repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:428 +#: ../../Zotlabs/Module/Admin/Addons.php:429 msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:452 +#: ../../Zotlabs/Module/Admin/Addons.php:453 msgid "Manage Repos" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:453 +#: ../../Zotlabs/Module/Admin/Addons.php:454 msgid "Installed Addon Repositories" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:454 +#: ../../Zotlabs/Module/Admin/Addons.php:455 msgid "Install a New Addon Repository" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:461 +#: ../../Zotlabs/Module/Admin/Addons.php:462 msgid "Switch branch" msgstr "" @@ -10878,158 +10865,159 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:89 +#: ../../Zotlabs/Module/Admin/Profs.php:90 msgid "New Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:90 -#: ../../Zotlabs/Module/Admin/Profs.php:110 +#: ../../Zotlabs/Module/Admin/Profs.php:91 +#: ../../Zotlabs/Module/Admin/Profs.php:111 msgid "Field nickname" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:90 -#: ../../Zotlabs/Module/Admin/Profs.php:110 -msgid "System name of field" -msgstr "" - #: ../../Zotlabs/Module/Admin/Profs.php:91 #: ../../Zotlabs/Module/Admin/Profs.php:111 -msgid "Input type" +msgid "System name of field" msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:92 #: ../../Zotlabs/Module/Admin/Profs.php:112 -msgid "Field Name" +msgid "Input type" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:92 -#: ../../Zotlabs/Module/Admin/Profs.php:112 -msgid "Label on profile pages" +#: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 +msgid "Field Name" msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:93 #: ../../Zotlabs/Module/Admin/Profs.php:113 +msgid "Label on profile pages" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 msgid "Help text" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:93 -#: ../../Zotlabs/Module/Admin/Profs.php:113 +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 msgid "Additional info (optional)" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:103 +#: ../../Zotlabs/Module/Admin/Profs.php:104 msgid "Field definition not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:109 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:169 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "Basic Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:170 +#: ../../Zotlabs/Module/Admin/Profs.php:171 msgid "Advanced Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:170 +#: ../../Zotlabs/Module/Admin/Profs.php:171 msgid "(In addition to basic fields)" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:172 +#: ../../Zotlabs/Module/Admin/Profs.php:173 msgid "All available fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:173 +#: ../../Zotlabs/Module/Admin/Profs.php:174 msgid "Custom Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:177 +#: ../../Zotlabs/Module/Admin/Profs.php:178 msgid "Create Custom Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:31 +#: ../../Zotlabs/Module/Admin/Channels.php:28 +#: ../../Zotlabs/Module/Admin/Channels.php:80 +msgid "Channel not found" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:48 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin/Channels.php:40 +#: ../../Zotlabs/Module/Admin/Channels.php:57 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin/Channels.php:46 +#: ../../Zotlabs/Module/Admin/Channels.php:63 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin/Channels.php:65 -msgid "Channel not found" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:75 +#: ../../Zotlabs/Module/Admin/Channels.php:90 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:87 +#: ../../Zotlabs/Module/Admin/Channels.php:109 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:87 +#: ../../Zotlabs/Module/Admin/Channels.php:109 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:98 +#: ../../Zotlabs/Module/Admin/Channels.php:120 #, php-format msgid "Channel '%s' code allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:98 +#: ../../Zotlabs/Module/Admin/Channels.php:120 #, php-format msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:148 +#: ../../Zotlabs/Module/Admin/Channels.php:170 msgid "select all" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:150 +#: ../../Zotlabs/Module/Admin/Channels.php:172 msgid "Censor" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:151 +#: ../../Zotlabs/Module/Admin/Channels.php:173 msgid "Uncensor" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:152 +#: ../../Zotlabs/Module/Admin/Channels.php:174 msgid "Allow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:153 +#: ../../Zotlabs/Module/Admin/Channels.php:175 msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:158 +#: ../../Zotlabs/Module/Admin/Channels.php:180 msgid "UID" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:162 +#: ../../Zotlabs/Module/Admin/Channels.php:184 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:163 +#: ../../Zotlabs/Module/Admin/Channels.php:185 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?" @@ -11123,29 +11111,29 @@ msgstr "" msgid "No failed updates." msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:28 +#: ../../Zotlabs/Module/Admin/Logs.php:29 msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:85 +#: ../../Zotlabs/Module/Admin/Logs.php:86 msgid "Clear" msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:91 +#: ../../Zotlabs/Module/Admin/Logs.php:92 msgid "Debugging" msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:92 +#: ../../Zotlabs/Module/Admin/Logs.php:93 msgid "Log file" msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:92 +#: ../../Zotlabs/Module/Admin/Logs.php:93 msgid "" "Must be writable by web server. Relative to your top-level webserver " "directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:93 +#: ../../Zotlabs/Module/Admin/Logs.php:94 msgid "Log level" msgstr "" @@ -11177,668 +11165,668 @@ msgstr "" msgid "Last known contact" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:111 +#: ../../Zotlabs/Module/Admin/Site.php:112 msgid "Invalid input" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:131 +#: ../../Zotlabs/Module/Admin/Site.php:132 msgid "Errors" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:219 +#: ../../Zotlabs/Module/Admin/Site.php:220 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:242 -#: ../../Zotlabs/Module/Settings/Display.php:116 +#: ../../Zotlabs/Module/Admin/Site.php:243 +#: ../../Zotlabs/Module/Settings/Display.php:117 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:249 +#: ../../Zotlabs/Module/Admin/Site.php:250 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:251 +#: ../../Zotlabs/Module/Admin/Site.php:252 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:253 +#: ../../Zotlabs/Module/Admin/Site.php:254 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Default permission role for new accounts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "" "This role will be used for the first channel created after registration." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 ../../Zotlabs/Module/Invite.php:410 +#: ../../Zotlabs/Module/Admin/Site.php:343 ../../Zotlabs/Module/Invite.php:411 msgid "Minute(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 ../../Zotlabs/Module/Invite.php:411 +#: ../../Zotlabs/Module/Admin/Site.php:344 ../../Zotlabs/Module/Invite.php:412 msgid "Hour(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 ../../Zotlabs/Module/Invite.php:412 +#: ../../Zotlabs/Module/Admin/Site.php:345 ../../Zotlabs/Module/Invite.php:413 msgid "Day(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Week(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Month(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Year(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Register verification delay" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:359 msgid "Time to wait before a registration can be verified" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:361 -#: ../../Zotlabs/Module/Admin/Site.php:383 ../../Zotlabs/Module/Invite.php:421 +#: ../../Zotlabs/Module/Admin/Site.php:362 +#: ../../Zotlabs/Module/Admin/Site.php:384 ../../Zotlabs/Module/Invite.php:422 msgid "duration up from now" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:377 +#: ../../Zotlabs/Module/Admin/Site.php:378 msgid "Register verification expiration time" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:380 +#: ../../Zotlabs/Module/Admin/Site.php:381 msgid "Time before an unverified registration will expire" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:403 +#: ../../Zotlabs/Module/Admin/Site.php:404 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:404 +#: ../../Zotlabs/Module/Admin/Site.php:405 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:411 +#: ../../Zotlabs/Module/Admin/Site.php:412 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:411 +#: ../../Zotlabs/Module/Admin/Site.php:412 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:412 +#: ../../Zotlabs/Module/Admin/Site.php:413 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:412 +#: ../../Zotlabs/Module/Admin/Site.php:413 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:413 ../../Zotlabs/Module/Siteinfo.php:24 +#: ../../Zotlabs/Module/Admin/Site.php:414 ../../Zotlabs/Module/Siteinfo.php:25 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:413 +#: ../../Zotlabs/Module/Admin/Site.php:414 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:414 +#: ../../Zotlabs/Module/Admin/Site.php:415 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:414 +#: ../../Zotlabs/Module/Admin/Site.php:415 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:417 +#: ../../Zotlabs/Module/Admin/Site.php:418 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:417 +#: ../../Zotlabs/Module/Admin/Site.php:418 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:418 +#: ../../Zotlabs/Module/Admin/Site.php:419 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:418 +#: ../../Zotlabs/Module/Admin/Site.php:419 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:419 +#: ../../Zotlabs/Module/Admin/Site.php:420 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:419 +#: ../../Zotlabs/Module/Admin/Site.php:420 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:420 +#: ../../Zotlabs/Module/Admin/Site.php:421 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:420 +#: ../../Zotlabs/Module/Admin/Site.php:421 msgid "This is displayed on the public server site list." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:426 +#: ../../Zotlabs/Module/Admin/Site.php:427 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:428 +#: ../../Zotlabs/Module/Admin/Site.php:429 msgid "This text will be displayed prominently at the registration page" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:432 +#: ../../Zotlabs/Module/Admin/Site.php:433 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:439 +#: ../../Zotlabs/Module/Admin/Site.php:440 msgid "Configure the registration open days/hours" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:441 +#: ../../Zotlabs/Module/Admin/Site.php:442 msgid "Empty or '-:-' value will keep registration open 24/7 (default)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:442 +#: ../../Zotlabs/Module/Admin/Site.php:443 msgid "" "Weekdays and hours must be separated by colon ':', From-To ranges with a " "dash `-` example: 1:800-1200" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:443 +#: ../../Zotlabs/Module/Admin/Site.php:444 msgid "" "Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 " "2:900-1700" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:444 +#: ../../Zotlabs/Module/Admin/Site.php:445 msgid "" "From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 " "or 1-2,4-5:900-1700" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:445 +#: ../../Zotlabs/Module/Admin/Site.php:446 msgid "Advanced examples:" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:445 -#: ../../Zotlabs/Module/Settings/Channel.php:183 +#: ../../Zotlabs/Module/Admin/Site.php:446 +#: ../../Zotlabs/Module/Settings/Channel.php:184 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:446 +#: ../../Zotlabs/Module/Admin/Site.php:447 msgid "Check your configuration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:450 +#: ../../Zotlabs/Module/Admin/Site.php:451 msgid "Max account registrations per day" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:452 +#: ../../Zotlabs/Module/Admin/Site.php:453 msgid "Unlimited if zero or no value - default 50" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:456 +#: ../../Zotlabs/Module/Admin/Site.php:457 msgid "Max account registrations from same IP" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:458 +#: ../../Zotlabs/Module/Admin/Site.php:459 msgid "Unlimited if zero or no value - default 3" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:464 +#: ../../Zotlabs/Module/Admin/Site.php:465 msgid "Auto channel create" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:466 +#: ../../Zotlabs/Module/Admin/Site.php:467 msgid "" "If disabled the channel will be created in a separate step during the " "registration process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:470 +#: ../../Zotlabs/Module/Admin/Site.php:471 msgid "Require invite code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:475 +#: ../../Zotlabs/Module/Admin/Site.php:476 msgid "Allow invite code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:480 +#: ../../Zotlabs/Module/Admin/Site.php:481 msgid "Require email address" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:482 +#: ../../Zotlabs/Module/Admin/Site.php:483 msgid "The provided email address will be verified (recommended)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:486 +#: ../../Zotlabs/Module/Admin/Site.php:487 msgid "Abandon account after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:488 +#: ../../Zotlabs/Module/Admin/Site.php:489 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:493 +#: ../../Zotlabs/Module/Admin/Site.php:494 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:493 +#: ../../Zotlabs/Module/Admin/Site.php:494 msgid "" "example: 'pubstream' 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:494 +#: ../../Zotlabs/Module/Admin/Site.php:495 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:494 +#: ../../Zotlabs/Module/Admin/Site.php:495 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:495 +#: ../../Zotlabs/Module/Admin/Site.php:496 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:495 +#: ../../Zotlabs/Module/Admin/Site.php:496 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:496 +#: ../../Zotlabs/Module/Admin/Site.php:497 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:496 +#: ../../Zotlabs/Module/Admin/Site.php:497 msgid "" "Check to force all profiles on this site to be listed in the site directory" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:497 +#: ../../Zotlabs/Module/Admin/Site.php:498 msgid "Enable public stream" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:497 +#: ../../Zotlabs/Module/Admin/Site.php:498 msgid "Enable the public stream. Warning: this content is unmoderated" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:498 +#: ../../Zotlabs/Module/Admin/Site.php:499 msgid "Site only public stream" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:498 +#: ../../Zotlabs/Module/Admin/Site.php:499 msgid "Restrict the public stream to content originating at this site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:499 +#: ../../Zotlabs/Module/Admin/Site.php:500 msgid "Allow anybody on the internet to access the public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:499 +#: ../../Zotlabs/Module/Admin/Site.php:500 msgid "Disable to require authentication before viewing" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:500 +#: ../../Zotlabs/Module/Admin/Site.php:501 msgid "Only import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:501 +#: ../../Zotlabs/Module/Admin/Site.php:502 msgid "Do not import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:504 +#: ../../Zotlabs/Module/Admin/Site.php:505 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:504 +#: ../../Zotlabs/Module/Admin/Site.php:505 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:505 +#: ../../Zotlabs/Module/Admin/Site.php:506 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:505 +#: ../../Zotlabs/Module/Admin/Site.php:506 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:507 +#: ../../Zotlabs/Module/Admin/Site.php:508 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:508 +#: ../../Zotlabs/Module/Admin/Site.php:509 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:509 +#: ../../Zotlabs/Module/Admin/Site.php:510 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:511 +#: ../../Zotlabs/Module/Admin/Site.php:512 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:511 +#: ../../Zotlabs/Module/Admin/Site.php:512 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:513 +#: ../../Zotlabs/Module/Admin/Site.php:514 msgid "Enable SSE Notifications" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:513 +#: ../../Zotlabs/Module/Admin/Site.php:514 msgid "" "If disabled, traditional polling will be used. Warning: this setting might " "not be suited for shared hosting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:515 +#: ../../Zotlabs/Module/Admin/Site.php:516 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:516 +#: ../../Zotlabs/Module/Admin/Site.php:517 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:517 +#: ../../Zotlabs/Module/Admin/Site.php:518 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:517 +#: ../../Zotlabs/Module/Admin/Site.php:518 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:518 +#: ../../Zotlabs/Module/Admin/Site.php:519 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:518 +#: ../../Zotlabs/Module/Admin/Site.php:519 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:519 +#: ../../Zotlabs/Module/Admin/Site.php:520 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:519 +#: ../../Zotlabs/Module/Admin/Site.php:520 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:521 +#: ../../Zotlabs/Module/Admin/Site.php:522 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:521 +#: ../../Zotlabs/Module/Admin/Site.php:522 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:522 +#: ../../Zotlabs/Module/Admin/Site.php:523 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:522 +#: ../../Zotlabs/Module/Admin/Site.php:523 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:523 +#: ../../Zotlabs/Module/Admin/Site.php:524 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:523 +#: ../../Zotlabs/Module/Admin/Site.php:524 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:524 +#: ../../Zotlabs/Module/Admin/Site.php:525 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:524 +#: ../../Zotlabs/Module/Admin/Site.php:525 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:525 +#: ../../Zotlabs/Module/Admin/Site.php:526 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:526 +#: ../../Zotlabs/Module/Admin/Site.php:527 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:526 +#: ../../Zotlabs/Module/Admin/Site.php:527 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:527 +#: ../../Zotlabs/Module/Admin/Site.php:528 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:527 +#: ../../Zotlabs/Module/Admin/Site.php:528 msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:528 +#: ../../Zotlabs/Module/Admin/Site.php:529 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:528 +#: ../../Zotlabs/Module/Admin/Site.php:529 msgid "Region or country" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:613 #: ../../Zotlabs/Module/Admin/Site.php:614 +#: ../../Zotlabs/Module/Admin/Site.php:615 msgid "Invalid 24h time value (hhmm/hmm)" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:97 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "https://youtube.com/
    https://www.youtube.com/
    https://youtu.be/" "
    https://vimeo.com/
    https://soundcloud.com/
    " msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" "All other embedded content will be filtered, unless " "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:108 +#: ../../Zotlabs/Module/Admin/Security.php:109 msgid "Block public" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:108 +#: ../../Zotlabs/Module/Admin/Security.php:109 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:109 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "Provide a cloud root directory" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:109 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "" "The cloud root directory lists all channel names which provide public files" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:110 +#: ../../Zotlabs/Module/Admin/Security.php:111 msgid "Show total disk space available to cloud uploads" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:111 +#: ../../Zotlabs/Module/Admin/Security.php:112 msgid "Set \"Transport Security\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:112 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "Set \"Content Security Policy\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:113 +#: ../../Zotlabs/Module/Admin/Security.php:114 msgid "Allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:113 +#: ../../Zotlabs/Module/Admin/Security.php:114 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:114 +#: ../../Zotlabs/Module/Admin/Security.php:115 msgid "Not allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:114 +#: ../../Zotlabs/Module/Admin/Security.php:115 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:115 +#: ../../Zotlabs/Module/Admin/Security.php:116 msgid "Allow communications only from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:115 +#: ../../Zotlabs/Module/Admin/Security.php:116 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:116 +#: ../../Zotlabs/Module/Admin/Security.php:117 msgid "Block communications from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:117 +#: ../../Zotlabs/Module/Admin/Security.php:118 msgid "Allow communications only from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:117 +#: ../../Zotlabs/Module/Admin/Security.php:118 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:118 +#: ../../Zotlabs/Module/Admin/Security.php:119 msgid "Block communications from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:119 +#: ../../Zotlabs/Module/Admin/Security.php:120 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:120 +#: ../../Zotlabs/Module/Admin/Security.php:121 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:120 +#: ../../Zotlabs/Module/Admin/Security.php:121 msgid "One site per line. By default embedded content is filtered." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:121 +#: ../../Zotlabs/Module/Admin/Security.php:122 msgid "Block embedded HTML from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:122 +#: ../../Zotlabs/Module/Admin/Security.php:123 msgid "Allow SVG thumbnails in file browser" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:122 +#: ../../Zotlabs/Module/Admin/Security.php:123 msgid "WARNING: SVG images may contain malicious code." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:123 +#: ../../Zotlabs/Module/Admin/Security.php:124 msgid "Allow embedded (inline) PDF files" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:125 +#: ../../Zotlabs/Module/Admin/Security.php:126 msgid "Additional trusted directory server URLs" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:125 +#: ../../Zotlabs/Module/Admin/Security.php:126 msgid "" "Accept directory flags (spam, nsfw) from those servers. One per line like " "https://example.tld" msgstr "" -#: ../../Zotlabs/Module/Manage.php:130 ../../Zotlabs/Module/New_channel.php:147 +#: ../../Zotlabs/Module/Manage.php:130 ../../Zotlabs/Module/New_channel.php:148 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" @@ -11873,7 +11861,7 @@ msgid "Delegated Channel" msgstr "" #: ../../Zotlabs/Module/Email_resend.php:12 -#: ../../Zotlabs/Module/Email_validation.php:24 +#: ../../Zotlabs/Module/Email_validation.php:25 msgid "Token verification failed." msgstr "" @@ -11968,7 +11956,7 @@ msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cal.php:200 ../../Zotlabs/Module/Photos.php:955 -#: ../../Zotlabs/Module/Setup.php:272 ../../Zotlabs/Module/Cdav.php:1027 +#: ../../Zotlabs/Module/Setup.php:275 ../../Zotlabs/Module/Cdav.php:1027 msgid "Next" msgstr "" @@ -12023,55 +12011,55 @@ msgstr "" msgid "Affinity Tool Settings" msgstr "" -#: ../../Zotlabs/Module/Admin.php:96 +#: ../../Zotlabs/Module/Admin.php:98 msgid "Blocked accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:97 +#: ../../Zotlabs/Module/Admin.php:99 msgid "Expired accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:98 +#: ../../Zotlabs/Module/Admin.php:100 msgid "Expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:122 +#: ../../Zotlabs/Module/Admin.php:124 msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Admin.php:136 +#: ../../Zotlabs/Module/Admin.php:138 msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Admin.php:141 +#: ../../Zotlabs/Module/Admin.php:143 msgid "Summary" msgstr "" -#: ../../Zotlabs/Module/Admin.php:144 +#: ../../Zotlabs/Module/Admin.php:146 msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:145 +#: ../../Zotlabs/Module/Admin.php:147 msgid "Pending registrations" msgstr "" -#: ../../Zotlabs/Module/Admin.php:146 +#: ../../Zotlabs/Module/Admin.php:148 msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:147 ../../Zotlabs/Module/Siteinfo.php:41 +#: ../../Zotlabs/Module/Admin.php:149 ../../Zotlabs/Module/Siteinfo.php:42 msgid "Active addons" msgstr "" -#: ../../Zotlabs/Module/Admin.php:148 +#: ../../Zotlabs/Module/Admin.php:150 msgid "Version" msgstr "" -#: ../../Zotlabs/Module/Admin.php:149 +#: ../../Zotlabs/Module/Admin.php:151 msgid "Repository version (master)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:150 +#: ../../Zotlabs/Module/Admin.php:152 msgid "Repository version (dev)" msgstr "" @@ -12146,89 +12134,97 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Module/Group.php:47 +#: ../../Zotlabs/Module/Group.php:48 msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Group.php:50 +#: ../../Zotlabs/Module/Group.php:51 msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:82 +#: ../../Zotlabs/Module/Group.php:83 msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:301 +#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:302 msgid "Post to this group by default" msgstr "" -#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:302 +#: ../../Zotlabs/Module/Group.php:139 ../../Zotlabs/Module/Group.php:303 msgid "Add new contacts to this group by default" msgstr "" -#: ../../Zotlabs/Module/Group.php:146 +#: ../../Zotlabs/Module/Group.php:147 msgid "Privacy group name" msgstr "" -#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249 +#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:250 msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Group.php:175 +#: ../../Zotlabs/Module/Group.php:176 msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Group.php:178 +#: ../../Zotlabs/Module/Group.php:179 msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:244 +#: ../../Zotlabs/Module/Group.php:245 #, php-format msgid "Privacy Group: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:246 +#: ../../Zotlabs/Module/Group.php:247 msgid "Privacy group name: " msgstr "" -#: ../../Zotlabs/Module/Group.php:262 +#: ../../Zotlabs/Module/Group.php:263 msgid "Group members" msgstr "" -#: ../../Zotlabs/Module/Group.php:264 +#: ../../Zotlabs/Module/Group.php:265 msgid "Not in this group" msgstr "" -#: ../../Zotlabs/Module/Group.php:296 +#: ../../Zotlabs/Module/Group.php:297 msgid "Click a channel to toggle membership" msgstr "" -#: ../../Zotlabs/Module/Help.php:25 +#: ../../Zotlabs/Module/Help.php:68 msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:86 +#: ../../Zotlabs/Module/Help.php:172 +msgid "Not Found" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:225 +msgid "$Projectname Documentation" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:236 +msgid "Contents" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:243 msgid "Members" msgstr "" -#: ../../Zotlabs/Module/Help.php:87 +#: ../../Zotlabs/Module/Help.php:244 msgid "Administrators" msgstr "" -#: ../../Zotlabs/Module/Help.php:88 +#: ../../Zotlabs/Module/Help.php:245 msgid "Developers" msgstr "" -#: ../../Zotlabs/Module/Help.php:89 +#: ../../Zotlabs/Module/Help.php:246 msgid "Tutorials" msgstr "" -#: ../../Zotlabs/Module/Help.php:101 -msgid "$Projectname Documentation" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:102 -msgid "Contents" +#: ../../Zotlabs/Module/Help.php:264 +msgid "Help:" msgstr "" #: ../../Zotlabs/Module/Tagger.php:50 @@ -12240,168 +12236,168 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../Zotlabs/Module/Invite.php:69 +#: ../../Zotlabs/Module/Invite.php:70 msgid "Invite App" msgstr "" -#: ../../Zotlabs/Module/Invite.php:81 +#: ../../Zotlabs/Module/Invite.php:82 msgid "Register is closed" msgstr "" -#: ../../Zotlabs/Module/Invite.php:115 ../../Zotlabs/Module/Invite.php:562 +#: ../../Zotlabs/Module/Invite.php:116 ../../Zotlabs/Module/Invite.php:563 msgid "Note, the invitation code is valid up to" msgstr "" -#: ../../Zotlabs/Module/Invite.php:128 +#: ../../Zotlabs/Module/Invite.php:129 #, php-format msgid "Too many recipients for one invitation (max %d)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:132 +#: ../../Zotlabs/Module/Invite.php:133 msgid "No recipients for this invitation" msgstr "" -#: ../../Zotlabs/Module/Invite.php:151 +#: ../../Zotlabs/Module/Invite.php:152 #, php-format msgid "(%s) : Not a real email address" msgstr "" -#: ../../Zotlabs/Module/Invite.php:158 +#: ../../Zotlabs/Module/Invite.php:159 #, php-format msgid "(%s) : Not allowed email address" msgstr "" -#: ../../Zotlabs/Module/Invite.php:171 +#: ../../Zotlabs/Module/Invite.php:172 #, php-format msgid "(%s) : email address already in use" msgstr "" -#: ../../Zotlabs/Module/Invite.php:178 +#: ../../Zotlabs/Module/Invite.php:179 #, php-format msgid "(%s) : Accepted email address" msgstr "" -#: ../../Zotlabs/Module/Invite.php:270 +#: ../../Zotlabs/Module/Invite.php:271 #, php-format msgid "To %s : Message delivery success." msgstr "" -#: ../../Zotlabs/Module/Invite.php:302 +#: ../../Zotlabs/Module/Invite.php:303 #, php-format msgid "%1$d mail(s) sent, %2$d mail error(s)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:327 +#: ../../Zotlabs/Module/Invite.php:328 msgid "Invites not proposed by configuration" msgstr "" -#: ../../Zotlabs/Module/Invite.php:328 +#: ../../Zotlabs/Module/Invite.php:329 msgid "Contact the site admin" msgstr "" -#: ../../Zotlabs/Module/Invite.php:344 +#: ../../Zotlabs/Module/Invite.php:345 msgid "Invites by users not enabled" msgstr "" -#: ../../Zotlabs/Module/Invite.php:349 +#: ../../Zotlabs/Module/Invite.php:350 msgid "You have no more invitations available" msgstr "" -#: ../../Zotlabs/Module/Invite.php:365 +#: ../../Zotlabs/Module/Invite.php:366 msgid "Not on xchan" msgstr "" -#: ../../Zotlabs/Module/Invite.php:398 +#: ../../Zotlabs/Module/Invite.php:399 msgid "All users invitation limit exceeded." msgstr "" -#: ../../Zotlabs/Module/Invite.php:416 +#: ../../Zotlabs/Module/Invite.php:417 msgid "Invitation expires after" msgstr "" -#: ../../Zotlabs/Module/Invite.php:517 ../../Zotlabs/Module/Invite.php:556 +#: ../../Zotlabs/Module/Invite.php:518 ../../Zotlabs/Module/Invite.php:557 msgid "Invitation" msgstr "" -#: ../../Zotlabs/Module/Invite.php:547 +#: ../../Zotlabs/Module/Invite.php:548 msgid "Send invitations" msgstr "" -#: ../../Zotlabs/Module/Invite.php:548 +#: ../../Zotlabs/Module/Invite.php:549 msgid "Invitations I am using" msgstr "" -#: ../../Zotlabs/Module/Invite.php:549 +#: ../../Zotlabs/Module/Invite.php:550 msgid "Invitations we are using" msgstr "" -#: ../../Zotlabs/Module/Invite.php:550 +#: ../../Zotlabs/Module/Invite.php:551 msgid "§ Note, the email(s) sent will be recorded in the system logs" msgstr "" -#: ../../Zotlabs/Module/Invite.php:551 +#: ../../Zotlabs/Module/Invite.php:552 msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:552 +#: ../../Zotlabs/Module/Invite.php:553 msgid "Your message:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:553 +#: ../../Zotlabs/Module/Invite.php:554 msgid "Invite template" msgstr "" -#: ../../Zotlabs/Module/Invite.php:555 +#: ../../Zotlabs/Module/Invite.php:556 msgid "Subject:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:561 +#: ../../Zotlabs/Module/Invite.php:562 msgid "Here you may enter personal notes to the recipient(s)" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:21 +#: ../../Zotlabs/Module/Siteinfo.php:22 msgid "About this site" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:22 +#: ../../Zotlabs/Module/Siteinfo.php:23 msgid "Site Name" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:26 +#: ../../Zotlabs/Module/Siteinfo.php:27 msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:29 +#: ../../Zotlabs/Module/Siteinfo.php:30 msgid "Software and Project information" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:30 +#: ../../Zotlabs/Module/Siteinfo.php:31 msgid "This site is powered by $Projectname" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:31 +#: ../../Zotlabs/Module/Siteinfo.php:32 msgid "" -"Federated and decentralised networking and identity services provided by Zot" +"Federated and decentralised networking and identity services provided by" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:34 +#: ../../Zotlabs/Module/Siteinfo.php:35 msgid "Additional federated transport protocols:" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:36 +#: ../../Zotlabs/Module/Siteinfo.php:37 #, php-format msgid "Version %s" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:37 +#: ../../Zotlabs/Module/Siteinfo.php:38 msgid "Project homepage" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:38 +#: ../../Zotlabs/Module/Siteinfo.php:39 msgid "Developer homepage" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:42 +#: ../../Zotlabs/Module/Siteinfo.php:43 msgid "Blocked sites" msgstr "" @@ -12672,51 +12668,51 @@ msgstr "" msgid "Use arrows to move the corresponding app up or down in the app tray" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:159 +#: ../../Zotlabs/Module/New_channel.php:160 msgid "Your real name is recommended." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:160 +#: ../../Zotlabs/Module/New_channel.php:161 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:165 +#: ../../Zotlabs/Module/New_channel.php:166 msgid "" "This will be used to create a unique network address (like an email address)." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:167 +#: ../../Zotlabs/Module/New_channel.php:168 msgid "Allowed characters are a-z 0-9, - and _" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:175 +#: ../../Zotlabs/Module/New_channel.php:176 msgid "Channel name" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:233 +#: ../../Zotlabs/Module/New_channel.php:179 +#: ../../Zotlabs/Module/Settings/Channel.php:234 msgid "Channel role" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:181 +#: ../../Zotlabs/Module/New_channel.php:182 msgid "Create a Channel" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:182 +#: ../../Zotlabs/Module/New_channel.php:183 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:183 +#: ../../Zotlabs/Module/New_channel.php:184 msgid "" "or import an existing channel from another location." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:188 +#: ../../Zotlabs/Module/New_channel.php:189 msgid "Validate" msgstr "" @@ -12872,17 +12868,17 @@ msgstr "" msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Hcard.php:37 ../../Zotlabs/Module/Channel.php:149 +#: ../../Zotlabs/Module/Hcard.php:37 ../../Zotlabs/Module/Channel.php:150 #: ../../Zotlabs/Module/Profile.php:62 msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Hcard.php:44 ../../Zotlabs/Module/Channel.php:156 +#: ../../Zotlabs/Module/Hcard.php:44 ../../Zotlabs/Module/Channel.php:157 #: ../../Zotlabs/Module/Profile.php:69 msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:230 +#: ../../Zotlabs/Module/Channel.php:231 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" @@ -12970,260 +12966,260 @@ msgstr "" msgid "Unable to remove source." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:22 ../../Zotlabs/Module/Profiles.php:210 -#: ../../Zotlabs/Module/Profiles.php:638 +#: ../../Zotlabs/Module/Profiles.php:23 ../../Zotlabs/Module/Profiles.php:211 +#: ../../Zotlabs/Module/Profiles.php:641 msgid "Profile not found." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:42 +#: ../../Zotlabs/Module/Profiles.php:43 msgid "Profile deleted." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:66 ../../Zotlabs/Module/Profiles.php:103 +#: ../../Zotlabs/Module/Profiles.php:67 ../../Zotlabs/Module/Profiles.php:104 msgid "Profile-" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:88 ../../Zotlabs/Module/Profiles.php:125 +#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126 msgid "New profile created." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:109 +#: ../../Zotlabs/Module/Profiles.php:110 msgid "Profile unavailable to clone." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:144 +#: ../../Zotlabs/Module/Profiles.php:145 msgid "Profile unavailable to export." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:220 +#: ../../Zotlabs/Module/Profiles.php:221 msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:425 +#: ../../Zotlabs/Module/Profiles.php:426 msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:429 +#: ../../Zotlabs/Module/Profiles.php:430 msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:787 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:788 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:441 ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:795 msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:444 +#: ../../Zotlabs/Module/Profiles.php:445 msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:448 +#: ../../Zotlabs/Module/Profiles.php:449 msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:456 +#: ../../Zotlabs/Module/Profiles.php:457 msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:460 +#: ../../Zotlabs/Module/Profiles.php:461 msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:464 +#: ../../Zotlabs/Module/Profiles.php:465 msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:572 +#: ../../Zotlabs/Module/Profiles.php:573 msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:668 +#: ../../Zotlabs/Module/Profiles.php:671 msgid "Hide my connections from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Profiles.php:684 msgid "Publish my default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:689 +#: ../../Zotlabs/Module/Profiles.php:692 msgid "Suggest me as a potential contact to new members" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 +#: ../../Zotlabs/Module/Profiles.php:696 msgid "Reveal my online status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:746 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:748 msgid "Basic" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:751 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:754 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:760 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:761 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Short title/description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Maximal 190 characters" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:768 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:784 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:789 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Profiles.php:792 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Profiles.php:793 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Profiles.php:794 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Profiles.php:796 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Profiles.php:797 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Profiles.php:798 msgid "My other channels" msgstr "" @@ -13243,19 +13239,19 @@ msgstr "" msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:93 +#: ../../Zotlabs/Module/Rbmark.php:72 msgid "Select a bookmark folder" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:98 +#: ../../Zotlabs/Module/Rbmark.php:80 msgid "Save Bookmark" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:99 +#: ../../Zotlabs/Module/Rbmark.php:81 msgid "URL of bookmark" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:104 +#: ../../Zotlabs/Module/Rbmark.php:86 msgid "Or enter new bookmark folder name" msgstr "" @@ -13264,7 +13260,7 @@ msgid "Remote privacy information not available" msgstr "" #: ../../Zotlabs/Module/Lockview.php:144 ../../Zotlabs/Module/Lockview.php:203 -#: ../../Zotlabs/Module/Acl.php:123 +#: ../../Zotlabs/Module/Acl.php:124 msgctxt "acl" msgid "Profile" msgstr "" @@ -13329,58 +13325,58 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Go.php:21 +#: ../../Zotlabs/Module/Go.php:22 msgid "This page is available only to site members" msgstr "" -#: ../../Zotlabs/Module/Go.php:29 +#: ../../Zotlabs/Module/Go.php:30 msgid "What would you like to do?" msgstr "" -#: ../../Zotlabs/Module/Go.php:31 +#: ../../Zotlabs/Module/Go.php:32 msgid "" "Please bookmark this page if you would like to return to it in the future" msgstr "" -#: ../../Zotlabs/Module/Go.php:35 +#: ../../Zotlabs/Module/Go.php:36 msgid "Upload a profile photo" msgstr "" -#: ../../Zotlabs/Module/Go.php:36 +#: ../../Zotlabs/Module/Go.php:37 msgid "Upload a cover photo" msgstr "" -#: ../../Zotlabs/Module/Go.php:37 +#: ../../Zotlabs/Module/Go.php:38 msgid "Edit your default profile" msgstr "" -#: ../../Zotlabs/Module/Go.php:39 +#: ../../Zotlabs/Module/Go.php:40 msgid "View the channel directory" msgstr "" -#: ../../Zotlabs/Module/Go.php:40 +#: ../../Zotlabs/Module/Go.php:41 msgid "View/edit your channel settings" msgstr "" -#: ../../Zotlabs/Module/Go.php:41 +#: ../../Zotlabs/Module/Go.php:42 msgid "View the site or project documentation" msgstr "" -#: ../../Zotlabs/Module/Go.php:42 +#: ../../Zotlabs/Module/Go.php:43 msgid "Visit your channel homepage" msgstr "" -#: ../../Zotlabs/Module/Go.php:43 +#: ../../Zotlabs/Module/Go.php:44 msgid "" "View your connections and/or add somebody whose address you already know" msgstr "" -#: ../../Zotlabs/Module/Go.php:44 +#: ../../Zotlabs/Module/Go.php:45 msgid "" "View your personal stream (this may be empty until you add some connections)" msgstr "" -#: ../../Zotlabs/Module/Go.php:52 +#: ../../Zotlabs/Module/Go.php:53 msgid "View the public stream. Warning: this content is not moderated" msgstr "" @@ -13441,130 +13437,130 @@ msgstr "" msgid "min" msgstr "" -#: ../../Zotlabs/Module/Regate.php:84 +#: ../../Zotlabs/Module/Regate.php:85 msgid "Email resent" msgstr "" -#: ../../Zotlabs/Module/Regate.php:84 +#: ../../Zotlabs/Module/Regate.php:85 msgid "Email resend failed" msgstr "" -#: ../../Zotlabs/Module/Regate.php:109 +#: ../../Zotlabs/Module/Regate.php:110 msgid "Verification successful" msgstr "" -#: ../../Zotlabs/Module/Regate.php:153 +#: ../../Zotlabs/Module/Regate.php:154 msgid "Account successfull created" msgstr "" -#: ../../Zotlabs/Module/Regate.php:211 +#: ../../Zotlabs/Module/Regate.php:212 msgid "Channel successfull created" msgstr "" -#: ../../Zotlabs/Module/Regate.php:217 +#: ../../Zotlabs/Module/Regate.php:218 msgid "Automatic channel creation failed. Please create a channel." msgstr "" -#: ../../Zotlabs/Module/Regate.php:229 +#: ../../Zotlabs/Module/Regate.php:230 msgid "Account creation error" msgstr "" -#: ../../Zotlabs/Module/Regate.php:241 +#: ../../Zotlabs/Module/Regate.php:242 msgid "Verify failed" msgstr "" -#: ../../Zotlabs/Module/Regate.php:246 +#: ../../Zotlabs/Module/Regate.php:247 msgid "Token verification failed" msgstr "" -#: ../../Zotlabs/Module/Regate.php:251 +#: ../../Zotlabs/Module/Regate.php:252 msgid "Request not inside time frame" msgstr "" -#: ../../Zotlabs/Module/Regate.php:257 ../../Zotlabs/Module/Regate.php:287 +#: ../../Zotlabs/Module/Regate.php:258 ../../Zotlabs/Module/Regate.php:288 msgid "Identity unknown" msgstr "" -#: ../../Zotlabs/Module/Regate.php:263 +#: ../../Zotlabs/Module/Regate.php:264 msgid "dId2 mistaken" msgstr "" -#: ../../Zotlabs/Module/Regate.php:291 +#: ../../Zotlabs/Module/Regate.php:292 msgid "Your Registration ID" msgstr "" -#: ../../Zotlabs/Module/Regate.php:304 ../../Zotlabs/Module/Regate.php:396 -#: ../../Zotlabs/Module/Regate.php:428 +#: ../../Zotlabs/Module/Regate.php:305 ../../Zotlabs/Module/Regate.php:397 +#: ../../Zotlabs/Module/Regate.php:429 msgid "Registration verification" msgstr "" -#: ../../Zotlabs/Module/Regate.php:311 ../../Zotlabs/Module/Regate.php:433 +#: ../../Zotlabs/Module/Regate.php:312 ../../Zotlabs/Module/Regate.php:434 msgid "Hold on, you can start verification in" msgstr "" -#: ../../Zotlabs/Module/Regate.php:312 +#: ../../Zotlabs/Module/Regate.php:313 msgid "Please remember your verification token for ID" msgstr "" -#: ../../Zotlabs/Module/Regate.php:314 +#: ../../Zotlabs/Module/Regate.php:315 msgid "Token validity" msgstr "" -#: ../../Zotlabs/Module/Regate.php:350 +#: ../../Zotlabs/Module/Regate.php:351 msgid "Resend email" msgstr "" -#: ../../Zotlabs/Module/Regate.php:355 +#: ../../Zotlabs/Module/Regate.php:356 msgid "Registration status" msgstr "" -#: ../../Zotlabs/Module/Regate.php:358 +#: ../../Zotlabs/Module/Regate.php:359 msgid "Verification successful!" msgstr "" -#: ../../Zotlabs/Module/Regate.php:359 +#: ../../Zotlabs/Module/Regate.php:360 msgid "Your login ID is" msgstr "" -#: ../../Zotlabs/Module/Regate.php:360 +#: ../../Zotlabs/Module/Regate.php:361 msgid "" "After your account has been approved by our administrator you will be able " "to login with your login ID and your provided password." msgstr "" -#: ../../Zotlabs/Module/Regate.php:372 +#: ../../Zotlabs/Module/Regate.php:373 msgid "Registration request revoked" msgstr "" -#: ../../Zotlabs/Module/Regate.php:373 +#: ../../Zotlabs/Module/Regate.php:374 msgid "Sorry for any inconvience. Thank you for your response." msgstr "" -#: ../../Zotlabs/Module/Regate.php:397 +#: ../../Zotlabs/Module/Regate.php:398 msgid "Please enter your verification token for ID" msgstr "" -#: ../../Zotlabs/Module/Regate.php:398 ../../Zotlabs/Module/Regate.php:425 +#: ../../Zotlabs/Module/Regate.php:399 ../../Zotlabs/Module/Regate.php:426 msgid "Please check your email!" msgstr "" -#: ../../Zotlabs/Module/Regate.php:408 +#: ../../Zotlabs/Module/Regate.php:409 msgid "Verification token" msgstr "" -#: ../../Zotlabs/Module/Regate.php:419 +#: ../../Zotlabs/Module/Regate.php:420 msgid "ID expired" msgstr "" -#: ../../Zotlabs/Module/Regate.php:434 +#: ../../Zotlabs/Module/Regate.php:435 msgid "You will require the verification token for ID" msgstr "" -#: ../../Zotlabs/Module/Regate.php:443 +#: ../../Zotlabs/Module/Regate.php:444 msgid "Unknown or expired ID" msgstr "" -#: ../../Zotlabs/Module/Regate.php:454 +#: ../../Zotlabs/Module/Regate.php:455 msgid "dId2 malformed" msgstr "" @@ -13572,434 +13568,434 @@ msgstr "" msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Setup.php:179 +#: ../../Zotlabs/Module/Setup.php:180 msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Setup.php:183 +#: ../../Zotlabs/Module/Setup.php:184 msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:187 +#: ../../Zotlabs/Module/Setup.php:188 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: ../../Zotlabs/Module/Setup.php:194 +#: ../../Zotlabs/Module/Setup.php:195 msgid "Could not create table." msgstr "" -#: ../../Zotlabs/Module/Setup.php:200 +#: ../../Zotlabs/Module/Setup.php:201 msgid "Your site database has been installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:206 +#: ../../Zotlabs/Module/Setup.php:207 msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -#: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:271 -#: ../../Zotlabs/Module/Setup.php:796 +#: ../../Zotlabs/Module/Setup.php:208 ../../Zotlabs/Module/Setup.php:274 +#: ../../Zotlabs/Module/Setup.php:799 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:268 +#: ../../Zotlabs/Module/Setup.php:271 msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Setup.php:273 +#: ../../Zotlabs/Module/Setup.php:276 msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Setup.php:294 +#: ../../Zotlabs/Module/Setup.php:297 msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Setup.php:295 +#: ../../Zotlabs/Module/Setup.php:298 msgid "" "In order to install $Projectname we need to know how to connect to your " "database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:296 +#: ../../Zotlabs/Module/Setup.php:299 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 +#: ../../Zotlabs/Module/Setup.php:300 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 +#: ../../Zotlabs/Module/Setup.php:304 msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 +#: ../../Zotlabs/Module/Setup.php:304 msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Setup.php:302 +#: ../../Zotlabs/Module/Setup.php:305 msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Setup.php:302 +#: ../../Zotlabs/Module/Setup.php:305 msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Setup.php:303 +#: ../../Zotlabs/Module/Setup.php:306 msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:304 +#: ../../Zotlabs/Module/Setup.php:307 msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Setup.php:305 +#: ../../Zotlabs/Module/Setup.php:308 msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:306 +#: ../../Zotlabs/Module/Setup.php:309 msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:348 +#: ../../Zotlabs/Module/Setup.php:311 ../../Zotlabs/Module/Setup.php:351 msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:348 +#: ../../Zotlabs/Module/Setup.php:311 ../../Zotlabs/Module/Setup.php:351 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350 +#: ../../Zotlabs/Module/Setup.php:312 ../../Zotlabs/Module/Setup.php:353 msgid "Website URL" msgstr "" -#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350 +#: ../../Zotlabs/Module/Setup.php:312 ../../Zotlabs/Module/Setup.php:353 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Setup.php:310 ../../Zotlabs/Module/Setup.php:352 +#: ../../Zotlabs/Module/Setup.php:313 ../../Zotlabs/Module/Setup.php:355 msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Setup.php:337 +#: ../../Zotlabs/Module/Setup.php:340 msgid "Site settings" msgstr "" -#: ../../Zotlabs/Module/Setup.php:391 +#: ../../Zotlabs/Module/Setup.php:394 msgid "PHP version 8.0 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:392 +#: ../../Zotlabs/Module/Setup.php:395 msgid "PHP version" msgstr "" -#: ../../Zotlabs/Module/Setup.php:408 +#: ../../Zotlabs/Module/Setup.php:411 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../Zotlabs/Module/Setup.php:409 +#: ../../Zotlabs/Module/Setup.php:412 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:413 +#: ../../Zotlabs/Module/Setup.php:416 msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Setup.php:413 +#: ../../Zotlabs/Module/Setup.php:416 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../Zotlabs/Module/Setup.php:418 +#: ../../Zotlabs/Module/Setup.php:421 msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Setup.php:428 +#: ../../Zotlabs/Module/Setup.php:431 msgid "" "Unable to check command line PHP, as shell_exec() is disabled. This is " "required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:432 +#: ../../Zotlabs/Module/Setup.php:435 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../Zotlabs/Module/Setup.php:433 +#: ../../Zotlabs/Module/Setup.php:436 msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Setup.php:436 +#: ../../Zotlabs/Module/Setup.php:439 msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Setup.php:456 +#: ../../Zotlabs/Module/Setup.php:459 msgid "" "This is not sufficient to upload larger images or files. You should be able " "to upload at least 4 MB at once." msgstr "" -#: ../../Zotlabs/Module/Setup.php:458 +#: ../../Zotlabs/Module/Setup.php:461 #, 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:464 +#: ../../Zotlabs/Module/Setup.php:467 msgid "You can adjust these settings in the server php.ini file." msgstr "" -#: ../../Zotlabs/Module/Setup.php:466 +#: ../../Zotlabs/Module/Setup.php:469 msgid "PHP upload limits" msgstr "" -#: ../../Zotlabs/Module/Setup.php:489 +#: ../../Zotlabs/Module/Setup.php:492 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:490 +#: ../../Zotlabs/Module/Setup.php:493 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:493 +#: ../../Zotlabs/Module/Setup.php:496 msgid "Generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:497 +#: ../../Zotlabs/Module/Setup.php:500 msgid "Error: the sodium encryption library is not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:499 +#: ../../Zotlabs/Module/Setup.php:502 msgid "Generate ed25519 encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:504 +#: ../../Zotlabs/Module/Setup.php:507 msgid "" "Error: one of \"bcmath\" or \"gmp\" (bigmath library) extensions are " "required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:506 +#: ../../Zotlabs/Module/Setup.php:509 msgid "Bigmath library (either bcmath or gmp)" msgstr "" -#: ../../Zotlabs/Module/Setup.php:523 +#: ../../Zotlabs/Module/Setup.php:526 msgid "libCurl PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:524 +#: ../../Zotlabs/Module/Setup.php:527 msgid "GD graphics PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:525 +#: ../../Zotlabs/Module/Setup.php:528 msgid "OpenSSL PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:526 +#: ../../Zotlabs/Module/Setup.php:529 msgid "PDO database PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:527 +#: ../../Zotlabs/Module/Setup.php:530 msgid "mb_string PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:528 +#: ../../Zotlabs/Module/Setup.php:531 msgid "xml PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:529 +#: ../../Zotlabs/Module/Setup.php:532 msgid "zip PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:530 +#: ../../Zotlabs/Module/Setup.php:533 msgid "intl PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:534 ../../Zotlabs/Module/Setup.php:536 +#: ../../Zotlabs/Module/Setup.php:537 ../../Zotlabs/Module/Setup.php:539 msgid "Apache mod_rewrite module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:534 +#: ../../Zotlabs/Module/Setup.php:537 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:540 ../../Zotlabs/Module/Setup.php:543 +#: ../../Zotlabs/Module/Setup.php:543 ../../Zotlabs/Module/Setup.php:546 msgid "exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:540 +#: ../../Zotlabs/Module/Setup.php:543 msgid "" "Error: exec is required but is either not installed or has been disabled in " "php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:546 ../../Zotlabs/Module/Setup.php:549 +#: ../../Zotlabs/Module/Setup.php:549 ../../Zotlabs/Module/Setup.php:552 msgid "shell_exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:546 +#: ../../Zotlabs/Module/Setup.php:549 msgid "" "Error: shell_exec is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:554 +#: ../../Zotlabs/Module/Setup.php:557 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:558 +#: ../../Zotlabs/Module/Setup.php:561 msgid "" "Error: GD PHP module with JPEG support or ImageMagick graphics library " "required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:562 +#: ../../Zotlabs/Module/Setup.php:565 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:568 +#: ../../Zotlabs/Module/Setup.php:571 msgid "" "Error: PDO database PHP module missing a driver for either mysql or pgsql." msgstr "" -#: ../../Zotlabs/Module/Setup.php:573 +#: ../../Zotlabs/Module/Setup.php:576 msgid "Error: PDO database PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:577 +#: ../../Zotlabs/Module/Setup.php:580 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:581 +#: ../../Zotlabs/Module/Setup.php:584 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:585 +#: ../../Zotlabs/Module/Setup.php:588 msgid "Error: zip PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:589 +#: ../../Zotlabs/Module/Setup.php:592 msgid "Error: intl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:608 ../../Zotlabs/Module/Setup.php:617 +#: ../../Zotlabs/Module/Setup.php:611 ../../Zotlabs/Module/Setup.php:620 msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:613 +#: ../../Zotlabs/Module/Setup.php:616 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:614 +#: ../../Zotlabs/Module/Setup.php:617 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:615 +#: ../../Zotlabs/Module/Setup.php:618 msgid "Please see install/INSTALL.txt for additional information." msgstr "" -#: ../../Zotlabs/Module/Setup.php:631 +#: ../../Zotlabs/Module/Setup.php:634 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:632 +#: ../../Zotlabs/Module/Setup.php:635 #, 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:633 ../../Zotlabs/Module/Setup.php:654 +#: ../../Zotlabs/Module/Setup.php:636 ../../Zotlabs/Module/Setup.php:657 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:634 +#: ../../Zotlabs/Module/Setup.php:637 #, 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:637 +#: ../../Zotlabs/Module/Setup.php:640 #, php-format msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:653 +#: ../../Zotlabs/Module/Setup.php:656 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:657 +#: ../../Zotlabs/Module/Setup.php:660 msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:689 +#: ../../Zotlabs/Module/Setup.php:692 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../Zotlabs/Module/Setup.php:690 +#: ../../Zotlabs/Module/Setup.php:693 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:691 +#: ../../Zotlabs/Module/Setup.php:694 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:692 +#: ../../Zotlabs/Module/Setup.php:695 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:693 +#: ../../Zotlabs/Module/Setup.php:696 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:694 +#: ../../Zotlabs/Module/Setup.php:697 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Setup.php:695 +#: ../../Zotlabs/Module/Setup.php:698 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. " @@ -14007,32 +14003,32 @@ msgid "" "server communications." msgstr "" -#: ../../Zotlabs/Module/Setup.php:697 +#: ../../Zotlabs/Module/Setup.php:700 msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Setup.php:703 +#: ../../Zotlabs/Module/Setup.php:706 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../Zotlabs/Module/Setup.php:706 +#: ../../Zotlabs/Module/Setup.php:709 msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Setup.php:719 +#: ../../Zotlabs/Module/Setup.php:722 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:794 +#: ../../Zotlabs/Module/Setup.php:797 msgid "

    What next?

    " msgstr "" -#: ../../Zotlabs/Module/Setup.php:795 +#: ../../Zotlabs/Module/Setup.php:798 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -14041,23 +14037,23 @@ msgstr "" msgid "toggle full screen mode" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 +#: ../../Zotlabs/Module/Profperm.php:35 ../../Zotlabs/Module/Profperm.php:64 msgid "Invalid profile identifier." msgstr "" -#: ../../Zotlabs/Module/Profperm.php:111 +#: ../../Zotlabs/Module/Profperm.php:112 msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:115 +#: ../../Zotlabs/Module/Profperm.php:116 msgid "Click on a contact to add or remove." msgstr "" -#: ../../Zotlabs/Module/Profperm.php:124 +#: ../../Zotlabs/Module/Profperm.php:125 msgid "Visible To" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:140 +#: ../../Zotlabs/Module/Profperm.php:141 #: ../../Zotlabs/Module/Connections.php:221 msgid "All Connections" msgstr "" @@ -14066,7 +14062,7 @@ msgstr "" msgid "Language App" msgstr "" -#: ../../Zotlabs/Module/Rpost.php:217 ../../Zotlabs/Module/Editpost.php:113 +#: ../../Zotlabs/Module/Rpost.php:117 ../../Zotlabs/Module/Editpost.php:113 msgid "Edit post" msgstr "" @@ -14276,7 +14272,7 @@ msgstr "" msgid "Default Addressbook" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:31 +#: ../../Zotlabs/Module/Dirsearch.php:32 msgid "This directory server requires an access token" msgstr "" @@ -14312,74 +14308,74 @@ msgstr "" msgid "Connected OAuth2 Apps" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:125 +#: ../../Zotlabs/Module/Settings/Display.php:126 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:182 +#: ../../Zotlabs/Module/Settings/Display.php:183 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:183 +#: ../../Zotlabs/Module/Settings/Display.php:184 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:184 +#: ../../Zotlabs/Module/Settings/Display.php:185 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:185 +#: ../../Zotlabs/Module/Settings/Display.php:186 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:191 +#: ../../Zotlabs/Module/Settings/Display.php:192 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:192 +#: ../../Zotlabs/Module/Settings/Display.php:193 msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:194 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:194 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:195 +#: ../../Zotlabs/Module/Settings/Display.php:196 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Maximum of 30 items" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Display new member quick links menu" msgstr "" @@ -14405,67 +14401,67 @@ msgstr "" msgid "Channel Home Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:21 +#: ../../Zotlabs/Module/Settings/Account.php:23 msgid "Not valid email." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:24 +#: ../../Zotlabs/Module/Settings/Account.php:26 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:33 +#: ../../Zotlabs/Module/Settings/Account.php:35 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:51 +#: ../../Zotlabs/Module/Settings/Account.php:53 msgid "Password verification failed." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:58 +#: ../../Zotlabs/Module/Settings/Account.php:60 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:62 +#: ../../Zotlabs/Module/Settings/Account.php:64 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:76 +#: ../../Zotlabs/Module/Settings/Account.php:78 msgid "Password changed." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:78 +#: ../../Zotlabs/Module/Settings/Account.php:80 msgid "Password update failed. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:103 +#: ../../Zotlabs/Module/Settings/Account.php:105 msgid "Account Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:104 +#: ../../Zotlabs/Module/Settings/Account.php:106 msgid "Current Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:105 +#: ../../Zotlabs/Module/Settings/Account.php:107 msgid "Enter New Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:106 +#: ../../Zotlabs/Module/Settings/Account.php:108 msgid "Confirm New Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:106 +#: ../../Zotlabs/Module/Settings/Account.php:108 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:108 +#: ../../Zotlabs/Module/Settings/Account.php:110 msgid "Multi-Factor Authentication" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:109 +#: ../../Zotlabs/Module/Settings/Account.php:111 msgid "DId2 or Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:112 +#: ../../Zotlabs/Module/Settings/Account.php:114 msgid "Remove this account including all its channels" msgstr "" @@ -14497,103 +14493,103 @@ msgstr "" msgid "Channel Manager Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:48 +#: ../../Zotlabs/Module/Settings/Privacy.php:49 msgid "Privacy settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:66 +#: ../../Zotlabs/Module/Settings/Privacy.php:67 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:67 +#: ../../Zotlabs/Module/Settings/Privacy.php:68 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:68 +#: ../../Zotlabs/Module/Settings/Privacy.php:69 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:69 +#: ../../Zotlabs/Module/Settings/Privacy.php:70 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:70 +#: ../../Zotlabs/Module/Settings/Privacy.php:71 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:71 +#: ../../Zotlabs/Module/Settings/Privacy.php:72 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:72 +#: ../../Zotlabs/Module/Settings/Privacy.php:73 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:82 +#: ../../Zotlabs/Module/Settings/Privacy.php:83 msgid "" "Advise: set to \"Anybody on the internet\" and use privacy groups to " "restrict access" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:121 +#: ../../Zotlabs/Module/Settings/Privacy.php:122 msgid "Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:126 +#: ../../Zotlabs/Module/Settings/Privacy.php:127 msgid "Advanced configuration" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:128 +#: ../../Zotlabs/Module/Settings/Privacy.php:129 msgid "Proceed with caution" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:129 +#: ../../Zotlabs/Module/Settings/Privacy.php:130 msgid "" "Changing advanced configuration settings can impact your, and your contacts " "channels functionality and security." msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:130 +#: ../../Zotlabs/Module/Settings/Privacy.php:131 msgid "Accept the risk and continue" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 msgid "Automatically approve new contacts" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:133 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 msgid "Opt-out of search engine indexing" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:134 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 msgid "Group actor" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:134 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 msgid "Allow this channel to act as a forum" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:135 +#: ../../Zotlabs/Module/Settings/Privacy.php:136 msgid "Accept all messages which mention you" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:135 +#: ../../Zotlabs/Module/Settings/Privacy.php:136 msgid "This setting bypasses normal permissions" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:137 msgid "Accept unsolicited comments for moderation" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:137 msgid "Otherwise they will be silently dropped" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:137 +#: ../../Zotlabs/Module/Settings/Privacy.php:138 msgid "Enable OCAP access" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:137 +#: ../../Zotlabs/Module/Settings/Privacy.php:138 msgid "Grant limited posts the right to access linked private media" msgstr "" @@ -14617,271 +14613,271 @@ msgstr "" msgid "Conversation Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:105 -#: ../../Zotlabs/Module/Settings/Channel.php:217 +#: ../../Zotlabs/Module/Settings/Channel.php:106 +#: ../../Zotlabs/Module/Settings/Channel.php:218 msgid "Please select a channel role" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:194 +#: ../../Zotlabs/Module/Settings/Channel.php:195 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:197 +#: ../../Zotlabs/Module/Settings/Channel.php:198 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:228 +#: ../../Zotlabs/Module/Settings/Channel.php:229 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:235 +#: ../../Zotlabs/Module/Settings/Channel.php:236 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:236 +#: ../../Zotlabs/Module/Settings/Channel.php:237 msgid "Channel timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:237 +#: ../../Zotlabs/Module/Settings/Channel.php:238 msgid "Default post location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:237 +#: ../../Zotlabs/Module/Settings/Channel.php:238 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:238 +#: ../../Zotlabs/Module/Settings/Channel.php:239 msgid "Use browser location" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:239 +#: ../../Zotlabs/Module/Settings/Channel.php:240 msgid "Adult content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:239 +#: ../../Zotlabs/Module/Settings/Channel.php:240 msgid "This channel frequently or regularly publishes adult content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:240 +#: ../../Zotlabs/Module/Settings/Channel.php:241 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:240 +#: ../../Zotlabs/Module/Settings/Channel.php:241 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:242 +#: ../../Zotlabs/Module/Settings/Channel.php:243 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:243 +#: ../../Zotlabs/Module/Settings/Channel.php:244 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:244 +#: ../../Zotlabs/Module/Settings/Channel.php:245 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:245 +#: ../../Zotlabs/Module/Settings/Channel.php:246 msgid "making an interesting profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:246 +#: ../../Zotlabs/Module/Settings/Channel.php:247 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:247 +#: ../../Zotlabs/Module/Settings/Channel.php:248 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:248 +#: ../../Zotlabs/Module/Settings/Channel.php:249 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:249 +#: ../../Zotlabs/Module/Settings/Channel.php:250 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:250 +#: ../../Zotlabs/Module/Settings/Channel.php:251 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:251 +#: ../../Zotlabs/Module/Settings/Channel.php:252 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:252 +#: ../../Zotlabs/Module/Settings/Channel.php:253 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:253 +#: ../../Zotlabs/Module/Settings/Channel.php:254 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:254 +#: ../../Zotlabs/Module/Settings/Channel.php:255 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:255 +#: ../../Zotlabs/Module/Settings/Channel.php:256 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:256 +#: ../../Zotlabs/Module/Settings/Channel.php:257 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:257 +#: ../../Zotlabs/Module/Settings/Channel.php:258 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:258 +#: ../../Zotlabs/Module/Settings/Channel.php:259 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:260 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:259 -#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Settings/Channel.php:260 #: ../../Zotlabs/Module/Settings/Channel.php:265 #: ../../Zotlabs/Module/Settings/Channel.php:266 +#: ../../Zotlabs/Module/Settings/Channel.php:267 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:260 +#: ../../Zotlabs/Module/Settings/Channel.php:261 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:262 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:262 +#: ../../Zotlabs/Module/Settings/Channel.php:263 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:262 +#: ../../Zotlabs/Module/Settings/Channel.php:263 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:263 +#: ../../Zotlabs/Module/Settings/Channel.php:264 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Settings/Channel.php:265 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:265 +#: ../../Zotlabs/Module/Settings/Channel.php:266 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:266 +#: ../../Zotlabs/Module/Settings/Channel.php:267 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:267 +#: ../../Zotlabs/Module/Settings/Channel.php:268 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:268 +#: ../../Zotlabs/Module/Settings/Channel.php:269 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:269 +#: ../../Zotlabs/Module/Settings/Channel.php:270 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:270 +#: ../../Zotlabs/Module/Settings/Channel.php:271 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:271 +#: ../../Zotlabs/Module/Settings/Channel.php:272 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:273 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:273 #, 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 "" -#: ../../Zotlabs/Module/Settings/Channel.php:273 +#: ../../Zotlabs/Module/Settings/Channel.php:274 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:274 +#: ../../Zotlabs/Module/Settings/Channel.php:275 msgid "Mark all notices of the thread read if a notice is clicked" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:274 +#: ../../Zotlabs/Module/Settings/Channel.php:275 msgid "If no, only the clicked notice will be marked read" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:275 +#: ../../Zotlabs/Module/Settings/Channel.php:276 msgid "" "Desktop notifications are unavailable because the required browser " "permission has not been granted" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:276 +#: ../../Zotlabs/Module/Settings/Channel.php:277 msgid "Grant permission" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:277 +#: ../../Zotlabs/Module/Settings/Channel.php:278 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:277 +#: ../../Zotlabs/Module/Settings/Channel.php:278 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:280 +#: ../../Zotlabs/Module/Settings/Channel.php:281 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:280 #: ../../Zotlabs/Module/Settings/Channel.php:281 +#: ../../Zotlabs/Module/Settings/Channel.php:282 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:281 +#: ../../Zotlabs/Module/Settings/Channel.php:282 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:283 +#: ../../Zotlabs/Module/Settings/Channel.php:284 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:284 +#: ../../Zotlabs/Module/Settings/Channel.php:285 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:284 +#: ../../Zotlabs/Module/Settings/Channel.php:285 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:284 +#: ../../Zotlabs/Module/Settings/Channel.php:285 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:284 +#: ../../Zotlabs/Module/Settings/Channel.php:285 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:284 +#: ../../Zotlabs/Module/Settings/Channel.php:285 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:285 #: ../../Zotlabs/Module/Settings/Channel.php:286 +#: ../../Zotlabs/Module/Settings/Channel.php:287 msgid "" "Words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - " "leave blank to import all posts" @@ -14961,11 +14957,11 @@ msgstr "" msgid "Edit Block" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:36 +#: ../../Zotlabs/Module/Email_validation.php:37 msgid "Email Verification Required" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:37 +#: ../../Zotlabs/Module/Email_validation.php:38 #, php-format msgid "" "A verification token was sent to your email address [%s]. Enter that token " @@ -14973,73 +14969,73 @@ msgid "" "for delivery, and check your spam folder if you do not see the message." msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:38 +#: ../../Zotlabs/Module/Email_validation.php:39 msgid "Resend Email" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:41 +#: ../../Zotlabs/Module/Email_validation.php:42 msgid "Validation token" msgstr "" -#: ../../Zotlabs/Module/Import.php:70 +#: ../../Zotlabs/Module/Import.php:71 msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Import.php:86 ../../Zotlabs/Module/Import.php:100 +#: ../../Zotlabs/Module/Import.php:87 ../../Zotlabs/Module/Import.php:101 msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Import.php:163 +#: ../../Zotlabs/Module/Import.php:164 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Import.php:190 +#: ../../Zotlabs/Module/Import.php:191 msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:557 +#: ../../Zotlabs/Module/Import.php:562 msgid "" "Automatic content and files import was not possible due to API version " "incompatiblity. Please import content and files manually!" msgstr "" -#: ../../Zotlabs/Module/Import.php:585 +#: ../../Zotlabs/Module/Import.php:590 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:592 +#: ../../Zotlabs/Module/Import.php:597 msgid "Channel Import" msgstr "" -#: ../../Zotlabs/Module/Import.php:593 +#: ../../Zotlabs/Module/Import.php:598 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:595 +#: ../../Zotlabs/Module/Import.php:600 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:597 +#: ../../Zotlabs/Module/Import.php:602 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:598 +#: ../../Zotlabs/Module/Import.php:603 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:599 +#: ../../Zotlabs/Module/Import.php:604 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:600 +#: ../../Zotlabs/Module/Import.php:605 msgid "Import your items and files (limited by available memory)" msgstr "" -#: ../../Zotlabs/Module/Import.php:602 +#: ../../Zotlabs/Module/Import.php:607 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 " @@ -15047,31 +15043,31 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:604 +#: ../../Zotlabs/Module/Import.php:609 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:605 +#: ../../Zotlabs/Module/Import.php:610 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:606 +#: ../../Zotlabs/Module/Import.php:611 msgid "Use this channel nickname instead of the one provided" msgstr "" -#: ../../Zotlabs/Module/Import.php:606 +#: ../../Zotlabs/Module/Import.php:611 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:608 +#: ../../Zotlabs/Module/Import.php:613 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/Acl.php:370 +#: ../../Zotlabs/Module/Acl.php:371 msgid "network" msgstr "" diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 9df6511aa..69ec2d8ca 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1312,6 +1312,7 @@ return array( 'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php', 'Zotlabs\\Lib\\ThreadListener' => $baseDir . '/Zotlabs/Lib/ThreadListener.php', 'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php', + 'Zotlabs\\Lib\\Traits\\HelpHelperTrait' => $baseDir . '/Zotlabs/Lib/Traits/HelpHelperTrait.php', 'Zotlabs\\Lib\\Verify' => $baseDir . '/Zotlabs/Lib/Verify.php', 'Zotlabs\\Lib\\Webfinger' => $baseDir . '/Zotlabs/Lib/Webfinger.php', 'Zotlabs\\Lib\\XConfig' => $baseDir . '/Zotlabs/Lib/XConfig.php', @@ -1512,8 +1513,6 @@ return array( 'Zotlabs\\Module\\Tasks' => $baseDir . '/Zotlabs/Module/Tasks.php', 'Zotlabs\\Module\\Theme_info' => $baseDir . '/Zotlabs/Module/Theme_info.php', 'Zotlabs\\Module\\Thing' => $baseDir . '/Zotlabs/Module/Thing.php', - 'Zotlabs\\Module\\Toggle_mobile' => $baseDir . '/Zotlabs/Module/Toggle_mobile.php', - 'Zotlabs\\Module\\Toggle_safesearch' => $baseDir . '/Zotlabs/Module/Toggle_safesearch.php', 'Zotlabs\\Module\\Token' => $baseDir . '/Zotlabs/Module/Token.php', 'Zotlabs\\Module\\Tokens' => $baseDir . '/Zotlabs/Module/Tokens.php', 'Zotlabs\\Module\\Totp_check' => $baseDir . '/Zotlabs/Module/Totp_check.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d6f2c2f9d..1b958f6a8 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1559,6 +1559,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\ThreadItem' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadItem.php', 'Zotlabs\\Lib\\ThreadListener' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadListener.php', 'Zotlabs\\Lib\\ThreadStream' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadStream.php', + 'Zotlabs\\Lib\\Traits\\HelpHelperTrait' => __DIR__ . '/../..' . '/Zotlabs/Lib/Traits/HelpHelperTrait.php', 'Zotlabs\\Lib\\Verify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Verify.php', 'Zotlabs\\Lib\\Webfinger' => __DIR__ . '/../..' . '/Zotlabs/Lib/Webfinger.php', 'Zotlabs\\Lib\\XConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/XConfig.php', @@ -1759,8 +1760,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Tasks' => __DIR__ . '/../..' . '/Zotlabs/Module/Tasks.php', 'Zotlabs\\Module\\Theme_info' => __DIR__ . '/../..' . '/Zotlabs/Module/Theme_info.php', 'Zotlabs\\Module\\Thing' => __DIR__ . '/../..' . '/Zotlabs/Module/Thing.php', - 'Zotlabs\\Module\\Toggle_mobile' => __DIR__ . '/../..' . '/Zotlabs/Module/Toggle_mobile.php', - 'Zotlabs\\Module\\Toggle_safesearch' => __DIR__ . '/../..' . '/Zotlabs/Module/Toggle_safesearch.php', 'Zotlabs\\Module\\Token' => __DIR__ . '/../..' . '/Zotlabs/Module/Token.php', 'Zotlabs\\Module\\Tokens' => __DIR__ . '/../..' . '/Zotlabs/Module/Tokens.php', 'Zotlabs\\Module\\Totp_check' => __DIR__ . '/../..' . '/Zotlabs/Module/Totp_check.php', -- cgit v1.2.3 From 6666bdfda9bfa0ff547334195201c1d71e074520 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jun 2024 07:47:39 +0000 Subject: version 9.3 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 9191600fb..52c222b0a 100644 --- a/boot.php +++ b/boot.php @@ -66,7 +66,7 @@ require_once('include/security.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.2RC1'); +define('STD_VERSION', '9.3'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3 From 7028e075350e9f1d16bcd6b9785f573937aa8f8c Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jun 2024 08:27:54 +0000 Subject: adjust right margin of profile images --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 53d164482..2de40d671 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -781,7 +781,7 @@ nav .acpopup { .shared_header img { border-radius: var(--bs-border-radius); - margin-right: .75rem; + margin-right: .5rem; } .tag1 { -- cgit v1.2.3 From 6a710c3cc303fed95532fe3600c2bdda08068add Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jun 2024 08:29:01 +0000 Subject: fix version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 52c222b0a..9191600fb 100644 --- a/boot.php +++ b/boot.php @@ -66,7 +66,7 @@ require_once('include/security.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.3'); +define('STD_VERSION', '9.2RC1'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3 From 26cb32612d275bd4f44d8bdf2c9da3e6e535b1ed Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jun 2024 19:23:00 +0000 Subject: fix display issue for doubleleft template --- view/php/doubleleft.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/php/doubleleft.php b/view/php/doubleleft.php index 2d1571bf8..97b1546dc 100644 --- a/view/php/doubleleft.php +++ b/view/php/doubleleft.php @@ -23,7 +23,7 @@
    - +
    -- cgit v1.2.3 From 30ba0661aa591b860ee4d7e38cee0a8ad4c3ea44 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jun 2024 20:01:52 +0000 Subject: fix php error --- Zotlabs/Module/Setup.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 7ca3f827c..35079e5e5 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -58,7 +58,7 @@ class Setup extends \Zotlabs\Web\Controller { */ function post() { - switch($this->install_wizard_pass) { + switch(self::$install_wizard_pass) { case 1: case 2: return; @@ -180,18 +180,18 @@ class Setup extends \Zotlabs\Web\Controller { $install_title = t('$Projectname Server - Setup'); if(x(\App::$data, 'db_conn_failed')) { - $this->install_wizard_pass = 2; + self::$install_wizard_pass = 2; $wizard_status = t('Could not connect to database.'); } if(x(\App::$data, 'url_fail')) { - $this->install_wizard_pass = 3; + self::$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; + self::$install_wizard_pass = 2; $wizard_status = t('Could not create table.'); } $db_return_text = ''; -- cgit v1.2.3 From 464149e22d2654fc548e4c7090358d9007bc8031 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 28 Jun 2024 18:18:35 +0000 Subject: fail to import more gracefully if a channel has already been imported at some point but was deleted again --- Zotlabs/Module/Import.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 24b7498dd..5ace4e72d 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -192,6 +192,12 @@ class Import extends Controller { return; } + if ($channel['channel_removed']) { + logger('Channel exists but has been marked removed on this hub. ', print_r($channel,true)); + notice( t('Channel exists but has been marked removed on this hub. Import failed.') . EOL); + return; + } + if (is_array($data['config'])) { import_config($channel, $data['config']); } @@ -558,7 +564,7 @@ class Import extends Controller { goaway(z_root() . '/import_progress'); } - if (!$cf_api_compat) { + if ($import_posts && !$cf_api_compat) { notice(t('Automatic content and files import was not possible due to API version incompatiblity. Please import content and files manually!') . EOL); } -- cgit v1.2.3 From f944f46744c45aa64068b33790692f89f03fce50 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 4 Jul 2024 09:30:21 +0000 Subject: fix possible php error --- include/zid.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/zid.php b/include/zid.php index 9f0b23edf..f25a7122f 100644 --- a/include/zid.php +++ b/include/zid.php @@ -38,10 +38,16 @@ function is_matrix_url($url) { * @return string */ function zid($s, $address = '') { - if (!$s || strpos($s,'zid=')) + if (!strlen($s) || strpos($s,'zid=')) { return $s; + } $m = parse_url($s); + + if (!is_array($m)) { + return $s; + } + $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); if($fragment !== false) $s = str_replace('#' . $fragment,'',$s); -- cgit v1.2.3 From ed03befa027aa324fb2aaa766002e647ecaa77d8 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 4 Jul 2024 09:31:13 +0000 Subject: fix possible php error --- include/zid.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/zid.php b/include/zid.php index 9f0b23edf..f25a7122f 100644 --- a/include/zid.php +++ b/include/zid.php @@ -38,10 +38,16 @@ function is_matrix_url($url) { * @return string */ function zid($s, $address = '') { - if (!$s || strpos($s,'zid=')) + if (!strlen($s) || strpos($s,'zid=')) { return $s; + } $m = parse_url($s); + + if (!is_array($m)) { + return $s; + } + $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); if($fragment !== false) $s = str_replace('#' . $fragment,'',$s); -- cgit v1.2.3 From 04a35dac9aa1949981f2c2d261f869747a0e2686 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 4 Jul 2024 09:41:21 +0000 Subject: revert the strlen check --- include/zid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zid.php b/include/zid.php index f25a7122f..05b4cee16 100644 --- a/include/zid.php +++ b/include/zid.php @@ -38,7 +38,7 @@ function is_matrix_url($url) { * @return string */ function zid($s, $address = '') { - if (!strlen($s) || strpos($s,'zid=')) { + if ($s || strpos($s,'zid=')) { return $s; } -- cgit v1.2.3 From f882c44fb397c8a891c0e16541a6bd44a6086c20 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 4 Jul 2024 10:13:08 +0000 Subject: fix wrong logic after last commit --- include/zid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zid.php b/include/zid.php index 05b4cee16..159a3b834 100644 --- a/include/zid.php +++ b/include/zid.php @@ -38,7 +38,7 @@ function is_matrix_url($url) { * @return string */ function zid($s, $address = '') { - if ($s || strpos($s,'zid=')) { + if (!$s || strpos($s,'zid=')) { return $s; } -- cgit v1.2.3 From 213ee83a92bf7a297bd985f680e98d9a3ba513d4 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 6 Jul 2024 10:29:13 +0000 Subject: update changelog --- CHANGELOG | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b5cd098a4..9d8b2178f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,64 @@ +Hubzilla 9.2 (2024-??-??) + - Fail to import more gracefully if a channel has already been imported at some point but was deleted again + - Use the doubleleft template by default for admin pages to work around some display issues + - Reflect the censored state in the local xchan + - Exclude toplevel posts by censored channels in the public stream + - Update API docs for Module test case base class + - Add helper expectRedirectTo to module test class + - Refactor is_local_url() and add api doc + - Use empty() to check if array entry exist in create_identity() + - Add basic test for create_identity function + - Allow passing callable as array to hooks + - Use DbaTransaction class for db transactions in queueworker + - Remove obsolete stubs from Permissions tests + - Refactor mod rpost to fix open redirect issue and add tests + - Configure system.baseurl for tests + - Add basic test and fix session access for mod rpost + - Add config file and rules for PHP Code Sniffer + - Refactor mod setup + - Pass the force argument to the xchan_photo daemon + - Declare arg and return types for unparse_url() + - Skip checking MFA status for WebDAV and CardDAV requests + - Upgrade test framework to PHPUnit 10.5 + - Minor style update for the .abook-self CSS class + - Update docs on tags and mentions. + - Refactor and cleanup Rbmark module and add tests + - Remove unused Toggle_(safesearch|mobile) modules + - Make mod regate return to system.workflow_channel_next + - Show register message field only if registration is set to register_approve + - Add bbcode support for the HTML5 del tag + - Rename HelpHelper to HelpHelperTrait + - Remove jgrowl in favour of bootstrap toast + - Refactor mod help + - Reduce some global state and add some docs + - Make save_chunk() deal with userfile and file array keys + - Update siteinfo to remove traces of zotlabs.org + - Minor refactor for in mod import and store import host for possible later use + - Allow to kick off import sync process in case it did not start at all + - Updated spanish translations + + Bugfixes + - Fix possible PHP error in zid() + - Fix display issue for doubleleft template + - Fix issue where event items were parsed multiple times on display + - Fix return to blank page after editing post under some circumstances + - Fix missing include in QueueWorker + - Fix warnings exposed by tests + - Fix timestamp handling in menu_create() + - Fix updated arg not supported in pconfig wrapper function + - Fix default timeouts for z_(fetch|post)_url + - Fix hcard addon markup not available if profile entries were missing + - Fix nested lists parsing + - Fix help menu CSS + - Fix get_rpost_path() broken for URL's with no port + - Fix passing an empty filter to deliverable_abook_xchans() will return all deliverable abook xchans + + Addons + - Wiki: fix revert if editor is not ace + - Wiki: do not slate deleted wiki pages for download + - Pubcrawl: do not use mentions for addressing if post is restricted + + Hubzilla 9.0.2 (2024-06-07) - Fix buttons in event viewer - Fix some PHP warnings and errors -- cgit v1.2.3 From c04e781926a78e514cdf211fa24930a331149072 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 6 Jul 2024 11:04:43 +0000 Subject: version 9.2 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 9191600fb..79609e876 100644 --- a/boot.php +++ b/boot.php @@ -66,7 +66,7 @@ require_once('include/security.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '9.2RC1'); +define('STD_VERSION', '9.2'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); -- cgit v1.2.3