From b263f11d77db347122bce22de23587fbb2b0edff Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 7 Jun 2013 20:40:36 +0100 Subject: Another missing include --- mod/import.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/import.php b/mod/import.php index d1b3216d0..b7e48ed7a 100644 --- a/mod/import.php +++ b/mod/import.php @@ -5,6 +5,7 @@ require_once('include/Contact.php'); require_once('include/zot.php'); +require_once('include/identity.php'); function import_post(&$a) { -- cgit v1.2.3 From 4132cab862608f05c7a5b1467e5a66df9070b01b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 7 Jun 2013 22:53:43 +0100 Subject: Rename newmessage widget (since we'll need to put more stuff in it as we make zotmail look like email), and add a "check mail" button. --- mod/message.php | 9 ++++++++- view/tpl/message_side.tpl | 6 +----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mod/message.php b/mod/message.php index 93b5c2494..54615f081 100644 --- a/mod/message.php +++ b/mod/message.php @@ -9,13 +9,20 @@ require_once('include/Contact.php'); function message_aside(&$a) { - $a->set_widget('newmessage',replace_macros(get_markup_template('message_side.tpl'), array( + $a->set_widget('msgaside',replace_macros(get_markup_template('message_side.tpl'), array( '$tabs'=> array(), + + '$check'=>array( + 'label' => t('Check Mail'), + 'url' => $a->get_baseurl(true) . '/message', + 'sel' => (argv(1) == ''), + ), '$new'=>array( 'label' => t('New Message'), 'url' => $a->get_baseurl(true) . '/message/new', 'sel'=> (argv(1) == 'new'), ) + ))); } diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 7da22ee3e..4db427fa7 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,9 +1,5 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
+
    -- cgit v1.2.3 From ee1ecd8ea29e41f70f8ee233ff6859e2e45e28b7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 8 Jun 2013 16:29:56 -0700 Subject: remove uploaded import file once we're done with it. --- doc/html/boot_8php.html | 22 +- doc/html/identity_8php.html | 2 +- doc/html/include_2config_8php.html | 2 +- doc/html/items_8php.html | 4 +- doc/html/photo__driver_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/text_8php.html | 6 +- doc/html/typo_8php.html | 2 +- doc/html/typohelper_8php.html | 2 +- mod/import.php | 1 + util/messages.po | 483 +++++++++++++++++++------------------ version.inc | 2 +- 12 files changed, 271 insertions(+), 261 deletions(-) diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 0fd10cf8b..3ee9f7aca 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -216,7 +216,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1042 +const DB_UPDATE_VERSION 1043   const EOL '<br />' . "\r\n"   @@ -1431,7 +1431,7 @@ Variables
-

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

+

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

@@ -1558,7 +1558,7 @@ Variables
-

Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), group_content(), group_get_members(), intro_content(), ping_init(), and zot_refresh().

+

Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), intro_content(), perm_is_allowed(), ping_init(), and zot_refresh().

@@ -1803,7 +1803,7 @@ Variables
-

Referenced by consume_feed(), event_store(), local_delivery(), localize_item(), and process_delivery().

+

Referenced by consume_feed(), event_store(), local_delivery(), localize_item(), process_delivery(), and tagger_content().

@@ -1909,7 +1909,7 @@ Variables
-

Referenced by consume_feed(), local_delivery(), and tagger_content().

+

Referenced by consume_feed(), local_delivery(), tag_deliver(), and tagger_content().

@@ -2141,7 +2141,7 @@ Variables
- +
const DB_UPDATE_VERSION 1042const DB_UPDATE_VERSION 1043
@@ -2269,8 +2269,6 @@ Variables
-

Referenced by tagger_content().

-
@@ -2449,7 +2447,7 @@ Variables

Item Flags

-

Referenced by event_store(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), and tag_deliver().

+

Referenced by event_store(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), and tagger_content().

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

Referenced by api_get_user(), channel_content(), drop_item(), event_store(), events_content(), first_post_date(), item_post(), item_store(), like_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), and zot_feed().

+

Referenced by api_get_user(), channel_content(), drop_item(), event_store(), events_content(), first_post_date(), item_post(), item_store(), like_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), tagger_content(), and zot_feed().

@@ -3891,7 +3889,7 @@ Variables
-

Referenced by decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), item_post(), items_fetch(), network_content(), search_ac_init(), and search_content().

+

Referenced by decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), item_post(), items_fetch(), network_content(), search_ac_init(), search_content(), and tag_deliver().

@@ -3931,7 +3929,7 @@ Variables
-

Referenced by delete_item_lowlevel(), fetch_post_tags(), filer_content(), get_atom_elements(), item_post(), item_store(), item_store_update(), search_content(), and tagadelic().

+

Referenced by delete_item_lowlevel(), fetch_post_tags(), filer_content(), get_atom_elements(), item_post(), item_store(), item_store_update(), search_content(), tag_deliver(), and tagadelic().

diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index f44d8f685..2af7e89f2 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -251,7 +251,7 @@ Functions
-

Referenced by create_identity().

+

Referenced by create_identity(), and import_post().

diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 2c77bc458..e085beb3a 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(), and theme_content().

+

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/items_8php.html b/doc/html/items_8php.html index 0dbfdb66b..ed3a69e79 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -1183,7 +1183,7 @@ Functions
-

Referenced by consume_feed(), event_store(), item_post(), like_content(), local_delivery(), mood_init(), photo_upload(), photos_create_item(), photos_post(), post_activity_item(), process_delivery(), profile_activity(), subthread_content(), and tagger_content().

+

Referenced by consume_feed(), event_store(), item_post(), like_content(), local_delivery(), mood_init(), photo_upload(), photos_create_item(), photos_post(), post_activity_item(), process_delivery(), profile_activity(), and subthread_content().

@@ -1482,7 +1482,7 @@ Functions
Returns
array 'success' => true or false 'activity' => the resulting activity if successful
-

Referenced by api_channel_stream(), and poke_init().

+

Referenced by api_channel_stream(), poke_init(), and tagger_content().

diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index 98a98ede4..6069d2302 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -226,7 +226,7 @@ Functions
-

Referenced by crepair_post(), import_post(), and import_xchan().

+

Referenced by crepair_post(), import_post(), import_xchan(), and poller_run().

diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index d5b987336..76ee71792 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(), 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(), tagger_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

+

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

+

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/text_8php.html b/doc/html/text_8php.html index 37ede1aed..ec1c00ff6 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1279,7 +1279,7 @@ Variables
-

Referenced by event_store(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), photos_post(), post_activity_item(), profile_activity(), subthread_content(), and tagger_content().

+

Referenced by event_store(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), photos_post(), post_activity_item(), profile_activity(), and subthread_content().

@@ -1889,7 +1889,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(), 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().

+

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().

@@ -2079,7 +2079,7 @@ Variables
-

Referenced by filer_content().

+

Referenced by filer_content(), and tag_deliver().

diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index d53c8a27f..47416ed52 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_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_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().

diff --git a/doc/html/typohelper_8php.html b/doc/html/typohelper_8php.html index 6cefd44cc..ff0de04c5 100644 --- a/doc/html/typohelper_8php.html +++ b/doc/html/typohelper_8php.html @@ -144,7 +144,7 @@ Variables
-

Referenced by nav(), network_init(), subthread_content(), system_down(), and tagger_content().

+

Referenced by nav(), network_init(), subthread_content(), and system_down().

diff --git a/mod/import.php b/mod/import.php index d1b3216d0..a36519a0c 100644 --- a/mod/import.php +++ b/mod/import.php @@ -22,6 +22,7 @@ function import_post(&$a) { if($filesize) { $data = @file_get_contents($src); } + unlink($src); } if(! $src) { diff --git a/util/messages.po b/util/messages.po index 0464d6f24..8387405f5 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-05-31 00:01-0700\n" +"POT-Creation-Date: 2013-06-07 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -642,7 +642,7 @@ msgid "Enable widget to display Network posts only from selected collections" msgstr "" #: ../../include/features.php:45 ../../mod/network.php:163 -#: ../../mod/search.php:17 +#: ../../mod/search.php:17 ../../custom/network.php:168 msgid "Saved Searches" msgstr "" @@ -766,6 +766,7 @@ msgid "Channels not in any collection" msgstr "" #: ../../include/group.php:289 ../../mod/network.php:164 +#: ../../custom/network.php:169 msgid "add" msgstr "" @@ -899,7 +900,7 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1006 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1008 msgid "Full Name:" msgstr "" @@ -1107,8 +1108,8 @@ msgstr "" msgid "Addon applications, utilities, games" msgstr "" -#: ../../include/nav.php:128 ../../include/text.php:705 -#: ../../include/text.php:706 ../../mod/search.php:96 +#: ../../include/nav.php:128 ../../include/text.php:701 +#: ../../include/text.php:702 ../../mod/search.php:96 msgid "Search" msgstr "" @@ -1270,11 +1271,11 @@ msgstr "" msgid "commented on %s's post" msgstr "" -#: ../../include/oembed.php:143 +#: ../../include/oembed.php:148 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:152 +#: ../../include/oembed.php:157 msgid "Embedding disabled" msgstr "" @@ -1282,10 +1283,10 @@ 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:4493 +#: ../../include/attach.php:464 ../../include/items.php:4531 #: ../../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:579 +#: ../../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 @@ -1298,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 ../../index.php:174 -#: ../../index.php:336 +#: ../../mod/message.php:197 ../../mod/mood.php:111 ../../custom/network.php:7 +#: ../../index.php:174 ../../index.php:336 msgid "Permission denied." msgstr "" @@ -1475,6 +1476,7 @@ msgstr "" #: ../../include/profile_selectors.php:42 ../../include/identity.php:225 #: ../../mod/network.php:377 ../../mod/connections.php:337 +#: ../../custom/network.php:382 msgid "Friends" msgstr "" @@ -1596,7 +1598,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:266 ../../include/account.php:293 -#: ../../include/account.php:350 ../../include/items.php:4021 +#: ../../include/account.php:350 ../../include/items.php:4059 #: ../../boot.php:1154 msgid "Administrator" msgstr "" @@ -1809,292 +1811,294 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:624 +#: ../../include/text.php:620 msgid "No connections" msgstr "" -#: ../../include/text.php:635 +#: ../../include/text.php:631 #, php-format msgid "%d Connection" msgid_plural "%d Connections" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:647 +#: ../../include/text.php:643 msgid "View Connections" msgstr "" -#: ../../include/text.php:708 ../../mod/filer.php:36 +#: ../../include/text.php:704 ../../mod/filer.php:36 msgid "Save" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:742 msgid "poke" msgstr "" -#: ../../include/text.php:746 ../../include/conversation.php:207 +#: ../../include/text.php:742 ../../include/conversation.php:207 msgid "poked" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:743 msgid "ping" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:743 msgid "pinged" msgstr "" -#: ../../include/text.php:748 +#: ../../include/text.php:744 msgid "prod" msgstr "" -#: ../../include/text.php:748 +#: ../../include/text.php:744 msgid "prodded" msgstr "" -#: ../../include/text.php:749 +#: ../../include/text.php:745 msgid "slap" msgstr "" -#: ../../include/text.php:749 +#: ../../include/text.php:745 msgid "slapped" msgstr "" -#: ../../include/text.php:750 +#: ../../include/text.php:746 msgid "finger" msgstr "" -#: ../../include/text.php:750 +#: ../../include/text.php:746 msgid "fingered" msgstr "" -#: ../../include/text.php:751 +#: ../../include/text.php:747 msgid "rebuff" msgstr "" -#: ../../include/text.php:751 +#: ../../include/text.php:747 msgid "rebuffed" msgstr "" -#: ../../include/text.php:763 +#: ../../include/text.php:759 msgid "happy" msgstr "" -#: ../../include/text.php:764 +#: ../../include/text.php:760 msgid "sad" msgstr "" -#: ../../include/text.php:765 +#: ../../include/text.php:761 msgid "mellow" msgstr "" -#: ../../include/text.php:766 +#: ../../include/text.php:762 msgid "tired" msgstr "" -#: ../../include/text.php:767 +#: ../../include/text.php:763 msgid "perky" msgstr "" -#: ../../include/text.php:768 +#: ../../include/text.php:764 msgid "angry" msgstr "" -#: ../../include/text.php:769 +#: ../../include/text.php:765 msgid "stupified" msgstr "" -#: ../../include/text.php:770 +#: ../../include/text.php:766 msgid "puzzled" msgstr "" -#: ../../include/text.php:771 +#: ../../include/text.php:767 msgid "interested" msgstr "" -#: ../../include/text.php:772 +#: ../../include/text.php:768 msgid "bitter" msgstr "" -#: ../../include/text.php:773 +#: ../../include/text.php:769 msgid "cheerful" msgstr "" -#: ../../include/text.php:774 +#: ../../include/text.php:770 msgid "alive" msgstr "" -#: ../../include/text.php:775 +#: ../../include/text.php:771 msgid "annoyed" msgstr "" -#: ../../include/text.php:776 +#: ../../include/text.php:772 msgid "anxious" msgstr "" -#: ../../include/text.php:777 +#: ../../include/text.php:773 msgid "cranky" msgstr "" -#: ../../include/text.php:778 +#: ../../include/text.php:774 msgid "disturbed" msgstr "" -#: ../../include/text.php:779 +#: ../../include/text.php:775 msgid "frustrated" msgstr "" -#: ../../include/text.php:780 +#: ../../include/text.php:776 msgid "motivated" msgstr "" -#: ../../include/text.php:781 +#: ../../include/text.php:777 msgid "relaxed" msgstr "" -#: ../../include/text.php:782 +#: ../../include/text.php:778 msgid "surprised" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Monday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Tuesday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Wednesday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Thursday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Friday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Saturday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:942 msgid "Sunday" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "January" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "February" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "March" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "April" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "May" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "June" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "July" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "August" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "September" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "October" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "November" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:946 msgid "December" msgstr "" -#: ../../include/text.php:1023 +#: ../../include/text.php:1019 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1024 +#: ../../include/text.php:1020 msgid "bytes" msgstr "" -#: ../../include/text.php:1041 ../../include/text.php:1056 +#: ../../include/text.php:1037 ../../include/text.php:1052 #: ../../include/conversation.php:773 msgid "remove" msgstr "" -#: ../../include/text.php:1041 ../../include/text.php:1056 +#: ../../include/text.php:1037 ../../include/text.php:1052 msgid "[remove]" msgstr "" -#: ../../include/text.php:1044 ../../include/conversation.php:636 +#: ../../include/text.php:1040 ../../include/conversation.php:636 msgid "Categories:" msgstr "" -#: ../../include/text.php:1059 ../../include/conversation.php:637 +#: ../../include/text.php:1055 ../../include/conversation.php:637 msgid "Filed under:" msgstr "" -#: ../../include/text.php:1075 ../../include/text.php:1087 +#: ../../include/text.php:1071 ../../include/text.php:1083 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1239 ../../mod/events.php:324 +#: ../../include/text.php:1235 ../../mod/events.php:324 msgid "link to source" msgstr "" -#: ../../include/text.php:1271 +#: ../../include/text.php:1267 msgid "default" msgstr "" -#: ../../include/text.php:1283 +#: ../../include/text.php:1279 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1432 ../../include/conversation.php:125 +#: ../../include/text.php:1428 ../../include/conversation.php:125 +#: ../../mod/tagger.php:47 msgid "event" msgstr "" -#: ../../include/text.php:1434 ../../include/conversation.php:122 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:62 +#: ../../include/text.php:1430 ../../include/conversation.php:122 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:43 msgid "photo" msgstr "" -#: ../../include/text.php:1436 +#: ../../include/text.php:1432 msgid "activity" msgstr "" -#: ../../include/text.php:1438 ../../include/conversation.php:131 +#: ../../include/text.php:1434 ../../include/conversation.php:131 +#: ../../mod/tagger.php:53 msgid "comment" msgstr "" -#: ../../include/text.php:1439 ../../include/bbcode.php:163 +#: ../../include/text.php:1435 ../../include/bbcode.php:163 msgid "post" msgstr "" -#: ../../include/text.php:1663 +#: ../../include/text.php:1659 msgid "Item filed" msgstr "" @@ -2153,13 +2157,13 @@ msgstr "" msgid "Private Message" msgstr "" -#: ../../include/ItemObject.php:110 ../../mod/settings.php:659 +#: ../../include/ItemObject.php:110 ../../mod/settings.php:660 #: ../../mod/editpost.php:66 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:123 ../../include/conversation.php:599 -#: ../../mod/settings.php:660 ../../mod/group.php:177 +#: ../../mod/settings.php:661 ../../mod/group.php:177 #: ../../mod/photos.php:1154 ../../mod/admin.php:628 #: ../../mod/connections.php:304 msgid "Delete" @@ -2260,13 +2264,13 @@ msgstr "" #: ../../include/ItemObject.php:541 ../../mod/events.php:456 #: ../../mod/invite.php:138 ../../mod/setup.php:283 ../../mod/setup.php:326 -#: ../../mod/settings.php:597 ../../mod/settings.php:709 -#: ../../mod/settings.php:738 ../../mod/settings.php:761 -#: ../../mod/settings.php:832 ../../mod/settings.php:998 +#: ../../mod/settings.php:598 ../../mod/settings.php:710 +#: ../../mod/settings.php:739 ../../mod/settings.php:762 +#: ../../mod/settings.php:833 ../../mod/settings.php:1000 #: ../../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:339 ../../mod/admin.php:397 ../../mod/admin.php:621 +#: ../../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/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 @@ -2315,7 +2319,7 @@ msgid "Preview" msgstr "" #: ../../include/conversation.php:129 ../../mod/like.php:103 -#: ../../mod/subthread.php:89 ../../mod/tagger.php:62 +#: ../../mod/subthread.php:89 ../../mod/tagger.php:51 msgid "status" msgstr "" @@ -2523,52 +2527,52 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/items.php:112 ../../mod/like.php:55 ../../mod/group.php:70 +#: ../../include/items.php:120 ../../mod/like.php:55 ../../mod/group.php:70 #: ../../mod/profperm.php:28 ../../index.php:335 msgid "Permission denied" msgstr "" -#: ../../include/items.php:2549 +#: ../../include/items.php:2587 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/items.php:2550 +#: ../../include/items.php:2588 #, php-format msgid "Happy Birthday %s" msgstr "" -#: ../../include/items.php:4011 +#: ../../include/items.php:4049 msgid "[Name Withheld]" msgstr "" -#: ../../include/items.php:4019 +#: ../../include/items.php:4057 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:4019 +#: ../../include/items.php:4057 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4442 ../../mod/viewsrc.php:18 +#: ../../include/items.php:4480 ../../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:4614 +#: ../../include/items.php:4652 msgid "Archives" msgstr "" -#: ../../include/items.php:4757 ../../mod/group.php:43 ../../mod/group.php:141 +#: ../../include/items.php:4795 ../../mod/group.php:43 ../../mod/group.php:141 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4767 +#: ../../include/items.php:4805 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:4783 +#: ../../include/items.php:4821 msgid "Connection not found." msgstr "" @@ -2777,16 +2781,16 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:953 ../../mod/settings.php:958 -#: ../../mod/settings.php:981 ../../mod/settings.php:983 -#: ../../mod/settings.php:984 ../../mod/settings.php:985 +#: ../../mod/api.php:105 ../../mod/settings.php:955 ../../mod/settings.php:960 +#: ../../mod/settings.php:983 ../../mod/settings.php:985 +#: ../../mod/settings.php:986 ../../mod/settings.php:987 #: ../../mod/profiles.php:501 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:953 ../../mod/settings.php:958 -#: ../../mod/settings.php:981 ../../mod/settings.php:983 -#: ../../mod/settings.php:984 ../../mod/settings.php:985 +#: ../../mod/api.php:106 ../../mod/settings.php:955 ../../mod/settings.php:960 +#: ../../mod/settings.php:983 ../../mod/settings.php:985 +#: ../../mod/settings.php:986 ../../mod/settings.php:987 #: ../../mod/profiles.php:502 msgid "No" msgstr "" @@ -3157,7 +3161,7 @@ msgstr "" msgid "toggle full screen mode" msgstr "" -#: ../../mod/tagger.php:95 +#: ../../mod/tagger.php:96 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -3198,7 +3202,7 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:149 ../../mod/settings.php:623 +#: ../../mod/settings.php:149 ../../mod/settings.php:624 msgid "Update" msgstr "" @@ -3230,355 +3234,355 @@ msgstr "" msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:531 +#: ../../mod/settings.php:532 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:596 ../../mod/settings.php:622 -#: ../../mod/settings.php:658 +#: ../../mod/settings.php:597 ../../mod/settings.php:623 +#: ../../mod/settings.php:659 msgid "Add application" msgstr "" -#: ../../mod/settings.php:598 ../../mod/settings.php:624 +#: ../../mod/settings.php:599 ../../mod/settings.php:625 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81 #: ../../mod/fbrowser.php:116 msgid "Cancel" msgstr "" -#: ../../mod/settings.php:599 ../../mod/settings.php:625 +#: ../../mod/settings.php:600 ../../mod/settings.php:626 #: ../../mod/admin.php:624 ../../mod/crepair.php:148 msgid "Name" msgstr "" -#: ../../mod/settings.php:600 ../../mod/settings.php:626 +#: ../../mod/settings.php:601 ../../mod/settings.php:627 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:601 ../../mod/settings.php:627 +#: ../../mod/settings.php:602 ../../mod/settings.php:628 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:602 ../../mod/settings.php:628 +#: ../../mod/settings.php:603 ../../mod/settings.php:629 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:603 ../../mod/settings.php:629 +#: ../../mod/settings.php:604 ../../mod/settings.php:630 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:614 +#: ../../mod/settings.php:615 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:657 +#: ../../mod/settings.php:658 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:661 +#: ../../mod/settings.php:662 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:662 +#: ../../mod/settings.php:663 msgid "No name" msgstr "" -#: ../../mod/settings.php:663 +#: ../../mod/settings.php:664 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:675 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:683 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:705 +#: ../../mod/settings.php:706 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:706 +#: ../../mod/settings.php:707 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:707 +#: ../../mod/settings.php:708 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:708 +#: ../../mod/settings.php:709 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:708 +#: ../../mod/settings.php:709 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:710 ../../mod/settings.php:1007 +#: ../../mod/settings.php:711 ../../mod/settings.php:1009 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:711 +#: ../../mod/settings.php:712 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:712 +#: ../../mod/settings.php:713 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:729 +#: ../../mod/settings.php:730 msgid "Off" msgstr "" -#: ../../mod/settings.php:729 +#: ../../mod/settings.php:730 msgid "On" msgstr "" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:737 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:761 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:790 ../../mod/admin.php:356 +#: ../../mod/settings.php:791 ../../mod/admin.php:356 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:830 +#: ../../mod/settings.php:831 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:836 +#: ../../mod/settings.php:837 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:837 +#: ../../mod/settings.php:838 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:838 +#: ../../mod/settings.php:839 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:838 +#: ../../mod/settings.php:839 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:840 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:840 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:840 +#: ../../mod/settings.php:841 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:876 +#: ../../mod/settings.php:877 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:877 +#: ../../mod/settings.php:878 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:878 +#: ../../mod/settings.php:879 msgid "Anybody in your address book" msgstr "" -#: ../../mod/settings.php:879 +#: ../../mod/settings.php:880 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:880 +#: ../../mod/settings.php:881 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:881 +#: ../../mod/settings.php:882 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:955 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:960 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:962 ../../mod/profile_photo.php:276 +#: ../../mod/settings.php:964 ../../mod/profile_photo.php:276 msgid "or" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:969 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:980 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:980 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:981 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:982 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:983 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:985 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:986 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:987 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:998 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1007 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1010 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1009 +#: ../../mod/settings.php:1011 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1010 +#: ../../mod/settings.php:1012 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1013 +#: ../../mod/settings.php:1015 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1015 +#: ../../mod/settings.php:1017 msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1016 +#: ../../mod/settings.php:1018 msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1019 msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/settings.php:1018 +#: ../../mod/settings.php:1020 msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/settings.php:1019 +#: ../../mod/settings.php:1021 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1024 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1024 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1025 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1026 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1040 +#: ../../mod/settings.php:1042 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1041 +#: ../../mod/settings.php:1043 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1042 +#: ../../mod/settings.php:1044 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1043 +#: ../../mod/settings.php:1045 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1044 +#: ../../mod/settings.php:1046 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1045 +#: ../../mod/settings.php:1047 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1046 +#: ../../mod/settings.php:1048 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1047 +#: ../../mod/settings.php:1049 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1048 +#: ../../mod/settings.php:1050 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1051 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1050 +#: ../../mod/settings.php:1052 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1053 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1052 +#: ../../mod/settings.php:1054 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1053 +#: ../../mod/settings.php:1055 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1056 +#: ../../mod/settings.php:1058 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1059 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -3665,11 +3669,11 @@ msgid "Finding:" msgstr "" #: ../../mod/directory.php:169 -msgid "more" +msgid "next page" msgstr "" #: ../../mod/directory.php:169 -msgid "back" +msgid "previous page" msgstr "" #: ../../mod/directory.php:176 @@ -3761,11 +3765,6 @@ msgstr "" msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:653 ../../mod/photos.php:751 ../../mod/photos.php:773 -#: ../../mod/photos.php:1229 ../../mod/photos.php:1241 -msgid "Contact Photos" -msgstr "" - #: ../../mod/photos.php:684 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." @@ -3796,6 +3795,11 @@ msgstr "" msgid "Permissions" msgstr "" +#: ../../mod/photos.php:751 ../../mod/photos.php:773 ../../mod/photos.php:1229 +#: ../../mod/photos.php:1241 +msgid "Contact Photos" +msgstr "" + #: ../../mod/photos.php:777 msgid "Edit Album" msgstr "" @@ -3913,28 +3917,28 @@ msgstr "" msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:82 +#: ../../mod/import.php:83 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:100 +#: ../../mod/import.php:101 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:110 +#: ../../mod/import.php:111 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:319 +#: ../../mod/import.php:322 msgid "Import completed." msgstr "" -#: ../../mod/import.php:328 +#: ../../mod/import.php:331 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:329 +#: ../../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 " @@ -3942,27 +3946,27 @@ msgid "" "imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:330 +#: ../../mod/import.php:333 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:331 +#: ../../mod/import.php:334 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:332 +#: ../../mod/import.php:335 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:333 +#: ../../mod/import.php:336 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:334 +#: ../../mod/import.php:337 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:335 +#: ../../mod/import.php:338 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 " @@ -3970,7 +3974,7 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:336 +#: ../../mod/import.php:339 msgid "Make this hub my primary location" msgstr "" @@ -4019,102 +4023,109 @@ msgid "Wall Photos" msgstr "" #: ../../mod/network.php:154 ../../mod/search.php:20 +#: ../../custom/network.php:159 msgid "Remove term" msgstr "" -#: ../../mod/network.php:292 +#: ../../mod/network.php:292 ../../custom/network.php:297 msgid "Commented Order" msgstr "" -#: ../../mod/network.php:295 +#: ../../mod/network.php:295 ../../custom/network.php:300 msgid "Sort by Comment Date" msgstr "" -#: ../../mod/network.php:298 +#: ../../mod/network.php:298 ../../custom/network.php:303 msgid "Posted Order" msgstr "" -#: ../../mod/network.php:301 +#: ../../mod/network.php:301 ../../custom/network.php:306 msgid "Sort by Post Date" msgstr "" #: ../../mod/network.php:305 ../../mod/notifications.php:85 +#: ../../custom/network.php:310 msgid "Personal" msgstr "" -#: ../../mod/network.php:308 +#: ../../mod/network.php:308 ../../custom/network.php:313 msgid "Posts that mention or involve you" msgstr "" #: ../../mod/network.php:311 ../../mod/connections.php:480 +#: ../../custom/network.php:316 msgid "New" msgstr "" -#: ../../mod/network.php:314 +#: ../../mod/network.php:314 ../../custom/network.php:319 msgid "Activity Stream - by date" msgstr "" -#: ../../mod/network.php:321 +#: ../../mod/network.php:321 ../../custom/network.php:326 msgid "Starred" msgstr "" -#: ../../mod/network.php:324 +#: ../../mod/network.php:324 ../../custom/network.php:329 msgid "Favourite Posts" msgstr "" -#: ../../mod/network.php:331 +#: ../../mod/network.php:331 ../../custom/network.php:336 msgid "Spam" msgstr "" -#: ../../mod/network.php:334 +#: ../../mod/network.php:334 ../../custom/network.php:339 msgid "Posts flagged as SPAM" msgstr "" -#: ../../mod/network.php:374 +#: ../../mod/network.php:374 ../../custom/network.php:379 msgid "Refresh" msgstr "" #: ../../mod/network.php:375 ../../mod/connections.php:334 +#: ../../custom/network.php:380 msgid "Me" msgstr "" #: ../../mod/network.php:376 ../../mod/connections.php:336 +#: ../../custom/network.php:381 msgid "Best Friends" msgstr "" -#: ../../mod/network.php:378 +#: ../../mod/network.php:378 ../../custom/network.php:383 msgid "Co-workers" msgstr "" #: ../../mod/network.php:379 ../../mod/connections.php:338 +#: ../../custom/network.php:384 msgid "Former Friends" msgstr "" #: ../../mod/network.php:380 ../../mod/connections.php:339 +#: ../../custom/network.php:385 msgid "Acquaintances" msgstr "" -#: ../../mod/network.php:381 +#: ../../mod/network.php:381 ../../custom/network.php:386 msgid "Everybody" msgstr "" -#: ../../mod/network.php:398 +#: ../../mod/network.php:398 ../../custom/network.php:403 msgid "Search Results For:" msgstr "" -#: ../../mod/network.php:443 +#: ../../mod/network.php:443 ../../custom/network.php:448 msgid "No such group" msgstr "" -#: ../../mod/network.php:454 +#: ../../mod/network.php:454 ../../custom/network.php:459 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:469 +#: ../../mod/network.php:469 ../../custom/network.php:474 msgid "Contact: " msgstr "" -#: ../../mod/network.php:472 +#: ../../mod/network.php:472 ../../custom/network.php:477 msgid "Invalid contact." msgstr "" diff --git a/version.inc b/version.inc index 6078ba2c4..9a2ddaf8a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-06.336 +2013-06-08.338 -- cgit v1.2.3 From d76ec28f7900c0c5fcf2d52bda3476de59b8fb1d Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 8 Jun 2013 16:41:57 -0700 Subject: import requires a valid account --- mod/import.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mod/import.php b/mod/import.php index bf55b3104..1bc61da43 100644 --- a/mod/import.php +++ b/mod/import.php @@ -9,6 +9,9 @@ require_once('include/identity.php'); function import_post(&$a) { + if(! $a->get_account()) { + return; + } $data = null; $seize = ((x($_REQUEST,'make_primary')) ? intval($_REQUEST['make_primary']) : 0); @@ -328,6 +331,10 @@ function import_post(&$a) { function import_content(&$a) { + if(! $a->get_account()) { + notice( t('You must be logged in to use this feature.')); + return ''; + } $o = replace_macros(get_markup_template('channel_import.tpl'),array( '$title' => t('Import Channel'), -- cgit v1.2.3 From e3a5a8c3687fcaf011492a2857d90114bb8e5ac5 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 9 Jun 2013 02:17:39 +0100 Subject: Quick fix for PCSS until the cleaned up version is finished. --- view/theme/redbasic/css/style.css | 4 ++++ view/theme/redbasic/php/style.php | 1 + 2 files changed, 5 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 53d17ea04..5fb4e8b36 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3389,6 +3389,8 @@ color-stop(0.82, #b00) ); } +/* + nav:hover { background-image: linear-gradient(bottom, #f00 26%, #b00 82%); @@ -3406,6 +3408,8 @@ color-stop(0.82, #b00) ); } +*/ + nav a, nav a:active, nav a:visited, diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e5b128546..31b83394f 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -44,6 +44,7 @@ if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";} // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} + if ($colour_scheme === 'redbasic'){$navcolour = 'red';} } // This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. -- cgit v1.2.3 From 8090177efb6aef9799932158b102f51131530443 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 9 Jun 2013 18:16:02 +0100 Subject: Another missing include --- mod/acl.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/acl.php b/mod/acl.php index 2f1866f85..dea0047f2 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -251,6 +251,7 @@ function navbar_complete(&$a) { } if(! $url) { + require_once("include/dir_fns.php"); $directory = find_upstream_directory($dirmode); if($directory) { -- cgit v1.2.3 From 1e3d59eca21443cc19ce3b1a69b1fd869a9ead00 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 9 Jun 2013 16:27:14 -0700 Subject: rev update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 9a2ddaf8a..760c4161b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-08.338 +2013-06-09.339 -- cgit v1.2.3 From 4a072297f7ba036da475ccaaaef765abb4105501 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Jun 2013 00:58:31 -0700 Subject: missed a few zrl/zmg conversions, like for translate_item and enotify messages --- include/conversation.php | 51 ++++++++++++++++++++++++------------------------ include/enotify.php | 2 +- version.inc | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 6f463a39a..13f67c4dd 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -114,8 +114,8 @@ function localize_item(&$item){ if($author_link && $author_name && $item_url) { - $author = '[url=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/url]'; - $objauthor = '[url=' . chanlink_url($author_link) . ']' . $author_name . '[/url]'; + $author = '[zrl=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/zrl]'; + $objauthor = '[zrl=' . chanlink_url($author_link) . ']' . $author_name . '[/zrl]'; switch($obj->type) { case ACTIVITY_OBJ_PHOTO: @@ -132,7 +132,7 @@ function localize_item(&$item){ break; } - $plink = '[url=' . zid($item_url) . ']' . $post_type . '[/url]'; + $plink = '[zrl=' . zid($item_url) . ']' . $post_type . '[/zrl]'; if(activity_match($item['verb'],ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); @@ -165,9 +165,9 @@ function localize_item(&$item){ $Bname = $obj['title']; - $A = '[url=' . chanlink_url($Alink) . ']' . $Aname . '[/url]'; - $B = '[url=' . chanlink_url($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . chanlink_url($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]'; + $B = '[zrl=' . chanlink_url($Blink) . ']' . $Bname . '[/zrl]'; + if ($Bphoto!="") $Bphoto = '[zrl=' . chanlink_url($Blink) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]'; $item['body'] = $item['localize'] = sprintf( t('%1$s is now connected with %2$s'), $A, $B); $item['body'] .= "\n\n\n" . $Bphoto; @@ -193,9 +193,9 @@ function localize_item(&$item){ } $Bname = $obj['title']; - $A = '[url=' . chanlink_url($Alink) . ']' . $Aname . '[/url]'; - $B = '[url=' . chanlink_url($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . chanlink_url($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]'; + $B = '[zrl=' . chanlink_url($Blink) . ']' . $Bname . '[/zrl]'; + if ($Bphoto!="") $Bphoto = '[zrl=' . chanlink_url($Blink) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]'; // we can't have a translation string with three positions but no distinguishable text // So here is the translate string. @@ -220,7 +220,7 @@ function localize_item(&$item){ $Aname = $item['author']['xchan_name']; $Alink = $item['author']['xchan_url']; - $A = '[url=' . chanlink_url($Alink) . ']' . $Aname . '[/url]'; + $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]'; $txt = t('%1$s is currently %2$s'); @@ -237,8 +237,8 @@ function localize_item(&$item){ if(count($r)==0) return; $obj=$r[0]; - $author = '[url=' . zid($item['author-link']) . ']' . $item['author-name'] . '[/url]'; - $objauthor = '[url=' . zid($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; + $author = '[zrl=' . zid($item['author-link']) . ']' . $item['author-name'] . '[/zrl]'; + $objauthor = '[zrl=' . zid($obj['author-link']) . ']' . $obj['author-name'] . '[/zrl]'; switch($obj['verb']){ case ACTIVITY_POST: @@ -253,17 +253,17 @@ function localize_item(&$item){ default: if($obj['resource_id']){ $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); + $m=array(); preg_match("/\[[zu]rl=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = t('status'); } } - $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; + $plink = '[zrl=' . $obj['plink'] . ']' . $post_type . '[/zrl]'; $parsedobj = parse_xml_string($xmlhead.$item['object']); - $tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content); + $tag = sprintf('#[zrl=%s]%s[/zrl]', $parsedobj->id, $parsedobj->content); $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); } @@ -288,9 +288,9 @@ function localize_item(&$item){ $target = $r[0]; $Bname = $target['author-name']; $Blink = $target['author-link']; - $A = '[url=' . zid($Alink) . ']' . $Aname . '[/url]'; - $B = '[url=' . zid($Blink) . ']' . $Bname . '[/url]'; - $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; + $A = '[zrl=' . zid($Alink) . ']' . $Aname . '[/zrl]'; + $B = '[zrl=' . zid($Blink) . ']' . $Bname . '[/zrl]'; + $P = '[zrl=' . $target['plink'] . ']' . t('post/item') . '[/zrl]'; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; } @@ -298,25 +298,26 @@ function localize_item(&$item){ } */ +/* $matches = null; - if(strpos($item['body'],'[url') !== false) { - if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { + if(strpos($item['body'],'[zrl') !== false) { + if(preg_match_all('/@\[zrl=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { foreach($matches as $mtch) { if(! strpos($mtch[1],'zid=')) - $item['body'] = str_replace($mtch[0],'@[url=' . zid($mtch[1]). ']',$item['body']); + $item['body'] = str_replace($mtch[0],'@[zrl=' . zid($mtch[1]). ']',$item['body']); } } } - if(strpos($item['body'],'[img') !== false) { + if(strpos($item['body'],'[zmg') !== false) { // add zid's to public images - if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) { + if(preg_match_all('/\[zrl=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[zmg(.*?)\]h(.*?)\[\/zmg\]\[\/zrl\]/is',$item['body'],$matches,PREG_SET_ORDER)) { foreach($matches as $mtch) { - $item['body'] = str_replace($mtch[0],'[url=' . zid( $mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3]) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']); + $item['body'] = str_replace($mtch[0],'[zrl=' . zid( $mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3]) . '][zmg' . $mtch[4] . ']h' . $mtch[5] . '[/zmg][/zrl]',$item['body']); } } } - +*/ // add sparkle links to appropriate permalinks // $x = stristr($item['plink'],'/display/'); diff --git a/include/enotify.php b/include/enotify.php index a774385da..5728d054c 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -114,7 +114,7 @@ function notification($params) { // "a post" $dest_str = sprintf(t('%1$s commented on [zrl=%2$s]a %3$s[/zrl]'), - '[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]', + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', $itemlink, $item_post_type); diff --git a/version.inc b/version.inc index 760c4161b..b7d3a4db6 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-09.339 +2013-06-12.342 -- cgit v1.2.3 From d996dc58be3010ab2680dbd125e54afb5cfee95a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Jun 2013 20:03:04 -0700 Subject: very minimal Atom feed - there will be a lot of bugs and unparseable content if you've got elaborately structured objects, but I got the thing to at least render in firefox given some quick test posts. If you find bugs (as you certainly will), feel free to fix them. --- include/items.php | 256 ++++++++++++++---------------------------------------- 1 file changed, 64 insertions(+), 192 deletions(-) diff --git a/include/items.php b/include/items.php index 9041e3da7..7fc132fe2 100755 --- a/include/items.php +++ b/include/items.php @@ -183,16 +183,17 @@ function get_public_feed($channel,$params) { $records = 40; $direction = 'desc'; - if(is_array($params)) { - $type = ((x($params,'type')) ? $params['type'] : $type); - $begin = ((x($params,'begin')) ? $params['begin'] : $begin); - $end = ((x($params,'end')) ? $params['end'] : $end); - $start = ((x($params,'start')) ? $params['start'] : $start); - $records = ((x($params,'records')) ? $params['records'] : $records); - $direction = ((x($params,'direction')) ? $params['direction'] : $direction); - } + if(! $params) + $params = array(); + + $params['type'] = ((x($params,'type')) ? $params['type'] : 'xml'); + $params['begin'] = ((x($params,'begin')) ? $params['begin'] : '0000-00-00 00:00:00'); + $params['end'] = ((x($params,'end')) ? $params['end'] : datetime_convert('UTC','UTC','now')); + $params['start'] = ((x($params,'start')) ? $params['start'] : 0); + $params['records'] = ((x($params,'records')) ? $params['records'] : 40); + $params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc'); - switch($type) { + switch($params['type']) { case 'json': header("Content-type: application/atom+json"); break; @@ -202,150 +203,32 @@ function get_public_feed($channel,$params) { break; } - - - - -} - -function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) { - - - $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic - $public_feed = (($dfrn_id) ? false : true); - $starred = false; // not yet implemented, possible security issues - $converse = false; - - if($public_feed && $a->argc > 2) { - for($x = 2; $x < $a->argc; $x++) { - if($a->argv[$x] == 'converse') - $converse = true; - if($a->argv[$x] == 'starred') - $starred = true; - if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) - $category = $a->argv[$x+1]; - } - } - + echo get_feed_for($channel,get_observer_hash(),$params); + killme(); - // default permissions - anonymous user - - $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' "; - - $r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags` - FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`self` = 1 AND `user`.`nickname` = '%s' LIMIT 1", - dbesc($owner_nick) - ); - - if(! count($r)) - killme(); - - $owner = $r[0]; - $owner_id = $owner['user_uid']; - $owner_nick = $owner['nickname']; -// feed_birthday no longer exists -// $birthday = feed_birthday($owner_id,$owner['timezone']); - - if(! $public_feed) { - - $sql_extra = ''; - switch($direction) { - case (-1): - $sql_extra = sprintf(" AND `issued_id` = '%s' ", dbesc($dfrn_id)); - $my_id = $dfrn_id; - break; - case 0: - $sql_extra = sprintf(" AND `issued_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); - $my_id = '1:' . $dfrn_id; - break; - case 1: - $sql_extra = sprintf(" AND `dfrn_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); - $my_id = '0:' . $dfrn_id; - break; - default: - return false; - break; // NOTREACHED - } - - $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `contact`.`uid` = %d $sql_extra LIMIT 1", - intval($owner_id) - ); - - if(! count($r)) - killme(); - - $contact = $r[0]; - require_once('include/security.php'); - $groups = init_groups_visitor($contact['id']); - - if(count($groups)) { - for($x = 0; $x < count($groups); $x ++) - $groups[$x] = '<' . intval($groups[$x]) . '>' ; - $gs = implode('|', $groups); - } - else - $gs = '<<>>' ; // Impossible to match - - $sql_extra = sprintf(" - AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) - AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' ) - AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' ) - AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') - ", - intval($contact['id']), - intval($contact['id']), - dbesc($gs), - dbesc($gs) - ); - } +} - if($public_feed) - $sort = 'DESC'; - else - $sort = 'ASC'; +function get_feed_for($channel, $observer_hash, $params) { - if(! strlen($last_update)) - $last_update = 'now -30 days'; + if(! channel) + http_status_exit(401); - if(isset($category)) { - $sql_extra .= file_tag_file_query('item',$category,'category'); - } + if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_stream')) + http_status_exit(403); - if($public_feed) { - if(! $converse) - $sql_extra .= " AND `contact`.`self` = 1 "; - } - - $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s'); - - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, - `contact`.`name_date`, `contact`.`uri_date`, `contact`.`avatar_date`, - `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`, - `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`, - `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`parent` != 0 - AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' ) - $sql_extra - ORDER BY `parent` %s, `created` ASC LIMIT 0, 300", - intval($owner_id), - dbesc($check_date), - dbesc($check_date), - dbesc($sort) - ); + $items = items_fetch(array( + 'wall' => '1', + 'datequery' => $params['begin'], + 'datequery2' => $params['end'], + 'start' => $params['start'], // FIXME + 'records' => $params['records'], // FIXME + 'direction' => $params['direction'], // FIXME + 'order' => 'post' + ), $channel, $observer_hash, CLIENT_MODE_NORMAL, get_app()->module); - // Will check further below if this actually returned results. - // We will provide an empty feed if that is the case. - $items = $r; - $items = fetch_post_tags($items); - - $feed_template = get_markup_template(($dfrn_id) ? 'atom_feed_dfrn.tpl' : 'atom_feed.tpl'); + $feed_template = get_markup_template('atom_feed.tpl'); $atom = ''; @@ -355,51 +238,33 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $atom .= replace_macros($feed_template, array( '$version' => xmlify(RED_VERSION), - '$feed_id' => xmlify($a->get_baseurl() . '/channel/' . $owner_nick), - '$feed_title' => xmlify($owner['name']), + '$feed_id' => xmlify($channel['channel_url']), + '$feed_title' => xmlify($channel['channel_name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , - '$hub' => $hubxml, - '$salmon' => $salmon, - '$name' => xmlify($owner['name']), - '$profile_page' => xmlify($owner['url']), - '$photo' => xmlify($owner['photo']), - '$thumb' => xmlify($owner['thumb']), - '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar_date'] . '+00:00' , ATOM_TIME)) , - '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri_date'] . '+00:00' , ATOM_TIME)) , - '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name_date'] . '+00:00' , ATOM_TIME)) , - '$birthday' => ((strlen($birthday)) ? '' . xmlify($birthday) . '' : ''), - '$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '1' : '') + '$hub' => feed_hublinks(), + '$salmon' => feed_salmonlinks($channel['channel_address']), + '$name' => xmlify($channel['channel_name']), + '$profile_page' => xmlify($channel['channel_url']), + '$mimephoto' => xmlify($channel['channel_photo_mimetype']), + '$photo' => xmlify($channel['channel_photo_l']), + '$thumb' => xmlify($channel['channel_photo_m']), + '$picdate' => '', + '$uridate' => '', + '$namdate' => '', + '$birthday' => '', + '$community' => '', )); call_hooks('atom_feed', $atom); - if(! count($items)) { - - call_hooks('atom_feed_end', $atom); - - $atom .= '' . "\r\n"; - return $atom; - } - - foreach($items as $item) { - - // prevent private email from leaking. - if($item['network'] === NETWORK_MAIL) - continue; - - // public feeds get html, our own nodes use bbcode - - if($public_feed) { - $type = 'html'; - // catch any email that's in a public conversation and make sure it doesn't leak - if($item['private']) + if($items) { + $type = 'html'; + foreach($items as $item) { + if($item['item_private']) continue; - } - else { - $type = 'text'; - } - $atom .= atom_entry($item,$type,null,$owner,true); + $atom .= atom_entry($item,$type,null,$owner,true); + } } call_hooks('atom_feed_end', $atom); @@ -4764,10 +4629,12 @@ function zot_feed($uid,$observer_xchan,$mindate) { -function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$module = 'network') { +function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = CLIENT_MODE_NORMAL,$module = 'network') { $result = array('success' => false); + $a = get_app(); + $sql_extra = ''; $sql_nets = ''; $sql_options = ''; @@ -4782,7 +4649,10 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod } if($arr['star']) - $sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ")"; + $sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ") "; + + if($arr['wall']) + $sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ") "; $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ") $sql_options ) "; @@ -4892,6 +4762,8 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod $start = dba_timer(); + $sql_extra .= item_permissions_sql($channel['channel_id']); + if($arr['nouveau'] && ($client_mode & CLIENT_MODELOAD) && $channel) { // "New Item View" - show all items unthreaded in reverse created date order @@ -4908,7 +4780,7 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod $items = fetch_post_tags($items,true); } - elseif($client_mode & CLIENT_MODE_UPDATE) { + else { // Normal conversation view @@ -4917,7 +4789,7 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod else $ordering = "commented"; - if($client_mode & CLIENT_MODE_LOAD) { + if(($client_mode & CLIENT_MODE_LOAD) || ($client_mode & CLIENT_MODE_NORMAL)) { // Fetch a page full of parent items for this page @@ -4955,7 +4827,6 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod WHERE $item_uids AND item.item_restrict = 0 AND item.parent IN ( %s ) $sql_extra ", - intval(local_user()), dbesc($parents_str) ); @@ -4969,10 +4840,9 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod $fourth = dba_timer(); + require_once('include/conversation.php'); $items = conv_sort($items,$ordering); - - //logger('items: ' . print_r($items,true)); } @@ -4980,8 +4850,10 @@ function items_fetch($arr,$channel = null,$client_mode = CLIENT_MODE_NORMAL,$mod $items = array(); } - if($parents_str) + if($parents_str && $arr['mark_seen']) $update_unseen = ' AND parent IN ( ' . dbesc($parents_str) . ' )'; - + // FIXME finish mark unseen sql } + + return $items; } \ No newline at end of file -- cgit v1.2.3 From 2d3a0a65258be35f4c046b6b3e416bf93baa4940 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Jun 2013 21:12:27 -0700 Subject: feeds are bit more standards compliant and a bit less broken now --- include/items.php | 79 +++++++++++++++++++++++++------------------------- mod/feed.php | 7 +---- view/tpl/atom_feed.tpl | 26 ++++++++--------- 3 files changed, 52 insertions(+), 60 deletions(-) diff --git a/include/items.php b/include/items.php index 7fc132fe2..2b38adb1a 100755 --- a/include/items.php +++ b/include/items.php @@ -204,9 +204,7 @@ function get_public_feed($channel,$params) { } - echo get_feed_for($channel,get_observer_hash(),$params); - killme(); - + return get_feed_for($channel,get_observer_hash(),$params); } function get_feed_for($channel, $observer_hash, $params) { @@ -232,22 +230,19 @@ function get_feed_for($channel, $observer_hash, $params) { $atom = ''; - $hubxml = feed_hublinks(); - - $salmon = feed_salmonlinks($owner_nick); - $atom .= replace_macros($feed_template, array( '$version' => xmlify(RED_VERSION), + '$red' => xmlify(RED_PLATFORM), '$feed_id' => xmlify($channel['channel_url']), '$feed_title' => xmlify($channel['channel_name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , - '$hub' => feed_hublinks(), - '$salmon' => feed_salmonlinks($channel['channel_address']), + '$hub' => '', // feed_hublinks(), + '$salmon' => '', // feed_salmonlinks($channel['channel_address']), '$name' => xmlify($channel['channel_name']), '$profile_page' => xmlify($channel['channel_url']), - '$mimephoto' => xmlify($channel['channel_photo_mimetype']), - '$photo' => xmlify($channel['channel_photo_l']), - '$thumb' => xmlify($channel['channel_photo_m']), + '$mimephoto' => xmlify($channel['xchan_photo_mimetype']), + '$photo' => xmlify($channel['xchan_photo_l']), + '$thumb' => xmlify($channel['xchan_photo_m']), '$picdate' => '', '$uridate' => '', '$namdate' => '', @@ -285,8 +280,7 @@ function construct_activity_object($item) { if($item['object']) { $o = '' . "\r\n"; - $r = parse_xml_string($item['object'],false); - + $r = json_decode($item['object'],false); if(! $r) return ''; @@ -296,7 +290,8 @@ function construct_activity_object($item) { $o .= '' . xmlify($r->id) . '' . "\r\n"; if($r->title) $o .= '' . xmlify($r->title) . '' . "\r\n"; - if($r->link) { + if($r->links) { + // FIXME!! if(substr($r->link,0,1) === '<') { $r->link = preg_replace('/\/','',$r->link); $o .= $r->link; @@ -317,7 +312,7 @@ function construct_activity_target($item) { if($item['target']) { $o = '' . "\r\n"; - $r = parse_xml_string($item['target'],false); + $r = json_decode($item['target'],false); if(! $r) return ''; if($r->type) @@ -326,7 +321,8 @@ function construct_activity_target($item) { $o .= '' . xmlify($r->id) . '' . "\r\n"; if($r->title) $o .= '' . xmlify($r->title) . '' . "\r\n"; - if($r->link) { + if($r->links) { + // FIXME !!! if(substr($r->link,0,1) === '<') { if(strstr($r->link,'&') && (! strstr($r->link,'&'))) $r->link = str_replace('&','&', $r->link); @@ -3957,7 +3953,7 @@ function lose_sharer($importer,$contact,$datarray,$item) { } -function atom_author($tag,$name,$uri,$h,$w,$photo) { +function atom_author($tag,$name,$uri,$h,$w,$type,$photo) { $o = ''; if(! $tag) return $o; @@ -3971,8 +3967,8 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) { $o .= "<$tag>\r\n"; $o .= "$name\r\n"; $o .= "$uri\r\n"; - $o .= '' . "\r\n"; - $o .= '' . "\r\n"; + $o .= '' . "\r\n"; + $o .= '' . "\r\n"; call_hooks('atom_author', $o); @@ -4000,35 +3996,36 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { $o = "\r\n\r\n\r\n"; if(is_array($author)) - $o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb']); + $o .= atom_author('author',$author['xchan_name'],$author['xchan_url'],80,80,$author['xchan_photo_mimetype'],$author['xchan_photo_m']); else - $o .= atom_author('author',(($item['author-name']) ? $item['author-name'] : $item['name']),(($item['author-link']) ? $item['author-link'] : $item['url']),80,80,(($item['author-avatar']) ? $item['author-avatar'] : $item['thumb'])); - if(strlen($item['owner-name'])) - $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']); + $o .= atom_author('author',$item['author']['xchan_name'],$item['author']['xchan_url'],80,80,$item['author']['xchan_photo_mimetype'], $item['author']['xchan_photo_m']); + + $o .= atom_author('zot:owner',$item['owner']['xchan_name'],$item['owner']['xchan_url'],80,80,$item['owner']['xchan_photo_mimetype'],$item['owner']['xchan_photo_m']); if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) { $parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']); - $o .= '' . "\r\n"; + $o .= '' . "\r\n"; } $o .= '' . xmlify($item['mid']) . '' . "\r\n"; $o .= '' . xmlify($item['title']) . '' . "\r\n"; $o .= '' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '' . "\r\n"; $o .= '' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '' . "\r\n"; - $o .= '' . base64url_encode($body, true) . '' . "\r\n"; + $o .= '' . base64url_encode($body, true) . '' . "\r\n"; + // FIXME for other content types $o .= '' . xmlify((($type === 'html') ? bbcode($body) : $body)) . '' . "\r\n"; - $o .= '' . "\r\n"; + $o .= '' . "\r\n"; if($item['location']) { - $o .= '' . xmlify($item['location']) . '' . "\r\n"; + $o .= '' . xmlify($item['location']) . '' . "\r\n"; $o .= '' . xmlify($item['location']) . '' . "\r\n"; } if($item['coord']) $o .= '' . xmlify($item['coord']) . '' . "\r\n"; - if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) - $o .= '' . (($item['private']) ? $item['private'] : 1) . '' . "\r\n"; + if(($item['item_private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) + $o .= '' . (($item['item_private']) ? $item['item_private'] : 1) . '' . "\r\n"; if($item['app']) @@ -4044,18 +4041,20 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { if(strlen($actarg)) $o .= $actarg; - $tags = item_getfeedtags($item); - if(count($tags)) { - foreach($tags as $t) { - $o .= '' . "\r\n"; - } - } + // FIXME +// $tags = item_getfeedtags($item); +// if(count($tags)) { +// foreach($tags as $t) { +// $o .= '' . "\r\n"; +// } +// } - $o .= item_getfeedattach($item); +// FIXME +// $o .= item_getfeedattach($item); - $mentioned = get_mentions($item,$tags); - if($mentioned) - $o .= $mentioned; +// $mentioned = get_mentions($item,$tags); +// if($mentioned) +// $o .= $mentioned; call_hooks('atom_entry', $o); diff --git a/mod/feed.php b/mod/feed.php index a6adc620e..104208875 100644 --- a/mod/feed.php +++ b/mod/feed.php @@ -13,7 +13,7 @@ function feed_init(&$a) { $channel = ''; if(argc() > 1) { - $r = q("select * from channel where channel_address = '%s' limit 1", + $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1", dbesc(argv(1)) ); if(!($r && count($r))) @@ -21,11 +21,6 @@ function feed_init(&$a) { $channel = $r[0]; - // check site and channel permissions - - if(!($channel['channel_r_stream'] & PERMS_PUBLIC)) - killme(); - if((intval(get_config('system','block_public'))) && (! get_account_id())) killme(); diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index db553d99f..2c8024d47 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -1,14 +1,10 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{$feed_id}} {{$feed_title}} - Friendica + {{$red}} +{{if $hub}} {{$hub}} +{{/if}} +{{if $salmon}} {{$salmon}} - {{$community}} +{{/if}} {{$feed_updated}} - - {{$name}} - {{$profile_page}} - - - {{$birthday}} - + + {{$name}} + {{$profile_page}} + + + -- cgit v1.2.3 From 9992b1ffe6ef5f7621f8f6ec60fa024d10ccf1d5 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 13 Jun 2013 17:46:23 +0100 Subject: Add sample nginx conf in doc/install - we'll keep configs and trouble shooting doco here, where everything can be plain text, since it's for people who haven't got Red installed yet/properly, and may not be able to read markdown easily. --- doc/install/sample-nginx.conf | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/install/sample-nginx.conf diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf new file mode 100644 index 000000000..e7ce66db0 --- /dev/null +++ b/doc/install/sample-nginx.conf @@ -0,0 +1,28 @@ +# A sample configuration for The Red Matrix on Nginx. One should also take care to block access to dot files, etc, in their standard.conf. + + +server { +listen 80; +listen 443 ssl; +server_name example.com; +ssl_certificate /path/to/ssl.crt; +ssl_certificate_key /path/to/ssl.key; + +root /var/www/example.com; + access_log /var/log/nginx/example.com.log; + include standard.conf; + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + include fastcgi_params; + fastcgi_intercept_errors on; + fastcgi_pass php; + fastcgi_read_timeout 300; + } + if (!-e $request_filename){ + rewrite ^(.*)$ /index.php?q=$1 last; + } + location / { + try_files $uri $uri/ /index.php; + } +} + -- cgit v1.2.3 From 047967da990aee62d029a20502981ee8c57bec97 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 13 Jun 2013 18:47:22 +0100 Subject: Nginx config - add an index in case they don't have a http block --- doc/install/sample-nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf index e7ce66db0..3f33044fb 100644 --- a/doc/install/sample-nginx.conf +++ b/doc/install/sample-nginx.conf @@ -9,6 +9,7 @@ ssl_certificate /path/to/ssl.crt; ssl_certificate_key /path/to/ssl.key; root /var/www/example.com; + index index.php; access_log /var/log/nginx/example.com.log; include standard.conf; location ~ \.php$ { -- cgit v1.2.3 From 125ee673de6015387680260b82e2110ecf9978df Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Jun 2013 17:53:16 -0700 Subject: missing include --- include/items.php | 1 + version.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 2b38adb1a..5489fa9e8 100755 --- a/include/items.php +++ b/include/items.php @@ -4761,6 +4761,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $start = dba_timer(); + require_once('include/security.php'); $sql_extra .= item_permissions_sql($channel['channel_id']); if($arr['nouveau'] && ($client_mode & CLIENT_MODELOAD) && $channel) { diff --git a/version.inc b/version.inc index b7d3a4db6..6d757a648 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-12.342 +2013-06-13.343 -- cgit v1.2.3 From 9b67e114ad9da2b5e0456709affd20d9c760e4ae Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Jun 2013 19:21:45 -0700 Subject: possibly fix skipped pages on endless scroll --- js/main.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/js/main.js b/js/main.js index 01aea6b22..f1a50e28a 100644 --- a/js/main.js +++ b/js/main.js @@ -118,6 +118,7 @@ var scroll_next = false; var next_page = 1; var page_load = true; + var loadingPage = false; $(function() { $.ajaxSetup({cache: false}); @@ -395,6 +396,10 @@ function updateConvItems(mode,data) { // $("div.wall-item-body").divgrow({ initialHeight: 400 }); } }); + + if(loadingPage) { + loadingPage = false; + } } if(mode === 'replace') { // clear existing content @@ -916,6 +921,7 @@ $(".autotime").timeago(); } + $(window).scroll(function () { if(typeof buildCmd == 'function') { $('#more').hide(); @@ -927,12 +933,15 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() == $(document).height()) { - $('#more').hide(); - $('#no-more').hide(); - // alert('scroll'); - next_page++; - scroll_next = true; - liveUpdate(); + if(! loadingPage) { + $('#more').hide(); + $('#no-more').hide(); + // alert('scroll'); + next_page++; + scroll_next = true; + loadingPage = true; + liveUpdate(); + } } } -- cgit v1.2.3 From 2a9611467ba556c7ccc9231cb5e320c52e0bb77e Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 14 Jun 2013 15:41:19 +0100 Subject: Lighttpd sample config --- doc/install/sample-lighttpd.conf | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 doc/install/sample-lighttpd.conf diff --git a/doc/install/sample-lighttpd.conf b/doc/install/sample-lighttpd.conf new file mode 100644 index 000000000..99971d9d1 --- /dev/null +++ b/doc/install/sample-lighttpd.conf @@ -0,0 +1,82 @@ +# See http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions + +### LOAD MODULES +server.modules = ( "mod_access", +"mod_accesslog", +"mod_fastcgi", +"mod_redirect", +"mod_rewrite" +) + +### BASIC STUFF +server.port = 80 + +server.username = "http" + +server.groupname = "http" + +server.document-root = "/path/to/your/www/files" #adjust to your setup + +server.errorlog = "/var/log/lighttpd/error.log" + +accesslog.filename = "/var/log/lighttpd/access.log" + +### DISABLE DIR LISTING +dir-listing.activate = "disable" + +### DISABLE REJECT EXPECT HEADER +### (needed for curl POST requests - otherwise they fail with error 417) +server.reject-expect-100-with-417 = "disable" + +### DEFINE SUPPORTED INDEX FILENAMES +index-file.names = ( "index.html", +"index.htm", +"index.php" +) + +### DEFINE SUPPORTED MIME TYPES +mimetype.assign = ( ".html" => "text/html", +".htm" => "text/html", +".css" => "text/css", +".txt" => "text/plain", +".svg" => "image/svg+xml", +".jpg" => "image/jpeg", +".png" => "image/png" +) + +### DONT EVER SERVE FILES WITH EXTENSION +static-file.exclude-extensions = ( ".php" ) + +### PHP WITH PHP-FPM +### (needs php-fpm installed and running) +fastcgi.server = ( +".php" => ( +"localhost" => ( +"socket" => "/run/php-fpm/php-fpm.sock", +"broken-scriptfilename" => "enable", +"allow-x-sendfile" => "enable" +) +) +) + +### ENABLE SSL +$SERVER["socket"] == ":443" { +ssl.engine = "enable" +ssl.ca-file = "/etc/lighttpd/certs/ca-certs.crt" +ssl.pemfile = "/etc/lighttpd/certs/red-ssl.crt" +} + +### RISTRICT ACCESS TO DIRECTORYS AND FILES +$HTTP["url"] =~ "\.(out|log|htaccess)$" { +url.access-deny = ("") +} + +$HTTP["url"] =~ "(^|/)\.git" { +url.access-deny = ("") +} + +### URL REWRITE RULES +url.rewrite-if-not-file = ( +"^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2", +"^\/(.*)$" => "/index.php?q=$1" +) -- cgit v1.2.3 From ed939ed21cc1e81cdf8b1c20deadc925bdae342b Mon Sep 17 00:00:00 2001 From: git-marijus Date: Fri, 14 Jun 2013 20:17:15 +0200 Subject: beautify code --- doc/install/sample-lighttpd.conf | 82 -------------------------------------- sample-lighttpd.conf | 85 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 82 deletions(-) delete mode 100644 doc/install/sample-lighttpd.conf create mode 100644 sample-lighttpd.conf diff --git a/doc/install/sample-lighttpd.conf b/doc/install/sample-lighttpd.conf deleted file mode 100644 index 99971d9d1..000000000 --- a/doc/install/sample-lighttpd.conf +++ /dev/null @@ -1,82 +0,0 @@ -# See http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions - -### LOAD MODULES -server.modules = ( "mod_access", -"mod_accesslog", -"mod_fastcgi", -"mod_redirect", -"mod_rewrite" -) - -### BASIC STUFF -server.port = 80 - -server.username = "http" - -server.groupname = "http" - -server.document-root = "/path/to/your/www/files" #adjust to your setup - -server.errorlog = "/var/log/lighttpd/error.log" - -accesslog.filename = "/var/log/lighttpd/access.log" - -### DISABLE DIR LISTING -dir-listing.activate = "disable" - -### DISABLE REJECT EXPECT HEADER -### (needed for curl POST requests - otherwise they fail with error 417) -server.reject-expect-100-with-417 = "disable" - -### DEFINE SUPPORTED INDEX FILENAMES -index-file.names = ( "index.html", -"index.htm", -"index.php" -) - -### DEFINE SUPPORTED MIME TYPES -mimetype.assign = ( ".html" => "text/html", -".htm" => "text/html", -".css" => "text/css", -".txt" => "text/plain", -".svg" => "image/svg+xml", -".jpg" => "image/jpeg", -".png" => "image/png" -) - -### DONT EVER SERVE FILES WITH EXTENSION -static-file.exclude-extensions = ( ".php" ) - -### PHP WITH PHP-FPM -### (needs php-fpm installed and running) -fastcgi.server = ( -".php" => ( -"localhost" => ( -"socket" => "/run/php-fpm/php-fpm.sock", -"broken-scriptfilename" => "enable", -"allow-x-sendfile" => "enable" -) -) -) - -### ENABLE SSL -$SERVER["socket"] == ":443" { -ssl.engine = "enable" -ssl.ca-file = "/etc/lighttpd/certs/ca-certs.crt" -ssl.pemfile = "/etc/lighttpd/certs/red-ssl.crt" -} - -### RISTRICT ACCESS TO DIRECTORYS AND FILES -$HTTP["url"] =~ "\.(out|log|htaccess)$" { -url.access-deny = ("") -} - -$HTTP["url"] =~ "(^|/)\.git" { -url.access-deny = ("") -} - -### URL REWRITE RULES -url.rewrite-if-not-file = ( -"^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2", -"^\/(.*)$" => "/index.php?q=$1" -) diff --git a/sample-lighttpd.conf b/sample-lighttpd.conf new file mode 100644 index 000000000..213719ac9 --- /dev/null +++ b/sample-lighttpd.conf @@ -0,0 +1,85 @@ +# See http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions + +### LOAD MODULES +server.modules = ( + "mod_access", + "mod_accesslog", + "mod_fastcgi", + "mod_redirect", + "mod_rewrite" +) + +### BASIC STUFF +server.port = 80 + +server.username = "http" + +server.groupname = "http" + +server.document-root = "/path/to/your/www/files" #adjust to your setup + +server.errorlog = "/var/log/lighttpd/error.log" + +accesslog.filename = "/var/log/lighttpd/access.log" + +### DISABLE DIR LISTING +dir-listing.activate = "disable" + +### DISABLE REJECT EXPECT HEADER +### (needed for curl POST requests - otherwise they fail with error 417) +server.reject-expect-100-with-417 = "disable" + +### DEFINE SUPPORTED INDEX FILENAMES +index-file.names = ( + "index.html", + "index.htm", + "index.php" +) + +### DEFINE SUPPORTED MIME TYPES +mimetype.assign = ( + ".html" => "text/html", + ".htm" => "text/html", + ".css" => "text/css", + ".txt" => "text/plain", + ".svg" => "image/svg+xml", + ".jpg" => "image/jpeg", + ".png" => "image/png" +) + +### DONT EVER SERVE FILES WITH EXTENSION +static-file.exclude-extensions = ( ".php" ) + +### PHP WITH PHP-FPM +### (needs php-fpm installed and running) +fastcgi.server = ( + ".php" => ( + "localhost" => ( + "socket" => "/run/php-fpm/php-fpm.sock", + "broken-scriptfilename" => "enable", + "allow-x-sendfile" => "enable" + ) + ) +) + +### ENABLE SSL +$SERVER["socket"] == ":443" { + ssl.engine = "enable" + ssl.ca-file = "/etc/lighttpd/certs/ca-certs.crt" #adjust to your needs + ssl.pemfile = "/etc/lighttpd/certs/red-ssl.crt" #adjust to your needs +} + +### RISTRICT ACCESS TO DIRECTORYS AND FILES +$HTTP["url"] =~ "\.(out|log|htaccess)$" { + url.access-deny = ("") +} + +$HTTP["url"] =~ "(^|/)\.git" { + url.access-deny = ("") +} + +### URL REWRITE RULES +url.rewrite-if-not-file = ( + "^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2", + "^\/(.*)$" => "/index.php?q=$1" +) -- cgit v1.2.3 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().

+

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
-

Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_store(), common_content(), common_friends_visitor_widget(), display_content(), editpost_content(), new_contact(), photo_init(), photos_post(), prepare_body(), suggest_content(), viewconnections_content(), wall_attach_post(), and z_readdir().

+

Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_store(), common_content(), common_friends_visitor_widget(), display_content(), editpost_content(), get_public_feed(), new_contact(), photo_init(), photos_post(), prepare_body(), suggest_content(), viewconnections_content(), wall_attach_post(), and z_readdir().

@@ -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
-

Referenced by acl_init(), channel_content(), connections_content(), get_all_perms(), group_content(), group_get_members(), intro_post(), items_fetch(), network_content(), perm_is_allowed(), and search_content().

+

Referenced by acl_init(), channel_content(), connections_content(), get_all_perms(), group_content(), group_get_members(), intro_post(), items_fetch(), network_content(), perm_is_allowed(), and search_content().

@@ -1558,7 +1558,7 @@ Variables
-

Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), intro_content(), perm_is_allowed(), ping_init(), and zot_refresh().

+

Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), intro_content(), notifier_run(), perm_is_allowed(), ping_init(), and zot_refresh().

@@ -2021,7 +2021,7 @@ Variables
-

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

+

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().

+

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().

+

Referenced by items_fetch().

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

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

+

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().

+

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

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

Referenced by channel_content(), encode_item_flags(), event_store(), format_notification(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), network_content(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), and tag_deliver().

+

Referenced by channel_content(), encode_item_flags(), event_store(), format_notification(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), network_content(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), and tag_deliver().

@@ -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().

+

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
-

Referenced by api_get_user(), channel_content(), drop_item(), event_store(), events_content(), first_post_date(), item_post(), item_store(), like_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), tagger_content(), and zot_feed().

+

Referenced by api_get_user(), channel_content(), drop_item(), event_store(), events_content(), first_post_date(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), tagger_content(), and zot_feed().

@@ -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().

+

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().

+

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
-

Referenced by decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), item_post(), items_fetch(), network_content(), search_ac_init(), search_content(), and tag_deliver().

+

Referenced by decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), item_post(), items_fetch(), network_content(), search_ac_init(), search_content(), and tag_deliver().

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().

+

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().

+

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().

    +

    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().

    +

    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().

    +

    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().

    +

    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().

    +

    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().

    +

    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().

    +

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

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

    Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().

    +

    Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().

    @@ -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().

    +

    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().

    +

    Referenced by items_fetch(), and network_content().

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

    Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), channel_content(), display_content(), events_content(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), and zot_feed().

    +

    Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), channel_content(), display_content(), events_content(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), and zot_feed().

    @@ -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().

    +

    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 From b7854c89b1e568353ddfa576fc9baec432eff7c0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 15 Jun 2013 02:15:45 -0700 Subject: silence a pointless warning --- include/config.php | 2 +- version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config.php b/include/config.php index 92fae165b..dc4470823 100644 --- a/include/config.php +++ b/include/config.php @@ -130,7 +130,7 @@ function del_config($family,$key) { function load_pconfig($uid,$family) { global $a; - if(! array_key_exists($uid,$a->config)) + if(($uid) && (! array_key_exists($uid,$a->config))) $a->config[$uid] = array(); if($family) { diff --git a/version.inc b/version.inc index 4bc76b341..52a82faff 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-14.344 +2013-06-15.345 -- cgit v1.2.3 From 87e4f50edab4e32a6191cd1fa5c1ee9f5dba791e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 15 Jun 2013 02:31:34 -0700 Subject: hijack the #getzot tag --- mod/item.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/mod/item.php b/mod/item.php index b09ee06f3..ed5941d2a 100644 --- a/mod/item.php +++ b/mod/item.php @@ -799,15 +799,23 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { if(strpos($tag,'[zrl=')) //...do nothing return $replaced; - //base tag has the tags name only - $basetag = str_replace('_',' ',substr($tag,1)); - //create text for link - $url = $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag); - $newtag = '#[zrl=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/zrl]'; - //replace tag by the link - $body = str_replace($tag, $newtag, $body); - $replaced = true; - + if($tag == '#getzot') { + $basetag = 'getzot'; + $url = 'http://getzot.com'; + $newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]'; + $body = str_replace($tag,$newtag,$body); + $replace = true; + } + else { + //base tag has the tags name only + $basetag = str_replace('_',' ',substr($tag,1)); + //create text for link + $url = $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag); + $newtag = '#[zrl=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/zrl]'; + //replace tag by the link + $body = str_replace($tag, $newtag, $body); + $replaced = true; + } //is the link already in str_tags? if(! stristr($str_tags,$newtag)) { //append or set str_tags -- cgit v1.2.3 From ee21dfc2456dee1c5e0f22e8ca57a236d5c9a0b3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 15 Jun 2013 15:45:54 -0700 Subject: fix "new connection has less permissions than public" --- include/permissions.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/permissions.php b/include/permissions.php index 071a599f8..bf380cf95 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -98,7 +98,7 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { // If they're blocked - they can't read or write - if(($x) && (($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) || ($x[0]['abook_flags'] & ABOOK_FLAG_PENDING))) { + if(($x) && ($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)) { $ret[$perm_name] = false; continue; } @@ -164,13 +164,17 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { // If PERMS_CONTACTS or PERMS_SPECIFIC, they need to be in your address book // $x is a valid address book entry - - if(! $x) { $ret[$perm_name] = false; continue; } + // They are in your address book, but haven't been approved + + if($x[0]['abook_flags'] & ABOOK_FLAG_PENDING) { + $ret[$perm_name] = false; + continue; + } if(($r) && ($r[0][$channel_perm] & PERMS_CONTACTS)) { @@ -242,7 +246,7 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { // If they're blocked - they can't read or write - if(($x) && (($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) || ($x[0]['abook_flags'] & ABOOK_FLAG_PENDING))) + if(($x) && ($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)) return false; if(($x) && (! $global_perms[$permission][2]) && ($x[0]['abook_flags'] & ABOOK_FLAG_IGNORED)) @@ -287,6 +291,10 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { return false; } + if($x[0]['abook_flags'] & ABOOK_FLAG_PENDING) { + return false; + } + if($r[0][$channel_perm] & PERMS_CONTACTS) { return true; } -- cgit v1.2.3 From f338da04e13990de57dabc3a284945486f96c741 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 15 Jun 2013 19:31:38 -0700 Subject: don't federate webpages ;-) --- include/notifier.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/notifier.php b/include/notifier.php index d72fa29b5..7d107e4d4 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -236,6 +236,12 @@ function notifier_run($argv, $argc){ return; } + if($target_item['item_restrict'] & ITEM_WEBPAGE) { + logger('notifier: target item ITEM_WEBPAGE', LOGGER_DEBUG); + return; + } + + $s = q("select * from channel where channel_id = %d limit 1", intval($target_item['uid']) ); -- cgit v1.2.3 From a37ac8f2f36353bba26ccd2631bf1c85ae6e02da Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 00:03:22 -0700 Subject: flag taggable connections in acl selector --- js/acl.js | 4 ++-- mod/acl.php | 20 +++++++++++--------- version.inc | 2 +- view/theme/redbasic/css/style.css | 4 ++++ view/tpl/acl_selector.tpl | 5 ----- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/js/acl.js b/js/acl.js index 629a55447..591c9c467 100644 --- a/js/acl.js +++ b/js/acl.js @@ -247,8 +247,8 @@ ACL.prototype.populate = function(data){ var height = Math.ceil(data.tot / that.nw) * 42; that.list_content.height(height); $(data.items).each(function(){ - html = "
    "+that.item_tpl+"
    "; - html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link ); + html = "
    "+that.item_tpl+"
    "; + html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link, this.taggable ); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); diff --git a/mod/acl.php b/mod/acl.php index dea0047f2..df6de13b2 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -123,7 +123,7 @@ function acl_init(&$a){ } if ($type=='' || $type=='c') { - $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick + $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" , intval(local_user()), @@ -142,7 +142,7 @@ function acl_init(&$a){ ); } elseif($type == 'a') { - $r = q("SELECT abook_id as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash + $r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag , abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d $sql_extra3 ORDER BY xchan_name ASC ", @@ -196,13 +196,15 @@ function acl_init(&$a){ if(count($r)) { foreach($r as $g){ $contacts[] = array( - "type" => "c", - "photo" => $g['micro'], - "name" => $g['name'], - "id" => $g['id'], - "xid" => $g['hash'], - "link" => $g['nick'], - "nick" => substr($g['nick'],0,strpos($g['nick'],'@')) + "type" => "c", + "photo" => $g['micro'], + "name" => $g['name'], + "id" => $g['id'], + "xid" => $g['hash'], + "link" => $g['nick'], + "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), + "network" => '', + "taggable" => (($g['abook_their_perms'] & PERMS_W_TAGWALL) ? 'taggable' : '') ); } } diff --git a/version.inc b/version.inc index 52a82faff..b47f8837e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-15.345 +2013-06-16.346 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5fb4e8b36..416e79dd5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3739,6 +3739,10 @@ ul.menu-popup { float: left; margin: 4px; } +.acl-list-item.taggable { + background-color: #ccccff; +} + .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} .acl-list-item a { font-size: 8px; diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index aebef71ee..d21073b56 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
    {{$showall}} -- cgit v1.2.3 From 2971ee9a4c91aaeb558ddd6127d5baf4c74fefba Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 00:57:39 -0700 Subject: hopefully this won't screw up everything - if it does, revert. Otherwise this should work at delivery time to check tag deliveries and bounce the message before it's stored if the channel doesn't allow you to post and you aren't allowed to tag deliver either. Previously this was handled after the post was already stored so you needed posting permission as well as tag deliver permission to get past the checks. --- include/items.php | 50 ++++++++++++++++++++++++++++---------------------- include/zot.php | 4 +++- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/include/items.php b/include/items.php index 5489fa9e8..64eeae4b4 100755 --- a/include/items.php +++ b/include/items.php @@ -1931,45 +1931,51 @@ function tgroup_check($uid,$item) { // check that the message originated elsewhere and is a top-level post - if(($item['wall']) || ($item['origin']) || ($item['mid'] != $item['parent-mid'])) + if($arr['mid'] != $arr['parent_mid']) return false; + if(! perm_is_allowed($uid,$item['author_xchan'],'tag_deliver')) + return false; - $u = q("select * from user where uid = %d limit 1", + $u = q("select * from channel where channel_id = %d limit 1", intval($uid) ); - if(! count($u)) - return false; - - $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); - $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); + if(! $u) + return false; - $link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['nickname']); + $terms = get_terms_oftype($item['term'],TERM_MENTION); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger + logger('tgroup_check: post mentions: ' . print_r($terms,true), LOGGER_DATA); - $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']); + $link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['channel_address']); - $body = preg_replace("/\[share\](.*?)\[\/share\]/ism", '', $item['body']); - - $cnt = preg_match_all('/[\@\!]\[zrl\=(.*?)\](.*?)\[\/zrl\]/ism',$body,$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { - if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + if($terms) { + foreach($terms as $term) { + if(($term['term'] == $u[0]['channel_name']) && link_compare($term['url'],$link)) { $mention = true; - logger('tgroup_check: mention found: ' . $mtch[2]); + break; } } - } + } - if(! $mention) + if($mention) { + logger('tgroup_check: mention found for ' . $u[0]['channel_name']); + } + else return false; - if((! $community_page) && (! $prvgroup)) - return false; + // At this point we've determined that the person receiving this post was mentioned in it. + // Now let's check if this mention was inside a reshare so we don't spam a forum + $body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']); + + $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; + + if(! preg_match($pattern,$body,$matches)) { + logger('tgroup_check: mention was in a reshare - ignoring'); + return false; + } return true; diff --git a/include/zot.php b/include/zot.php index 2eb3b5eb0..79031ab26 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1017,9 +1017,11 @@ function process_delivery($sender,$arr,$deliveries,$relay) { $channel = $r[0]; + $tag_delivery = tgroup_check($channel['channel_id'],$arr); + $perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments'); - if(! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) { + if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery)) { logger("permission denied for delivery {$channel['channel_id']}"); $result[] = array($d['hash'],'permission denied'); continue; -- cgit v1.2.3 From c4c80a2e472173dfed9b982c6705ccfbb6e6cdab Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 05:28:49 -0700 Subject: directory search by hub --- mod/dirsearch.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index c7fa8a9d8..5465e11ff 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -23,6 +23,7 @@ function dirsearch_content(&$a) { } $name = ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''); + $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : ''); $address = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); $locale = ((x($_REQUEST,'locale')) ? $_REQUEST['locale'] : ''); $region = ((x($_REQUEST,'region')) ? $_REQUEST['region'] : ''); @@ -38,6 +39,8 @@ function dirsearch_content(&$a) { if($name) $sql_extra .= " OR xchan_name like '" . protect_sprintf( '%' . dbesc($name) . '%' ) . "' "; + if($hub) + $sql_extra .= " OR xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') "; if($address) $sql_extra .= " OR xchan_addr like '" . protect_sprintf( '%' . dbesc($address) . '%' ) . "' "; if($city) @@ -96,7 +99,6 @@ function dirsearch_content(&$a) { $order = " ORDER BY `xchan_name` ASC "; - $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) $order $qlimit ", intval(XCHAN_FLAGS_HIDDEN) ); -- cgit v1.2.3