From 8148b7c32f160cbe2cdc37e7271ac62aa2133b7c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Mar 2013 19:02:01 -0700 Subject: update manage table and some documentation --- boot.php | 7 +- doc/html/account_8php.html | 2 +- doc/html/boot_8php.html | 40 ++++++-- doc/html/boot_8php.js | 1 + doc/html/crypto_8php.html | 4 +- doc/html/dba_8php.html | 4 +- doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 2 - doc/html/dir_d41ce877eb409a4791b288730010abe2.js | 3 +- doc/html/files.html | 3 +- doc/html/globals_0x63.html | 3 + doc/html/globals_0x70.html | 5 +- doc/html/globals_0x7a.html | 6 -- doc/html/globals_func_0x63.html | 3 + doc/html/globals_func_0x70.html | 2 +- doc/html/globals_func_0x7a.html | 6 -- doc/html/globals_vars_0x70.html | 3 + doc/html/identity_8php.html | 17 ++++ doc/html/identity_8php.js | 1 + doc/html/include_2network_8php.html | 24 ++++- doc/html/navtree.js | 12 +-- doc/html/navtreeindex0.js | 70 +++++++------- doc/html/navtreeindex1.js | 28 +++--- doc/html/navtreeindex2.js | 4 +- doc/html/navtreeindex3.js | 20 ++-- doc/html/navtreeindex4.js | 6 +- doc/html/navtreeindex5.js | 6 +- doc/html/navtreeindex6.js | 15 ++- doc/html/post_8php.html | 8 ++ doc/html/search/all_63.js | 1 + doc/html/search/all_70.js | 3 +- doc/html/search/all_7a.js | 5 +- doc/html/search/files_7a.js | 3 +- doc/html/search/functions_63.js | 1 + doc/html/search/functions_70.js | 2 +- doc/html/search/functions_7a.js | 4 +- doc/html/search/variables_70.js | 1 + doc/html/text_8php.html | 24 +++-- doc/html/text_8php.js | 2 +- doc/html/zot_8php.html | 102 +++++++++++---------- doc/html/zot_8php.js | 1 - include/items.php | 18 +--- include/network.php | 31 ++++++- include/text.php | 1 + install/database.sql | 4 +- install/update.php | 10 +- version.inc | 2 +- 46 files changed, 310 insertions(+), 210 deletions(-) diff --git a/boot.php b/boot.php index 6c958465a..b37f51b9b 100644 --- a/boot.php +++ b/boot.php @@ -4,8 +4,9 @@ /** * Red. * - * Red is an open source decentralised communications platform wrapped in - * an extensible content management framework, providing website designers + * Red is an open source decentralised communications platform combined with + * a decentralised identity/authentication framework wrapped in + * an extensible content management system, providing website designers * the ability to embed fully decentralised communications and social tools * into many traditional website designs (blogs, forums, small business * websites, charitable organisations, etc.). Red also provides DNS mobility @@ -40,7 +41,7 @@ require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica Red'); define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1038 ); +define ( 'DB_UPDATE_VERSION', 1039 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/doc/html/account_8php.html b/doc/html/account_8php.html index cddddadcd..df899466e 100644 --- a/doc/html/account_8php.html +++ b/doc/html/account_8php.html @@ -237,7 +237,7 @@ Functions
-

Referenced by register_post().

+

Referenced by create_dir_account(), and register_post().

diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index ccab65f30..b07a7a89a 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -216,7 +216,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1036 +const DB_UPDATE_VERSION 1039   const EOL '<br />' . "\r\n"   @@ -286,6 +286,8 @@ Variables   const PAGE_APPLICATION 0x0004   +const PAGE_DIRECTORY_CHANNEL 0x0008 +  const PAGE_REMOVED 0x8000   const NETWORK_DFRN 'dfrn' @@ -618,7 +620,7 @@ Variables
-

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), attach_init(), channel_content(), channel_init(), common_init(), connections_content(), connections_init(), contactgroup_content(), display_content(), editpost_content(), events_content(), feed_init(), group_content(), group_post(), like_content(), lockview_content(), manage_content(), message_content(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), profile_init(), profile_photo_post(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), settings_aside(), settings_post(), setup_init(), share_init(), starred_init(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and zotfeed_init().

+

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), attach_init(), channel_content(), channel_init(), common_init(), connections_content(), connections_init(), contactgroup_content(), display_content(), editpost_content(), events_content(), feed_init(), group_content(), group_post(), like_content(), lockview_content(), manage_content(), message_content(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), profile_init(), profile_photo_post(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), settings_aside(), settings_post(), setup_init(), share_init(), starred_init(), subthread_content(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and zotfeed_init().

@@ -636,7 +638,7 @@ Variables
-

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), attach_init(), channel_content(), channel_init(), common_init(), connections_content(), connections_init(), connections_post(), contactgroup_content(), display_content(), editpost_content(), events_content(), feed_init(), group_content(), group_post(), like_content(), lockview_content(), manage_content(), message_aside(), message_content(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), profile_init(), profile_photo_post(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), settings_aside(), settings_post(), setup_init(), share_init(), starred_init(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and zotfeed_init().

+

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), attach_init(), channel_content(), channel_init(), common_init(), connections_content(), connections_init(), connections_post(), contactgroup_content(), display_content(), editpost_content(), events_content(), feed_init(), group_content(), group_post(), like_content(), lockview_content(), manage_content(), message_aside(), message_content(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), profile_init(), profile_photo_post(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), settings_aside(), settings_post(), setup_init(), share_init(), starred_init(), subthread_content(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and zotfeed_init().

@@ -1352,7 +1354,7 @@ Variables
-

Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), channel_aside(), channel_content(), check_config(), check_form_security_token(), community_content(), connections_aside(), connections_content(), connections_post(), construct_page(), consume_feed(), create_account(), create_identity(), crepair_init(), crepair_post(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), directory_content(), dirfind_init(), dirsearch_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), get_atom_elements(), App\get_baseurl(), get_browser_language(), get_item_elements(), get_max_import_size(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), hcard_init(), import_post(), import_xchan(), info(), intro_content(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_delivery(), local_user(), lostpass_content(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), network_query_get_sel_tab(), new_channel_content(), nogroup_init(), notice(), notifications_content(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_post(), dba\q(), qsearch_init(), redir_init(), register_content(), register_post(), regmod_content(), remote_user(), removeme_post(), saved_searches(), search_ac_init(), search_content(), search_init(), search_post(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), xchan_content(), z_fetch_url(), zfinger_init(), and zperms_init().

+

Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), channel_aside(), channel_content(), check_config(), check_form_security_token(), community_content(), connections_aside(), connections_content(), connections_post(), construct_page(), consume_feed(), create_account(), create_identity(), crepair_init(), crepair_post(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), directory_content(), dirfind_init(), dirsearch_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), get_atom_elements(), App\get_baseurl(), get_browser_language(), get_item_elements(), get_max_import_size(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), hcard_init(), import_post(), import_xchan(), info(), intro_content(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_delivery(), local_user(), lostpass_content(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), network_query_get_sel_tab(), new_channel_content(), nogroup_init(), notice(), notifications_content(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_post(), dba\q(), qsearch_init(), redir_init(), register_content(), register_post(), regmod_content(), remote_user(), removeme_post(), saved_searches(), search_ac_init(), search_content(), search_init(), search_post(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), xchan_content(), z_fetch_url(), and zfinger_init().

@@ -1420,7 +1422,7 @@ Variables
-

Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connections_content(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), hostxrd_init(), import_post(), import_xchan(), intro_post(), item_store(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), siteinfo_content(), siteinfo_init(), user_allow(), vcard_from_xchan(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_notify().

+

Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connections_content(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), hostxrd_init(), import_post(), import_xchan(), intro_post(), item_store(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), siteinfo_content(), siteinfo_init(), user_allow(), vcard_from_xchan(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

@@ -2078,7 +2080,7 @@ Variables
- +
const DB_UPDATE_VERSION 1036const DB_UPDATE_VERSION 1039
@@ -2205,6 +2207,10 @@ Variables
+

Red.

+

Red is an open source decentralised communications platform combined with a decentralised identity/authentication framework wrapped in an extensible content management system, providing website designers the ability to embed fully decentralised communications and social tools into many traditional website designs (blogs, forums, small business websites, charitable organisations, etc.). Red also provides DNS mobility and internet scale privacy/access control.

+

This allows any individual website to participate in a matrix of linked sites and people and media sharing which is far greater than the reach of an individual site.

+

If you are reading the source code and come across a function or code block which is not documented, but you have a good idea what it does, please add some descriptive comments and push it to the main project. Even if your description isn't perfect, it gives us a base which we can build on and correct - so that eventually everything is fully documented.

Referenced by api_statusnet_config(), App\build_pagehead(), identity_basic_export(), notification(), and siteinfo_init().

@@ -2275,7 +2281,7 @@ Variables
-

Referenced by create_identity(), import_author_xchan(), import_post(), import_xchan(), magic_init(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), zot_get_hubloc(), zot_refresh(), and zperms_init().

+

Referenced by create_identity(), import_author_xchan(), import_post(), import_xchan(), magic_init(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), zot_get_hubloc(), and zot_refresh().

@@ -2289,7 +2295,7 @@ Variables
-

Referenced by zfinger_init(), and zperms_init().

+

Referenced by zfinger_init().

@@ -3314,6 +3320,20 @@ Variables
+
+ + +
+
+ + + + +
const PAGE_DIRECTORY_CHANNEL 0x0008
+
+ +

Referenced by create_dir_account().

+
@@ -3326,7 +3346,7 @@ Variables
-

Referenced by zfinger_init().

+

Referenced by create_dir_account(), and zfinger_init().

@@ -3947,7 +3967,7 @@ Variables
-

Referenced by api_statusnet_config(), magic_init(), zot_build_packet(), and zot_notify().

+

Referenced by api_statusnet_config(), magic_init(), and zot_build_packet().

diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 97687e57b..54c978d72 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -180,6 +180,7 @@ var boot_8php = [ "NOTIFY_WALL", "boot_8php.html#a505410c7edc5f5bb5fa227b98359793e", null ], [ "PAGE_APPLICATION", "boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed", null ], [ "PAGE_AUTOCONNECT", "boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9", null ], + [ "PAGE_DIRECTORY_CHANNEL", "boot_8php.html#a5b8484922918946d041e5e0515dbe718", null ], [ "PAGE_HIDDEN", "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640", null ], [ "PAGE_NORMAL", "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3", null ], [ "PAGE_REMOVED", "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6", null ], diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 0edb72808..d6fd1b396 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -247,7 +247,7 @@ Functions
-

Referenced by post_post(), zfinger_init(), zot_build_packet(), zot_fetch(), and zot_notify().

+

Referenced by post_post(), zfinger_init(), zot_build_packet(), and zot_fetch().

@@ -615,7 +615,7 @@ Functions
-

Referenced by create_identity(), fix_system_urls(), import_post(), magic_init(), zot_build_packet(), zot_fetch(), zot_notify(), and zperms_init().

+

Referenced by create_identity(), fix_system_urls(), import_post(), magic_init(), zot_build_packet(), and zot_fetch().

diff --git a/doc/html/dba_8php.html b/doc/html/dba_8php.html index 5e98f74f8..2e8b8d9bf 100644 --- a/doc/html/dba_8php.html +++ b/doc/html/dba_8php.html @@ -148,7 +148,7 @@ Functions
-

Referenced by account_verify_password(), acl_init(), add_fcontact(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), change_channel(), channel_content(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_webbie(), Cache\clear(), common_friends(), connections_content(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editpost_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), file_tag_save_file(), file_tag_unsave_file(), filerm_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config(), get_events(), get_feed_for(), get_pconfig(), get_xconfig(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), like_content(), load_config(), load_pconfig(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), redir_init(), register_post(), remove_all_xchan_resources(), remove_queue_item(), rmagic_init(), rmagic_post(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), Photo\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), zotfeed_init(), and zperms_init().

+

Referenced by account_verify_password(), acl_init(), add_fcontact(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), change_channel(), channel_content(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_webbie(), Cache\clear(), common_friends(), connections_content(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editpost_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), file_tag_save_file(), file_tag_unsave_file(), filerm_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config(), get_events(), get_feed_for(), get_pconfig(), get_xconfig(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), like_content(), load_config(), load_pconfig(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), redir_init(), register_post(), remove_all_xchan_resources(), remove_queue_item(), rmagic_init(), rmagic_post(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), Photo\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

@@ -264,7 +264,7 @@ Functions

This will happen occasionally trying to store the session data after abnormal program termination

-

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_summary(), admin_page_users(), admin_page_users_post(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_webbie(), Cache\clear(), collect_recipients(), common_friends(), common_friends_zcid(), common_init(), community_content(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), directory_run(), dirsearch_content(), display_content(), drop_item(), editpost_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_save_file(), file_tag_unsave_file(), file_tag_update_pconfig(), fileas_widget(), filer_content(), filerm_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config(), get_events(), get_feed_for(), get_pconfig(), get_xconfig(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), intro_content(), intro_post(), invite_post(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), like_content(), load_config(), load_contact_links(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lose_follower(), lose_sharer(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), message_content(), mini_group_select(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), redir_init(), register_content(), register_post(), remove_all_xchan_resources(), remove_queue_item(), rmagic_init(), rmagic_post(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), starred_init(), Photo\store(), store_item_tag(), stream_perms_api_uids(), subthread_content(), suggest_init(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zotfeed_init(), and zperms_init().

+

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_summary(), admin_page_users(), admin_page_users_post(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_webbie(), Cache\clear(), collect_recipients(), common_friends(), common_friends_zcid(), common_init(), community_content(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), directory_run(), dirsearch_content(), display_content(), drop_item(), editpost_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_save_file(), file_tag_unsave_file(), file_tag_update_pconfig(), fileas_widget(), filer_content(), filerm_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config(), get_events(), get_feed_for(), get_pconfig(), get_xconfig(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), intro_content(), intro_post(), invite_post(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), like_content(), load_config(), load_contact_links(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lose_follower(), lose_sharer(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), message_content(), mini_group_select(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), redir_init(), register_content(), register_post(), remove_all_xchan_resources(), remove_queue_item(), rmagic_init(), rmagic_post(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), starred_init(), Photo\store(), store_item_tag(), stream_perms_api_uids(), subthread_content(), suggest_init(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index aafe650c2..92af94979 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -314,8 +314,6 @@ Files   file  zotfeed.php   -file  zperms.php -  diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 03a53b3b4..d1ab6993a 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -104,6 +104,5 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "xchan.php", "xchan_8php.html", "xchan_8php" ], [ "xrd.php", "xrd_8php.html", "xrd_8php" ], [ "zfinger.php", "zfinger_8php.html", "zfinger_8php" ], - [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ], - [ "zperms.php", "zperms_8php.html", "zperms_8php" ] + [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ] ]; \ No newline at end of file diff --git a/doc/html/files.html b/doc/html/files.html index c9b8afc58..27e835a11 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -278,8 +278,7 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*xchan.php |o*xrd.php |o*zfinger.php -|o*zotfeed.php -|\*zperms.php +|\*zotfeed.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 1c0458b69..95239ec66 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -366,6 +366,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • create_account() : account.php
    • +
  • create_dir_account() +: identity.php +
  • create_identity() : identity.php
    • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 23b14d451..d8b82f9a7 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -158,6 +158,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • page_content() : page.php
    • +
  • PAGE_DIRECTORY_CHANNEL +: boot.php +
  • PAGE_HIDDEN : boot.php
    • @@ -360,7 +363,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : conversation.php
  • prepare_text() -: text.php +: text.php
  • pretheme_init() : pretheme.php diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html index 97e2184e5..f00548bdf 100644 --- a/doc/html/globals_0x7a.html +++ b/doc/html/globals_0x7a.html @@ -201,9 +201,6 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
  • zot_new_uid() : zot.php
    • -
  • zot_notify() -: zot.php -
  • zot_process_response() : zot.php
    • @@ -222,9 +219,6 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
  • zotfeed_init() : zotfeed.php
    • -
  • zperms_init() -: zperms.php -
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 08101048c..90425939c 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -356,6 +356,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • create_account() : account.php
    • +
  • create_dir_account() +: identity.php +
  • create_identity() : identity.php
    • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 779ed3fce..26f083272 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -273,7 +273,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : conversation.php
  • prepare_text() -: text.php +: text.php
  • pretheme_init() : pretheme.php diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index 0fdb021a0..6586ffbd3 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.html @@ -197,9 +197,6 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
  • zot_new_uid() : zot.php
    • -
  • zot_notify() -: zot.php -
  • zot_process_response() : zot.php
    • @@ -215,9 +212,6 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
  • zotfeed_init() : zotfeed.php
    • -
  • zperms_init() -: zperms.php -
    • diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index 4712c6efb..46b365270 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -150,6 +150,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
  • PAGE_AUTOCONNECT : boot.php
    • +
  • PAGE_DIRECTORY_CHANNEL +: boot.php +
  • PAGE_HIDDEN : boot.php
    • diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 4955239f8..750160b4e 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -116,6 +116,8 @@ Functions    validate_channelname ($name)   + create_dir_account () +   create_identity ($arr)    set_default_login_identity ($account_id, $channel_id, $force=true) @@ -126,6 +128,21 @@ Functions  

    Function Documentation

    + +
    +
    + + + + + + + +
    create_dir_account ()
    +
    + +
    +
    diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js index ca564b9a7..02a3f145b 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -1,5 +1,6 @@ var identity_8php = [ + [ "create_dir_account", "identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd", null ], [ "create_identity", "identity_8php.html#a345f4c943d84de502ec6e72d2c813945", null ], [ "identity_basic_export", "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03", null ], [ "identity_basic_import", "identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485", null ], diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 1f9c28120..bbe181a56 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -477,6 +477,15 @@ Functions
    +

    http_status_exit

    +

    Send HTTP status header and exit

    +
    Parameters
    + + +
    int$valinteger HTTP status result value
    +
    +
    +
    Returns
    (does not return, process is terminated)

    Referenced by _well_known_init(), and poco_init().

    @@ -496,7 +505,7 @@ Functions
    -

    Referenced by api_export_basic(), dirsearch_content(), new_channel_init(), post_post(), register_init(), zfinger_init(), zotfeed_init(), and zperms_init().

    +

    Referenced by api_export_basic(), dirsearch_content(), new_channel_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().

    @@ -826,6 +835,17 @@ Functions
    +

    z_fetch_url

    +
    Parameters
    + + + + + +
    string$urlURL to fetch
    boolean$binary= false TRUE if asked to return binary results (file download)
    int$redirects= 0 internal use, recursion counter
    array$opts(optional parameters) 'accept_content' => supply Accept: header with 'accept_content' as the value 'timeout' => int seconds, default system config value or 60 seconds 'http_auth' => username:password 'novalidate' => do not validate SSL certs, default is to validate using our CA list
    +
    +
    +
    Returns
    array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content

    Referenced by check_htaccess(), directory_content(), import_post(), import_profile_photo(), navbar_complete(), oembed_fetch_url(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), z_post_url(), zot_finger(), and zot_register_hub().

    @@ -873,7 +893,7 @@ Functions
    -

    Referenced by zot_finger(), zot_notify(), zot_refresh(), and zot_zot().

    +

    Referenced by zot_finger(), zot_refresh(), and zot_zot().

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 03682538f..dfd5a6750 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -35,12 +35,12 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78", -"classPhoto.html#a4ff11117ada771637a61a668d2af6636", -"friendica-to-smarty-tpl_8py.html#a68d15934660cd1f4301ce251b1646f09", -"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d", -"plugin_8php.html#a901657dd078e070516cf97285e0bada7", -"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110" +"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f", +"classPhoto.html#a4ace266825f6b2bbc3c7f990f5d92500", +"friendica-to-smarty-tpl_8py.html#a5f9bf7a67d955c0d6be70a82097611c5", +"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7", +"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d", +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 69d95a0a9..6fa9730ba 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -93,16 +93,16 @@ var NAVTREEINDEX0 = "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[4,0,4,118], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[4,0,4,39], "boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[4,0,4,131], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[4,0,4,208], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[4,0,4,209], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[4,0,4,54], "boot_8php.html#a03d19251c245587de7ed959300b87bdf":[4,0,4,144], "boot_8php.html#a0450389f24c632906fbc24347700a543":[4,0,4,50], "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[4,0,4,97], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[4,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[4,0,4,181], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[4,0,4,182], "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[4,0,4,66], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[4,0,4,148], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[4,0,4,219], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[4,0,4,220], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[4,0,4,58], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[4,0,4,15], "boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[4,0,4,79], @@ -112,10 +112,10 @@ var NAVTREEINDEX0 = "boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[4,0,4,130], "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[4,0,4,126], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[4,0,4,147], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[4,0,4,222], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[4,0,4,223], "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[4,0,4,151], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[4,0,4,75], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[4,0,4,191], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[4,0,4,192], "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[4,0,4,35], "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[4,0,4,101], "boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[4,0,4,136], @@ -123,79 +123,80 @@ var NAVTREEINDEX0 = "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[4,0,4,45], "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[4,0,4,95], "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[4,0,4,87], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[4,0,4,213], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[4,0,4,214], "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[4,0,4,170], "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[4,0,4,81], "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[4,0,4,113], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[4,0,4,189], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[4,0,4,190], "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[4,0,4,102], "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[4,0,4,166], "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[4,0,4,67], "boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[4,0,4,72], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[4,0,4,196], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[4,0,4,197], "boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[4,0,4,124], "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[4,0,4,47], "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[4,0,4,106], "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[4,0,4,138], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[4,0,4,224], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[4,0,4,225], "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[4,0,4,155], "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[4,0,4,103], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[4,0,4,223], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[4,0,4,187], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[4,0,4,224], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[4,0,4,188], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[4,0,4,12], "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[4,0,4,59], "boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[4,0,4,52], "boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[4,0,4,114], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[4,0,4,183], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[4,0,4,184], "boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[4,0,4,165], "boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[4,0,4,141], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[4,0,4,70], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[4,0,4,217], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[4,0,4,218], "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[4,0,4,19], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[4,0,4,153], "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[4,0,4,100], "boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[4,0,4,152], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[4,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[4,0,4,182], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[4,0,4,200], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[4,0,4,183], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[4,0,4,201], "boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[4,0,4,177], "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[4,0,4,137], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[4,0,4,46], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[4,0,4,80], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[4,0,4,36], "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[4,0,4,169], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[4,0,4,199], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[4,0,4,200], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[4,0,4,22], "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[4,0,4,60], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[4,0,4,159], "boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67":[4,0,4,32], "boot_8php.html#a5b7ce5c0a79796800883644c389dc87f":[4,0,4,43], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[4,0,4,180], "boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[4,0,4,77], "boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[4,0,4,139], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[4,0,4,180], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[4,0,4,181], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[4,0,4,21], "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[4,0,4,74], "boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b":[4,0,4,34], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[4,0,4,215], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[4,0,4,216], "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[4,0,4,145], "boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[4,0,4,122], "boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[4,0,4,44], "boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[4,0,4,125], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[4,0,4,49], "boot_8php.html#a6969947145a139ec374ce098224d8e81":[4,0,4,128], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[4,0,4,206], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[4,0,4,203], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[4,0,4,197], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[4,0,4,207], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[4,0,4,204], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[4,0,4,198], "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[4,0,4,96], "boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[4,0,4,88], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[4,0,4,185], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[4,0,4,205], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[4,0,4,186], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[4,0,4,206], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[4,0,4,27], "boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[4,0,4,160], "boot_8php.html#a749144d8dd9c1366596a0213c277d050":[4,0,4,116], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[4,0,4,71], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[4,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[4,0,4,220], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[4,0,4,221], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[4,0,4,4], "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[4,0,4,73], "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[4,0,4,85], @@ -212,21 +213,21 @@ var NAVTREEINDEX0 = "boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[4,0,4,110], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[4,0,4,158], "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[4,0,4,93], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[4,0,4,201], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[4,0,4,202], "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[4,0,4,112], "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[4,0,4,108], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[4,0,4,204], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[4,0,4,205], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[4,0,4,30], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[4,0,4,129], "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[4,0,4,111], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[4,0,4,18], "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[4,0,4,172], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[4,0,4,202], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[4,0,4,203], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[4,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[4,0,4,194], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[4,0,4,195], "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[4,0,4,173], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[4,0,4,216], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[4,0,4,193], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[4,0,4,217], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[4,0,4,194], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[4,0,4,161], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[4,0,4,25], "boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[4,0,4,179], @@ -237,17 +238,16 @@ var NAVTREEINDEX0 = "boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[4,0,4,133], "boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[4,0,4,84], "boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[4,0,4,90], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[4,0,4,198], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[4,0,4,199], "boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[4,0,4,120], "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[4,0,4,65], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[4,0,4,164], "boot_8php.html#ab2878f40a7f3978476fcfb4c95b96806":[4,0,4,11], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[4,0,4,105], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[4,0,4,184], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[4,0,4,185], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[4,0,4,31], "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[4,0,4,157], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[4,0,4,188], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[4,0,4,189], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[4,0,4,104], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[4,0,4,121], -"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[4,0,4,40] +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[4,0,4,121] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index a16ef158c..35f67ce74 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,12 +1,13 @@ var NAVTREEINDEX1 = { +"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[4,0,4,40], "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[4,0,4,55], "boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[4,0,4,175], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[4,0,4,7], "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[4,0,4,92], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[4,0,4,41], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[4,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[4,0,4,218], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[4,0,4,219], "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[4,0,4,63], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[4,0,4,91], "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[4,0,4,109], @@ -15,14 +16,14 @@ var NAVTREEINDEX1 = "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[4,0,4,89], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[4,0,4,38], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[4,0,4,56], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[4,0,4,221], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[4,0,4,222], "boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[4,0,4,107], "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[4,0,4,171], "boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[4,0,4,37], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[4,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[4,0,4,8], "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[4,0,4,146], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[4,0,4,195], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[4,0,4,196], "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[4,0,4,62], "boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[4,0,4,132], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[4,0,4,10], @@ -30,40 +31,40 @@ var NAVTREEINDEX1 = "boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[4,0,4,69], "boot_8php.html#ad34c1547020a305915bcc39707744690":[4,0,4,83], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[4,0,4,28], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[4,0,4,190], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[4,0,4,207], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[4,0,4,191], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[4,0,4,208], "boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[4,0,4,86], "boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[4,0,4,117], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[4,0,4,210], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[4,0,4,211], "boot_8php.html#add517a0958ac684792c62142a3877f81":[4,0,4,42], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[4,0,4,23], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[4,0,4,214], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[4,0,4,215], "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[4,0,4,17], "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[4,0,4,154], "boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[4,0,4,134], "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[4,0,4,162], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[4,0,4,26], "boot_8php.html#aebc5ed38c73ade57f360471da712ded2":[4,0,4,33], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[4,0,4,192], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[4,0,4,193], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[4,0,4,94], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[4,0,4,149], "boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[4,0,4,163], "boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[4,0,4,119], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[4,0,4,29], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[4,0,4,211], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[4,0,4,212], "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[4,0,4,156], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[4,0,4,57], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[4,0,4,51], "boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[4,0,4,123], "boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[4,0,4,176], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[4,0,4,209], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[4,0,4,210], "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[4,0,4,168], "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[4,0,4,150], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[4,0,4,212], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[4,0,4,213], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[4,0,4,78], "boot_8php.html#afe63ae69ba55299f813766e54df06ede":[4,0,4,127], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[4,0,4,14], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[4,0,4,186], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[4,0,4,187], "cache_8php.html":[4,0,0,9], "channel_8php.html":[4,0,1,7], "channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[4,0,1,7,1], @@ -248,6 +249,5 @@ var NAVTREEINDEX1 = "classPhoto.html#a29213571e2688f17240cd2b3892d7a62":[3,0,15,7], "classPhoto.html#a2b05906daa294e0c904aff0ba24b5bd3":[3,0,15,20], "classPhoto.html#a32ff09cd464a48bc8e510a1403410753":[3,0,15,13], -"classPhoto.html#a338d80512bdfeb6a6a00a9381d76de5f":[3,0,15,24], -"classPhoto.html#a4ace266825f6b2bbc3c7f990f5d92500":[3,0,15,2] +"classPhoto.html#a338d80512bdfeb6a6a00a9381d76de5f":[3,0,15,24] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index c7c513949..d2419c830 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,6 @@ var NAVTREEINDEX2 = { +"classPhoto.html#a4ace266825f6b2bbc3c7f990f5d92500":[3,0,15,2], "classPhoto.html#a4ff11117ada771637a61a668d2af6636":[3,0,15,16], "classPhoto.html#a50e0b85ea8a3f724dd74366756669e61":[3,0,15,25], "classPhoto.html#a66705cd7db1f8dce59ceac57dbf14476":[3,0,15,12], @@ -248,6 +249,5 @@ var NAVTREEINDEX2 = "friendica-to-smarty-tpl_8py.html#a0b4cf73d1a8d201a28d269eeb62a5d5c":[4,0,2,4,8], "friendica-to-smarty-tpl_8py.html#a3719dd46e286a57d315e6adae1845854":[4,0,2,4,1], "friendica-to-smarty-tpl_8py.html#a38503e37fe68ac27c88cce91a9ac9efa":[4,0,2,4,0], -"friendica-to-smarty-tpl_8py.html#a5dfc21ab8282dda8e3a7dff43cd0e283":[4,0,2,4,13], -"friendica-to-smarty-tpl_8py.html#a5f9bf7a67d955c0d6be70a82097611c5":[4,0,2,4,6] +"friendica-to-smarty-tpl_8py.html#a5dfc21ab8282dda8e3a7dff43cd0e283":[4,0,2,4,13] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 012f11dde..c245d3d75 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,6 @@ var NAVTREEINDEX3 = { +"friendica-to-smarty-tpl_8py.html#a5f9bf7a67d955c0d6be70a82097611c5":[4,0,2,4,6], "friendica-to-smarty-tpl_8py.html#a68d15934660cd1f4301ce251b1646f09":[4,0,2,4,12], "friendica-to-smarty-tpl_8py.html#a8540514fb7c4aa18ad2dffa2a975036b":[4,0,2,4,14], "friendica-to-smarty-tpl_8py.html#a87182a9bab47640428bd0b2b9946bef9":[4,0,2,4,10], @@ -64,8 +65,8 @@ var NAVTREEINDEX3 = "globals_0x77.html":[4,1,0,24], "globals_0x78.html":[4,1,0,25], "globals_0x7a.html":[4,1,0,26], -"globals_func.html":[4,1,1,0], "globals_func.html":[4,1,1], +"globals_func.html":[4,1,1,0], "globals_func_0x61.html":[4,1,1,1], "globals_func_0x62.html":[4,1,1,2], "globals_func_0x63.html":[4,1,1,3], @@ -136,12 +137,13 @@ var NAVTREEINDEX3 = "html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[4,0,0,33,2], "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[4,0,0,33,1], "identity_8php.html":[4,0,0,34], -"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[4,0,0,34,0], -"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[4,0,0,34,1], -"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[4,0,0,34,2], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[4,0,0,34,4], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[4,0,0,34,3], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[4,0,0,34,5], +"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[4,0,0,34,1], +"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[4,0,0,34,2], +"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[4,0,0,34,3], +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[4,0,0,34,5], +"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[4,0,0,34,0], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[4,0,0,34,4], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[4,0,0,34,6], "import_8php.html":[4,0,1,32], "import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[4,0,1,32,1], "import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[4,0,1,32,0], @@ -247,7 +249,5 @@ var NAVTREEINDEX3 = "include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[4,0,0,40,13], "include_2network_8php.html#a540420ff3675a72cb781ef9a7e8c2cd9":[4,0,0,40,5], "include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[4,0,0,40,19], -"include_2network_8php.html#a6259181fec4d36722d1e91ac6210e876":[4,0,0,40,25], -"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[4,0,0,40,11], -"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[4,0,0,40,20] +"include_2network_8php.html#a6259181fec4d36722d1e91ac6210e876":[4,0,0,40,25] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index fea256418..d33e4fac3 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,7 @@ var NAVTREEINDEX4 = { +"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[4,0,0,40,11], +"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[4,0,0,40,20], "include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[4,0,0,40,9], "include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[4,0,0,40,18], "include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[4,0,0,40,7], @@ -247,7 +249,5 @@ var NAVTREEINDEX4 = "plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[4,0,0,49,11], "plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[4,0,0,49,4], "plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[4,0,0,49,6], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[4,0,0,49,9], -"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[4,0,0,49,10], -"plugin_8php.html#a888a4c565cf06eb86ffc67131e5f19e0":[4,0,0,49,2] +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[4,0,0,49,9] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 4407a33dc..6d7a4963e 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,7 @@ var NAVTREEINDEX5 = { +"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[4,0,0,49,10], +"plugin_8php.html#a888a4c565cf06eb86ffc67131e5f19e0":[4,0,0,49,2], "plugin_8php.html#a901657dd078e070516cf97285e0bada7":[4,0,0,49,12], "plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[4,0,0,49,0], "plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[4,0,0,49,8], @@ -212,7 +214,6 @@ var NAVTREEINDEX5 = "text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[4,0,0,61,9], "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[4,0,0,61,14], "text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[4,0,0,61,83], -"text_8php.html#a70c59f9fde874ef711390d48b407d7ef":[4,0,0,61,61], "text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[4,0,0,61,45], "text_8php.html#a736db13a966b8abaf8c9198faa35911a":[4,0,0,61,33], "text_8php.html#a740ad03e00459039a2c0992246c4e727":[4,0,0,61,81], @@ -248,6 +249,5 @@ var NAVTREEINDEX5 = "text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[4,0,0,61,66], "text_8php.html#adba17ec946f4285285dc100f7860bf51":[4,0,0,61,54], "text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[4,0,0,61,30], -"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[4,0,0,61,44], -"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[4,0,0,61,68] +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[4,0,0,61,44] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index d85743fe7..ab6eaccc6 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,6 @@ var NAVTREEINDEX6 = { +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[4,0,0,61,68], "text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[4,0,0,61,17], "text_8php.html#ae4f6881d7e13623f8eded6277595112a":[4,0,0,61,31], "text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c":[4,0,0,61,60], @@ -8,6 +9,7 @@ var NAVTREEINDEX6 = "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[4,0,0,61,29], "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[4,0,0,61,12], "text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d":[4,0,0,61,76], +"text_8php.html#afe54312607d92f7ce9593f5760831f80":[4,0,0,61,61], "text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[4,0,0,61,56], "theme_8php.html":[4,0,3,1,0,0,2], "theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[4,0,3,1,0,0,2,0], @@ -75,23 +77,20 @@ var NAVTREEINDEX6 = "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[4,0,0,62,2], "zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[4,0,0,62,3], "zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[4,0,0,62,15], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[4,0,0,62,21], +"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[4,0,0,62,20], "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[4,0,0,62,12], "zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[4,0,0,62,10], "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[4,0,0,62,0], "zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[4,0,0,62,13], -"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[4,0,0,62,20], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[4,0,0,62,19], +"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[4,0,0,62,19], +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[4,0,0,62,18], "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[4,0,0,62,7], "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[4,0,0,62,6], "zot_8php.html#ab0227978011d8601494a7651fa26acf0":[4,0,0,62,4], "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[4,0,0,62,17], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[4,0,0,62,22], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[4,0,0,62,21], "zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[4,0,0,62,14], "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[4,0,0,62,1], -"zot_8php.html#af22a8732e60d30055617a95f77493446":[4,0,0,62,18], "zotfeed_8php.html":[4,0,1,104], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[4,0,1,104,0], -"zperms_8php.html":[4,0,1,105], -"zperms_8php.html#a2f698dcd51150bda3146425f038da628":[4,0,1,105,0] +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[4,0,1,104,0] }; diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html index 7c10f4b2c..1999a0b9d 100644 --- a/doc/html/post_8php.html +++ b/doc/html/post_8php.html @@ -148,6 +148,14 @@ Functions
    +

    Many message packets will arrive encrypted. The existence of an 'iv' element tells us we need to unencapsulate the AES-256-CBC content using the site private key

    +

    The 'pickup' message arrives with a tracking ID which is associated with a particular outq_hash First verify that that the returned signatures verify, then check that we have an outbound queue item with the correct hash. If everything verifies, find any/all outbound messages in the queue for this hubloc and send them back

    +

    If we made it to here, the signatures verify, but we still don't know if the tracking ID is valid. It wouldn't be an error if the tracking ID isn't found, because we may have sent this particular queue item with another pickup (after the tracking ID for the other pickup was verified).

    +

    Everything is good if we made it here, so find all messages that are going to this location and send them all.

    +

    pickup: end

    +

    All other message types require us to verify the sender. This is a generic check, so we will do it once here and bail if anything goes wrong.

    +

    Check if the sender is already verified here

    +

    Have never seen this guid or this guid coming from this location. Check it and register it.

    diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index f189a5c35..c585a364f 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -98,6 +98,7 @@ var searchData= ['count_5fcommon_5ffriends_5fzcid',['count_common_friends_zcid',['../socgraph_8php.html#af175807406d94407a5e11742a3287746',1,'socgraph.php']]], ['count_5fdescendants',['count_descendants',['../classItem.html#aca1e66988ed00cd627b2a359b72cd0ae',1,'Item\count_descendants()'],['../conversation_8php.html#ab2383dff4f823e580399ff469d90ab19',1,'count_descendants(): conversation.php']]], ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], + ['create_5fdir_5faccount',['create_dir_account',['../identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd',1,'identity.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], ['crepair_2ephp',['crepair.php',['../crepair_8php.html',1,'']]], ['crepair_5fcontent',['crepair_content',['../crepair_8php.html#a29464c01838e209c8059cfcd2d195caa',1,'crepair.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index cba4ee5fe..ea647e04d 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -5,6 +5,7 @@ var searchData= ['page_5fapplication',['PAGE_APPLICATION',['../boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed',1,'boot.php']]], ['page_5fautoconnect',['PAGE_AUTOCONNECT',['../boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9',1,'boot.php']]], ['page_5fcontent',['page_content',['../page_8php.html#a91a5f649f68406149108bded1dc90b22',1,'page.php']]], + ['page_5fdirectory_5fchannel',['PAGE_DIRECTORY_CHANNEL',['../boot_8php.html#a5b8484922918946d041e5e0515dbe718',1,'boot.php']]], ['page_5fhidden',['PAGE_HIDDEN',['../boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640',1,'boot.php']]], ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], @@ -89,7 +90,7 @@ var searchData= ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]], ['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]], ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]], - ['prepare_5ftext',['prepare_text',['../text_8php.html#a70c59f9fde874ef711390d48b407d7ef',1,'text.php']]], + ['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]], ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]], ['pretheme_5finit',['pretheme_init',['../pretheme_8php.html#af5660943ee99db5fd75182316522eafe',1,'pretheme.php']]], ['printable',['printable',['../dba_8php.html#a55bf30d8176967e682656b5be4ad9249',1,'dba.php']]], diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js index 5aea94ffb..6094308e4 100644 --- a/doc/html/search/all_7a.js +++ b/doc/html/search/all_7a.js @@ -21,7 +21,6 @@ var searchData= ['zot_5fgethub',['zot_gethub',['../zot_8php.html#a55056e863a7860bc0cf922e78fcce073',1,'zot.php']]], ['zot_5fimport',['zot_import',['../zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c',1,'zot.php']]], ['zot_5fnew_5fuid',['zot_new_uid',['../zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7',1,'zot.php']]], - ['zot_5fnotify',['zot_notify',['../zot_8php.html#af22a8732e60d30055617a95f77493446',1,'zot.php']]], ['zot_5fprocess_5fresponse',['zot_process_response',['../zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03',1,'zot.php']]], ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d',1,'zot.php']]], ['zot_5fregister_5fhub',['zot_register_hub',['../zot_8php.html#a5bcdfef419b16075a0eca990956223dc',1,'zot.php']]], @@ -29,7 +28,5 @@ var searchData= ['zot_5fzot',['zot_zot',['../zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142',1,'zot.php']]], ['zotdriver',['ZotDriver',['../classZotDriver.html',1,'']]], ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]], - ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]], - ['zperms_2ephp',['zperms.php',['../zperms_8php.html',1,'']]], - ['zperms_5finit',['zperms_init',['../zperms_8php.html#a2f698dcd51150bda3146425f038da628',1,'zperms.php']]] + ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]] ]; diff --git a/doc/html/search/files_7a.js b/doc/html/search/files_7a.js index 02bfad2af..f3e2fc21d 100644 --- a/doc/html/search/files_7a.js +++ b/doc/html/search/files_7a.js @@ -2,6 +2,5 @@ var searchData= [ ['zfinger_2ephp',['zfinger.php',['../zfinger_8php.html',1,'']]], ['zot_2ephp',['zot.php',['../zot_8php.html',1,'']]], - ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]], - ['zperms_2ephp',['zperms.php',['../zperms_8php.html',1,'']]] + ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]] ]; diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 541b4fec2..e6b90af92 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -77,6 +77,7 @@ var searchData= ['count_5fcommon_5ffriends_5fzcid',['count_common_friends_zcid',['../socgraph_8php.html#af175807406d94407a5e11742a3287746',1,'socgraph.php']]], ['count_5fdescendants',['count_descendants',['../classItem.html#aca1e66988ed00cd627b2a359b72cd0ae',1,'Item\count_descendants()'],['../conversation_8php.html#ab2383dff4f823e580399ff469d90ab19',1,'count_descendants(): conversation.php']]], ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], + ['create_5fdir_5faccount',['create_dir_account',['../identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd',1,'identity.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], ['crepair_5fcontent',['crepair_content',['../crepair_8php.html#a29464c01838e209c8059cfcd2d195caa',1,'crepair.php']]], ['crepair_5finit',['crepair_init',['../crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198',1,'crepair.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 282cc0ed8..f88183efc 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -44,7 +44,7 @@ var searchData= ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]], ['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]], ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]], - ['prepare_5ftext',['prepare_text',['../text_8php.html#a70c59f9fde874ef711390d48b407d7ef',1,'text.php']]], + ['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]], ['pretheme_5finit',['pretheme_init',['../pretheme_8php.html#af5660943ee99db5fd75182316522eafe',1,'pretheme.php']]], ['printable',['printable',['../dba_8php.html#a55bf30d8176967e682656b5be4ad9249',1,'dba.php']]], ['private_5fmessages_5fdrop',['private_messages_drop',['../include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1',1,'message.php']]], diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js index 6fc89b9a3..84070c839 100644 --- a/doc/html/search/functions_7a.js +++ b/doc/html/search/functions_7a.js @@ -18,11 +18,9 @@ var searchData= ['zot_5fgethub',['zot_gethub',['../zot_8php.html#a55056e863a7860bc0cf922e78fcce073',1,'zot.php']]], ['zot_5fimport',['zot_import',['../zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c',1,'zot.php']]], ['zot_5fnew_5fuid',['zot_new_uid',['../zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7',1,'zot.php']]], - ['zot_5fnotify',['zot_notify',['../zot_8php.html#af22a8732e60d30055617a95f77493446',1,'zot.php']]], ['zot_5fprocess_5fresponse',['zot_process_response',['../zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03',1,'zot.php']]], ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d',1,'zot.php']]], ['zot_5fregister_5fhub',['zot_register_hub',['../zot_8php.html#a5bcdfef419b16075a0eca990956223dc',1,'zot.php']]], ['zot_5fzot',['zot_zot',['../zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142',1,'zot.php']]], - ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]], - ['zperms_5finit',['zperms_init',['../zperms_8php.html#a2f698dcd51150bda3146425f038da628',1,'zperms.php']]] + ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]] ]; diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index 7934c86db..fb75bc702 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -3,6 +3,7 @@ var searchData= ['page',['page',['../mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_import.php'],['../mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_new_channel.php'],['../mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_register.php']]], ['page_5fapplication',['PAGE_APPLICATION',['../boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed',1,'boot.php']]], ['page_5fautoconnect',['PAGE_AUTOCONNECT',['../boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9',1,'boot.php']]], + ['page_5fdirectory_5fchannel',['PAGE_DIRECTORY_CHANNEL',['../boot_8php.html#a5b8484922918946d041e5e0515dbe718',1,'boot.php']]], ['page_5fhidden',['PAGE_HIDDEN',['../boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640',1,'boot.php']]], ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index ae4b27719..3df149bcd 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -195,8 +195,8 @@ Functions    prepare_body ($item, $attach=false)   - prepare_text ($text) -  + prepare_text ($text, $content_type= 'text/bbcode') +   feed_hublinks ()    feed_salmonlinks ($nick) @@ -471,7 +471,7 @@ Variables
    -

    Referenced by aes_encapsulate(), allowed_public_recips(), atom_entry(), create_identity(), fix_system_urls(), get_item_elements(), get_mail_elements(), get_profile_elements(), identity_basic_export(), import_post(), import_xchan(), magic_init(), oembed_iframe(), post_post(), random_string(), salmon_key(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), zot_notify(), zot_register_hub(), and zperms_init().

    +

    Referenced by aes_encapsulate(), allowed_public_recips(), atom_entry(), create_identity(), fix_system_urls(), get_item_elements(), get_mail_elements(), get_profile_elements(), identity_basic_export(), import_post(), import_xchan(), magic_init(), oembed_iframe(), post_post(), random_string(), salmon_key(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().

    @@ -1410,7 +1410,7 @@ Variables
    -

    Referenced by account_verify_password(), Item\add_child(), Conversation\add_thread(), allowed_public_recips(), api_call(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), base64url_decode(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), encode_mail(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), local_delivery(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_init(), post_post(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), dba\q(), q(), queue_run(), redir_init(), register_content(), Item\remove_child(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), update_imported_item(), update_queue_time(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by account_verify_password(), Item\add_child(), Conversation\add_thread(), allowed_public_recips(), api_call(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), base64url_decode(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), display_content(), email_send(), encode_item(), encode_mail(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), local_delivery(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_init(), post_post(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), dba\q(), q(), queue_run(), redir_init(), register_content(), Item\remove_child(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), update_imported_item(), update_queue_time(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -1655,7 +1655,7 @@ Variables - +
    @@ -1663,8 +1663,18 @@ Variables - + + + + + + + + + + +
    prepare_text (  $text)$text,
     $content_type = 'text/bbcode' 
    )
    @@ -1957,7 +1967,7 @@ Variables

    : string $s

    Returns string

    It is expected that this function will be called using HTML text. We will escape text between HTML pre and code blocks from being processed.

    -

    At a higher level, the bbcode [nosmile] tag can be used to prevent this function from being executed by the prepare_text() routine when preparing bbcode source for HTML display

    +

    At a higher level, the bbcode [nosmile] tag can be used to prevent this function from being executed by the prepare_text() routine when preparing bbcode source for HTML display

    Referenced by message_content(), and smilies_content().

    diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index 323fead36..1f50904ed 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -61,7 +61,7 @@ var text_8php = [ "photo_new_resource", "text_8php.html#aa5528f41533927e1bd2da3618a74a6d7", null ], [ "preg_heart", "text_8php.html#ac19d2b33a58372a357a43d51eed19162", null ], [ "prepare_body", "text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c", null ], - [ "prepare_text", "text_8php.html#a70c59f9fde874ef711390d48b407d7ef", null ], + [ "prepare_text", "text_8php.html#afe54312607d92f7ce9593f5760831f80", null ], [ "profiler", "text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6", null ], [ "protect_sprintf", "text_8php.html#a4e7698aca48982512594b274543c3b9b", null ], [ "qp", "text_8php.html#afc998d2796a6b2a08e96f7cc061e7221", null ], diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index c96e0b6d3..60ec4b677 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -116,8 +116,6 @@ Functions    zot_get_hubloc ($arr, $primary=false)   - zot_notify ($channel, $url, $type= 'notify', $recipients=null, $remote_key=null) -   zot_build_packet ($channel, $type= 'notify', $recipients=null, $remote_key=null, $secret=null)    zot_zot ($url, $data) @@ -505,7 +503,30 @@ Functions
    - +

    obsolete

    +

    function zot_notify($channel,$url,$type = 'notify',$recipients = null, $remote_key = null) {

    +
    $params = array(
+    'type' => $type,
+    'sender' => json_encode(array(
+        'guid' => $channel['channel_guid'],
+        'guid_sig' => base64url_encode(rsa_sign($channel['channel_guid'],$channel['channel_prvkey'])),
+        'url' => z_root(),
+        'url_sig' => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))
+    )), 
+    'callback' => '/post',
+    'version' => ZOT_REVISION
+);
+
+if($recipients)
+    $params['recipients'] = json_encode($recipients);
+

    Hush-hush ultra top-secret mode

    +
    if($remote_key) {
+    $params = aes_encapsulate($params,$remote_key);
+}
+
+$x = z_post_url($url,$params);
+return($x);
+

    Referenced by directory_run(), notifier_run(), and post_init().

    @@ -523,6 +544,8 @@ Functions
    +

    : zot_fetch

    +

    We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender. Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign. The entire pickup message is encrypted with the remote site's public key. If everything checks out on the remote end, we will receive back a packet containing one or more messages, which will be processed before returning.

    Referenced by post_post().

    @@ -551,6 +574,16 @@ Functions
    +

    : zot_finger

    +

    Look up information about channel

    +
    Parameters
    + + + +
    string $webbie does not have to be host qualified e.g. 'foo' is treated as 'foo'
    array $channel (optional), if supplied permissions will be enumerated specifically for $channel
    +
    +
    +
    Returns
    : array => see z_post_url and mod/zfinger.php

    Referenced by chanview_content(), gprobe_run(), magic_init(), message_post(), new_contact(), poco_load(), post_init(), and probe_content().

    @@ -581,7 +614,7 @@ Functions

    Given an array of zot hashes, return all distinct hubs If primary is true, return only primary hubs Result is ordered by url to assist in batching. Return only the first primary hub as there should only be one.

    -

    Referenced by zfinger_init(), and zperms_init().

    +

    Referenced by zfinger_init().

    @@ -598,6 +631,9 @@ Functions
    +

    : zot_gethub

    +

    A guid and a url, both signed by the sender, distinguish a known sender at a known location This function looks these up to see if the channel is known. If not, we will need to verify it.

    +
    Returns
    : array => hubloc record

    Referenced by import_post(), post_post(), and zot_fetch().

    @@ -616,6 +652,9 @@ Functions
    +

    zot_import

    +

    Process an incoming array of messages which were obtained via pickup, and import, update, delete as directed.

    +

    The message types handled here are 'activity' (e.g. posts), 'mail' and 'profile'

    Referenced by deliver_run(), and zot_fetch().

    @@ -639,50 +678,6 @@ Functions

    Referenced by create_identity().

    -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    zot_notify ( $channel,
     $url,
     $type = 'notify',
     $recipients = null,
     $remote_key = null 
    )
    -
    -
    @@ -742,6 +737,8 @@ Functions
    +

    : zot_refresh

    +

    zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified to fetch new permissions via a finger operation. This may result in a new connection (abook entry) being added to a local channel and it may result in auto-permissions being granted.

    Referenced by connections_content(), import_author_xchan(), onepoll_run(), and post_post().

    @@ -788,6 +785,15 @@ Functions
    +

    : zot_zot

    +
    Parameters
    + + + +
    string $url
    array $data
    +
    +
    +
    Returns
    : array => see z_post_url for returned data format

    Referenced by deliver_run(), directory_run(), notifier_run(), post_init(), queue_run(), and zot_fetch().

    diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 3dfa5f0f2..4f767358d 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -18,7 +18,6 @@ var zot_8php = [ "zot_gethub", "zot_8php.html#a55056e863a7860bc0cf922e78fcce073", null ], [ "zot_import", "zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c", null ], [ "zot_new_uid", "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7", null ], - [ "zot_notify", "zot_8php.html#af22a8732e60d30055617a95f77493446", null ], [ "zot_process_response", "zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03", null ], [ "zot_refresh", "zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d", null ], [ "zot_register_hub", "zot_8php.html#a5bcdfef419b16075a0eca990956223dc", null ], diff --git a/include/items.php b/include/items.php index 6b9ecdd48..c303801e7 100755 --- a/include/items.php +++ b/include/items.php @@ -1427,22 +1427,8 @@ function item_store($arr,$force_parent = false) { $arr['item_private'] = 0; } else { - - // Allow one to see reply tweets from status.net even when - // we don't have or can't see the original post. - - if($force_parent) { - logger('item_store: $force_parent=true, reply converted to top-level post.'); - $parent_id = 0; - $arr['parent_mid'] = $arr['mid']; - $arr['flags'] = $arr['flags'] | ITEM_THREAD_TOP; - } - else { - logger('item_store: item parent was not found - ignoring item'); - return 0; - } - - $parent_deleted = 0; + logger('item_store: item parent was not found - ignoring item'); + return 0; } } diff --git a/include/network.php b/include/network.php index 9d7ae8497..427519c7a 100644 --- a/include/network.php +++ b/include/network.php @@ -10,6 +10,7 @@ function get_capath() { // curl wrapper. If binary flag is true, return binary // results. + /** * fetch_url is deprecated and being replaced by the more capable z_fetch_url * please use that function instead. @@ -204,6 +205,26 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0) return($body); } +/** + * @function z_fetch_url + * @param string $url + * URL to fetch + * @param boolean $binary = false + * TRUE if asked to return binary results (file download) + * @param int $redirects = 0 + * internal use, recursion counter + * @param array $opts (optional parameters) + * 'accept_content' => supply Accept: header with 'accept_content' as the value + * 'timeout' => int seconds, default system config value or 60 seconds + * 'http_auth' => username:password + * 'novalidate' => do not validate SSL certs, default is to validate using our CA list + * + * @returns array + * 'return_code' => HTTP return code or 0 if timeout or failure + * 'success' => boolean true (if HTTP 2xx result) or false + * 'header' => HTTP headers + * 'body' => fetched content + */ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @@ -421,7 +442,15 @@ function xml_status($st, $message = '') { killme(); } - +/** + * @function http_status_exit + * + * Send HTTP status header and exit + * @param int $val + * integer HTTP status result value + * + * @returns (does not return, process is terminated) + */ function http_status_exit($val) { diff --git a/include/text.php b/include/text.php index 6e0e63df3..833b495f4 100644 --- a/include/text.php +++ b/include/text.php @@ -222,6 +222,7 @@ function unxmlify($s) { // convenience wrapper, reverse the operation "bin2hex" +// This is a built-in function in php >= 5.4 if(! function_exists('hex2bin')) { function hex2bin($s) { diff --git a/install/database.sql b/install/database.sql index 7dbaff7ea..6e16e7646 100644 --- a/install/database.sql +++ b/install/database.sql @@ -537,10 +537,10 @@ CREATE TABLE IF NOT EXISTS `mail` ( CREATE TABLE IF NOT EXISTS `manage` ( `id` int(11) NOT NULL AUTO_INCREMENT, `uid` int(11) NOT NULL, - `mid` int(11) NOT NULL, + `xchan` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`), - KEY `mid` (`mid`) + KEY `xchan` (`xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `menu` ( diff --git a/install/update.php b/install/update.php index 493a5478b..a2a280e67 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 27 Mar 2013 19:35:34 -0700 Subject: add new connections to default group (if any) --- boot.php | 2 +- include/follow.php | 61 ++++++++++------------------------------------------ include/group.php | 34 +++++++++++++++++++++-------- install/database.sql | 2 +- install/update.php | 10 ++++++++- 5 files changed, 47 insertions(+), 62 deletions(-) diff --git a/boot.php b/boot.php index b37f51b9b..2c7c76777 100644 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica Red'); define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1039 ); +define ( 'DB_UPDATE_VERSION', 1040 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/follow.php b/include/follow.php index 88418926b..eba353c8b 100644 --- a/include/follow.php +++ b/include/follow.php @@ -111,7 +111,10 @@ function new_contact($uid,$url,$channel,$interactive = false) { if((local_user()) && $uid == local_user()) { $aid = get_account_id(); - $hash = $a->observer['xchan_hash']; + $hash = get_observer_hash(); + $ch = $a->get_channel(); + $default_group = $ch['channel_default_group']; + } else { $r = q("select * from channel where channel_id = %d limit 1", @@ -123,6 +126,7 @@ function new_contact($uid,$url,$channel,$interactive = false) { } $aid = $r[0]['channel_account_id']; $hash = $r[0]['channel_hash']; + $default_group = $r[0]['channel_default_group']; } if($hash == $xchan_hash) { @@ -163,59 +167,16 @@ function new_contact($uid,$url,$channel,$interactive = false) { if($r) $result['abook'] = $r[0]; - // Then send a ping/message to the other side - - -/* - - $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, - `writable`, `hidden`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0) ", - intval($uid), - dbesc(datetime_convert()), - dbesc($ret['url']), - dbesc(normalise_link($ret['url'])), - dbesc($ret['addr']), - dbesc($ret['alias']), - dbesc($ret['batch']), - dbesc($ret['notify']), - dbesc($ret['poll']), - dbesc($ret['poco']), - dbesc($ret['name']), - dbesc($ret['nick']), - dbesc($ret['photo']), - dbesc($ret['network']), - dbesc($ret['pubkey']), - intval($new_relation), - intval($ret['priority']), - intval($writeable), - intval($hidden) - ); - } - - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", - dbesc($ret['url']), - intval($uid) - ); - - if(! count($r)) { - $result['message'] .= t('Unable to retrieve contact information.') . EOL; - return $result; - } + /** If there is a default group for this channel, add this member to it */ - $contact = $r[0]; - $contact_id = $r[0]['id']; - - - $g = q("select def_gid from user where uid = %d limit 1", - intval($uid) - ); - if($g && intval($g[0]['def_gid'])) { + if($default_group) { require_once('include/group.php'); - group_add_member($uid,'',$contact_id,$g[0]['def_gid']); + $g = group_rec_byhash($uid,$default_group); + if($g) + group_add_member($uid,'',$xchan_hash,$g['id']); } -*/ + // Then send a ping/message to the other side $result['success'] = true; diff --git a/include/group.php b/include/group.php index d4a01593e..4a7acf7c9 100644 --- a/include/group.php +++ b/include/group.php @@ -52,40 +52,43 @@ function group_add($uid,$name) { function group_rmv($uid,$name) { $ret = false; if(x($uid) && x($name)) { - $r = q("SELECT id FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1", + $r = q("SELECT id, hash FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1", intval($uid), dbesc($name) ); - if(count($r)) + if($r) { $group_id = $r[0]['id']; + $group_hash = $r[0]['hash']; + } + if(! $group_id) return false; // remove group from default posting lists - $r = q("SELECT channel_default_gid, channel_allow_gid, channel_deny_gid FROM channel WHERE channel_id = %d LIMIT 1", + $r = q("SELECT channel_default_group, channel_allow_gid, channel_deny_gid FROM channel WHERE channel_id = %d LIMIT 1", intval($uid) ); if($r) { $user_info = $r[0]; $change = false; - if($user_info['channel_default_gid'] == $group_id) { - $user_info['channel_default_gid'] = 0; + if($user_info['channel_default_group'] == $group_hash) { + $user_info['channel_default_group'] = ''; $change = true; } if(strpos($user_info['channel_allow_gid'], '<' . $group_id . '>') !== false) { - $user_info['channel_allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['channel_allow_gid']); + $user_info['channel_allow_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_allow_gid']); $change = true; } if(strpos($user_info['channel_deny_gid'], '<' . $group_id . '>') !== false) { - $user_info['channel_deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['channel_deny_gid']); + $user_info['channel_deny_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_deny_gid']); $change = true; } if($change) { - q("UPDATE channel SET channel_default_gid = %d, channel_allow_gid = '%s', channel_deny_gid = '%s' + q("UPDATE channel SET channel_default_group = '%s', channel_allow_gid = '%s', channel_deny_gid = '%s' WHERE channel_id = %d", - intval($user_info['channel_default_gid']), + intval($user_info['channel_default_group']), dbesc($user_info['channel_allow_gid']), dbesc($user_info['channel_deny_gid']), intval($uid) @@ -124,6 +127,19 @@ function group_byname($uid,$name) { return false; } + +function group_rec_byhash($uid,$hash) { + if((! $uid) || (! strlen($hash))) + return false; + $r = q("SELECT * FROM `group` WHERE `uid` = %d AND `hash` = '%s' LIMIT 1", + intval($uid), + dbesc($hash) + ); + if($r) + return $r[0]; + return false; +} + function group_rmv_member($uid,$name,$member) { $gid = group_byname($uid,$name); if(! $gid) diff --git a/install/database.sql b/install/database.sql index 6e16e7646..c989439fa 100644 --- a/install/database.sql +++ b/install/database.sql @@ -160,7 +160,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10', `channel_expire_days` int(11) NOT NULL DEFAULT '0', `channel_passwd_reset` char(255) NOT NULL DEFAULT '', - `channel_default_gid` int(10) unsigned NOT NULL DEFAULT '0', + `channel_default_group` char(255) NOT NULL DEFAULT '', `channel_allow_cid` mediumtext NOT NULL, `channel_allow_gid` mediumtext NOT NULL, `channel_deny_cid` mediumtext NOT NULL, diff --git a/install/update.php b/install/update.php index a2a280e67..eb796ccf6 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 27 Mar 2013 20:32:37 -0700 Subject: updated readme --- README | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/README b/README index a930d0910..ecae1655d 100644 --- a/README +++ b/README @@ -1,11 +1,8 @@ -Friendica RED Interaction Engine -================================ +Friendica RED +============= -Red is a new concept in electronic communications which is based on our earlier work with Friendica and our pioneering developments in decentralised, federated social networking. +Red is essentially a "personal CMS" linked to a decentralised permissions and communication platform. This creates a grid of small servers which link together to form a much larger system (much like the internet itself). This allows one to create services with social contexts and extensible permission controls which are all integrated together as if they were offered by a single large data provider - but without the inherent privacy problems and costs associated with centralisation. Privacy and access controls are instead maintained at the local level where they can be enforced by those who own the data being shared. Additionally, identities in Red are not tied to DNS endpoints and have some degree of mobility between providers. -Red is prototype code and has limited functionality at the present time. This message will be changed when it approaches stability. - -At its heart, Red is a decentralised collection of location agnostic info streams (e.g. "channels") which are attached to permission controlled web resources, and which have the ability to discover each other and interact. You could call it a type of social network, but that would be degrading. This is a different concept in online communications, starting where social networks leave off and extending those somewhat primitive types of interactions in new ways - particularly when it comes to privacy. - - -Social networking emulation is one form that these streams can take, but they can take many other forms - limited only by your imagination. +For example, let's say "Iggy Normak" is a colleague of mine. I can create a web service called "Mike Macgirvin" which acts as a blog or social networking hub, and share files and data with Iggy. These are stored on my website, which is served by a small hosting provider. Iggy can access my private photos from anywhere on the web, while logged into any Red website (for instance, from Iggy's own business website) - without encountering any additional authentication dialogues. Nobody else is able to access these files and photos without my permission, even if they "guess the URL". This kind of decentralised access control is somewhat unique and opens up new possibilities for creating very large scale web services from smaller operators, providers, and website designers. + +Red has somewhat limited functionality at the present time, and is being provided as a "developer preview". The communication layers, authentication and permission systems are all basically functional. Much development work remains. Red is free and open source distributed under the MIT license. -- cgit v1.2.3 From d0bf45972135bde9ac39a06c6fa5eb64d075a225 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Mar 2013 20:36:23 -0700 Subject: clarify --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index ecae1655d..1d65063e1 100644 --- a/README +++ b/README @@ -3,6 +3,6 @@ Friendica RED Red is essentially a "personal CMS" linked to a decentralised permissions and communication platform. This creates a grid of small servers which link together to form a much larger system (much like the internet itself). This allows one to create services with social contexts and extensible permission controls which are all integrated together as if they were offered by a single large data provider - but without the inherent privacy problems and costs associated with centralisation. Privacy and access controls are instead maintained at the local level where they can be enforced by those who own the data being shared. Additionally, identities in Red are not tied to DNS endpoints and have some degree of mobility between providers. -For example, let's say "Iggy Normak" is a colleague of mine. I can create a web service called "Mike Macgirvin" which acts as a blog or social networking hub, and share files and data with Iggy. These are stored on my website, which is served by a small hosting provider. Iggy can access my private photos from anywhere on the web, while logged into any Red website (for instance, from Iggy's own business website) - without encountering any additional authentication dialogues. Nobody else is able to access these files and photos without my permission, even if they "guess the URL". This kind of decentralised access control is somewhat unique and opens up new possibilities for creating very large scale web services from smaller operators, providers, and website designers. +For example, let's say "Iggy Normak" is a colleague of mine. I can create a web service called "Mike Macgirvin" which acts as a blog or social networking hub, and share files and data with Iggy. These are stored on my website, which is served by a small hosting provider (or perhaps running on an old PC in my garage). Iggy can access my private photos from anywhere on the web, while logged into any Red website (for instance, from Iggy's own business website) - without encountering any additional authentication dialogues. Nobody else is able to access these files and photos without my permission, even if they "guess the URL". This kind of decentralised access control is somewhat unique and opens up new possibilities for creating very large scale web services from smaller operators, providers, and website designers. Red has somewhat limited functionality at the present time, and is being provided as a "developer preview". The communication layers, authentication and permission systems are all basically functional. Much development work remains. Red is free and open source distributed under the MIT license. -- cgit v1.2.3