diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:39:08 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:39:08 -0400 |
commit | e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272 (patch) | |
tree | 27bd2e18dddc900edc39f34b47bfea749b3dcf61 /doc | |
parent | 50e581d88ad4901b13bbf99b2e58a5787b6bccec (diff) | |
parent | 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff) | |
download | volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.tar.gz volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.tar.bz2 volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.zip |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'doc')
-rw-r--r-- | doc/hook/change_channel.bb | 11 | ||||
-rw-r--r-- | doc/hooklist.bb | 3 | ||||
-rw-r--r-- | doc/service_classes.bb | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/doc/hook/change_channel.bb b/doc/hook/change_channel.bb new file mode 100644 index 000000000..4514b9265 --- /dev/null +++ b/doc/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/hooklist.bb b/doc/hooklist.bb index bb1bffcf0..66ff1cf71 100644 --- a/doc/hooklist.bb +++ b/doc/hooklist.bb @@ -73,6 +73,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [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/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 diff --git a/doc/service_classes.bb b/doc/service_classes.bb index e5d4ecfad..4dead5d29 100644 --- a/doc/service_classes.bb +++ b/doc/service_classes.bb @@ -35,3 +35,4 @@ 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
\ No newline at end of file |