From 765d6e0a97f135755d6ec1322f6e3272bc0ae620 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 14 Jun 2013 16:54:58 -0700 Subject: push refresh messages, performance work on conversations and configs, doc updates --- doc/html/boot_8php.html | 48 +++-- doc/html/conversation_8php.html | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/extract_8php.html | 2 +- doc/html/globals_0x61.html | 2 +- doc/html/globals_0x67.html | 2 +- doc/html/globals_0x69.html | 2 +- doc/html/globals_func_0x61.html | 2 +- doc/html/globals_func_0x67.html | 2 +- doc/html/globals_func_0x69.html | 2 +- doc/html/include_2config_8php.html | 2 +- doc/html/include_2group_8php.html | 2 +- doc/html/include_2network_8php.html | 4 +- doc/html/items_8php.html | 60 +++--- doc/html/items_8php.js | 6 +- doc/html/language_8php.html | 2 +- doc/html/navtreeindex4.js | 6 +- doc/html/permissions_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/search/all_61.js | 2 +- doc/html/search/all_67.js | 2 +- doc/html/search/all_69.js | 2 +- doc/html/search/functions_61.js | 2 +- doc/html/search/functions_67.js | 2 +- doc/html/search/functions_69.js | 2 +- doc/html/security_8php.html | 2 +- doc/html/text_8php.html | 20 +- doc/html/typo_8php.html | 2 +- include/config.php | 34 ++- include/conversation.php | 7 +- include/deliver.php | 13 +- include/directory.php | 7 +- include/notifier.php | 63 ++++-- index.php | 1 + util/messages.po | 404 ++++++++++++++++++------------------ version.inc | 2 +- 37 files changed, 398 insertions(+), 327 deletions(-) diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 3ee9f7aca..320a68e20 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -806,7 +806,7 @@ Variables

Referenced by Item\get_template_data(), items_fetch(), network_content(), ping_init(), and Template\replace_macros().

@@ -868,7 +868,7 @@ Variables

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), call_hooks(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), common_friends_visitor_widget(), connections_content(), consume_feed(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_permissions_sql(), items_fetch(), load_contact_links(), load_hooks(), local_delivery(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), new_follower(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), permissions_sql(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), what_next(), z_fetch_url(), and zot_finger().

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), call_hooks(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), common_friends_visitor_widget(), connections_content(), consume_feed(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_permissions_sql(), items_fetch(), load_contact_links(), load_hooks(), local_delivery(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), new_follower(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), permissions_sql(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), what_next(), z_fetch_url(), and zot_finger().

@@ -966,7 +966,7 @@ Variables @@ -1053,7 +1053,7 @@ Variables

Referenced by FriendicaSmartyEngine\__construct(), acl_init(), admin_content(), api_content(), api_ff_ids(), api_friendica_version(), api_oauth_access_token(), api_oauth_request_token(), api_statusnet_version(), attach_init(), check_form_security_token_ForbiddenOnErr(), contactgroup_content(), events_content(), fbrowser_content(), feed_init(), filer_content(), filerm_content(), get_feed_for(), goaway(), http_status_exit(), item_post(), json_return_and_die(), like_content(), lockview_content(), msearch_post(), network_content(), oembed_init(), oexchange_init(), opensearch_init(), parse_url_content(), photo_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), pretheme_init(), qsearch_init(), App\register_template_engine(), regmod_content(), search_ac_init(), setup_init(), setup_post(), share_init(), siteinfo_init(), starred_init(), subthread_content(), system_unavailable(), tagger_content(), App\template_engine(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xml_status(), and xrd_init().

Referenced by FriendicaSmartyEngine\__construct(), acl_init(), admin_content(), api_content(), api_ff_ids(), api_friendica_version(), api_oauth_access_token(), api_oauth_request_token(), api_statusnet_version(), attach_init(), check_form_security_token_ForbiddenOnErr(), contactgroup_content(), events_content(), fbrowser_content(), feed_init(), filer_content(), filerm_content(), goaway(), http_status_exit(), item_post(), json_return_and_die(), like_content(), lockview_content(), msearch_post(), network_content(), oembed_init(), oexchange_init(), opensearch_init(), parse_url_content(), photo_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), pretheme_init(), qsearch_init(), App\register_template_engine(), regmod_content(), search_ac_init(), setup_init(), setup_post(), share_init(), siteinfo_init(), starred_init(), subthread_content(), system_unavailable(), tagger_content(), App\template_engine(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xml_status(), and xrd_init().

@@ -1088,7 +1088,7 @@ Variables

Referenced by Item\__construct(), acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), best_link_url(), App\build_pagehead(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), crepair_content(), crepair_init(), crepair_post(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editpost_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_post(), items_fetch(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_post(), share_init(), smilies(), starred_init(), stream_perms_api_uids(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), and zid_init().

Referenced by Item\__construct(), acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), best_link_url(), App\build_pagehead(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), crepair_content(), crepair_init(), crepair_post(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editpost_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_post(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_post(), share_init(), smilies(), starred_init(), stream_perms_api_uids(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), and zid_init().

@@ -1140,7 +1140,7 @@ Variables

Referenced by admin_content(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), channel_content(), channel_init(), chanview_content(), check_form_security_token_redirectOnErr(), common_content(), common_init(), community_content(), connections_content(), connections_post(), crepair_content(), crepair_post(), delegate_content(), directory_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_post(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), like_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), nogroup_content(), notifications_content(), notifications_post(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), rmagic_post(), search_content(), settings_post(), suggest_content(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and xchan_content().

Referenced by admin_content(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), channel_content(), channel_init(), chanview_content(), check_form_security_token_redirectOnErr(), common_content(), common_init(), community_content(), connections_content(), connections_post(), crepair_content(), crepair_post(), delegate_content(), directory_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_content(), import_post(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), like_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), nogroup_content(), notifications_content(), notifications_post(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), rmagic_post(), search_content(), settings_post(), suggest_content(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and xchan_content().

@@ -1162,7 +1162,7 @@ Variables

e.g.: proc_run("ls","-la","/tmp");

$cmd and string args are surrounded with ""

Referenced by connections_content(), connections_post(), create_identity(), drop_item(), drop_items(), events_post(), fsuggest_post(), item_expire(), item_post(), like_content(), local_delivery(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

Referenced by connections_content(), connections_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fsuggest_post(), item_expire(), item_post(), like_content(), local_delivery(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

@@ -1516,7 +1516,7 @@ Variables @@ -1558,7 +1558,7 @@ Variables @@ -2021,7 +2021,7 @@ Variables

Referenced by api_account_rate_limit_status(), api_rss_extra(), atom_entry(), format_event_html(), and get_feed_for().

@@ -2063,7 +2063,7 @@ Variables

Referenced by items_fetch().

@@ -2077,6 +2077,8 @@ Variables

Referenced by get_feed_for(), and items_fetch().

@@ -2089,7 +2091,7 @@ Variables

Referenced by items_fetch().

@@ -2390,7 +2392,7 @@ Variables

Referenced by items_fetch(), network_content(), and tag_deliver().

@@ -2485,7 +2487,7 @@ Variables

Referenced by api_format_items(), api_get_user(), Item\get_template_data(), items_fetch(), network_content(), and starred_init().

@@ -2499,7 +2501,7 @@ Variables @@ -2525,7 +2527,7 @@ Variables

Referenced by api_statuses_home_timeline(), channel_content(), display_content(), format_notification(), item_post(), item_store(), items_fetch(), mood_init(), network_content(), and ping_init().

@@ -2580,7 +2582,7 @@ Variables @@ -3104,7 +3106,7 @@ Variables

Referenced by get_feed_for(), and network_to_name().

Referenced by network_to_name().

@@ -3475,7 +3477,7 @@ Variables

Referenced by feed_init(), get_all_perms(), map_scope(), and perm_is_allowed().

Referenced by get_all_perms(), map_scope(), and perm_is_allowed().

@@ -3747,7 +3749,7 @@ Variables

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(), parse_url_content(), and siteinfo_init().

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

@@ -3761,7 +3763,7 @@ Variables

Referenced by admin_page_summary(), api_friendica_version(), api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), siteinfo_content(), and siteinfo_init().

@@ -3875,7 +3877,7 @@ Variables

Referenced by decode_tags(), file_tag_file_query(), fileas_widget(), filer_content(), filerm_content(), items_fetch(), network_content(), and prepare_body().

@@ -3889,7 +3891,7 @@ Variables diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index 95305e6fa..838addbc4 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -220,7 +220,7 @@ Functions

Referenced by channel_content(), display_content(), items_fetch(), network_content(), and search_content().

diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 0ecf719bc..80b54ad6c 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -332,7 +332,7 @@ Functions

Referenced by add_fcontact(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_store(), authenticate_success(), cal(), channel_content(), Cache\clear(), consume_feed(), create_account(), create_identity(), crepair_post(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), Item\get_template_data(), import_directory_profile(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), local_delivery(), logger(), FKOAuth1\loginUser(), magic_init(), mail_store(), message_content(), network_content(), new_contact(), new_follower(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

Referenced by add_fcontact(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_store(), authenticate_success(), cal(), channel_content(), Cache\clear(), consume_feed(), create_account(), create_identity(), crepair_post(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), local_delivery(), logger(), FKOAuth1\loginUser(), magic_init(), mail_store(), message_content(), network_content(), new_contact(), new_follower(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 3980f263d..3c68babe7 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,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(), call_hooks(), 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_rec_byhash(), 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(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_pconfig(), load_plugin(), 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_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), 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(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), 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_driver\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), uninstall_plugin(), unregister_hook(), 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().

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(), call_hooks(), 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_pconfig(), get_xconfig(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), 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(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_pconfig(), load_plugin(), 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_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), 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(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), 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_driver\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), uninstall_plugin(), unregister_hook(), 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().

@@ -320,7 +320,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(), call_hooks(), 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_rec_byhash(), 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(), install_plugin(), intro_content(), intro_post(), invite_post(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), 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_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), 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(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), 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_driver\store(), store_item_tag(), stream_perms_api_uids(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), uninstall_plugin(), unregister_hook(), 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().

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(), call_hooks(), 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_pconfig(), get_xconfig(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), 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(), install_plugin(), intro_content(), intro_post(), invite_post(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), 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_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), 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(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), 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_driver\store(), store_item_tag(), stream_perms_api_uids(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), uninstall_plugin(), unregister_hook(), 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/extract_8php.html b/doc/html/extract_8php.html index bb5db7f78..7d1617ad0 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables

Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connections_content(), construct_page(), contact_block(), contact_select(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), load_database(), lrdd(), magic_init(), mail_store(), mood_init(), network_content(), new_channel_post(), new_contact(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), prepare_body(), proc_run(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index d695150f5..03db9b5cc 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -541,7 +541,7 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');}); : text.php

atom_author() -: items.php +: items.php

atom_entry() : items.php diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index 5a82b59c1..0d120414e 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -193,7 +193,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : features.php

get_feed_for() -: items.php +: items.php

get_first_dim() : datetime.php diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 9b7102463..917665055 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -309,7 +309,7 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');}); : boot.php

items_fetch() -: items.php +: items.php

diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 5ef5571e5..63695de3a 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -423,7 +423,7 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); : text.php

atom_author() -: items.php +: items.php

atom_entry() : items.php diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index ebe5358aa..21601815f 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -192,7 +192,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : features.php

get_feed_for() -: items.php +: items.php

get_first_dim() : datetime.php diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 12a367317..2fe42b47b 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -240,7 +240,7 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');}); : items.php

items_fetch() -: items.php +: items.php

diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index e085beb3a..b496b2542 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -300,7 +300,7 @@ Functions

Referenced by App\build_pagehead(), channel_aside(), channel_content(), community_content(), contact_block(), contact_remove(), feature_enabled(), file_tag_save_file(), file_tag_unsave_file(), file_tag_update_pconfig(), findpeople_widget(), Item\get_comment_box(), group_content(), intro_content(), invite_content(), invite_post(), item_expire(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), message_content(), network_content(), network_init(), notifications_content(), profile_activity(), profperm_content(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index abad13e11..4bd2fefa9 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -152,7 +152,7 @@ Functions

Referenced by collect_recipients(), enumerate_permissions(), items_fetch(), and network_content().

diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 0c5909363..1e2c69a68 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -498,7 +498,7 @@ Functions

Returns: (does not return, process is terminated)

Referenced by _well_known_init(), and poco_init().

Referenced by _well_known_init(), get_feed_for(), and poco_init().

@@ -572,7 +572,7 @@ Functions

Referenced by construct_activity_object(), construct_activity_target(), consume_feed(), dfrn_deliver(), local_delivery(), lrdd(), and notifications_content().

Referenced by consume_feed(), dfrn_deliver(), local_delivery(), lrdd(), and notifications_content().

diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index ed3a69e79..7a8744588 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -120,8 +120,8 @@ Functions get_public_feed ($channel, $params) - get_feed_for (&$a, $dfrn_id, $owner_nick, $last_update, $direction=0) - + get_feed_for ($channel, $observer_hash, $params) + construct_verb ($item) construct_activity_object ($item) @@ -190,8 +190,8 @@ Functions lose_sharer ($importer, $contact, $datarray, $item) - atom_author ($tag, $name, $uri, $h, $w, $photo) - + atom_author ($tag, $name, $uri, $h, $w, $type, $photo) + atom_entry ($item, $type, $author, $owner, $comment=false, $cid=0) fix_private_photos ($s, $uid, $item=null, $cid=0) @@ -224,8 +224,8 @@ Functions zot_feed ($uid, $observer_xchan, $mindate) - items_fetch ($arr, $channel=null, $client_mode=CLIENT_MODE_NORMAL, $module= 'network') - + items_fetch ($arr, $channel=null, $observer_hash=null, $client_mode=CLIENT_MODE_NORMAL, $module= 'network') +

Function Documentation

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

@@ -298,6 +298,12 @@ Functions + + + + + + @@ -364,7 +370,7 @@ Functions

	$w,
			$type,

Referenced by get_feed_for().

@@ -806,7 +812,7 @@ Functions

Referenced by channel_content(), display_content(), events_content(), get_feed_for(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().

Referenced by channel_content(), display_content(), events_content(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().

@@ -907,39 +913,27 @@ Functions - +

- - - - - - - - - - - - - + - + - + @@ -949,6 +943,8 @@ Functions

get_feed_for	(	&	$a,
			$dfrn_id,
			$owner_nick,	$channel,
			$last_update,	$observer_hash,
			$direction = `0`	$params

Referenced by get_public_feed().

@@ -1137,8 +1133,6 @@ Functions

Referenced by atom_entry().

@@ -1155,8 +1149,6 @@ Functions

Referenced by atom_entry().

@@ -1215,7 +1207,7 @@ Functions - +

@@ -1231,6 +1223,12 @@ Functions + + + + + + @@ -1251,6 +1249,8 @@ Functions

	$channel = `null`,
			$observer_hash = `null`,

Referenced by get_feed_for().

diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index 6338b5ddb..956414a8f 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -2,7 +2,7 @@ var items_8php = [ [ "activity_sanitise", "items_8php.html#a36e656667193c83aa2cc03a024fc131b", null ], [ "array_sanitise", "items_8php.html#abf7a1b73eb352d79acd36309b0dababd", null ], - [ "atom_author", "items_8php.html#adc8bda87ba08626f2a8cde7748d1bdae", null ], + [ "atom_author", "items_8php.html#a016dd86c827d08db89061ea81d15c6cb", null ], [ "atom_entry", "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6", null ], [ "collect_recipients", "items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70", null ], [ "compare_permissions", "items_8php.html#a0790a4550b829e85504af548623002ca", null ], @@ -26,7 +26,7 @@ var items_8php = [ "first_post_date", "items_8php.html#a0cf98bb619f07dd18f602683a55a5f59", null ], [ "fix_private_photos", "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87", null ], [ "get_atom_elements", "items_8php.html#a896c1809d58f2d7a42cfe14577958ddf", null ], - [ "get_feed_for", "items_8php.html#a59abb61d7581dc6592257ef022cbfada", null ], + [ "get_feed_for", "items_8php.html#a04a35b610acfe54434df08adec39c0c7", null ], [ "get_item_contact", "items_8php.html#aab9c6bae4c40799867596bdaae9829fd", null ], [ "get_item_elements", "items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361", null ], [ "get_mail_elements", "items_8php.html#a94ddb1d6c8fa21dd7433677e85168037", null ], @@ -39,7 +39,7 @@ var items_8php = [ "item_getfeedtags", "items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7", null ], [ "item_store", "items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049", null ], [ "item_store_update", "items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53", null ], - [ "items_fetch", "items_8php.html#ade43f7ae289e124d5af4985272981e1b", null ], + [ "items_fetch", "items_8php.html#a756738301f2ed96be50232500677d58a", null ], [ "limit_body_size", "items_8php.html#af94c281016c6c912d06e064113336c5c", null ], [ "local_delivery", "items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45", null ], [ "lose_follower", "items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 585433e32..b5c57a94c 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions

Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), allfriends_content(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_store(), authenticate_success(), bb_ShareAttributes(), bbcode(), categories_widget(), channel_content(), channel_init(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_content(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_poll_interval(), contact_reputation(), create_account(), create_identity(), crepair_content(), crepair_post(), datesel_format(), day_translate(), delegate_content(), directory_content(), dirfind_content(), dirsearch_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), fbrowser_content(), file_tag_save_file(), fileas_widget(), filer_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), follow_widget(), format_event_diaspora(), format_event_html(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), item_post_type(), items_fetch(), lang_selector(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), message_aside(), message_content(), message_post(), mini_group_select(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), new_follower(), nogroup_content(), notification(), notifications_content(), notifications_post(), notify_content(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), populate_acl(), post_activity_item(), post_init(), posted_date_widget(), prepare_body(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), timezone_cmp(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_deny(), validate_channelname(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_upload_post(), what_next(), xchan_content(), z_readdir(), and zfinger_init().

diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index a399a6c23..5d12f8dc0 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -110,7 +110,9 @@ var NAVTREEINDEX4 = "item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,35,2], "items_8php.html":[5,0,0,38], "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,38,56], +"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,38,2], "items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,38,4], +"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,38,26], "items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,38,5], "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,38,31], "items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,38,35], @@ -128,11 +130,11 @@ var NAVTREEINDEX4 = "items_8php.html#a53eb3d27e1c55083be93a32f392d54e7":[5,0,0,38,46], "items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,38,18], "items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,38,10], -"items_8php.html#a59abb61d7581dc6592257ef022cbfada":[5,0,0,38,26], "items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,38,16], "items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,38,36], "items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,38,14], "items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,38,34], +"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,38,39], "items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,38,32], "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,38,44], "items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,38,15], @@ -157,8 +159,6 @@ var NAVTREEINDEX4 = "items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,38,17], "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,38,49], "items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,38,53], -"items_8php.html#adc8bda87ba08626f2a8cde7748d1bdae":[5,0,0,38,2], -"items_8php.html#ade43f7ae289e124d5af4985272981e1b":[5,0,0,38,39], "items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4":[5,0,0,38,42], "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,38,22], "items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45":[5,0,0,38,41], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 473f0478c..4ced96ff4 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -246,7 +246,7 @@ Functions

Referenced by Item\__construct(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), viewconnections_content(), z_readdir(), and zot_feed().

Referenced by Item\__construct(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), get_feed_for(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), viewconnections_content(), z_readdir(), and zot_feed().

diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 76ee71792..f1ac73e90 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -190,7 +190,7 @@ Functions

Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), connections_content(), connections_post(), contact_block(), contact_select(), create_identity(), cronhooks_run(), directory_content(), editpost_content(), event_store(), feature_enabled(), gender_selector(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), Item\get_template_data(), App\get_widgets(), group_select(), html2bbcode(), item_post(), item_store(), item_store_update(), like_content(), login(), FKOAuth1\loginUser(), magic_init(), mail_store(), marital_selector(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), post_activity_item(), post_init(), prepare_body(), proc_run(), profile_content(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_post(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

@@ -282,7 +282,7 @@ Functions

Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connections_content(), construct_page(), contact_block(), crepair_content(), delegate_content(), directory_content(), dirfind_content(), display_content(), editpost_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), login(), lostpass_content(), manage_content(), match_content(), message_aside(), message_content(), micropro(), mini_group_select(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), suggest_content(), vcard_from_xchan(), viewconnections_content(), and xrd_init().

diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index d0118abf1..dfe3e75dd 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -146,7 +146,7 @@ var searchData= ['arr_5fadd_5fhashes',['arr_add_hashes',['../parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868',1,'parse_url.php']]], ['array_5fsanitise',['array_sanitise',['../items_8php.html#abf7a1b73eb352d79acd36309b0dababd',1,'items.php']]], ['array_5fxmlify',['array_xmlify',['../text_8php.html#acedb584f65114a33f389efb796172a91',1,'text.php']]], - ['atom_5fauthor',['atom_author',['../items_8php.html#adc8bda87ba08626f2a8cde7748d1bdae',1,'items.php']]], + ['atom_5fauthor',['atom_author',['../items_8php.html#a016dd86c827d08db89061ea81d15c6cb',1,'items.php']]], ['atom_5fentry',['atom_entry',['../items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6',1,'items.php']]], ['atom_5ftime',['ATOM_TIME',['../boot_8php.html#ad34c1547020a305915bcc39707744690',1,'boot.php']]], ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 28fde5301..4f0861f92 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -31,7 +31,7 @@ var searchData= ['get_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], ['get_5fevents',['get_events',['../boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'boot.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], - ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a59abb61d7581dc6592257ef022cbfada',1,'items.php']]], + ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]], ['get_5ffirst_5fdim',['get_first_dim',['../datetime_8php.html#aba971b67f17fecf050813f1eba72367f',1,'datetime.php']]], ['get_5fform_5fsecurity_5ftoken',['get_form_security_token',['../security_8php.html#acd06ef411116115c2f0a92633700db8a',1,'security.php']]], ['get_5fformatsmap',['get_FormatsMap',['../classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4',1,'photo_imagick']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index b55f3c5b8..635e8be89 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -73,5 +73,5 @@ var searchData= ['itemplateengine',['ITemplateEngine',['../interfaceITemplateEngine.html',1,'']]], ['itemplateengine_2ephp',['ITemplateEngine.php',['../ITemplateEngine_8php.html',1,'']]], ['items_2ephp',['items.php',['../items_8php.html',1,'']]], - ['items_5ffetch',['items_fetch',['../items_8php.html#ade43f7ae289e124d5af4985272981e1b',1,'items.php']]] + ['items_5ffetch',['items_fetch',['../items_8php.html#a756738301f2ed96be50232500677d58a',1,'items.php']]] ]; diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index 4ab085242..50639ccf3 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -96,7 +96,7 @@ var searchData= ['arr_5fadd_5fhashes',['arr_add_hashes',['../parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868',1,'parse_url.php']]], ['array_5fsanitise',['array_sanitise',['../items_8php.html#abf7a1b73eb352d79acd36309b0dababd',1,'items.php']]], ['array_5fxmlify',['array_xmlify',['../text_8php.html#acedb584f65114a33f389efb796172a91',1,'text.php']]], - ['atom_5fauthor',['atom_author',['../items_8php.html#adc8bda87ba08626f2a8cde7748d1bdae',1,'items.php']]], + ['atom_5fauthor',['atom_author',['../items_8php.html#a016dd86c827d08db89061ea81d15c6cb',1,'items.php']]], ['atom_5fentry',['atom_entry',['../items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6',1,'items.php']]], ['attach_5fby_5fhash',['attach_by_hash',['../include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36',1,'attach.php']]], ['attach_5fby_5fhash_5fnodata',['attach_by_hash_nodata',['../include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932',1,'attach.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 5b59467e0..6098afe23 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -31,7 +31,7 @@ var searchData= ['get_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], ['get_5fevents',['get_events',['../boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'boot.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], - ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a59abb61d7581dc6592257ef022cbfada',1,'items.php']]], + ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]], ['get_5ffirst_5fdim',['get_first_dim',['../datetime_8php.html#aba971b67f17fecf050813f1eba72367f',1,'datetime.php']]], ['get_5fform_5fsecurity_5ftoken',['get_form_security_token',['../security_8php.html#acd06ef411116115c2f0a92633700db8a',1,'security.php']]], ['get_5fformatsmap',['get_FormatsMap',['../classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4',1,'photo_imagick']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 7c2e5e5fa..0affc3dcd 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -42,5 +42,5 @@ var searchData= ['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]], ['item_5fstore',['item_store',['../items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049',1,'items.php']]], ['item_5fstore_5fupdate',['item_store_update',['../items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53',1,'items.php']]], - ['items_5ffetch',['items_fetch',['../items_8php.html#ade43f7ae289e124d5af4985272981e1b',1,'items.php']]] + ['items_5ffetch',['items_fetch',['../items_8php.html#a756738301f2ed96be50232500677d58a',1,'items.php']]] ]; diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index e5ac4346c..8424ba7e1 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -359,7 +359,7 @@ Functions

Profile owner - everything is visible

Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.

Referenced by channel_content(), and zot_feed().

Referenced by channel_content(), items_fetch(), and zot_feed().

diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index ec1c00ff6..a3bca5a58 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -715,8 +715,6 @@ Variables

return atom link elements for all of our hubs

Referenced by get_feed_for().

@@ -733,8 +731,6 @@ Variables

Referenced by get_feed_for().

@@ -803,7 +799,7 @@ Variables

Referenced by channel_content(), file_tag_unsave_file(), file_tag_update_pconfig(), and get_feed_for().

Referenced by channel_content(), file_tag_unsave_file(), and file_tag_update_pconfig().

@@ -1072,8 +1068,6 @@ Variables

Referenced by atom_entry().

@@ -1244,7 +1238,7 @@ Variables

Referenced by channel_content(), display_content(), items_fetch(), network_content(), and search_content().

@@ -1762,7 +1756,7 @@ Variables @@ -1889,7 +1883,7 @@ Variables

Returns: string substituted string

Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connections_content(), construct_page(), contact_block(), crepair_content(), delegate_content(), directory_content(), dirfind_content(), display_content(), editpost_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), message_aside(), message_content(), micropro(), mini_group_select(), mood_content(), nav(), network_content(), new_channel_content(), new_follower(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), suggest_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), and xrd_init().

@@ -2239,7 +2233,7 @@ Variables

Referenced by items_fetch(), and network_content().

@@ -2355,7 +2349,7 @@ Variables @@ -2381,7 +2375,7 @@ Variables

Returns: string Escaped text.

Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), photos_post(), subthread_content(), tagger_content(), and xml_status().

diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 47416ed52..d1d0e487e 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables

Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allfriends_content(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), apps_content(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), cal(), call_hooks(), categories_widget(), channel_aside(), channel_content(), channel_init(), channel_remove(), chanview_content(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_aside(), connections_content(), connections_init(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_select(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), dfrn_deliver(), directory_aside(), directory_content(), directory_init(), dirfind_content(), dirfind_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), help_content(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_post(), items_fetch(), lang_selector(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), message_aside(), message_content(), message_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), new_follower(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onepoll_run(), opensearch_init(), page_content(), paginate(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), redbasic_init(), redir_init(), redstrap_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), saved_searches(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), smilies(), subthread_content(), suggest_aside(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_content(), theme_include(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), wall_upload_post(), wfinger_init(), what_next(), xrd_init(), z_fetch_url(), z_path(), z_root(), zid_init(), and zotfeed_init().

Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allfriends_content(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), apps_content(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), cal(), call_hooks(), categories_widget(), channel_aside(), channel_content(), channel_init(), channel_remove(), chanview_content(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_aside(), connections_content(), connections_init(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_select(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), dfrn_deliver(), directory_aside(), directory_content(), directory_init(), dirfind_content(), dirfind_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), help_content(), hostxrd_init(), import_channel_photo(), import_content(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_post(), items_fetch(), lang_selector(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), message_aside(), message_content(), message_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), new_follower(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onepoll_run(), opensearch_init(), page_content(), paginate(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), redbasic_init(), redir_init(), redstrap_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), saved_searches(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), smilies(), subthread_content(), suggest_aside(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_content(), theme_include(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), wall_upload_post(), wfinger_init(), what_next(), xrd_init(), z_fetch_url(), z_path(), z_root(), zid_init(), and zotfeed_init().

diff --git a/include/config.php b/include/config.php index 5db0a3d05..92fae165b 100644 --- a/include/config.php +++ b/include/config.php @@ -129,19 +129,35 @@ function del_config($family,$key) { function load_pconfig($uid,$family) { global $a; - $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", - dbesc($family), - intval($uid) - ); - if(count($r)) { + + if(! array_key_exists($uid,$a->config)) + $a->config[$uid] = array(); + + if($family) { + $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", + dbesc($family), + intval($uid) + ); + } + else { + $r = q("SELECT * FROM `pconfig` WHERE `uid` = %d", + intval($uid) + ); + } + + if($r) { foreach($r as $rr) { $k = $rr['k']; - $a->config[$uid][$family][$k] = $rr['v']; + $c = $rr['cat']; + if(! array_key_exists($c,$a->config[$uid])) + $a->config[$uid][$c] = array(); + $a->config[$uid][$c][$k] = $rr['v']; } - } else if ($family != 'config') { + } +// else if ($family != 'config') { // Negative caching - $a->config[$uid][$family] = "!!"; - } +// $a->config[$uid][$family] = "!!"; +// } } diff --git a/include/conversation.php b/include/conversation.php index 13f67c4dd..8e69e9ea3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -365,7 +365,7 @@ function visible_activity($item) { * */ -if(!function_exists('conversation')) { + function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tstart = dba_timer(); @@ -374,6 +374,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $ssl_state = ((local_user()) ? true : false); + if(local_user()) + load_pconfig(local_user(),''); $arr_blocked = null; @@ -678,6 +680,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { } else { + // Normal View // logger('conv: items: ' . print_r($items,true)); @@ -790,7 +793,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { return $o; -}} +} function best_link_url($item) { diff --git a/include/deliver.php b/include/deliver.php index c5ed35c87..547d009cc 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -23,11 +23,14 @@ function deliver_run($argv, $argc) { if($r[0]['outq_posturl'] === z_root() . '/post') { // local delivery // we should probably batch these and save a few delivery processes - $msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true)))))); - zot_import($msg); - $r = q("delete from outq where outq_hash = '%s' limit 1", - dbesc($argv[$x]) - ); + // If there is no outq_msg, this is a refresh_all message which does not require local handling + if($r[0]['outq_msg']) { + $msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true)))))); + zot_import($msg); + $r = q("delete from outq where outq_hash = '%s' limit 1", + dbesc($argv[$x]) + ); + } } else { $result = zot_zot($r[0]['outq_posturl'],$r[0]['outq_notify']); diff --git a/include/directory.php b/include/directory.php index 5f24b4af8..5f3696a58 100644 --- a/include/directory.php +++ b/include/directory.php @@ -41,11 +41,16 @@ function directory_run($argv, $argc){ $url = DIRECTORY_FALLBACK_MASTER . '/post'; } + // ensure the upstream directory is updated + $packet = zot_build_packet($channel,'refresh'); $z = zot_zot($url,$packet); - // re-queue if unsuccessful + // Now update all the connections + + proc_run('php','notifier','refresh_all',$channel['channel_id']); + } if (array_search(__file__,get_included_files())===0){ diff --git a/include/notifier.php b/include/notifier.php index 159931124..d72fa29b5 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -53,6 +53,7 @@ require_once('include/html2plain.php'); * * ZOT * permission_update abook_id + * refresh_all channel_id * relay item_id (item was relayed to owner, we will deliver it as owner) * */ @@ -136,6 +137,7 @@ function notifier_run($argv, $argc){ $recipients = array(); $url_recipients = array(); $normal_mode = true; + $packet_type = 'undefined'; if($cmd === 'mail') { $normal_mode = false; @@ -186,6 +188,27 @@ function notifier_run($argv, $argc){ $recipients[] = $suggest[0]['cid']; $item = $suggest[0]; } + elseif($cmd === 'refresh_all') { + $s = q("select * from channel where channel_id = %d limit 1", + intval($item_id) + ); + if($s) + $channel = $s[0]; + $uid = $item_id; + $recipients = array(); + $r = q("select * from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d)", + intval($item_id), + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) + ); + if($r) { + foreach($r as $rr) { + $recipients[] = $rr['abook_xchan']; + } + } + $private = false; + $packet_type = 'refresh'; + } else { // Normal items @@ -346,18 +369,34 @@ function notifier_run($argv, $argc){ foreach($hubs as $hub) { $hash = random_string(); - $n = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash); - q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s' )", - dbesc($hash), - intval($target_item['aid']), - intval($target_item['uid']), - dbesc($hub['hubloc_callback']), - intval(1), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($n), - dbesc(json_encode($encoded_item)) - ); + if($packet_type === 'refresh') { + $n = zot_build_packet($channel,'refresh'); + q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s' )", + dbesc($hash), + intval($channel['channel_account']), + intval($channel['channel_id']), + dbesc($hub['hubloc_callback']), + intval(1), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($n), + dbesc('') + ); + } + else { + $n = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash); + q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s' )", + dbesc($hash), + intval($target_item['aid']), + intval($target_item['uid']), + dbesc($hub['hubloc_callback']), + intval(1), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($n), + dbesc(json_encode($encoded_item)) + ); + } $deliver[] = $hash; if(count($deliver) >= $deliveries_per_process) { diff --git a/index.php b/index.php index cf9262bf7..08943e4b7 100755 --- a/index.php +++ b/index.php @@ -48,6 +48,7 @@ if(! $install) { load_config('config'); load_config('system'); + load_config('feature'); require_once("session.php"); load_hooks(); diff --git a/util/messages.po b/util/messages.po index 8387405f5..e184ded34 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 00:01-0700\n" +"POT-Creation-Date: 2013-06-14 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -255,33 +255,33 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:375 ../../include/conversation.php:873 +#: ../../include/Contact.php:375 ../../include/conversation.php:874 msgid "Poke" msgstr "" -#: ../../include/Contact.php:376 ../../include/conversation.php:867 +#: ../../include/Contact.php:376 ../../include/conversation.php:868 msgid "View Status" msgstr "" #: ../../include/Contact.php:377 ../../include/nav.php:75 -#: ../../include/conversation.php:868 ../../mod/connections.php:264 +#: ../../include/conversation.php:869 ../../mod/connections.php:264 #: ../../mod/connections.php:371 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:378 ../../include/conversation.php:869 +#: ../../include/Contact.php:378 ../../include/conversation.php:870 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:379 ../../include/conversation.php:870 +#: ../../include/Contact.php:379 ../../include/conversation.php:871 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:380 ../../include/conversation.php:871 +#: ../../include/Contact.php:380 ../../include/conversation.php:872 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:381 ../../include/conversation.php:872 +#: ../../include/Contact.php:381 ../../include/conversation.php:873 msgid "Send PM" msgstr "" @@ -1201,7 +1201,7 @@ msgstr "" msgid "Outbox" msgstr "" -#: ../../include/nav.php:164 ../../mod/message.php:15 +#: ../../include/nav.php:164 ../../mod/message.php:21 msgid "New Message" msgstr "" @@ -1283,14 +1283,14 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:4531 +#: ../../include/attach.php:464 ../../include/items.php:4395 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:99 ../../mod/allfriends.php:10 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/setup.php:181 ../../mod/settings.php:580 #: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 #: ../../mod/delegate.php:6 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:639 ../../mod/viewsrc.php:12 ../../mod/item.php:148 -#: ../../mod/network.php:7 ../../mod/intro.php:50 +#: ../../mod/photos.php:639 ../../mod/viewsrc.php:12 ../../mod/message.php:204 +#: ../../mod/item.php:148 ../../mod/network.php:7 ../../mod/intro.php:50 #: ../../mod/connections.php:146 ../../mod/profiles.php:163 #: ../../mod/profiles.php:471 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 @@ -1299,8 +1299,8 @@ msgstr "" #: ../../mod/notifications.php:66 ../../mod/editpost.php:10 #: ../../mod/poke.php:128 ../../mod/channel.php:105 ../../mod/fsuggest.php:78 #: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 -#: ../../mod/message.php:197 ../../mod/mood.php:111 ../../custom/network.php:7 -#: ../../index.php:174 ../../index.php:336 +#: ../../mod/mood.php:111 ../../custom/network.php:7 ../../index.php:174 +#: ../../index.php:336 msgid "Permission denied." msgstr "" @@ -1598,7 +1598,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:266 ../../include/account.php:293 -#: ../../include/account.php:350 ../../include/items.php:4059 +#: ../../include/account.php:350 ../../include/items.php:3920 #: ../../boot.php:1154 msgid "Administrator" msgstr "" @@ -2043,7 +2043,7 @@ msgid "bytes" msgstr "" #: ../../include/text.php:1037 ../../include/text.php:1052 -#: ../../include/conversation.php:773 +#: ../../include/conversation.php:774 msgid "remove" msgstr "" @@ -2051,11 +2051,11 @@ msgstr "" msgid "[remove]" msgstr "" -#: ../../include/text.php:1040 ../../include/conversation.php:636 +#: ../../include/text.php:1040 ../../include/conversation.php:637 msgid "Categories:" msgstr "" -#: ../../include/text.php:1055 ../../include/conversation.php:637 +#: ../../include/text.php:1055 ../../include/conversation.php:638 msgid "Filed under:" msgstr "" @@ -2162,14 +2162,14 @@ msgstr "" msgid "Edit" msgstr "" -#: ../../include/ItemObject.php:123 ../../include/conversation.php:599 +#: ../../include/ItemObject.php:123 ../../include/conversation.php:600 #: ../../mod/settings.php:661 ../../mod/group.php:177 #: ../../mod/photos.php:1154 ../../mod/admin.php:628 #: ../../mod/connections.php:304 msgid "Delete" msgstr "" -#: ../../include/ItemObject.php:129 ../../include/conversation.php:598 +#: ../../include/ItemObject.php:129 ../../include/conversation.php:599 msgid "Select" msgstr "" @@ -2238,15 +2238,15 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:220 ../../include/conversation.php:646 +#: ../../include/ItemObject.php:220 ../../include/conversation.php:647 #, php-format msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:247 ../../include/conversation.php:665 -#: ../../include/conversation.php:1020 ../../mod/photos.php:1044 -#: ../../mod/editpost.php:75 ../../mod/message.php:289 -#: ../../mod/message.php:422 +#: ../../include/ItemObject.php:247 ../../include/conversation.php:666 +#: ../../include/conversation.php:1021 ../../mod/photos.php:1044 +#: ../../mod/message.php:296 ../../mod/message.php:429 +#: ../../mod/editpost.php:75 msgid "Please wait" msgstr "" @@ -2270,12 +2270,12 @@ msgstr "" #: ../../mod/group.php:83 ../../mod/photos.php:674 ../../mod/photos.php:766 #: ../../mod/photos.php:1023 ../../mod/photos.php:1062 #: ../../mod/photos.php:1100 ../../mod/photos.php:1127 -#: ../../mod/import.php:342 ../../mod/admin.php:397 ../../mod/admin.php:621 -#: ../../mod/admin.php:757 ../../mod/admin.php:956 ../../mod/admin.php:1043 -#: ../../mod/connections.php:381 ../../mod/profiles.php:523 +#: ../../mod/message.php:297 ../../mod/message.php:428 ../../mod/admin.php:397 +#: ../../mod/admin.php:621 ../../mod/admin.php:757 ../../mod/admin.php:956 +#: ../../mod/admin.php:1043 ../../mod/connections.php:381 +#: ../../mod/profiles.php:523 ../../mod/import.php:351 #: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/message.php:290 ../../mod/message.php:421 ../../mod/mood.php:134 -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../mod/mood.php:134 ../../view/theme/redbasic/php/config.php:132 #: ../../view/theme/redbasic/php/config.php:149 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2313,7 +2313,7 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:550 ../../include/conversation.php:1038 +#: ../../include/ItemObject.php:550 ../../include/conversation.php:1039 #: ../../mod/photos.php:1063 ../../mod/editpost.php:95 msgid "Preview" msgstr "" @@ -2348,182 +2348,182 @@ msgstr "" msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/conversation.php:624 +#: ../../include/conversation.php:625 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:663 +#: ../../include/conversation.php:664 msgid "View in context" msgstr "" -#: ../../include/conversation.php:777 +#: ../../include/conversation.php:778 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:778 +#: ../../include/conversation.php:779 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:866 +#: ../../include/conversation.php:867 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:936 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:936 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:940 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:942 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:948 msgid "and" msgstr "" -#: ../../include/conversation.php:950 +#: ../../include/conversation.php:951 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:951 +#: ../../include/conversation.php:952 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:951 +#: ../../include/conversation.php:952 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:976 +#: ../../include/conversation.php:977 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:977 ../../mod/message.php:245 -#: ../../mod/message.php:356 +#: ../../include/conversation.php:978 ../../mod/message.php:252 +#: ../../mod/message.php:363 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:978 +#: ../../include/conversation.php:979 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:979 +#: ../../include/conversation.php:980 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:980 +#: ../../include/conversation.php:981 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:981 ../../mod/filer.php:35 +#: ../../include/conversation.php:982 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:982 +#: ../../include/conversation.php:983 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:997 ../../mod/photos.php:1043 +#: ../../include/conversation.php:998 ../../mod/photos.php:1043 msgid "Share" msgstr "" -#: ../../include/conversation.php:999 +#: ../../include/conversation.php:1000 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1001 ../../mod/editpost.php:67 -#: ../../mod/message.php:287 ../../mod/message.php:419 +#: ../../include/conversation.php:1002 ../../mod/message.php:294 +#: ../../mod/message.php:426 ../../mod/editpost.php:67 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1002 +#: ../../include/conversation.php:1003 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1003 ../../mod/editpost.php:68 +#: ../../include/conversation.php:1004 ../../mod/editpost.php:68 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1004 +#: ../../include/conversation.php:1005 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1005 ../../mod/editpost.php:69 -#: ../../mod/message.php:288 ../../mod/message.php:420 +#: ../../include/conversation.php:1006 ../../mod/message.php:295 +#: ../../mod/message.php:427 ../../mod/editpost.php:69 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1007 msgid "web link" msgstr "" -#: ../../include/conversation.php:1007 +#: ../../include/conversation.php:1008 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1008 +#: ../../include/conversation.php:1009 msgid "video link" msgstr "" -#: ../../include/conversation.php:1009 +#: ../../include/conversation.php:1010 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1011 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1011 ../../mod/editpost.php:73 +#: ../../include/conversation.php:1012 ../../mod/editpost.php:73 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1012 +#: ../../include/conversation.php:1013 msgid "set location" msgstr "" -#: ../../include/conversation.php:1013 ../../mod/editpost.php:74 +#: ../../include/conversation.php:1014 ../../mod/editpost.php:74 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1014 +#: ../../include/conversation.php:1015 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1016 ../../mod/editpost.php:87 +#: ../../include/conversation.php:1017 ../../mod/editpost.php:87 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1019 ../../mod/editpost.php:89 +#: ../../include/conversation.php:1020 ../../mod/editpost.php:89 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1021 ../../mod/editpost.php:76 +#: ../../include/conversation.php:1022 ../../mod/editpost.php:76 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1023 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1030 ../../mod/editpost.php:84 +#: ../../include/conversation.php:1031 ../../mod/editpost.php:84 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1032 ../../mod/editpost.php:90 +#: ../../include/conversation.php:1033 ../../mod/editpost.php:90 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2532,47 +2532,47 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:2587 +#: ../../include/items.php:2448 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/items.php:2588 +#: ../../include/items.php:2449 #, php-format msgid "Happy Birthday %s" msgstr "" -#: ../../include/items.php:4049 +#: ../../include/items.php:3910 msgid "[Name Withheld]" msgstr "" -#: ../../include/items.php:4057 +#: ../../include/items.php:3918 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:4057 +#: ../../include/items.php:3918 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4480 ../../mod/viewsrc.php:18 +#: ../../include/items.php:4344 ../../mod/viewsrc.php:18 #: ../../mod/admin.php:142 ../../mod/admin.php:665 ../../mod/admin.php:864 #: ../../mod/display.php:33 ../../mod/page.php:34 msgid "Item not found." msgstr "" -#: ../../include/items.php:4652 +#: ../../include/items.php:4516 msgid "Archives" msgstr "" -#: ../../include/items.php:4795 ../../mod/group.php:43 ../../mod/group.php:141 +#: ../../include/items.php:4664 ../../mod/group.php:43 ../../mod/group.php:141 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4805 +#: ../../include/items.php:4674 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:4821 +#: ../../include/items.php:4690 msgid "Connection not found." msgstr "" @@ -2728,8 +2728,8 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:132 ../../mod/message.php:284 -#: ../../mod/message.php:415 +#: ../../mod/invite.php:132 ../../mod/message.php:291 +#: ../../mod/message.php:422 msgid "Your message:" msgstr "" @@ -3905,77 +3905,78 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: ../../mod/import.php:31 -msgid "Nothing to import." +#: ../../mod/message.php:16 +msgid "Check Mail" msgstr "" -#: ../../mod/import.php:53 -msgid "Unable to download data from old server" +#: ../../mod/message.php:52 +msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/import.php:59 -msgid "Imported file is empty." +#: ../../mod/message.php:60 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/import.php:83 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../mod/message.php:67 +msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/import.php:101 -msgid "Channel clone failed. Import failed." +#: ../../mod/message.php:93 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/import.php:111 -msgid "Cloned channel not found. Import failed." +#: ../../mod/message.php:212 ../../mod/notifications.php:100 +msgid "Messages" msgstr "" -#: ../../mod/import.php:322 -msgid "Import completed." +#: ../../mod/message.php:223 +msgid "Message deleted." msgstr "" -#: ../../mod/import.php:331 -msgid "Import Channel" +#: ../../mod/message.php:230 +msgid "Conversation removed." msgstr "" -#: ../../mod/import.php:332 -msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file. Only identity and connections/relationships will be " -"imported. Importation of content is not yet available." +#: ../../mod/message.php:281 +msgid "Send Private Message" msgstr "" -#: ../../mod/import.php:333 -msgid "File to Upload" +#: ../../mod/message.php:282 ../../mod/message.php:417 +msgid "To:" msgstr "" -#: ../../mod/import.php:334 -msgid "Or provide the old server/hub details" +#: ../../mod/message.php:287 ../../mod/message.php:419 +msgid "Subject:" msgstr "" -#: ../../mod/import.php:335 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/message.php:315 +msgid "No messages." msgstr "" -#: ../../mod/import.php:336 -msgid "Your old login email address" +#: ../../mod/message.php:331 ../../mod/message.php:388 +msgid "Delete message" msgstr "" -#: ../../mod/import.php:337 -msgid "Your old login password" +#: ../../mod/message.php:333 +msgid "D, d M Y - g:i A" +msgstr "" + +#: ../../mod/message.php:352 +msgid "Message not found." msgstr "" -#: ../../mod/import.php:338 +#: ../../mod/message.php:410 +msgid "Delete conversation" +msgstr "" + +#: ../../mod/message.php:412 msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +"No secure communications available. You may be able to " +"respond from the sender's profile page." msgstr "" -#: ../../mod/import.php:339 -msgid "Make this hub my primary location" +#: ../../mod/message.php:416 +msgid "Send Reply" msgstr "" #: ../../mod/hcard.php:10 @@ -5456,6 +5457,83 @@ msgstr "" msgid "Reset" msgstr "" +#: ../../mod/import.php:36 +msgid "Nothing to import." +msgstr "" + +#: ../../mod/import.php:58 +msgid "Unable to download data from old server" +msgstr "" + +#: ../../mod/import.php:64 +msgid "Imported file is empty." +msgstr "" + +#: ../../mod/import.php:88 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../mod/import.php:106 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../mod/import.php:116 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../mod/import.php:327 +msgid "Import completed." +msgstr "" + +#: ../../mod/import.php:335 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../mod/import.php:340 +msgid "Import Channel" +msgstr "" + +#: ../../mod/import.php:341 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." +msgstr "" + +#: ../../mod/import.php:342 +msgid "File to Upload" +msgstr "" + +#: ../../mod/import.php:343 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../mod/import.php:344 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../mod/import.php:345 +msgid "Your old login email address" +msgstr "" + +#: ../../mod/import.php:346 +msgid "Your old login password" +msgstr "" + +#: ../../mod/import.php:347 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." +msgstr "" + +#: ../../mod/import.php:348 +msgid "Make this hub my primary location" +msgstr "" + #: ../../mod/manage.php:59 msgid "Create a new channel" msgstr "" @@ -5661,10 +5739,6 @@ msgstr "" msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:100 ../../mod/message.php:205 -msgid "Messages" -msgstr "" - #: ../../mod/notifications.php:119 msgid "Show Ignored Requests" msgstr "" @@ -6029,72 +6103,6 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/message.php:45 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../mod/message.php:53 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../mod/message.php:60 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../mod/message.php:86 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../mod/message.php:216 -msgid "Message deleted." -msgstr "" - -#: ../../mod/message.php:223 -msgid "Conversation removed." -msgstr "" - -#: ../../mod/message.php:274 -msgid "Send Private Message" -msgstr "" - -#: ../../mod/message.php:275 ../../mod/message.php:410 -msgid "To:" -msgstr "" - -#: ../../mod/message.php:280 ../../mod/message.php:412 -msgid "Subject:" -msgstr "" - -#: ../../mod/message.php:308 -msgid "No messages." -msgstr "" - -#: ../../mod/message.php:324 ../../mod/message.php:381 -msgid "Delete message" -msgstr "" - -#: ../../mod/message.php:326 -msgid "D, d M Y - g:i A" -msgstr "" - -#: ../../mod/message.php:345 -msgid "Message not found." -msgstr "" - -#: ../../mod/message.php:403 -msgid "Delete conversation" -msgstr "" - -#: ../../mod/message.php:405 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../mod/message.php:409 -msgid "Send Reply" -msgstr "" - #: ../../mod/mood.php:130 msgid "Mood" msgstr "" diff --git a/version.inc b/version.inc index 6d757a648..4bc76b341 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-13.343 +2013-06-14.344 -- cgit v1.2.3