diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-06 15:58:56 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-06 15:58:56 +0100 |
| commit | 5776af30e84356dade6b644a56dce2094ecb99eb (patch) | |
| tree | 985a3325bdf75e341d70b2305c923dfbb2064972 | |
| parent | 91f751d10531e73078f7efb4efa1f5e215a8f871 (diff) | |
| parent | 4ca0c2cfd14df5e2b6e9c7f59a10628f7653d6a4 (diff) | |
| download | volse-hubzilla-5776af30e84356dade6b644a56dce2094ecb99eb.tar.gz volse-hubzilla-5776af30e84356dade6b644a56dce2094ecb99eb.tar.bz2 volse-hubzilla-5776af30e84356dade6b644a56dce2094ecb99eb.zip | |
Merge remote-tracking branch 'upstream/master'
174 files changed, 741 insertions, 11 deletions
diff --git a/app/firefoxshare.apd b/app/firefoxshare.apd new file mode 100644 index 000000000..5e0f38b4e --- /dev/null +++ b/app/firefoxshare.apd @@ -0,0 +1,4 @@ +url: $baseurl/ffsapi +requires: local_channel +name: Firefox Share +photo: $baseurl/app/firefoxshare.png diff --git a/app/firefoxshare.png b/app/firefoxshare.png Binary files differnew file mode 100644 index 000000000..755952284 --- /dev/null +++ b/app/firefoxshare.png diff --git a/doc/develop.bb b/doc/develop.bb index 67515c1ab..09ea1ee71 100644 --- a/doc/develop.bb +++ b/doc/develop.bb @@ -9,6 +9,7 @@ [zrl=[baseurl]/help/Widgets]Widgets[/zrl] [zrl=[baseurl]/help/plugins]Plugins[/zrl] [zrl=[baseurl]/help/hooks]Hooks[/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] diff --git a/doc/hook/about_hook.bb b/doc/hook/about_hook.bb new file mode 100644 index 000000000..22b60d786 --- /dev/null +++ b/doc/hook/about_hook.bb @@ -0,0 +1 @@ +[h2]about_hook[/h2] diff --git a/doc/hook/accept_follow.bb b/doc/hook/accept_follow.bb new file mode 100644 index 000000000..e8b1ed0c4 --- /dev/null +++ b/doc/hook/accept_follow.bb @@ -0,0 +1 @@ +[h2]accept_follow[/h2] diff --git a/doc/hook/account_downgrade.bb b/doc/hook/account_downgrade.bb new file mode 100644 index 000000000..63bae0a58 --- /dev/null +++ b/doc/hook/account_downgrade.bb @@ -0,0 +1 @@ +[h2]account_downgrade[/h2] diff --git a/doc/hook/account_settings.bb b/doc/hook/account_settings.bb new file mode 100644 index 000000000..91b3a8385 --- /dev/null +++ b/doc/hook/account_settings.bb @@ -0,0 +1 @@ +[h2]account_settings[/h2] diff --git a/doc/hook/account_settings_post.bb b/doc/hook/account_settings_post.bb new file mode 100644 index 000000000..bbd7a57a8 --- /dev/null +++ b/doc/hook/account_settings_post.bb @@ -0,0 +1 @@ +[h2]account_settings_post[/h2] diff --git a/doc/hook/activity_received.bb b/doc/hook/activity_received.bb new file mode 100644 index 000000000..2e9d68bf3 --- /dev/null +++ b/doc/hook/activity_received.bb @@ -0,0 +1 @@ +[h2]activity_received[/h2] diff --git a/doc/hook/affinity_labels.bb b/doc/hook/affinity_labels.bb new file mode 100644 index 000000000..7234b7632 --- /dev/null +++ b/doc/hook/affinity_labels.bb @@ -0,0 +1 @@ +[h2]affinity_labels[/h2] diff --git a/doc/hook/api_perm_is_allowed.bb b/doc/hook/api_perm_is_allowed.bb new file mode 100644 index 000000000..862cbd653 --- /dev/null +++ b/doc/hook/api_perm_is_allowed.bb @@ -0,0 +1 @@ +[h2]api_perm_is_allowed[/h2] diff --git a/doc/hook/app_menu.bb b/doc/hook/app_menu.bb new file mode 100644 index 000000000..0458a692a --- /dev/null +++ b/doc/hook/app_menu.bb @@ -0,0 +1 @@ +[h2]app_menu[/h2] diff --git a/doc/hook/atom_author.bb b/doc/hook/atom_author.bb new file mode 100644 index 000000000..c9d05a593 --- /dev/null +++ b/doc/hook/atom_author.bb @@ -0,0 +1 @@ +[h2]atom_author[/h2] diff --git a/doc/hook/atom_entry.bb b/doc/hook/atom_entry.bb new file mode 100644 index 000000000..0aec89f16 --- /dev/null +++ b/doc/hook/atom_entry.bb @@ -0,0 +1 @@ +[h2]atom_entry[/h2] diff --git a/doc/hook/atom_feed.bb b/doc/hook/atom_feed.bb new file mode 100644 index 000000000..69775ca5e --- /dev/null +++ b/doc/hook/atom_feed.bb @@ -0,0 +1 @@ +[h2]atom_feed[/h2] diff --git a/doc/hook/atom_feed_end.bb b/doc/hook/atom_feed_end.bb new file mode 100644 index 000000000..4f019fc8f --- /dev/null +++ b/doc/hook/atom_feed_end.bb @@ -0,0 +1 @@ +[h2]atom_feed_end[/h2] diff --git a/doc/hook/attach_upload_file.bb b/doc/hook/attach_upload_file.bb new file mode 100644 index 000000000..1f8056caa --- /dev/null +++ b/doc/hook/attach_upload_file.bb @@ -0,0 +1 @@ +[h2]attach_upload_file[/h2] diff --git a/doc/hook/authenticate.bb b/doc/hook/authenticate.bb new file mode 100644 index 000000000..eb8071e73 --- /dev/null +++ b/doc/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/hook/avatar_lookup.bb b/doc/hook/avatar_lookup.bb new file mode 100644 index 000000000..abd84de5e --- /dev/null +++ b/doc/hook/avatar_lookup.bb @@ -0,0 +1 @@ +[h2]avatar_lookup[/h2] diff --git a/doc/hook/bb2diaspora.bb b/doc/hook/bb2diaspora.bb new file mode 100644 index 000000000..c28f1883e --- /dev/null +++ b/doc/hook/bb2diaspora.bb @@ -0,0 +1 @@ +[h2]bb2diaspora[/h2] diff --git a/doc/hook/bbcode.bb b/doc/hook/bbcode.bb new file mode 100644 index 000000000..2996a8528 --- /dev/null +++ b/doc/hook/bbcode.bb @@ -0,0 +1 @@ +[h2]bbcode[/h2] diff --git a/doc/hook/channel_remove.bb b/doc/hook/channel_remove.bb new file mode 100644 index 000000000..db9e9dd82 --- /dev/null +++ b/doc/hook/channel_remove.bb @@ -0,0 +1 @@ +[h2]channel_remove[/h2] diff --git a/doc/hook/chat_message.bb b/doc/hook/chat_message.bb new file mode 100644 index 000000000..ccc93bb2c --- /dev/null +++ b/doc/hook/chat_message.bb @@ -0,0 +1 @@ +[h2]chat_message[/h2] diff --git a/doc/hook/chat_post.bb b/doc/hook/chat_post.bb new file mode 100644 index 000000000..7cb3c9fa1 --- /dev/null +++ b/doc/hook/chat_post.bb @@ -0,0 +1 @@ +[h2]chat_post[/h2] diff --git a/doc/hook/check_account_email.bb b/doc/hook/check_account_email.bb new file mode 100644 index 000000000..b309706a0 --- /dev/null +++ b/doc/hook/check_account_email.bb @@ -0,0 +1 @@ +[h2]check_account_email[/h2] diff --git a/doc/hook/check_account_invite.bb b/doc/hook/check_account_invite.bb new file mode 100644 index 000000000..8d4a40522 --- /dev/null +++ b/doc/hook/check_account_invite.bb @@ -0,0 +1 @@ +[h2]check_account_invite[/h2] diff --git a/doc/hook/check_account_password.bb b/doc/hook/check_account_password.bb new file mode 100644 index 000000000..53562ec6e --- /dev/null +++ b/doc/hook/check_account_password.bb @@ -0,0 +1 @@ +[h2]check_account_password[/h2] diff --git a/doc/hook/connect_premium.bb b/doc/hook/connect_premium.bb new file mode 100644 index 000000000..ae3aafc66 --- /dev/null +++ b/doc/hook/connect_premium.bb @@ -0,0 +1 @@ +[h2]connect_premium[/h2] diff --git a/doc/hook/connector_settings.bb b/doc/hook/connector_settings.bb new file mode 100644 index 000000000..9b59c49da --- /dev/null +++ b/doc/hook/connector_settings.bb @@ -0,0 +1 @@ +[h2]connector_settings[/h2] diff --git a/doc/hook/construct_page.bb b/doc/hook/construct_page.bb new file mode 100644 index 000000000..700d9256f --- /dev/null +++ b/doc/hook/construct_page.bb @@ -0,0 +1 @@ +[h2]construct_page[/h2] diff --git a/doc/hook/contact_block_end.bb b/doc/hook/contact_block_end.bb new file mode 100644 index 000000000..30a7d2d76 --- /dev/null +++ b/doc/hook/contact_block_end.bb @@ -0,0 +1 @@ +[h2]contact_block_end[/h2] diff --git a/doc/hook/contact_edit.bb b/doc/hook/contact_edit.bb new file mode 100644 index 000000000..5fd31fb1d --- /dev/null +++ b/doc/hook/contact_edit.bb @@ -0,0 +1 @@ +[h2]contact_edit[/h2] diff --git a/doc/hook/contact_edit_post.bb b/doc/hook/contact_edit_post.bb new file mode 100644 index 000000000..bc736f8b8 --- /dev/null +++ b/doc/hook/contact_edit_post.bb @@ -0,0 +1 @@ +[h2]contact_edit_post[/h2] diff --git a/doc/hook/contact_select_options.bb b/doc/hook/contact_select_options.bb new file mode 100644 index 000000000..65f9154ff --- /dev/null +++ b/doc/hook/contact_select_options.bb @@ -0,0 +1 @@ +[h2]contact_select_options[/h2] diff --git a/doc/hook/conversation_start.bb b/doc/hook/conversation_start.bb new file mode 100644 index 000000000..7208c8d8f --- /dev/null +++ b/doc/hook/conversation_start.bb @@ -0,0 +1 @@ +[h2]conversation_start[/h2] diff --git a/doc/hook/create_identity.bb b/doc/hook/create_identity.bb new file mode 100644 index 000000000..5c1da2d43 --- /dev/null +++ b/doc/hook/create_identity.bb @@ -0,0 +1 @@ +[h2]create_identity[/h2] diff --git a/doc/hook/cron.bb b/doc/hook/cron.bb new file mode 100644 index 000000000..ebbb64d50 --- /dev/null +++ b/doc/hook/cron.bb @@ -0,0 +1 @@ +[h2]cron[/h2] diff --git a/doc/hook/cron_daily.bb b/doc/hook/cron_daily.bb new file mode 100644 index 000000000..c5062330a --- /dev/null +++ b/doc/hook/cron_daily.bb @@ -0,0 +1 @@ +[h2]cron_daily[/h2] diff --git a/doc/hook/cron_weekly.bb b/doc/hook/cron_weekly.bb new file mode 100644 index 000000000..8dc85e494 --- /dev/null +++ b/doc/hook/cron_weekly.bb @@ -0,0 +1 @@ +[h2]cron_weekly[/h2] diff --git a/doc/hook/directory_item.bb b/doc/hook/directory_item.bb new file mode 100644 index 000000000..cb710e0b4 --- /dev/null +++ b/doc/hook/directory_item.bb @@ -0,0 +1 @@ +[h2]directory_item[/h2] diff --git a/doc/hook/discover_by_webbie.bb b/doc/hook/discover_by_webbie.bb new file mode 100644 index 000000000..f9228932e --- /dev/null +++ b/doc/hook/discover_by_webbie.bb @@ -0,0 +1 @@ +[h2]discover_by_webbie[/h2] diff --git a/doc/hook/display_item.bb b/doc/hook/display_item.bb new file mode 100644 index 000000000..a6bfd621d --- /dev/null +++ b/doc/hook/display_item.bb @@ -0,0 +1 @@ +[h2]display_item[/h2] diff --git a/doc/hook/display_settings.bb b/doc/hook/display_settings.bb new file mode 100644 index 000000000..1f1e0b491 --- /dev/null +++ b/doc/hook/display_settings.bb @@ -0,0 +1 @@ +[h2]display_settings[/h2] diff --git a/doc/hook/display_settings_post.bb b/doc/hook/display_settings_post.bb new file mode 100644 index 000000000..d3bb39359 --- /dev/null +++ b/doc/hook/display_settings_post.bb @@ -0,0 +1 @@ +[h2]display_settings_post[/h2] diff --git a/doc/hook/donate_contributors.bb b/doc/hook/donate_contributors.bb new file mode 100644 index 000000000..f97c77efa --- /dev/null +++ b/doc/hook/donate_contributors.bb @@ -0,0 +1 @@ +[h2]donate_contributors[/h2] diff --git a/doc/hook/donate_plugin.bb b/doc/hook/donate_plugin.bb new file mode 100644 index 000000000..db4a6f113 --- /dev/null +++ b/doc/hook/donate_plugin.bb @@ -0,0 +1 @@ +[h2]donate_plugin[/h2] diff --git a/doc/hook/donate_sponsors.bb b/doc/hook/donate_sponsors.bb new file mode 100644 index 000000000..3abd46d42 --- /dev/null +++ b/doc/hook/donate_sponsors.bb @@ -0,0 +1 @@ +[h2]donate_sponsors[/h2] diff --git a/doc/hook/dreport_is_storable.bb b/doc/hook/dreport_is_storable.bb new file mode 100644 index 000000000..9ca99b896 --- /dev/null +++ b/doc/hook/dreport_is_storable.bb @@ -0,0 +1 @@ +[h2]dreport_is_storable[/h2] diff --git a/doc/hook/drop_item.bb b/doc/hook/drop_item.bb new file mode 100644 index 000000000..35bb80f82 --- /dev/null +++ b/doc/hook/drop_item.bb @@ -0,0 +1 @@ +[h2]drop_item[/h2] diff --git a/doc/hook/enotify.bb b/doc/hook/enotify.bb new file mode 100644 index 000000000..703a3ffa0 --- /dev/null +++ b/doc/hook/enotify.bb @@ -0,0 +1 @@ +[h2]enotify[/h2] diff --git a/doc/hook/enotify_mail.bb b/doc/hook/enotify_mail.bb new file mode 100644 index 000000000..adeb8bd30 --- /dev/null +++ b/doc/hook/enotify_mail.bb @@ -0,0 +1 @@ +[h2]enotify_mail[/h2] diff --git a/doc/hook/enotify_store.bb b/doc/hook/enotify_store.bb new file mode 100644 index 000000000..dc44cc320 --- /dev/null +++ b/doc/hook/enotify_store.bb @@ -0,0 +1 @@ +[h2]enotify_store[/h2] diff --git a/doc/hook/event_created.bb b/doc/hook/event_created.bb new file mode 100644 index 000000000..222602e77 --- /dev/null +++ b/doc/hook/event_created.bb @@ -0,0 +1 @@ +[h2]event_created[/h2] diff --git a/doc/hook/event_updated.bb b/doc/hook/event_updated.bb new file mode 100644 index 000000000..69e3c72c1 --- /dev/null +++ b/doc/hook/event_updated.bb @@ -0,0 +1 @@ +[h2]event_updated[/h2] diff --git a/doc/hook/externals_url_select.bb b/doc/hook/externals_url_select.bb new file mode 100644 index 000000000..a542dcb29 --- /dev/null +++ b/doc/hook/externals_url_select.bb @@ -0,0 +1 @@ +[h2]externals_url_select[/h2] diff --git a/doc/hook/feature_enabled.bb b/doc/hook/feature_enabled.bb new file mode 100644 index 000000000..5630cc768 --- /dev/null +++ b/doc/hook/feature_enabled.bb @@ -0,0 +1 @@ +[h2]feature_enabled[/h2] diff --git a/doc/hook/feature_settings.bb b/doc/hook/feature_settings.bb new file mode 100644 index 000000000..d1691eb38 --- /dev/null +++ b/doc/hook/feature_settings.bb @@ -0,0 +1 @@ +[h2]feature_settings[/h2] diff --git a/doc/hook/feature_settings_post.bb b/doc/hook/feature_settings_post.bb new file mode 100644 index 000000000..eecf941ff --- /dev/null +++ b/doc/hook/feature_settings_post.bb @@ -0,0 +1 @@ +[h2]feature_settings_post[/h2] diff --git a/doc/hook/follow.bb b/doc/hook/follow.bb new file mode 100644 index 000000000..a97632b06 --- /dev/null +++ b/doc/hook/follow.bb @@ -0,0 +1 @@ +[h2]follow[/h2] diff --git a/doc/hook/follow_allow.bb b/doc/hook/follow_allow.bb new file mode 100644 index 000000000..fdab1865c --- /dev/null +++ b/doc/hook/follow_allow.bb @@ -0,0 +1 @@ +[h2]follow_allow[/h2] diff --git a/doc/hook/gender_selector.bb b/doc/hook/gender_selector.bb new file mode 100644 index 000000000..0b56b5c9b --- /dev/null +++ b/doc/hook/gender_selector.bb @@ -0,0 +1 @@ +[h2]gender_selector[/h2] diff --git a/doc/hook/gender_selector_min.bb b/doc/hook/gender_selector_min.bb new file mode 100644 index 000000000..9d143855a --- /dev/null +++ b/doc/hook/gender_selector_min.bb @@ -0,0 +1 @@ +[h2]gender_selector_min[/h2] diff --git a/doc/hook/generate_map.bb b/doc/hook/generate_map.bb new file mode 100644 index 000000000..33672d552 --- /dev/null +++ b/doc/hook/generate_map.bb @@ -0,0 +1 @@ +[h2]generate_map[/h2] diff --git a/doc/hook/generate_named_map.bb b/doc/hook/generate_named_map.bb new file mode 100644 index 000000000..5bacb846d --- /dev/null +++ b/doc/hook/generate_named_map.bb @@ -0,0 +1 @@ +[h2]generate_named_map[/h2] diff --git a/doc/hook/get_all_api_perms.bb b/doc/hook/get_all_api_perms.bb new file mode 100644 index 000000000..eb41f8a02 --- /dev/null +++ b/doc/hook/get_all_api_perms.bb @@ -0,0 +1 @@ +[h2]get_all_api_perms[/h2] diff --git a/doc/hook/get_all_perms.bb b/doc/hook/get_all_perms.bb new file mode 100644 index 000000000..149f8c78c --- /dev/null +++ b/doc/hook/get_all_perms.bb @@ -0,0 +1 @@ +[h2]get_all_perms[/h2] diff --git a/doc/hook/get_features.bb b/doc/hook/get_features.bb new file mode 100644 index 000000000..66e81f13c --- /dev/null +++ b/doc/hook/get_features.bb @@ -0,0 +1 @@ +[h2]get_features[/h2] diff --git a/doc/hook/get_role_perms.bb b/doc/hook/get_role_perms.bb new file mode 100644 index 000000000..87830f8e3 --- /dev/null +++ b/doc/hook/get_role_perms.bb @@ -0,0 +1 @@ +[h2]get_role_perms[/h2] diff --git a/doc/hook/get_widgets.bb b/doc/hook/get_widgets.bb new file mode 100644 index 000000000..54b43858a --- /dev/null +++ b/doc/hook/get_widgets.bb @@ -0,0 +1 @@ +[h2]get_widgets[/h2] diff --git a/doc/hook/global_permissions.bb b/doc/hook/global_permissions.bb new file mode 100644 index 000000000..fe998ee9c --- /dev/null +++ b/doc/hook/global_permissions.bb @@ -0,0 +1 @@ +[h2]global_permissions[/h2] diff --git a/doc/hook/home_content.bb b/doc/hook/home_content.bb new file mode 100644 index 000000000..7f32b3547 --- /dev/null +++ b/doc/hook/home_content.bb @@ -0,0 +1 @@ +[h2]home_content[/h2] diff --git a/doc/hook/home_init.bb b/doc/hook/home_init.bb new file mode 100644 index 000000000..25dd72792 --- /dev/null +++ b/doc/hook/home_init.bb @@ -0,0 +1 @@ +[h2]home_init[/h2] diff --git a/doc/hook/hostxrd.bb b/doc/hook/hostxrd.bb new file mode 100644 index 000000000..2b67320cf --- /dev/null +++ b/doc/hook/hostxrd.bb @@ -0,0 +1 @@ +[h2]hostxrd[/h2] diff --git a/doc/hook/html2bbcode.bb b/doc/hook/html2bbcode.bb new file mode 100644 index 000000000..3061f05f0 --- /dev/null +++ b/doc/hook/html2bbcode.bb @@ -0,0 +1 @@ +[h2]html2bbcode[/h2] diff --git a/doc/hook/identity_basic_export.bb b/doc/hook/identity_basic_export.bb new file mode 100644 index 000000000..3f4e88799 --- /dev/null +++ b/doc/hook/identity_basic_export.bb @@ -0,0 +1 @@ +[h2]identity_basic_export[/h2] diff --git a/doc/hook/import_author_xchan.bb b/doc/hook/import_author_xchan.bb new file mode 100644 index 000000000..e2340469d --- /dev/null +++ b/doc/hook/import_author_xchan.bb @@ -0,0 +1 @@ +[h2]import_author_xchan[/h2] diff --git a/doc/hook/import_channel.bb b/doc/hook/import_channel.bb new file mode 100644 index 000000000..b220b7415 --- /dev/null +++ b/doc/hook/import_channel.bb @@ -0,0 +1 @@ +[h2]import_channel[/h2] diff --git a/doc/hook/import_directory_profile.bb b/doc/hook/import_directory_profile.bb new file mode 100644 index 000000000..e2fac59bc --- /dev/null +++ b/doc/hook/import_directory_profile.bb @@ -0,0 +1 @@ +[h2]import_directory_profile[/h2] diff --git a/doc/hook/import_xchan.bb b/doc/hook/import_xchan.bb new file mode 100644 index 000000000..40e0783ce --- /dev/null +++ b/doc/hook/import_xchan.bb @@ -0,0 +1 @@ +[h2]import_xchan[/h2] diff --git a/doc/hook/item_photo_menu.bb b/doc/hook/item_photo_menu.bb new file mode 100644 index 000000000..8f9860a90 --- /dev/null +++ b/doc/hook/item_photo_menu.bb @@ -0,0 +1 @@ +[h2]item_photo_menu[/h2] diff --git a/doc/hook/item_store.bb b/doc/hook/item_store.bb new file mode 100644 index 000000000..5d49b725c --- /dev/null +++ b/doc/hook/item_store.bb @@ -0,0 +1 @@ +[h2]item_store[/h2] diff --git a/doc/hook/item_store_update.bb b/doc/hook/item_store_update.bb new file mode 100644 index 000000000..a7c58939a --- /dev/null +++ b/doc/hook/item_store_update.bb @@ -0,0 +1 @@ +[h2]item_store_update[/h2] diff --git a/doc/hook/item_translate.bb b/doc/hook/item_translate.bb new file mode 100644 index 000000000..695494b9c --- /dev/null +++ b/doc/hook/item_translate.bb @@ -0,0 +1 @@ +[h2]item_translate[/h2] diff --git a/doc/hook/jot_networks.bb b/doc/hook/jot_networks.bb new file mode 100644 index 000000000..4c1629ba7 --- /dev/null +++ b/doc/hook/jot_networks.bb @@ -0,0 +1 @@ +[h2]jot_networks[/h2] diff --git a/doc/hook/jot_tool.bb b/doc/hook/jot_tool.bb new file mode 100644 index 000000000..22ba9701e --- /dev/null +++ b/doc/hook/jot_tool.bb @@ -0,0 +1 @@ +[h2]jot_tool[/h2] diff --git a/doc/hook/load_pdl.bb b/doc/hook/load_pdl.bb new file mode 100644 index 000000000..149a3e766 --- /dev/null +++ b/doc/hook/load_pdl.bb @@ -0,0 +1 @@ +[h2]load_pdl[/h2] diff --git a/doc/hook/local_dir_update.bb b/doc/hook/local_dir_update.bb new file mode 100644 index 000000000..d0b0f8ac1 --- /dev/null +++ b/doc/hook/local_dir_update.bb @@ -0,0 +1 @@ +[h2]local_dir_update[/h2] diff --git a/doc/hook/logged_in.bb b/doc/hook/logged_in.bb new file mode 100644 index 000000000..b01041576 --- /dev/null +++ b/doc/hook/logged_in.bb @@ -0,0 +1 @@ +[h2]logged_in[/h2] diff --git a/doc/hook/logging_out.bb b/doc/hook/logging_out.bb new file mode 100644 index 000000000..d47b9f1df --- /dev/null +++ b/doc/hook/logging_out.bb @@ -0,0 +1 @@ +[h2]logging_out[/h2] diff --git a/doc/hook/login_hook.bb b/doc/hook/login_hook.bb new file mode 100644 index 000000000..156a0afcd --- /dev/null +++ b/doc/hook/login_hook.bb @@ -0,0 +1 @@ +[h2]login_hook[/h2] diff --git a/doc/hook/magic_auth.bb b/doc/hook/magic_auth.bb new file mode 100644 index 000000000..80d6edb27 --- /dev/null +++ b/doc/hook/magic_auth.bb @@ -0,0 +1 @@ +[h2]magic_auth[/h2] diff --git a/doc/hook/magic_auth_openid_success.bb b/doc/hook/magic_auth_openid_success.bb new file mode 100644 index 000000000..810f2e06d --- /dev/null +++ b/doc/hook/magic_auth_openid_success.bb @@ -0,0 +1 @@ +[h2]magic_auth_openid_success[/h2] diff --git a/doc/hook/magic_auth_success.bb b/doc/hook/magic_auth_success.bb new file mode 100644 index 000000000..d795e43e5 --- /dev/null +++ b/doc/hook/magic_auth_success.bb @@ -0,0 +1 @@ +[h2]magic_auth_success[/h2] diff --git a/doc/hook/main_slider.bb b/doc/hook/main_slider.bb new file mode 100644 index 000000000..a63c2170a --- /dev/null +++ b/doc/hook/main_slider.bb @@ -0,0 +1 @@ +[h2]main_slider[/h2] diff --git a/doc/hook/marital_selector.bb b/doc/hook/marital_selector.bb new file mode 100644 index 000000000..0f76c3f5a --- /dev/null +++ b/doc/hook/marital_selector.bb @@ -0,0 +1 @@ +[h2]marital_selector[/h2] diff --git a/doc/hook/marital_selector_min.bb b/doc/hook/marital_selector_min.bb new file mode 100644 index 000000000..f02d21f20 --- /dev/null +++ b/doc/hook/marital_selector_min.bb @@ -0,0 +1 @@ +[h2]marital_selector_min[/h2] diff --git a/doc/hook/module_loaded.bb b/doc/hook/module_loaded.bb new file mode 100644 index 000000000..cb0d2302d --- /dev/null +++ b/doc/hook/module_loaded.bb @@ -0,0 +1 @@ +[h2]module_loaded[/h2] diff --git a/doc/hook/module_mod_aftercontent.bb b/doc/hook/module_mod_aftercontent.bb new file mode 100644 index 000000000..5d48435b8 --- /dev/null +++ b/doc/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 $a->module + diff --git a/doc/hook/module_mod_content.bb b/doc/hook/module_mod_content.bb new file mode 100644 index 000000000..39f5743b1 --- /dev/null +++ b/doc/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 $a->module + diff --git a/doc/hook/module_mod_init.bb b/doc/hook/module_mod_init.bb new file mode 100644 index 000000000..52fe5a616 --- /dev/null +++ b/doc/hook/module_mod_init.bb @@ -0,0 +1 @@ +[h2]module_mod_init[/h2] diff --git a/doc/hook/module_mod_post.bb b/doc/hook/module_mod_post.bb new file mode 100644 index 000000000..3adb0e737 --- /dev/null +++ b/doc/hook/module_mod_post.bb @@ -0,0 +1 @@ +[h2]module_mod_post[/h2] diff --git a/doc/hook/mood_verbs.bb b/doc/hook/mood_verbs.bb new file mode 100644 index 000000000..67fb719dd --- /dev/null +++ b/doc/hook/mood_verbs.bb @@ -0,0 +1 @@ +[h2]mood_verbs[/h2] diff --git a/doc/hook/nav.bb b/doc/hook/nav.bb new file mode 100644 index 000000000..847573620 --- /dev/null +++ b/doc/hook/nav.bb @@ -0,0 +1 @@ +[h2]nav[/h2] diff --git a/doc/hook/network_content_init.bb b/doc/hook/network_content_init.bb new file mode 100644 index 000000000..224da393a --- /dev/null +++ b/doc/hook/network_content_init.bb @@ -0,0 +1 @@ +[h2]network_content_init[/h2] diff --git a/doc/hook/network_ping.bb b/doc/hook/network_ping.bb new file mode 100644 index 000000000..78deefe78 --- /dev/null +++ b/doc/hook/network_ping.bb @@ -0,0 +1 @@ +[h2]network_ping[/h2] diff --git a/doc/hook/network_tabs.bb b/doc/hook/network_tabs.bb new file mode 100644 index 000000000..677d7f2b9 --- /dev/null +++ b/doc/hook/network_tabs.bb @@ -0,0 +1 @@ +[h2]network_tabs[/h2] diff --git a/doc/hook/network_to_name.bb b/doc/hook/network_to_name.bb new file mode 100644 index 000000000..eea4a1841 --- /dev/null +++ b/doc/hook/network_to_name.bb @@ -0,0 +1 @@ +[h2]network_to_name[/h2] diff --git a/doc/hook/notifier_end.bb b/doc/hook/notifier_end.bb new file mode 100644 index 000000000..df9d852bd --- /dev/null +++ b/doc/hook/notifier_end.bb @@ -0,0 +1 @@ +[h2]notifier_end[/h2] diff --git a/doc/hook/notifier_hub.bb b/doc/hook/notifier_hub.bb new file mode 100644 index 000000000..4255ce446 --- /dev/null +++ b/doc/hook/notifier_hub.bb @@ -0,0 +1 @@ +[h2]notifier_hub[/h2] diff --git a/doc/hook/notifier_normal.bb b/doc/hook/notifier_normal.bb new file mode 100644 index 000000000..0059baa47 --- /dev/null +++ b/doc/hook/notifier_normal.bb @@ -0,0 +1 @@ +[h2]notifier_normal[/h2] diff --git a/doc/hook/obj_verbs.bb b/doc/hook/obj_verbs.bb new file mode 100644 index 000000000..ca98229aa --- /dev/null +++ b/doc/hook/obj_verbs.bb @@ -0,0 +1 @@ +[h2]obj_verbs[/h2] diff --git a/doc/hook/oembed_probe.bb b/doc/hook/oembed_probe.bb new file mode 100644 index 000000000..4f32ac267 --- /dev/null +++ b/doc/hook/oembed_probe.bb @@ -0,0 +1 @@ +[h2]oembed_probe[/h2] diff --git a/doc/hook/page_content_top.bb b/doc/hook/page_content_top.bb new file mode 100644 index 000000000..137e3abfd --- /dev/null +++ b/doc/hook/page_content_top.bb @@ -0,0 +1 @@ +[h2]page_content_top[/h2] diff --git a/doc/hook/page_end.bb b/doc/hook/page_end.bb new file mode 100644 index 000000000..09293cf50 --- /dev/null +++ b/doc/hook/page_end.bb @@ -0,0 +1 @@ +[h2]page_end[/h2] diff --git a/doc/hook/page_header.bb b/doc/hook/page_header.bb new file mode 100644 index 000000000..ffaa791c9 --- /dev/null +++ b/doc/hook/page_header.bb @@ -0,0 +1 @@ +[h2]page_header[/h2] diff --git a/doc/hook/parse_atom.bb b/doc/hook/parse_atom.bb new file mode 100644 index 000000000..c8037317f --- /dev/null +++ b/doc/hook/parse_atom.bb @@ -0,0 +1 @@ +[h2]parse_atom[/h2] diff --git a/doc/hook/parse_link.bb b/doc/hook/parse_link.bb new file mode 100644 index 000000000..1c328059c --- /dev/null +++ b/doc/hook/parse_link.bb @@ -0,0 +1 @@ +[h2]parse_link[/h2] diff --git a/doc/hook/pdl_selector.bb b/doc/hook/pdl_selector.bb new file mode 100644 index 000000000..bee01c843 --- /dev/null +++ b/doc/hook/pdl_selector.bb @@ -0,0 +1 @@ +[h2]pdl_selector[/h2] diff --git a/doc/hook/perm_is_allowed.bb b/doc/hook/perm_is_allowed.bb new file mode 100644 index 000000000..aac647609 --- /dev/null +++ b/doc/hook/perm_is_allowed.bb @@ -0,0 +1 @@ +[h2]perm_is_allowed[/h2] diff --git a/doc/hook/permissions_create.bb b/doc/hook/permissions_create.bb new file mode 100644 index 000000000..22f80a80e --- /dev/null +++ b/doc/hook/permissions_create.bb @@ -0,0 +1 @@ +[h2]permissions_create[/h2] diff --git a/doc/hook/permissions_update.bb b/doc/hook/permissions_update.bb new file mode 100644 index 000000000..40366b33d --- /dev/null +++ b/doc/hook/permissions_update.bb @@ -0,0 +1 @@ +[h2]permissions_update[/h2] diff --git a/doc/hook/personal_xrd.bb b/doc/hook/personal_xrd.bb new file mode 100644 index 000000000..71d4bd8dd --- /dev/null +++ b/doc/hook/personal_xrd.bb @@ -0,0 +1 @@ +[h2]personal_xrd[/h2] diff --git a/doc/hook/photo_post_end.bb b/doc/hook/photo_post_end.bb new file mode 100644 index 000000000..8a3291763 --- /dev/null +++ b/doc/hook/photo_post_end.bb @@ -0,0 +1 @@ +[h2]photo_post_end[/h2] diff --git a/doc/hook/photo_upload_begin.bb b/doc/hook/photo_upload_begin.bb new file mode 100644 index 000000000..5e441a12a --- /dev/null +++ b/doc/hook/photo_upload_begin.bb @@ -0,0 +1 @@ +[h2]photo_upload_begin[/h2] diff --git a/doc/hook/photo_upload_end.bb b/doc/hook/photo_upload_end.bb new file mode 100644 index 000000000..956175f1d --- /dev/null +++ b/doc/hook/photo_upload_end.bb @@ -0,0 +1 @@ +[h2]photo_upload_end[/h2] diff --git a/doc/hook/photo_upload_file.bb b/doc/hook/photo_upload_file.bb new file mode 100644 index 000000000..726622ac0 --- /dev/null +++ b/doc/hook/photo_upload_file.bb @@ -0,0 +1 @@ +[h2]photo_upload_file[/h2] diff --git a/doc/hook/photo_upload_form.bb b/doc/hook/photo_upload_form.bb new file mode 100644 index 000000000..70b8318b8 --- /dev/null +++ b/doc/hook/photo_upload_form.bb @@ -0,0 +1 @@ +[h2]photo_upload_form[/h2] diff --git a/doc/hook/poke_verbs.bb b/doc/hook/poke_verbs.bb new file mode 100644 index 000000000..54d68c3a2 --- /dev/null +++ b/doc/hook/poke_verbs.bb @@ -0,0 +1 @@ +[h2]poke_verbs[/h2] diff --git a/doc/hook/post_local.bb b/doc/hook/post_local.bb new file mode 100644 index 000000000..5aa723cb9 --- /dev/null +++ b/doc/hook/post_local.bb @@ -0,0 +1 @@ +[h2]post_local[/h2] diff --git a/doc/hook/post_local_end.bb b/doc/hook/post_local_end.bb new file mode 100644 index 000000000..380166fdb --- /dev/null +++ b/doc/hook/post_local_end.bb @@ -0,0 +1 @@ +[h2]post_local_end[/h2] diff --git a/doc/hook/post_local_start.bb b/doc/hook/post_local_start.bb new file mode 100644 index 000000000..2f684f67a --- /dev/null +++ b/doc/hook/post_local_start.bb @@ -0,0 +1 @@ +[h2]post_local_start[/h2] diff --git a/doc/hook/post_mail.bb b/doc/hook/post_mail.bb new file mode 100644 index 000000000..8f67ad4f0 --- /dev/null +++ b/doc/hook/post_mail.bb @@ -0,0 +1 @@ +[h2]post_mail[/h2] diff --git a/doc/hook/post_mail_end.bb b/doc/hook/post_mail_end.bb new file mode 100644 index 000000000..7f0085773 --- /dev/null +++ b/doc/hook/post_mail_end.bb @@ -0,0 +1 @@ +[h2]post_mail_end[/h2] diff --git a/doc/hook/post_remote.bb b/doc/hook/post_remote.bb new file mode 100644 index 000000000..f8e087eee --- /dev/null +++ b/doc/hook/post_remote.bb @@ -0,0 +1 @@ +[h2]post_remote[/h2] diff --git a/doc/hook/post_remote_end.bb b/doc/hook/post_remote_end.bb new file mode 100644 index 000000000..0fef20cbf --- /dev/null +++ b/doc/hook/post_remote_end.bb @@ -0,0 +1 @@ +[h2]post_remote_end[/h2] diff --git a/doc/hook/post_remote_update.bb b/doc/hook/post_remote_update.bb new file mode 100644 index 000000000..fd358db28 --- /dev/null +++ b/doc/hook/post_remote_update.bb @@ -0,0 +1 @@ +[h2]post_remote_update[/h2] diff --git a/doc/hook/post_remote_update_end.bb b/doc/hook/post_remote_update_end.bb new file mode 100644 index 000000000..95f1e6f78 --- /dev/null +++ b/doc/hook/post_remote_update_end.bb @@ -0,0 +1 @@ +[h2]post_remote_update_end[/h2] diff --git a/doc/hook/prepare_body.bb b/doc/hook/prepare_body.bb new file mode 100644 index 000000000..3f1eaef85 --- /dev/null +++ b/doc/hook/prepare_body.bb @@ -0,0 +1 @@ +[h2]prepare_body[/h2] diff --git a/doc/hook/prepare_body_final.bb b/doc/hook/prepare_body_final.bb new file mode 100644 index 000000000..96d1ae389 --- /dev/null +++ b/doc/hook/prepare_body_final.bb @@ -0,0 +1 @@ +[h2]prepare_body_final[/h2] diff --git a/doc/hook/prepare_body_init.bb b/doc/hook/prepare_body_init.bb new file mode 100644 index 000000000..f3de79970 --- /dev/null +++ b/doc/hook/prepare_body_init.bb @@ -0,0 +1 @@ +[h2]prepare_body_init[/h2] diff --git a/doc/hook/probe_well_known.bb b/doc/hook/probe_well_known.bb new file mode 100644 index 000000000..eff690f31 --- /dev/null +++ b/doc/hook/probe_well_known.bb @@ -0,0 +1 @@ +[h2]probe_well_known[/h2] diff --git a/doc/hook/proc_run.bb b/doc/hook/proc_run.bb new file mode 100644 index 000000000..a3759794a --- /dev/null +++ b/doc/hook/proc_run.bb @@ -0,0 +1 @@ +[h2]proc_run[/h2] diff --git a/doc/hook/process_channel_sync_delivery.bb b/doc/hook/process_channel_sync_delivery.bb new file mode 100644 index 000000000..c0416c8cb --- /dev/null +++ b/doc/hook/process_channel_sync_delivery.bb @@ -0,0 +1 @@ +[h2]process_channel_sync_delivery[/h2] diff --git a/doc/hook/profile_advanced.bb b/doc/hook/profile_advanced.bb new file mode 100644 index 000000000..65e56afd6 --- /dev/null +++ b/doc/hook/profile_advanced.bb @@ -0,0 +1 @@ +[h2]profile_advanced[/h2] diff --git a/doc/hook/profile_edit.bb b/doc/hook/profile_edit.bb new file mode 100644 index 000000000..e60663d4a --- /dev/null +++ b/doc/hook/profile_edit.bb @@ -0,0 +1 @@ +[h2]profile_edit[/h2] diff --git a/doc/hook/profile_photo_content_end.bb b/doc/hook/profile_photo_content_end.bb new file mode 100644 index 000000000..518415c4d --- /dev/null +++ b/doc/hook/profile_photo_content_end.bb @@ -0,0 +1 @@ +[h2]profile_photo_content_end[/h2] diff --git a/doc/hook/profile_post.bb b/doc/hook/profile_post.bb new file mode 100644 index 000000000..d22d8fbc7 --- /dev/null +++ b/doc/hook/profile_post.bb @@ -0,0 +1 @@ +[h2]profile_post[/h2] diff --git a/doc/hook/profile_sidebar.bb b/doc/hook/profile_sidebar.bb new file mode 100644 index 000000000..bfd059e4b --- /dev/null +++ b/doc/hook/profile_sidebar.bb @@ -0,0 +1 @@ +[h2]profile_sidebar[/h2] diff --git a/doc/hook/profile_sidebar_enter.bb b/doc/hook/profile_sidebar_enter.bb new file mode 100644 index 000000000..9d6726a30 --- /dev/null +++ b/doc/hook/profile_sidebar_enter.bb @@ -0,0 +1 @@ +[h2]profile_sidebar_enter[/h2] diff --git a/doc/hook/profile_tabs.bb b/doc/hook/profile_tabs.bb new file mode 100644 index 000000000..5b3e9e707 --- /dev/null +++ b/doc/hook/profile_tabs.bb @@ -0,0 +1 @@ +[h2]profile_tabs[/h2] diff --git a/doc/hook/register_account.bb b/doc/hook/register_account.bb new file mode 100644 index 000000000..df4de2b30 --- /dev/null +++ b/doc/hook/register_account.bb @@ -0,0 +1 @@ +[h2]register_account[/h2] diff --git a/doc/hook/render_location.bb b/doc/hook/render_location.bb new file mode 100644 index 000000000..41501c087 --- /dev/null +++ b/doc/hook/render_location.bb @@ -0,0 +1 @@ +[h2]render_location[/h2] diff --git a/doc/hook/replace_macros.bb b/doc/hook/replace_macros.bb new file mode 100644 index 000000000..fac39dd7b --- /dev/null +++ b/doc/hook/replace_macros.bb @@ -0,0 +1 @@ +[h2]replace_macros[/h2] diff --git a/doc/hook/reverse_magic_auth.bb b/doc/hook/reverse_magic_auth.bb new file mode 100644 index 000000000..4cbd84b93 --- /dev/null +++ b/doc/hook/reverse_magic_auth.bb @@ -0,0 +1 @@ +[h2]reverse_magic_auth[/h2] diff --git a/doc/hook/settings_form.bb b/doc/hook/settings_form.bb new file mode 100644 index 000000000..d65341181 --- /dev/null +++ b/doc/hook/settings_form.bb @@ -0,0 +1 @@ +[h2]settings_form[/h2] diff --git a/doc/hook/settings_post.bb b/doc/hook/settings_post.bb new file mode 100644 index 000000000..f72546c11 --- /dev/null +++ b/doc/hook/settings_post.bb @@ -0,0 +1 @@ +[h2]settings_post[/h2] diff --git a/doc/hook/sexpref_selector.bb b/doc/hook/sexpref_selector.bb new file mode 100644 index 000000000..b4dad6b38 --- /dev/null +++ b/doc/hook/sexpref_selector.bb @@ -0,0 +1 @@ +[h2]sexpref_selector[/h2] diff --git a/doc/hook/sexpref_selector_min.bb b/doc/hook/sexpref_selector_min.bb new file mode 100644 index 000000000..6f49946af --- /dev/null +++ b/doc/hook/sexpref_selector_min.bb @@ -0,0 +1 @@ +[h2]sexpref_selector_min[/h2] diff --git a/doc/hook/smilie.bb b/doc/hook/smilie.bb new file mode 100644 index 000000000..cea3e0c94 --- /dev/null +++ b/doc/hook/smilie.bb @@ -0,0 +1 @@ +[h2]smilie[/h2] diff --git a/doc/hook/tagged.bb b/doc/hook/tagged.bb new file mode 100644 index 000000000..5add76713 --- /dev/null +++ b/doc/hook/tagged.bb @@ -0,0 +1 @@ +[h2]tagged[/h2] diff --git a/doc/hook/validate_channelname.bb b/doc/hook/validate_channelname.bb new file mode 100644 index 000000000..c78961017 --- /dev/null +++ b/doc/hook/validate_channelname.bb @@ -0,0 +1 @@ +[h2]validate_channelname[/h2] diff --git a/doc/hook/webfinger.bb b/doc/hook/webfinger.bb new file mode 100644 index 000000000..7cc24322f --- /dev/null +++ b/doc/hook/webfinger.bb @@ -0,0 +1 @@ +[h2]webfinger[/h2] diff --git a/doc/hook/well_known.bb b/doc/hook/well_known.bb new file mode 100644 index 000000000..778b27a02 --- /dev/null +++ b/doc/hook/well_known.bb @@ -0,0 +1 @@ +[h2]well_known[/h2] diff --git a/doc/hook/zid.bb b/doc/hook/zid.bb new file mode 100644 index 000000000..2210c1342 --- /dev/null +++ b/doc/hook/zid.bb @@ -0,0 +1 @@ +[h2]zid[/h2] diff --git a/doc/hook/zid_init.bb b/doc/hook/zid_init.bb new file mode 100644 index 000000000..131dd8f72 --- /dev/null +++ b/doc/hook/zid_init.bb @@ -0,0 +1 @@ +[h2]zid_init[/h2] diff --git a/doc/hook/zot_finger.bb b/doc/hook/zot_finger.bb new file mode 100644 index 000000000..9383b4c31 --- /dev/null +++ b/doc/hook/zot_finger.bb @@ -0,0 +1 @@ +[h2]zot_finger[/h2] diff --git a/doc/hooklist.bb b/doc/hooklist.bb new file mode 100644 index 000000000..9e0220013 --- /dev/null +++ b/doc/hooklist.bb @@ -0,0 +1,494 @@ +[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/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/settings_account]account_settings_post[/zrl] + Called when posting from the account settings form + +[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/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_menu]app_menu[/zrl] + Used to register plugins as apps + +[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/avatar_lookup]avatar_lookup[/zrl] + Used for "gravatar" or libravatar profile photo lookup. + +[zrl=[baseurl]/help/hook/bb2diaspora]bb2diaspora[/zrl] + called when converting bbcode to markdown + +[zrl=[baseurl]/help/hook/bbcode]bbcode[/zrl] + Called when converting bbcode to HTML + +[zrl=[baseurl]/help/hook/channel_remove]channel_remove[/zrl] + Called when removing a channel + +[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/connect_premium]connect_premium[/zrl] + Called when connecting to a premium channel + +[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/conversation_start]conversation_start[/zrl] + Called in the beginning of rendering a conversation (message or message collection or stream) + +[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/directory_item]directory_item[/zrl] + Called when generating a directory listing for display + +[zrl=[baseurl]/help/hook/discover_by_webbie]discover_by_webbie[/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/drop_item]drop_item[/zrl] + called when an 'item' is removed + +[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/event_created]event_created[/zrl] + called when an event record is created + +[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/follow]follow[/zrl] + called when a follow operation takes place + +[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_features]get_features[/zrl] + Called when get_features() is called + +[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/get_widgets]get_widgets[/zrl] + No longer used - now widget placement is managed by Comanche + +[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/html2bbcode]html2bbcode[/zrl] + Called when using the html2bbcode tranlsation + +[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_store_update]item_store_update[/zrl] + Called when item_store_update() is called to update 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/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/logged_in]logged_in[/zrl] + Called when authentication by any means has succeeeded + +[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/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 whne 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_tabs]network_tabs[/zrl] + Called when generating the list of tabs for the network page + +[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 notofoer is invoked for a 'normal' delivery + +[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_probe]oembed_probe[/zrl] + Called when performing an oembed content lookup + +[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/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/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/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/probe_well_known]probe_well_known[/zrl] + under construction + +[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/profile_tabs]profile_tabs[/zrl] + Called when generating the tabs for channel related pages (channel,profile,files,etc.) + +[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_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/tagged]tagged[/zrl] + Called when a delivery is processed which results in you being tagged + +[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/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/images/hz-bookmark-32.png b/images/hz-bookmark-32.png Binary files differnew file mode 100644 index 000000000..f3a09d9b4 --- /dev/null +++ b/images/hz-bookmark-32.png diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php index 507fde46f..87bdf8f13 100644 --- a/include/RedDAV/RedDirectory.php +++ b/include/RedDAV/RedDirectory.php @@ -251,7 +251,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { intval($filesize), intval(0), intval($is_photo), - dbesc($this->os_path . '/' . $hash), + dbesc($f), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc($allow_cid), diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php index ec6871a69..2bc3f40e5 100644 --- a/include/RedDAV/RedFile.php +++ b/include/RedDAV/RedFile.php @@ -126,7 +126,11 @@ class RedFile extends DAV\Node implements DAV\IFile { } } $fname = dbunescbin($d[0]['data']); - $f = 'store/' . $this->auth->owner_nick . '/' . (($fname) ? $fname : ''); + if(strpos($fname,'store') === false) + $f = 'store/' . $this->auth->owner_nick . '/' . (($fname) ? $fname : ''); + else + $f = $fname; + // @todo check return value and set $size directly @file_put_contents($f, $data); $size = @filesize($f); @@ -226,7 +230,11 @@ class RedFile extends DAV\Node implements DAV\IFile { } if (intval($r[0]['os_storage'])) { - $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . dbunescbin($r[0]['data']); + $x = dbunescbin($r[0]['data']); + if(strpos($x,'store') === false) + $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x; + else + $f = $x; return fopen($f, 'rb'); } return dbunescbin($r[0]['data']); diff --git a/include/attach.php b/include/attach.php index 8a568d8e1..36b971712 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1270,9 +1270,13 @@ function attach_delete($channel_id, $resource, $is_photo = 0) { ); if($y) { - $f = 'store/' . $channel_address . '/' . $y[0]['data']; - if(is_dir($y[0]['data'])) - @rmdir($y[0]['data']); + if(strpos($y[0]['data'],'store') === false) + $f = 'store/' . $channel_address . '/' . $y[0]['data']; + else + $f = $y[0]['data']; + + if(is_dir($f)) + @rmdir($f); elseif(file_exists($f)) unlink($f); } diff --git a/include/bbcode.php b/include/bbcode.php index 517f22bee..05802aa57 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -599,6 +599,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1" target="_newwin" >$2</a>', $Text); } + // leave open the posibility of [map=something] // this is replaced in prepare_body() which has knowledge of the item location @@ -983,7 +984,12 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); // fix any escaped ampersands that may have been converted into links - $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism", '<$1$2=$3&$4>', $Text); + + if(strpos($Text,'&') !== false) + $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism", '<$1$2=$3&$4>', $Text); + + // This is subtle - it's an XSS filter. It only accepts links with a protocol scheme and where + // the scheme begins with z (zhttp), h (http(s)), f (ftp), m (mailto), and named anchors. $Text = preg_replace("/\<(.*?)(src|href)=\"[^zhfm#](.*?)\>/ism", '<$1$2="">', $Text); diff --git a/mod/ffsapi.php b/mod/ffsapi.php index de47408bd..f4033e63b 100644 --- a/mod/ffsapi.php +++ b/mod/ffsapi.php @@ -4,7 +4,7 @@ function ffsapi_content(&$a) { $baseurl = z_root(); -$name = sprintf( t('Social Provider on %1$s'), get_config('system','sitename')); +$name = get_config('system','sitename'); $description = t('Share content from Firefox to $Projectname'); $author = 'Mike Macgirvin'; $homepage = 'http://hubzilla.org'; @@ -35,8 +35,9 @@ var data = { // social bookmarks are available in Firefox 26 "markURL": baseurl+"/rbmark?f=&url=%{url}&title=%{title}", // icons should be 32x32 pixels - "markedIcon": baseurl+"/images/checkbox-checked-32.png", - "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png", + // "markedIcon": baseurl+"/images/checkbox-checked-32.png", + // "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png", + "unmarkedIcon": baseurl+"/images/hz-bookmark-32.png", // should be available for display purposes "description": '$description', diff --git a/mod/settings.php b/mod/settings.php index 18bfaeb08..9a18d8e48 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -218,7 +218,8 @@ function settings_post(&$a) { check_form_security_token_redirectOnErr('/settings/account', 'settings_account'); - call_hooks('settings_account', $_POST); + call_hooks('account_settings_post', $_POST); +// call_hooks('settings_account', $_POST); $errs = array(); |
