From f2de266ce6cfbc52288e3add070f8502fb5334d3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 18 May 2013 01:25:54 -0700 Subject: doc update plus fix the "only to those in my address book" permission --- doc/html/boot_8php.html | 25 +- doc/html/boot_8php.js | 2 +- doc/html/classFriendicaSmartyEngine-members.html | 5 +- doc/html/classFriendicaSmartyEngine.html | 28 ++ doc/html/classFriendicaSmartyEngine.js | 1 + doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 2 +- doc/html/extract_8php.html | 4 +- doc/html/functions_0x67.html | 9 +- doc/html/functions_func.html | 9 +- doc/html/globals_0x63.html | 2 +- doc/html/globals_0x67.html | 2 +- doc/html/globals_func_0x63.html | 2 +- doc/html/globals_func_0x67.html | 2 +- doc/html/include_2network_8php.html | 2 +- doc/html/navtree.js | 10 +- doc/html/navtreeindex0.js | 2 +- doc/html/navtreeindex1.js | 8 +- doc/html/navtreeindex2.js | 4 +- doc/html/navtreeindex3.js | 6 +- doc/html/navtreeindex4.js | 8 +- doc/html/navtreeindex5.js | 6 +- doc/html/navtreeindex6.js | 1 + doc/html/permissions_8php.html | 2 +- doc/html/plugin_8php.html | 22 +- doc/html/plugin_8php.js | 2 +- doc/html/search/all_63.js | 2 +- doc/html/search/all_67.js | 4 +- doc/html/search/functions_63.js | 2 +- doc/html/search/functions_67.js | 2 +- doc/html/text_8php.html | 2 +- doc/html/typo_8php.html | 2 +- include/permissions.php | 5 + mod/connections.php | 2 +- util/messages.po | 399 ++++++++++++----------- version.inc | 2 +- 36 files changed, 336 insertions(+), 254 deletions(-) diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 50aabab4a..2bf829d93 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -173,8 +173,8 @@ Functions    current_theme ()   - current_theme_url () -  + current_theme_url ($installing=false) +   z_birthday ($dob, $tz, $format="Y-m-d H:i:s")    is_site_admin () @@ -210,7 +210,7 @@ Functions - + @@ -762,18 +762,19 @@ Variables

Variables

const RED_PLATFORM 'Red'
const RED_PLATFORM 'Red Matrix'
 
const RED_VERSION trim(file_get_contents('version.inc')) . 'R'
 
-

Referenced by FriendicaSmarty\__construct(), construct_page(), current_theme_url(), and theme_include().

+

Referenced by FriendicaSmarty\__construct(), construct_page(), current_theme_url(), and theme_include().

- +
- + +
current_theme_url () $installing = false)
@@ -859,7 +860,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(), 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(), 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_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(), 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().

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

@@ -1422,7 +1423,7 @@ Variables
-

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

@@ -3677,12 +3678,12 @@ Variables
- +
const RED_PLATFORM 'Red'const RED_PLATFORM 'Red Matrix'
-

Red.

-

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

+

Red Matrix.

+

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

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

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

diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index e9af159d9..8ba06e554 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -11,7 +11,7 @@ var boot_8php = [ "construct_page", "boot_8php.html#acc4e0c910af066148b810e5fde55fff1", null ], [ "curPageURL", "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5", null ], [ "current_theme", "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13", null ], - [ "current_theme_url", "boot_8php.html#ab2878f40a7f3978476fcfb4c95b96806", null ], + [ "current_theme_url", "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3", null ], [ "dba_timer", "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4", null ], [ "fix_system_urls", "boot_8php.html#aca5e42678e178c6b9034610d66666fd7", null ], [ "get_account_id", "boot_8php.html#afe88b920aa285982edb817a0dd44eb37", null ], diff --git a/doc/html/classFriendicaSmartyEngine-members.html b/doc/html/classFriendicaSmartyEngine-members.html index b632a58e1..772ff8657 100644 --- a/doc/html/classFriendicaSmartyEngine-members.html +++ b/doc/html/classFriendicaSmartyEngine-members.html @@ -114,8 +114,9 @@ $(document).ready(function(){initNavTree('classFriendicaSmartyEngine.html','');} - - + + +
$nameFriendicaSmartyEnginestatic
__construct()FriendicaSmartyEngine
get_markup_template($file, $root='')FriendicaSmartyEngine
replace_macros($s, $r)FriendicaSmartyEngine
get_intltext_template($file, $root='')FriendicaSmartyEngine
get_markup_template($file, $root='')FriendicaSmartyEngine
replace_macros($s, $r)FriendicaSmartyEngine
diff --git a/doc/html/classFriendicaSmartyEngine.html b/doc/html/classFriendicaSmartyEngine.html index 3a0dcfefe..40f28092f 100644 --- a/doc/html/classFriendicaSmartyEngine.html +++ b/doc/html/classFriendicaSmartyEngine.html @@ -131,6 +131,8 @@ Public Member Functions    get_markup_template ($file, $root='')   + get_intltext_template ($file, $root='') +  @@ -154,6 +156,32 @@ Static Public Attributes

Member Function Documentation

+ +
+
+

Static Public Attributes

+ + + + + + + + + + + + + + + + + +
FriendicaSmartyEngine::get_intltext_template ( $file,
 $root = '' 
)
+
+ +
+
diff --git a/doc/html/classFriendicaSmartyEngine.js b/doc/html/classFriendicaSmartyEngine.js index aed2efab1..cabd197d1 100644 --- a/doc/html/classFriendicaSmartyEngine.js +++ b/doc/html/classFriendicaSmartyEngine.js @@ -1,6 +1,7 @@ var classFriendicaSmartyEngine = [ [ "__construct", "classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6", null ], + [ "get_intltext_template", "classFriendicaSmartyEngine.html#a35ec0ee828c36640ea25296bcb84a118", null ], [ "get_markup_template", "classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88", null ], [ "replace_macros", "classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2", null ] ]; \ No newline at end of file diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index e67e0b6fe..7915d827f 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(), 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_mysqli\q(), dba_mysql\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(), Item\get_template_data(), import_directory_profile(), invite_post(), item_post(), item_store(), item_store_update(), 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 39b5b792b..a49a76a06 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -301,7 +301,7 @@ Functions
-

Referenced by dba_mysqli\q(), and dba_mysql\q().

+

Referenced by dba_mysql\q(), and dba_mysqli\q().

diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 2aaa77af8..65ba0f9cd 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(), 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_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(), 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().

@@ -160,7 +160,7 @@ Variables
-

Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), fetch_url(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_term_for_display(), get_bb_tag_pos(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), legal_webbie(), linkify(), magic_link(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), post_url(), prepare_body(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), App\set_widget(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_post_url(), zfinger_init(), and zid().

+

Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), fetch_url(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), legal_webbie(), linkify(), magic_link(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), post_url(), prepare_body(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), App\set_widget(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_post_url(), zfinger_init(), and zid().

diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html index 02aa2b72f..2f5bfb95d 100644 --- a/doc/html/functions_0x67.html +++ b/doc/html/functions_0x67.html @@ -198,6 +198,9 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');});
  • get_id() : Item
  • +
  • get_intltext_template() +: FriendicaSmartyEngine +
  • get_markup_template() : FriendicaSmartyEngine , ITemplateEngine @@ -237,8 +240,8 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); : Item
  • get_template_data() -: Item -, Conversation +: Conversation +, Item
  • get_template_engine() : App @@ -263,8 +266,8 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');});
  • getImage() : photo_driver -, photo_gd , photo_imagick +, photo_gd
  • getType() : photo_driver diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html index ce904b8bd..30d0496fc 100644 --- a/doc/html/functions_func.html +++ b/doc/html/functions_func.html @@ -356,6 +356,9 @@ $(document).ready(function(){initNavTree('functions_func.html','');});
  • get_id() : Item
  • +
  • get_intltext_template() +: FriendicaSmartyEngine +
  • get_markup_template() : FriendicaSmartyEngine , ITemplateEngine @@ -395,8 +398,8 @@ $(document).ready(function(){initNavTree('functions_func.html','');}); : Item
  • get_template_data() -: Item -, Conversation +: Conversation +, Item
  • get_template_engine() : App @@ -421,8 +424,8 @@ $(document).ready(function(){initNavTree('functions_func.html','');});
  • getImage() : photo_driver -, photo_gd , photo_imagick +, photo_gd
  • getType() : photo_driver diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 76c5eae33..85cf277e9 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -394,7 +394,7 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');}); : boot.php
  • current_theme_url() -: boot.php +: boot.php
  • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index bf850d86d..5a82b59c1 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -202,7 +202,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : security.php
  • get_intltext_template() -: plugin.php +: plugin.php
  • get_item_children() : conversation.php diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index e63a19169..ad60dd6bb 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -384,7 +384,7 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');}); : boot.php
  • current_theme_url() -: boot.php +: boot.php
  • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 0150e643c..ebe5358aa 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -201,7 +201,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : security.php
  • get_intltext_template() -: plugin.php +: plugin.php
  • get_item_children() : conversation.php diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index e44953a35..04c7e6006 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -858,7 +858,7 @@ Functions
    Returns
    array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content
    -

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

    +

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

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 4be126e55..65cb97ba0 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -37,11 +37,11 @@ var NAVTREEINDEX = [ "BaseObject_8php.html", "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63", -"classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b", -"docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f", -"include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909", -"new__channel_8php.html#a180b0646957db8290482f02454ad7f23", -"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918" +"classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337", +"docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6", +"include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932", +"new__channel_8php.html", +"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 3378b2c92..cdafec84b 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -214,6 +214,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,106], "boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,203], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,30], +"boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,127], "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,109], "boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,204], @@ -239,7 +240,6 @@ var NAVTREEINDEX0 = "boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,118], "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,65], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,162], -"boot_8php.html#ab2878f40a7f3978476fcfb4c95b96806":[5,0,4,11], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,103], "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,183], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31], diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 44e465be1..30b7f9d71 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -194,9 +194,10 @@ var NAVTREEINDEX1 = "classFriendicaSmarty.html#a6a4d4281d6fa9be1d37a97b188ffe8c9":[4,0,15,1], "classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6":[4,0,15,0], "classFriendicaSmartyEngine.html":[4,0,16], -"classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88":[4,0,16,1], +"classFriendicaSmartyEngine.html#a35ec0ee828c36640ea25296bcb84a118":[4,0,16,1], +"classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88":[4,0,16,2], "classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6":[4,0,16,0], -"classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2":[4,0,16,2], +"classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2":[4,0,16,3], "classItem.html":[4,0,17], "classItem.html#a007424e3e3171dcfb4312a02161da6cd":[4,0,17,33], "classItem.html#a078f95b4134ce3a1df344cf8d386f986":[4,0,17,37], @@ -248,6 +249,5 @@ var NAVTREEINDEX1 = "classProtoDriver.html":[4,0,22], "classProtoDriver.html#a1593f3abae050edbd9304f4f8bc4894a":[4,0,22,0], "classProtoDriver.html#a2ba1758f0f9e3564580b6ff85292804d":[4,0,22,2], -"classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67":[4,0,22,1], -"classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337":[4,0,22,6] +"classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67":[4,0,22,1] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 0a1d7fa81..2c3bb28a3 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,6 @@ var NAVTREEINDEX2 = { +"classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337":[4,0,22,6], "classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b":[4,0,22,4], "classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181":[4,0,22,5], "classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b":[4,0,22,3], @@ -248,6 +249,5 @@ var NAVTREEINDEX2 = "docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b":[5,0,2,2,5], "docblox__errorchecker_8php.html#a721c6ff80a6d3e4ad4ffa52a04c60085":[5,0,2,2,9], "docblox__errorchecker_8php.html#a83018d9153d17d91fbcf3bc10158d34f":[5,0,2,2,6], -"docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73":[5,0,2,2,7], -"docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,2,4] +"docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73":[5,0,2,2,7] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 93bbdd391..5ae6a28b2 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,6 @@ var NAVTREEINDEX3 = { +"docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,2,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,2,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,2,10], "editpost_8php.html":[5,0,1,19], @@ -138,8 +139,8 @@ var NAVTREEINDEX3 = "globals_func_0x77.html":[5,1,1,23], "globals_func_0x78.html":[5,1,1,24], "globals_func_0x7a.html":[5,1,1,25], -"globals_vars.html":[5,1,2], "globals_vars.html":[5,1,2,0], +"globals_vars.html":[5,1,2], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -248,6 +249,5 @@ var NAVTREEINDEX3 = "include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d":[5,0,0,6,3], "include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a":[5,0,0,6,5], "include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f":[5,0,0,6,4], -"include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3":[5,0,0,6,2], -"include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[5,0,0,6,1] +"include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3":[5,0,0,6,2] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 6cdd9ca47..663e01270 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,6 @@ var NAVTREEINDEX4 = { +"include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[5,0,0,6,1], "include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,6], "include_2config_8php.html":[5,0,0,13], "include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,13,6], @@ -234,8 +235,8 @@ var NAVTREEINDEX4 = "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,45,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], +"namespaceacl__selectors.html":[4,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacefriendica-to-smarty-tpl.html":[3,0,2], "namespacemembers.html":[3,1,0], @@ -244,10 +245,9 @@ var NAVTREEINDEX4 = "namespaces.html":[3,0], "namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[3,0,3], -"namespaceutil.html":[4,0,4], "namespaceutil.html":[3,0,4], +"namespaceutil.html":[4,0,4], "nav_8php.html":[5,0,0,41], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,41,0], -"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,41,1], -"new__channel_8php.html":[5,0,1,47] +"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,41,1] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index fd0ea7a0f..6f20f67bc 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,6 @@ var NAVTREEINDEX5 = { +"new__channel_8php.html":[5,0,1,47], "new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,47,2], "new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,47,1], "new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,47,0], @@ -77,8 +78,8 @@ var NAVTREEINDEX5 = "plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,50,1], "plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,50,21], "plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,50,18], -"plugin_8php.html#a917f10208bec9090f062a8cec92e110f":[5,0,0,50,3], "plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,50,14], +"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,50,3], "plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,50,6], "plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,50,2], "plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,50,10], @@ -248,6 +249,5 @@ var NAVTREEINDEX5 = "smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,82,0], "socgraph_8php.html":[5,0,0,59], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,59,0], -"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,59,7], -"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,59,8] +"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,59,7] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index b947584e1..24c7cce11 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,6 @@ var NAVTREEINDEX6 = { +"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,59,8], "socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,59,1], "socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,59,4], "socgraph_8php.html#aad9ee2421fd1ca405b241e8ed72d9aca":[5,0,0,59,6], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 98fd395ba..b13af3a43 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -246,7 +246,7 @@ Functions diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index a7559b323..d5b987336 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -160,8 +160,8 @@ Functions    theme_include ($file, $root= '')   - get_intltext_template ($s) -  + get_intltext_template ($s, $root= '') +   get_markup_template ($s, $root= '')   @@ -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(), 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(), 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().

    @@ -230,7 +230,7 @@ Functions - + diff --git a/doc/html/plugin_8php.js b/doc/html/plugin_8php.js index 3d786baf0..4d2d79f2d 100644 --- a/doc/html/plugin_8php.js +++ b/doc/html/plugin_8php.js @@ -3,7 +3,7 @@ var plugin_8php = [ "call_hooks", "plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c", null ], [ "format_css_if_exists", "plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6", null ], [ "format_js_if_exists", "plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f", null ], - [ "get_intltext_template", "plugin_8php.html#a917f10208bec9090f062a8cec92e110f", null ], + [ "get_intltext_template", "plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295", null ], [ "get_markup_template", "plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4", null ], [ "get_plugin_info", "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35", null ], [ "get_theme_info", "plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405", null ], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 5959cf652..3330c3e41 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -114,6 +114,6 @@ var searchData= ['crypto_2ephp',['crypto.php',['../crypto_8php.html',1,'']]], ['curpageurl',['curPageURL',['../boot_8php.html#aa4221641e5c21db69fa52c426b9017f5',1,'boot.php']]], ['current_5ftheme',['current_theme',['../boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13',1,'boot.php']]], - ['current_5ftheme_5furl',['current_theme_url',['../boot_8php.html#ab2878f40a7f3978476fcfb4c95b96806',1,'boot.php']]], + ['current_5ftheme_5furl',['current_theme_url',['../boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3',1,'boot.php']]], ['cli_20config_20utility',['CLI config utility',['../md_config.html',1,'']]] ]; diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index e65dedc1d..28fde5301 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -38,7 +38,7 @@ var searchData= ['get_5fgroups',['get_groups',['../classApp.html#a4659785d13e4bac0bed50dbb1b0d4299',1,'App']]], ['get_5fhostname',['get_hostname',['../classApp.html#a622eace13f8fc9f4b5672a68e2bc4396',1,'App']]], ['get_5fid',['get_id',['../classItem.html#ac0f27e58532612f6e7a54c8a621b9b92',1,'Item']]], - ['get_5fintltext_5ftemplate',['get_intltext_template',['../plugin_8php.html#a917f10208bec9090f062a8cec92e110f',1,'plugin.php']]], + ['get_5fintltext_5ftemplate',['get_intltext_template',['../classFriendicaSmartyEngine.html#a35ec0ee828c36640ea25296bcb84a118',1,'FriendicaSmartyEngine\get_intltext_template()'],['../plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295',1,'get_intltext_template(): plugin.php']]], ['get_5fitem_5fchildren',['get_item_children',['../conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67',1,'conversation.php']]], ['get_5fitem_5fcontact',['get_item_contact',['../items_8php.html#aab9c6bae4c40799867596bdaae9829fd',1,'items.php']]], ['get_5fitem_5felements',['get_item_elements',['../items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361',1,'items.php']]], @@ -91,8 +91,8 @@ var searchData= ['gravity_5fcomment',['GRAVITY_COMMENT',['../boot_8php.html#a4a12ce5de39789b0361e308d89925a20',1,'boot.php']]], ['gravity_5flike',['GRAVITY_LIKE',['../boot_8php.html#a1f5906598e90b5ea2b4245f682be4348',1,'boot.php']]], ['gravity_5fparent',['GRAVITY_PARENT',['../boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3',1,'boot.php']]], - ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]], + ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], ['group_5fadd',['group_add',['../include_2group_8php.html#a0a515d42ec78aa0066aac4c278ead5b0',1,'group.php']]], ['group_5fadd_5fmember',['group_add_member',['../include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b',1,'group.php']]], ['group_5faside',['group_aside',['../mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c',1,'group.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index b74718649..cd8d23934 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -89,5 +89,5 @@ var searchData= ['cropimage',['cropImage',['../classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e',1,'photo_driver\cropImage()'],['../classphoto__gd.html#ab2232d775c8bacf66773a03308105f0c',1,'photo_gd\cropImage()'],['../classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4',1,'photo_imagick\cropImage()']]], ['curpageurl',['curPageURL',['../boot_8php.html#aa4221641e5c21db69fa52c426b9017f5',1,'boot.php']]], ['current_5ftheme',['current_theme',['../boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13',1,'boot.php']]], - ['current_5ftheme_5furl',['current_theme_url',['../boot_8php.html#ab2878f40a7f3978476fcfb4c95b96806',1,'boot.php']]] + ['current_5ftheme_5furl',['current_theme_url',['../boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3',1,'boot.php']]] ]; diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 645896cc9..5b59467e0 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -38,7 +38,7 @@ var searchData= ['get_5fgroups',['get_groups',['../classApp.html#a4659785d13e4bac0bed50dbb1b0d4299',1,'App']]], ['get_5fhostname',['get_hostname',['../classApp.html#a622eace13f8fc9f4b5672a68e2bc4396',1,'App']]], ['get_5fid',['get_id',['../classItem.html#ac0f27e58532612f6e7a54c8a621b9b92',1,'Item']]], - ['get_5fintltext_5ftemplate',['get_intltext_template',['../plugin_8php.html#a917f10208bec9090f062a8cec92e110f',1,'plugin.php']]], + ['get_5fintltext_5ftemplate',['get_intltext_template',['../classFriendicaSmartyEngine.html#a35ec0ee828c36640ea25296bcb84a118',1,'FriendicaSmartyEngine\get_intltext_template()'],['../plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295',1,'get_intltext_template(): plugin.php']]], ['get_5fitem_5fchildren',['get_item_children',['../conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67',1,'conversation.php']]], ['get_5fitem_5fcontact',['get_item_contact',['../items_8php.html#aab9c6bae4c40799867596bdaae9829fd',1,'items.php']]], ['get_5fitem_5felements',['get_item_elements',['../items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361',1,'items.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 2f55748b0..4503e3216 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1430,7 +1430,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 70a0c36ad..102abe202 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_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_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(), 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(), 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_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_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(), 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/permissions.php b/include/permissions.php index 97f1fe8e6..9641d224a 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -164,10 +164,13 @@ 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; } + if(($r) && ($r[0][$channel_perm] & PERMS_CONTACTS)) { @@ -192,6 +195,8 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { continue; } + + $arr = array( 'channel_id' => $uid, 'observer_hash' => $observer_xchan, diff --git a/mod/connections.php b/mod/connections.php index c98709470..2f49ee374 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -345,7 +345,7 @@ function connections_content(&$a) { $channel = $a->get_channel(); $global_perms = get_perms(); - $existing = get_all_perms(local_user(),$contact); + $existing = get_all_perms(local_user(),$contact['abook_xchan']); $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication')); diff --git a/util/messages.po b/util/messages.po index 4548a63d8..210c567e2 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-10 00:01-0700\n" +"POT-Creation-Date: 2013-05-17 00:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -732,7 +732,7 @@ msgstr "" #: ../../mod/common.php:43 ../../mod/profile_photo.php:185 #: ../../mod/profile_photo.php:198 ../../mod/connections.php:146 #: ../../mod/settings.php:578 ../../mod/delegate.php:6 -#: ../../mod/editpost.php:10 ../../mod/setup.php:157 ../../mod/photos.php:74 +#: ../../mod/editpost.php:10 ../../mod/setup.php:181 ../../mod/photos.php:74 #: ../../mod/photos.php:639 ../../mod/viewsrc.php:12 ../../mod/fsuggest.php:78 #: ../../mod/group.php:15 ../../mod/profiles.php:163 #: ../../mod/profiles.php:471 ../../mod/intro.php:50 ../../mod/crepair.php:115 @@ -1230,35 +1230,6 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/identity.php:14 -msgid "Unable to obtain identity information from database" -msgstr "" - -#: ../../include/identity.php:36 -msgid "Empty name" -msgstr "" - -#: ../../include/identity.php:38 -msgid "Name too long" -msgstr "" - -#: ../../include/identity.php:72 -msgid "No account identifier" -msgstr "" - -#: ../../include/identity.php:87 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/identity.php:135 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/identity.php:200 -msgid "Default Profile" -msgstr "" - #: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1323 msgid "Logout" msgstr "" @@ -1757,7 +1728,7 @@ msgstr "" msgid "Preview" msgstr "" -#: ../../include/dba/dba_driver.php:48 +#: ../../include/dba/dba_driver.php:50 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" @@ -2003,6 +1974,35 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" +#: ../../include/identity.php:14 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/identity.php:36 +msgid "Empty name" +msgstr "" + +#: ../../include/identity.php:38 +msgid "Name too long" +msgstr "" + +#: ../../include/identity.php:72 +msgid "No account identifier" +msgstr "" + +#: ../../include/identity.php:87 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../include/identity.php:135 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/identity.php:200 +msgid "Default Profile" +msgstr "" + #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -2489,19 +2489,19 @@ msgid "This is you" msgstr "" #: ../../include/ItemObject.php:539 ../../mod/invite.php:138 -#: ../../mod/import.php:339 ../../mod/connections.php:372 -#: ../../mod/settings.php:596 ../../mod/settings.php:708 -#: ../../mod/settings.php:737 ../../mod/settings.php:760 -#: ../../mod/settings.php:831 ../../mod/settings.php:997 -#: ../../mod/setup.php:257 ../../mod/setup.php:298 ../../mod/photos.php:674 -#: ../../mod/photos.php:766 ../../mod/photos.php:1023 +#: ../../mod/connections.php:372 ../../mod/settings.php:596 +#: ../../mod/settings.php:708 ../../mod/settings.php:737 +#: ../../mod/settings.php:760 ../../mod/settings.php:831 +#: ../../mod/settings.php:997 ../../mod/setup.php:283 ../../mod/setup.php:326 +#: ../../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/fsuggest.php:108 ../../mod/group.php:83 #: ../../mod/profiles.php:523 ../../mod/crepair.php:166 #: ../../mod/admin.php:397 ../../mod/admin.php:621 ../../mod/admin.php:757 #: ../../mod/admin.php:956 ../../mod/admin.php:1043 ../../mod/poke.php:166 -#: ../../mod/message.php:290 ../../mod/message.php:421 ../../mod/mood.php:134 -#: ../../mod/events.php:456 ../../view/theme/redbasic/php/config.php:131 +#: ../../mod/import.php:339 ../../mod/message.php:290 +#: ../../mod/message.php:421 ../../mod/mood.php:134 ../../mod/events.php:456 +#: ../../view/theme/redbasic/php/config.php:131 #: ../../view/theme/redbasic/php/config.php:148 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2731,86 +2731,13 @@ msgstr "" msgid "View Connnections" msgstr "" -#: ../../mod/import.php:31 -msgid "Nothing to import." -msgstr "" - -#: ../../mod/import.php:53 -msgid "Unable to download data from old server" -msgstr "" - -#: ../../mod/import.php:59 -msgid "Imported file is empty." -msgstr "" - -#: ../../mod/import.php:82 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../mod/import.php:100 -msgid "Channel clone failed. Import failed." -msgstr "" - -#: ../../mod/import.php:110 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../mod/import.php:319 -msgid "Import completed." -msgstr "" - -#: ../../mod/import.php:328 -msgid "Import Channel" -msgstr "" - -#: ../../mod/import.php:329 -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:330 -msgid "File to Upload" -msgstr "" - -#: ../../mod/import.php:331 -msgid "Or provide the old server/hub details" -msgstr "" - -#: ../../mod/import.php:332 -msgid "Your old identity address (xyz@example.com)" -msgstr "" - -#: ../../mod/import.php:333 -msgid "Your old login email address" -msgstr "" - -#: ../../mod/import.php:334 -msgid "Your old login password" -msgstr "" - -#: ../../mod/import.php:335 -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:336 -msgid "Make this hub my primary location" -msgstr "" - #: ../../mod/post.php:114 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../mod/post.php:124 +#: ../../mod/post.php:127 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" @@ -3887,311 +3814,340 @@ msgid "" "dot com" msgstr "" -#: ../../mod/setup.php:123 -msgid "Red Identity/Communications Server - Setup" +#: ../../mod/setup.php:142 +msgid "Red Matrix Server - Setup" msgstr "" -#: ../../mod/setup.php:129 +#: ../../mod/setup.php:148 msgid "Could not connect to database." msgstr "" -#: ../../mod/setup.php:133 +#: ../../mod/setup.php:152 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "" + +#: ../../mod/setup.php:157 msgid "Could not create table." msgstr "" -#: ../../mod/setup.php:139 +#: ../../mod/setup.php:163 msgid "Your site database has been installed." msgstr "" -#: ../../mod/setup.php:144 +#: ../../mod/setup.php:168 msgid "" "You may need to import the file \"install/database.sql\" manually using " "phpmyadmin or mysql." msgstr "" -#: ../../mod/setup.php:145 ../../mod/setup.php:212 ../../mod/setup.php:528 +#: ../../mod/setup.php:169 ../../mod/setup.php:236 ../../mod/setup.php:565 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../mod/setup.php:209 +#: ../../mod/setup.php:233 msgid "System check" msgstr "" -#: ../../mod/setup.php:213 ../../mod/events.php:349 +#: ../../mod/setup.php:237 ../../mod/events.php:349 msgid "Next" msgstr "" -#: ../../mod/setup.php:214 +#: ../../mod/setup.php:238 msgid "Check again" msgstr "" -#: ../../mod/setup.php:235 +#: ../../mod/setup.php:260 msgid "Database connection" msgstr "" -#: ../../mod/setup.php:236 +#: ../../mod/setup.php:261 msgid "" -"In order to install Red we need to know how to connect to your database." +"In order to install Red Matrix we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/setup.php:237 +#: ../../mod/setup.php:262 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../mod/setup.php:238 +#: ../../mod/setup.php:263 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../mod/setup.php:242 +#: ../../mod/setup.php:267 msgid "Database Server Name" msgstr "" -#: ../../mod/setup.php:243 +#: ../../mod/setup.php:267 +msgid "Default is localhost" +msgstr "" + +#: ../../mod/setup.php:268 +msgid "Database Port" +msgstr "" + +#: ../../mod/setup.php:268 +msgid "Communication port number - use 0 for default" +msgstr "" + +#: ../../mod/setup.php:269 msgid "Database Login Name" msgstr "" -#: ../../mod/setup.php:244 +#: ../../mod/setup.php:270 msgid "Database Login Password" msgstr "" -#: ../../mod/setup.php:245 +#: ../../mod/setup.php:271 msgid "Database Name" msgstr "" -#: ../../mod/setup.php:247 ../../mod/setup.php:287 +#: ../../mod/setup.php:273 ../../mod/setup.php:315 msgid "Site administrator email address" msgstr "" -#: ../../mod/setup.php:247 ../../mod/setup.php:287 +#: ../../mod/setup.php:273 ../../mod/setup.php:315 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../mod/setup.php:248 ../../mod/setup.php:289 +#: ../../mod/setup.php:274 ../../mod/setup.php:317 msgid "Website URL" msgstr "" -#: ../../mod/setup.php:248 ../../mod/setup.php:289 +#: ../../mod/setup.php:274 ../../mod/setup.php:317 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/setup.php:251 ../../mod/setup.php:292 +#: ../../mod/setup.php:277 ../../mod/setup.php:320 msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/setup.php:277 +#: ../../mod/setup.php:304 msgid "Site settings" msgstr "" -#: ../../mod/setup.php:332 +#: ../../mod/setup.php:360 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/setup.php:333 +#: ../../mod/setup.php:361 msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron." msgstr "" -#: ../../mod/setup.php:337 +#: ../../mod/setup.php:365 msgid "PHP executable path" msgstr "" -#: ../../mod/setup.php:337 +#: ../../mod/setup.php:365 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../mod/setup.php:342 +#: ../../mod/setup.php:370 msgid "Command line PHP" msgstr "" -#: ../../mod/setup.php:351 +#: ../../mod/setup.php:379 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/setup.php:352 +#: ../../mod/setup.php:380 msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/setup.php:354 +#: ../../mod/setup.php:382 msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/setup.php:375 +#: ../../mod/setup.php:403 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../mod/setup.php:376 +#: ../../mod/setup.php:404 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../mod/setup.php:378 +#: ../../mod/setup.php:406 msgid "Generate encryption keys" msgstr "" -#: ../../mod/setup.php:385 +#: ../../mod/setup.php:413 msgid "libCurl PHP module" msgstr "" -#: ../../mod/setup.php:386 +#: ../../mod/setup.php:414 msgid "GD graphics PHP module" msgstr "" -#: ../../mod/setup.php:387 +#: ../../mod/setup.php:415 msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/setup.php:388 +#: ../../mod/setup.php:416 msgid "mysqli PHP module" msgstr "" -#: ../../mod/setup.php:389 +#: ../../mod/setup.php:417 msgid "mb_string PHP module" msgstr "" -#: ../../mod/setup.php:390 +#: ../../mod/setup.php:418 msgid "mcrypt PHP module" msgstr "" -#: ../../mod/setup.php:395 ../../mod/setup.php:397 +#: ../../mod/setup.php:423 ../../mod/setup.php:425 msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/setup.php:395 +#: ../../mod/setup.php:423 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/setup.php:401 ../../mod/setup.php:404 +#: ../../mod/setup.php:429 ../../mod/setup.php:432 msgid "proc_open" msgstr "" -#: ../../mod/setup.php:401 +#: ../../mod/setup.php:429 msgid "" "Error: proc_open is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../mod/setup.php:409 +#: ../../mod/setup.php:437 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:413 +#: ../../mod/setup.php:441 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/setup.php:417 +#: ../../mod/setup.php:445 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:421 +#: ../../mod/setup.php:449 msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:425 +#: ../../mod/setup.php:453 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:429 +#: ../../mod/setup.php:457 msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:445 +#: ../../mod/setup.php:473 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/setup.php:446 +#: ../../mod/setup.php:474 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../mod/setup.php:447 +#: ../../mod/setup.php:475 msgid "" "At the end of this procedure, we will give you a text to save in a file " "named .htconfig.php in your Red top folder." msgstr "" -#: ../../mod/setup.php:448 +#: ../../mod/setup.php:476 msgid "" "You can alternatively skip this procedure and perform a manual installation. " "Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/setup.php:451 +#: ../../mod/setup.php:479 msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/setup.php:461 +#: ../../mod/setup.php:489 msgid "" "Red uses the Smarty3 template engine to render its web views. Smarty3 " "compiles templates to PHP to speed up rendering." msgstr "" -#: ../../mod/setup.php:462 +#: ../../mod/setup.php:490 msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory view/tpl/smarty3/ under the Red top level " "folder." msgstr "" -#: ../../mod/setup.php:463 +#: ../../mod/setup.php:491 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: ../../mod/setup.php:464 +#: ../../mod/setup.php:492 msgid "" "Note: as a security measure, you should give the web server write access to " "view/tpl/smarty3/ only--not the template files (.tpl) that it contains." msgstr "" -#: ../../mod/setup.php:467 +#: ../../mod/setup.php:495 msgid "view/tpl/smarty3 is writable" msgstr "" -#: ../../mod/setup.php:479 +#: ../../mod/setup.php:509 +msgid "SSL certificate validation" +msgstr "" + +#: ../../mod/setup.php:509 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." +msgstr "" + +#: ../../mod/setup.php:516 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../mod/setup.php:481 +#: ../../mod/setup.php:518 msgid "Url rewrite is working" msgstr "" -#: ../../mod/setup.php:491 +#: ../../mod/setup.php:528 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../mod/setup.php:515 +#: ../../mod/setup.php:552 msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/setup.php:526 +#: ../../mod/setup.php:563 msgid "

    What next

    " msgstr "" -#: ../../mod/setup.php:527 +#: ../../mod/setup.php:564 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -5321,6 +5277,79 @@ msgstr "" msgid "Make this post private" msgstr "" +#: ../../mod/import.php:31 +msgid "Nothing to import." +msgstr "" + +#: ../../mod/import.php:53 +msgid "Unable to download data from old server" +msgstr "" + +#: ../../mod/import.php:59 +msgid "Imported file is empty." +msgstr "" + +#: ../../mod/import.php:82 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../mod/import.php:100 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../mod/import.php:110 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../mod/import.php:319 +msgid "Import completed." +msgstr "" + +#: ../../mod/import.php:328 +msgid "Import Channel" +msgstr "" + +#: ../../mod/import.php:329 +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:330 +msgid "File to Upload" +msgstr "" + +#: ../../mod/import.php:331 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../mod/import.php:332 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../mod/import.php:333 +msgid "Your old login email address" +msgstr "" + +#: ../../mod/import.php:334 +msgid "Your old login password" +msgstr "" + +#: ../../mod/import.php:335 +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:336 +msgid "Make this hub my primary location" +msgstr "" + #: ../../mod/lockview.php:34 msgid "Remote privacy information not available." msgstr "" @@ -5840,7 +5869,7 @@ msgstr "" msgid "posted an event" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:967 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:969 msgid "Wall Photos" msgstr "" @@ -6021,7 +6050,7 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:698 +#: ../../mod/item.php:700 msgid "System error. Post not saved." msgstr "" @@ -6169,6 +6198,6 @@ msgstr "" msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2264 +#: ../../boot.php:2266 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index cf57809d8..96ee37fd3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-05-16.315 +2013-05-18.317 -- cgit v1.2.3