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