From c36fc59df30735b88ab55884f4411dedd3886f20 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 26 Oct 2013 01:27:19 -0700 Subject: doc updates --- doc/html/acl__selectors_8php.html | 2 +- doc/html/annotated.html | 5 +- doc/html/annotated.js | 1 + doc/html/auth_8php.html | 2 +- doc/html/boot_8php.html | 40 ++-- doc/html/classConversation-members.html | 37 ++-- doc/html/classConversation.html | 44 +++- doc/html/classConversation.js | 3 +- doc/html/classRedBasicAuth-members.html | 118 +++++++++++ doc/html/classRedBasicAuth.html | 169 +++++++++++++++ doc/html/classRedBasicAuth.js | 4 + doc/html/classRedBasicAuth.png | Bin 0 -> 485 bytes doc/html/classes.html | 19 +- doc/html/cloud_8php.html | 142 +++++++++++++ doc/html/cloud_8php.js | 5 + doc/html/comanche_8php.html | 8 +- doc/html/comanche_8php.js | 2 +- doc/html/conversation_8php.html | 28 ++- doc/html/conversation_8php.js | 2 +- doc/html/datetime_8php.html | 4 +- doc/html/dba__driver_8php.html | 4 +- doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 2 + doc/html/dir_d41ce877eb409a4791b288730010abe2.js | 1 + doc/html/extract_8php.html | 4 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 227 +++++++++++---------- doc/html/functions.html | 7 +- doc/html/functions_0x5f.html | 2 +- doc/html/functions_0x76.html | 3 + doc/html/functions_func.html | 5 +- doc/html/functions_vars.html | 7 +- doc/html/globals.html | 3 + doc/html/globals_0x63.html | 7 +- doc/html/globals_0x67.html | 2 +- doc/html/globals_0x72.html | 2 +- doc/html/globals_func_0x63.html | 7 +- doc/html/globals_func_0x67.html | 2 +- doc/html/globals_func_0x72.html | 2 +- doc/html/globals_vars.html | 3 + doc/html/hierarchy.html | 48 ++--- doc/html/hierarchy.js | 3 + doc/html/include_2config_8php.html | 6 +- doc/html/include_2network_8php.html | 4 +- doc/html/language_8php.html | 2 +- doc/html/namespacefriendica-to-smarty-tpl.html | 2 +- doc/html/navtree.js | 12 +- doc/html/navtreeindex1.js | 14 +- doc/html/navtreeindex2.js | 118 +++++------ doc/html/navtreeindex3.js | 82 ++++---- doc/html/navtreeindex4.js | 62 +++--- doc/html/navtreeindex5.js | 214 +++++++++---------- doc/html/navtreeindex6.js | 204 +++++++++--------- doc/html/navtreeindex7.js | 106 +++++----- doc/html/permissions_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/redbasic_2php_2style_8php.html | 36 +++- doc/html/redbasic_2php_2style_8php.js | 1 + doc/html/search/all_24.js | 2 + doc/html/search/all_5f.js | 2 +- doc/html/search/all_63.js | 6 +- doc/html/search/all_67.js | 2 +- doc/html/search/all_72.js | 3 +- doc/html/search/all_76.js | 1 + doc/html/search/classes_72.html | 26 +++ doc/html/search/classes_72.js | 4 + doc/html/search/files_63.js | 1 + doc/html/search/functions_5f.js | 2 +- doc/html/search/functions_63.js | 5 +- doc/html/search/functions_67.js | 2 +- doc/html/search/functions_72.js | 2 +- doc/html/search/functions_76.js | 1 + doc/html/search/search.js | 2 +- doc/html/search/variables_24.js | 2 + doc/html/taxonomy_8php.html | 4 +- doc/html/text_8php.html | 36 ++-- doc/html/text_8php.js | 2 +- doc/html/typo_8php.html | 2 +- .../view_2theme_2redbasic_2php_2config_8php.html | 14 +- .../view_2theme_2redbasic_2php_2config_8php.js | 2 +- doc/html/zot_8php.html | 2 +- 80 files changed, 1282 insertions(+), 690 deletions(-) create mode 100644 doc/html/classRedBasicAuth-members.html create mode 100644 doc/html/classRedBasicAuth.html create mode 100644 doc/html/classRedBasicAuth.js create mode 100644 doc/html/classRedBasicAuth.png create mode 100644 doc/html/cloud_8php.html create mode 100644 doc/html/cloud_8php.js create mode 100644 doc/html/search/classes_72.html create mode 100644 doc/html/search/classes_72.js diff --git a/doc/html/acl__selectors_8php.html b/doc/html/acl__selectors_8php.html index 470be4754..38197078b 100644 --- a/doc/html/acl__selectors_8php.html +++ b/doc/html/acl__selectors_8php.html @@ -270,7 +270,7 @@ Functions
-

Referenced by channel_content(), events_content(), lastpost_content(), network_content(), and photos_content().

+

Referenced by channel_content(), display_content(), events_content(), lastpost_content(), network_content(), and photos_content().

diff --git a/doc/html/annotated.html b/doc/html/annotated.html index a1b4d0318..794f05f2b 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -134,8 +134,9 @@ $(document).ready(function(){initNavTree('annotated.html','');}); oCphoto_gd oCphoto_imagick oCProtoDriver -oCTemplate -\CZotDriver +oCRedBasicAuth +oCTemplate +\CZotDriver diff --git a/doc/html/annotated.js b/doc/html/annotated.js index 243dc679f..23ebc6bf2 100644 --- a/doc/html/annotated.js +++ b/doc/html/annotated.js @@ -23,6 +23,7 @@ var annotated = [ "photo_gd", "classphoto__gd.html", "classphoto__gd" ], [ "photo_imagick", "classphoto__imagick.html", "classphoto__imagick" ], [ "ProtoDriver", "classProtoDriver.html", "classProtoDriver" ], + [ "RedBasicAuth", "classRedBasicAuth.html", "classRedBasicAuth" ], [ "Template", "classTemplate.html", "classTemplate" ], [ "ZotDriver", "classZotDriver.html", "classZotDriver" ] ]; \ No newline at end of file diff --git a/doc/html/auth_8php.html b/doc/html/auth_8php.html index 220d244b3..725b1156d 100644 --- a/doc/html/auth_8php.html +++ b/doc/html/auth_8php.html @@ -152,7 +152,7 @@ Variables

Returns account record on success, null on failure

A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record Plugins should never set 'authenticated' except to indicate success - as hooks may be chained and later plugins should not interfere with an earlier one that succeeded.

-

Referenced by api_login().

+

Referenced by api_login(), and RedBasicAuth\validateUserPass().

diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index f53d465b6..1229da1fb 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -898,7 +898,7 @@ Variables
-

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

+

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

@@ -960,7 +960,7 @@ Variables
-

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), 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(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_block(), comanche_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), 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(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

+

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), 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(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_block(), comanche_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), 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(), service_class_allows(), service_class_fetch(), smilies(), syncdirs(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

@@ -1221,7 +1221,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(), 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(), php_init(), 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(), sitelist_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(), cloud_init(), contactgroup_content(), events_content(), fbrowser_content(), feed_init(), filer_content(), filerm_content(), goaway(), http_status_exit(), item_post(), json_return_and_die(), like_content(), lockview_content(), msearch_post(), network_content(), oembed_init(), oexchange_init(), opensearch_init(), parse_url_content(), photo_init(), photos_post(), php_init(), 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(), sitelist_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().

@@ -1239,7 +1239,7 @@ Variables
-

Referenced by api_call(), conversation(), and item_photo_menu().

+

Referenced by api_call(), conversation(), and item_photo_menu().

@@ -1256,7 +1256,7 @@ Variables
-

Referenced by acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), lastpost_init(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_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(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_profile(), z_input_filter(), zid_init(), and zping_content().

+

Referenced by acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), lastpost_init(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_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(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_profile(), z_input_filter(), zid_init(), and zping_content().

@@ -1308,7 +1308,7 @@ Variables
-

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

+

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

@@ -1486,7 +1486,7 @@ Variables
-

Referenced by channel_content(), community_content(), directory_content(), display_content(), drop_items(), hcard_init(), item_content(), item_permissions_sql(), item_post(), lastpost_content(), nav(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), redir_init(), search_content(), subthread_content(), tagger_content(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), widget_profile(), zid_init(), and zotfeed_init().

+

Referenced by channel_content(), community_content(), directory_content(), display_content(), drop_items(), hcard_init(), item_content(), item_permissions_sql(), item_post(), lastpost_content(), nav(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), redir_init(), search_content(), subthread_content(), tagger_content(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), widget_profile(), zid_init(), and zotfeed_init().

@@ -1547,7 +1547,7 @@ Variables
-

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

+

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

@@ -1615,7 +1615,7 @@ Variables
-

Referenced by allowed_public_recips(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_css_if_exists(), format_filer(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), 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(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

+

Referenced by allowed_public_recips(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_css_if_exists(), format_filer(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), 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(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

@@ -1653,7 +1653,7 @@ Variables
Returns
string

'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else

-

Referenced by bb_ShareAttributes(), conversation(), get_plink(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

+

Referenced by bb_ShareAttributes(), conversation(), get_plink(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

@@ -1856,7 +1856,7 @@ Variables

Account Flags

-

Referenced by account_verify_password(), create_account(), onepoll_run(), and poller_run().

+

Referenced by account_verify_password(), create_account(), onepoll_run(), poller_run(), and RedBasicAuth\validateUserPass().

@@ -1925,7 +1925,7 @@ Variables
-

Referenced by account_verify_password(), onepoll_run(), poller_run(), and register_post().

+

Referenced by account_verify_password(), onepoll_run(), poller_run(), register_post(), and RedBasicAuth\validateUserPass().

@@ -1939,7 +1939,7 @@ Variables
-

Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), like_content(), like_puller(), localize_item(), notifications_content(), and visible_activity().

+

Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), like_content(), like_puller(), localize_item(), notifications_content(), and visible_activity().

@@ -2006,7 +2006,7 @@ Variables

activity stream defines

-

Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), like_content(), like_puller(), localize_item(), notifications_content(), and visible_activity().

+

Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), like_content(), like_puller(), localize_item(), notifications_content(), and visible_activity().

@@ -2926,7 +2926,7 @@ Variables
-

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

+

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

@@ -2966,7 +2966,7 @@ Variables
-

Referenced by conversation(), get_item_elements(), Item\get_template_data(), item_post(), item_store(), and item_store_update().

+

Referenced by conversation(), get_item_elements(), Item\get_template_data(), item_post(), item_store(), and item_store_update().

@@ -3095,7 +3095,7 @@ Variables
-

Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), lrdd(), magic_init(), mail_store(), mood_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), redir_init(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), and zot_register_hub().

+

Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), lrdd(), magic_init(), mail_store(), mood_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), redir_init(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), and zot_register_hub().

@@ -4491,7 +4491,7 @@ Variables
-

Referenced by check_item_source(), conversation(), decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), items_fetch(), network_content(), remove_community_tag(), search_ac_init(), search_content(), tag_deliver(), and tagger_content().

+

Referenced by check_item_source(), conversation(), decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), items_fetch(), network_content(), remove_community_tag(), search_ac_init(), search_content(), tag_deliver(), and tagger_content().

@@ -4505,7 +4505,7 @@ Variables
-

Referenced by conversation(), decode_tags(), encode_item_terms(), fetch_post_tags(), format_term_for_display(), get_atom_elements(), get_mentions(), handle_tag(), item_getfeedtags(), tag_deliver(), and tgroup_check().

+

Referenced by conversation(), decode_tags(), encode_item_terms(), fetch_post_tags(), format_term_for_display(), get_atom_elements(), get_mentions(), handle_tag(), item_getfeedtags(), tag_deliver(), and tgroup_check().

@@ -4638,7 +4638,7 @@ Variables

Tag/term types

-

Referenced by conversation(), decode_tags(), encode_item_terms(), get_atom_elements(), and handle_tag().

+

Referenced by conversation(), decode_tags(), encode_item_terms(), get_atom_elements(), and handle_tag().

diff --git a/doc/html/classConversation-members.html b/doc/html/classConversation-members.html index e93c324c5..a07c2b422 100644 --- a/doc/html/classConversation-members.html +++ b/doc/html/classConversation-members.html @@ -115,24 +115,25 @@ $(document).ready(function(){initNavTree('classConversation.html','');}); $commentableConversationprivate $modeConversationprivate $observerConversationprivate - $previewConversationprivate - $profile_ownerConversationprivate - $threadsConversationprivate - $writableConversationprivate - __construct($mode, $preview)Conversation - add_thread($item)Conversation - get_app()BaseObject - get_mode()Conversation - get_observer()Conversation - get_profile_owner()Conversation - get_template_data($alike, $dlike)Conversation - get_thread($id)Conversationprivate - is_commentable()Conversation - is_preview()Conversation - is_writable()Conversation - set_app($app)BaseObjectstatic - set_mode($mode)Conversationprivate - set_profile_owner($uid)Conversation + $prepared_itemConversationprivate + $previewConversationprivate + $profile_ownerConversationprivate + $threadsConversationprivate + $writableConversationprivate + __construct($mode, $preview, $prepared_item= '')Conversation + add_thread($item)Conversation + get_app()BaseObject + get_mode()Conversation + get_observer()Conversation + get_profile_owner()Conversation + get_template_data($alike, $dlike)Conversation + get_thread($id)Conversationprivate + is_commentable()Conversation + is_preview()Conversation + is_writable()Conversation + set_app($app)BaseObjectstatic + set_mode($mode)Conversationprivate + set_profile_owner($uid)Conversation diff --git a/doc/html/classConversation.html b/doc/html/classConversation.html index 913f04052..a71ebd774 100644 --- a/doc/html/classConversation.html +++ b/doc/html/classConversation.html @@ -126,8 +126,8 @@ Inheritance diagram for Conversation: - - + + @@ -173,6 +173,8 @@ Private Attributes + +

Public Member Functions

 __construct ($mode, $preview)
 
 __construct ($mode, $preview, $prepared_item= '')
 
 get_mode ()
 
 is_writable ()
 
 $preview = false
 
 $prepared_item = ''
 
@@ -183,7 +185,7 @@ Additional Inherited Members

Detailed Description

A list of threads

Constructor & Destructor Documentation

- +

Additional Inherited Members

@@ -197,7 +199,13 @@ Additional Inherited Members - + + + + + + + @@ -404,7 +412,7 @@ Additional Inherited Members

Set the mode we'll be displayed on

-

Referenced by __construct(), and set_profile_owner().

+

Referenced by __construct(), and set_profile_owner().

@@ -465,7 +473,7 @@ Additional Inherited Members
 $preview $preview,
 $prepared_item = '' 
-

Referenced by __construct(), get_mode(), set_mode(), and set_profile_owner().

+

Referenced by __construct(), get_mode(), set_mode(), and set_profile_owner().

@@ -489,6 +497,28 @@ Additional Inherited Members

Referenced by add_thread(), get_observer(), and set_mode().

+ + + +
+
+ + + + + +
+ + + + +
Conversation::$prepared_item = ''
+ 		+private
+
+ +

Referenced by __construct(), and get_template_data().

+
@@ -509,7 +539,7 @@ Additional Inherited Members
-

Referenced by __construct(), and is_preview().

+

Referenced by __construct(), and is_preview().

diff --git a/doc/html/classConversation.js b/doc/html/classConversation.js index 57f735fb5..28a45e7f1 100644 --- a/doc/html/classConversation.js +++ b/doc/html/classConversation.js @@ -1,6 +1,6 @@ var classConversation = [ - [ "__construct", "classConversation.html#a6b064d00c56a6b7dec359d4348711c84", null ], + [ "__construct", "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09", null ], [ "add_thread", "classConversation.html#a8335cdd43f1836e3c255638e61a09e16", null ], [ "get_mode", "classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd", null ], [ "get_observer", "classConversation.html#ae3d4190142e12b57051f11f2911f77a0", null ], @@ -15,6 +15,7 @@ var classConversation = [ "$commentable", "classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6", null ], [ "$mode", "classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a", null ], [ "$observer", "classConversation.html#a8748445aa26047ebed5141f3c3cbc244", null ], + [ "$prepared_item", "classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2", null ], [ "$preview", "classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae", null ], [ "$profile_owner", "classConversation.html#a2f12724ef0244e9049fe1bb9641b516d", null ], [ "$threads", "classConversation.html#a41f4a549e6a99f98935c4742addd22c8", null ], diff --git a/doc/html/classRedBasicAuth-members.html b/doc/html/classRedBasicAuth-members.html new file mode 100644 index 000000000..d12aa9a5e --- /dev/null +++ b/doc/html/classRedBasicAuth-members.html @@ -0,0 +1,118 @@ + + + + + + +The Red Matrix: Member List + + + + + + + + + + + + + +
+
+ + + + + + + +
+
The Red Matrix +
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+
RedBasicAuth Member List
+
+
+ +

This is the complete list of members for RedBasicAuth, including all inherited members.

+ + +
validateUserPass($username, $password)RedBasicAuthprotected
+
+ diff --git a/doc/html/classRedBasicAuth.html b/doc/html/classRedBasicAuth.html new file mode 100644 index 000000000..0269822c9 --- /dev/null +++ b/doc/html/classRedBasicAuth.html @@ -0,0 +1,169 @@ + + + + + + +The Red Matrix: RedBasicAuth Class Reference + + + + + + + + + + + + + +
+
+ + + + + + + +
+
The Red Matrix +
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+Protected Member Functions | +List of all members
+
+
RedBasicAuth Class Reference
+
+
+
+Inheritance diagram for RedBasicAuth:
+
+
+ + + +
+ + + + +

+Protected Member Functions

 validateUserPass ($username, $password)
 
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
RedBasicAuth::validateUserPass ( $username,
 $password 
)
+ 		+protected
+
+ +
+
+
The documentation for this class was generated from the following file: +
+
+ diff --git a/doc/html/classRedBasicAuth.js b/doc/html/classRedBasicAuth.js new file mode 100644 index 000000000..5c1d058d4 --- /dev/null +++ b/doc/html/classRedBasicAuth.js @@ -0,0 +1,4 @@ +var classRedBasicAuth = +[ + [ "validateUserPass", "classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b", null ] +]; \ No newline at end of file diff --git a/doc/html/classRedBasicAuth.png b/doc/html/classRedBasicAuth.png new file mode 100644 index 000000000..01abbef69 Binary files /dev/null and b/doc/html/classRedBasicAuth.png differ diff --git a/doc/html/classes.html b/doc/html/classes.html index 3fbe05e31..5a552ea9a 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -109,31 +109,32 @@ $(document).ready(function(){initNavTree('classes.html','');});
Class Index
-
A | B | C | D | E | F | I | P | T | Z
+
A | B | C | D | E | F | I | P | R | T | Z
- + - - + + + - - +
  A  
Conversation   
  F  
-		ITemplateEngine   
  Z  
+		ITemplateEngine   
  T  
  D  
  P  
App   FKOAuth1   ZotDriver   
App   FKOAuth1   Template   
  B  
-		dba_driver   FKOAuthDataStore   photo_driver   
dba_mysql   FriendicaSmarty   photo_gd   
BaseObject   dba_mysqli   FriendicaSmartyEngine   photo_imagick   
dba_driver   FKOAuthDataStore   photo_driver   
  Z  
+
dba_mysql   FriendicaSmarty   photo_gd   
BaseObject   dba_mysqli   FriendicaSmartyEngine   photo_imagick   ZotDriver   
  C  
  E  
  I  
ProtoDriver   
  T  
+
  R  
Cache   enotify   Item   
Template   
RedBasicAuth   
-
A | B | C | D | E | F | I | P | T | Z
+
A | B | C | D | E | F | I | P | R | T | Z
diff --git a/doc/html/cloud_8php.html b/doc/html/cloud_8php.html new file mode 100644 index 000000000..05196301b --- /dev/null +++ b/doc/html/cloud_8php.html @@ -0,0 +1,142 @@ + + + + + + +The Red Matrix: mod/cloud.php File Reference + + + + + + + + + + + + + +
+
+ + + + + + + +
+
The Red Matrix +
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+Classes | +Functions
+
+
cloud.php File Reference
+
+
+ + + + +

+Classes

class  RedBasicAuth
 
+ + + +

+Functions

 cloud_init ()
 
+

Function Documentation

+ +
+
+ + + + + + + +
cloud_init ()
+
+ +
+
+
+
+ diff --git a/doc/html/cloud_8php.js b/doc/html/cloud_8php.js new file mode 100644 index 000000000..9463067b2 --- /dev/null +++ b/doc/html/cloud_8php.js @@ -0,0 +1,5 @@ +var cloud_8php = +[ + [ "RedBasicAuth", "classRedBasicAuth.html", "classRedBasicAuth" ], + [ "cloud_init", "cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8", null ] +]; \ No newline at end of file diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html index 71084b7ba..ef1d9948b 100644 --- a/doc/html/comanche_8php.html +++ b/doc/html/comanche_8php.html @@ -124,8 +124,8 @@ Functions    comanche_webpage (&$a, $s)   - comanche_widget ($name, $args=null) -  + comanche_widget ($name, $text) +   comanche_region (&$a, $s)    widget_profile ($args) @@ -268,7 +268,7 @@ Functions - +
@@ -282,7 +282,7 @@ Functions - + diff --git a/doc/html/comanche_8php.js b/doc/html/comanche_8php.js index d4273e596..ab37f1a13 100644 --- a/doc/html/comanche_8php.js +++ b/doc/html/comanche_8php.js @@ -6,7 +6,7 @@ var comanche_8php = [ "comanche_region", "comanche_8php.html#a5718daeda40bf835345fe061e8808cdf", null ], [ "comanche_replace_region", "comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe", null ], [ "comanche_webpage", "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a", null ], - [ "comanche_widget", "comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e", null ], + [ "comanche_widget", "comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f", null ], [ "pdl_selector", "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e", null ], [ "widget_profile", "comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ] ]; \ No newline at end of file diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index 6ce2ab111..a7d0e8932 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -122,8 +122,8 @@ Functions - - + + @@ -198,7 +198,7 @@ Functions
 $args = null $text 
 
 visible_activity ($item)
 
 conversation (&$a, $items, $mode, $update, $page_mode= 'traditional')
 
 conversation (&$a, $items, $mode, $update, $page_mode= 'traditional', $prepared_item= '')
 
 best_link_url ($item)
 
 item_photo_menu ($item)
-

Referenced by conversation().

+

Referenced by conversation().

@@ -230,7 +230,7 @@ Functions - +
@@ -262,7 +262,13 @@ Functions - + + + + + + + @@ -378,7 +384,7 @@ Functions
 $page_mode = 'traditional' $page_mode = 'traditional',
 $prepared_item = '' 
-

Referenced by conversation(), and Item\get_template_data().

+

Referenced by conversation(), and Item\get_template_data().

@@ -438,7 +444,7 @@ Functions
-

Referenced by conversation(), and Item\get_template_data().

+

Referenced by conversation(), and Item\get_template_data().

@@ -510,7 +516,7 @@ Functions
-

Referenced by conversation().

+

Referenced by conversation().

@@ -529,7 +535,7 @@ Functions

Render actions localized

-

Referenced by api_format_items(), conversation(), format_notification(), Item\get_template_data(), and notification().

+

Referenced by api_format_items(), conversation(), format_notification(), Item\get_template_data(), and notification().

@@ -691,7 +697,7 @@ Functions
-

Referenced by blocks_content(), channel_content(), lastpost_content(), layouts_content(), network_content(), and webpages_content().

+

Referenced by blocks_content(), channel_content(), display_content(), lastpost_content(), layouts_content(), network_content(), and webpages_content().

@@ -709,7 +715,7 @@ Functions
-

Referenced by Item\__construct(), conversation(), count_descendants(), and notification().

+

Referenced by Item\__construct(), conversation(), count_descendants(), and notification().

diff --git a/doc/html/conversation_8php.js b/doc/html/conversation_8php.js index 4417191d0..4dd039449 100644 --- a/doc/html/conversation_8php.js +++ b/doc/html/conversation_8php.js @@ -3,7 +3,7 @@ var conversation_8php = [ "add_children_to_list", "conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b", null ], [ "best_link_url", "conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7", null ], [ "conv_sort", "conversation_8php.html#abed85a41f1160598de880b84021c9cf7", null ], - [ "conversation", "conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1", null ], + [ "conversation", "conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81", null ], [ "count_descendants", "conversation_8php.html#ab2383dff4f823e580399ff469d90ab19", null ], [ "find_thread_parent_index", "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6", null ], [ "format_like", "conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3", null ], diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 2e6f5f32e..2f049fea8 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(), build_sync_packet(), cal(), channel_content(), Cache\clear(), consume_feed(), conversation(), 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(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), like_content(), logger(), magic_init(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), 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(), build_sync_packet(), cal(), channel_content(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), like_content(), logger(), magic_init(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

@@ -474,7 +474,7 @@ Functions
-

Referenced by admin_page_users(), advanced_profile(), bb_ShareAttributes(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

+

Referenced by admin_page_users(), advanced_profile(), bb_ShareAttributes(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 169568bbe..979ba3ae1 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
-

Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

+

Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

@@ -320,7 +320,7 @@ Functions

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

-

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), dir_tagadelic(), directory_content(), directory_run(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), follow_widget(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), intro_content(), intro_post(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

+

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), dir_tagadelic(), directory_content(), directory_run(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), follow_widget(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), intro_content(), intro_post(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 0157db288..82f3f829c 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -126,6 +126,8 @@ Files   file  chanview.php   +file  cloud.php +  file  common.php   file  community.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index f4737d08a..61dd07801 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -11,6 +11,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "chanman.php", "mod_2chanman_8php.html", null ], [ "channel.php", "channel_8php.html", "channel_8php" ], [ "chanview.php", "chanview_8php.html", "chanview_8php" ], + [ "cloud.php", "cloud_8php.html", "cloud_8php" ], [ "common.php", "common_8php.html", "common_8php" ], [ "community.php", "community_8php.html", "community_8php" ], [ "connect.php", "connect_8php.html", "connect_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index aafba0347..66c753266 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(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), 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_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), 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(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), photo_driver\save(), 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(), theme_attachments(), thing_init(), 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(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), 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_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), 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(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), photo_driver\save(), 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(), theme_attachments(), thing_init(), 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().

@@ -146,7 +146,7 @@ Variables
-

Referenced by admin_page_plugins(), admin_page_site(), admin_page_themes(), apw_form(), fbrowser_content(), filestorage_content(), and redbasic_form().

+

Referenced by admin_page_plugins(), admin_page_site(), admin_page_themes(), apw_form(), fbrowser_content(), filestorage_content(), and redbasic_form().

diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 00def6ba4..443b7d2cd 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions
-

Referenced by apw_form(), categories_widget(), channel_aside(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), lastpost_aside(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), saved_searches(), search_saved_searches(), settings_aside(), sources_content(), sources_post(), and thing_content().

+

Referenced by apw_form(), categories_widget(), channel_aside(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), lastpost_aside(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), saved_searches(), search_saved_searches(), settings_aside(), sources_content(), sources_post(), and thing_content().

diff --git a/doc/html/files.html b/doc/html/files.html index c0c22cda7..fb49faead 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -199,119 +199,120 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*chanman.php |o*channel.php |o*chanview.php -|o*common.php -|o*community.php -|o*connect.php -|o*connections.php -|o*contactgroup.php -|o*crepair.php -|o*delegate.php -|o*directory.php -|o*dirsearch.php -|o*display.php -|o*editblock.php -|o*editlayout.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*filestorage.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*intro.php -|o*invite.php -|o*item.php -|o*lastpost.php -|o*layouts.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*nogroup.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*pubsites.php -|o*qsearch.php -|o*randprof.php -|o*redir.php -|o*register.php -|o*regmod.php -|o*removeme.php -|o*rmagic.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*sources.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*uexport.php -|o*update_channel.php -|o*update_community.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|o*zotfeed.php -|\*zping.php +|o*cloud.php +|o*common.php +|o*community.php +|o*connect.php +|o*connections.php +|o*contactgroup.php +|o*crepair.php +|o*delegate.php +|o*directory.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*filestorage.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*intro.php +|o*invite.php +|o*item.php +|o*lastpost.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*nogroup.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*pubsites.php +|o*qsearch.php +|o*randprof.php +|o*redir.php +|o*register.php +|o*regmod.php +|o*removeme.php +|o*rmagic.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*sources.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*uexport.php +|o*update_channel.php +|o*update_community.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/functions.html b/doc/html/functions.html index 209d03587..1aff4cec6 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -287,8 +287,8 @@ $(document).ready(function(){initNavTree('functions.html','');}); : App
  • $name -: Template -, FriendicaSmartyEngine +: FriendicaSmartyEngine +, Template
  • $nav_sel : App @@ -327,6 +327,9 @@ $(document).ready(function(){initNavTree('functions.html','');});
  • $plugins : App
    • +
  • $prepared_item +: Conversation +
  • $preview : Conversation
    • diff --git a/doc/html/functions_0x5f.html b/doc/html/functions_0x5f.html index f6b498986..ff74d25d6 100644 --- a/doc/html/functions_0x5f.html +++ b/doc/html/functions_0x5f.html @@ -141,7 +141,7 @@ $(document).ready(function(){initNavTree('functions_0x5f.html','');});

    - _ -

    diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html index 3c232a70e..636e241ad 100644 --- a/doc/html/functions_func.html +++ b/doc/html/functions_func.html @@ -84,25 +84,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); @@ -143,7 +143,10 @@ $(document).ready(function(){initNavTree('functions_func.html','');}); , Conversation , FriendicaSmarty , photo_driver +, RedInode , FriendicaSmartyEngine +, RedDirectory +, RedFile , dba_driver , Item , FKOAuth1 @@ -186,501 +189,6 @@ $(document).ready(function(){initNavTree('functions_func.html','');}); : Template - - -

    - a -

    - - -

    - b -

      -
    • build_pagehead() -: App -
      • -
    - - -

    - c -

    - - -

    - d -

    - - -

    - e -

    - - -

    - f -

    - - -

    - g -

    - - -

    - h -

      -
    • head_get_icon() -: App -
      • -
    • head_set_icon() -: App -
      • -
    - - -

    - i -

    - - -

    - l -

    - - -

    - n -

    - - -

    - o -

    - - -

    - p -

    - - -

    - q -

    - - -

    - r -

    - - -

    - s -

    - - -

    - t -

      -
    • template_engine() -: App -
      • -
    - - -

    - v -

    diff --git a/doc/html/functions_func.js b/doc/html/functions_func.js new file mode 100644 index 000000000..0df3edefe --- /dev/null +++ b/doc/html/functions_func.js @@ -0,0 +1,22 @@ +var functions_func = +[ + [ "_", "functions_func.html", null ], + [ "a", "functions_func_0x61.html", null ], + [ "b", "functions_func_0x62.html", null ], + [ "c", "functions_func_0x63.html", null ], + [ "d", "functions_func_0x64.html", null ], + [ "e", "functions_func_0x65.html", null ], + [ "f", "functions_func_0x66.html", null ], + [ "g", "functions_func_0x67.html", null ], + [ "h", "functions_func_0x68.html", null ], + [ "i", "functions_func_0x69.html", null ], + [ "l", "functions_func_0x6c.html", null ], + [ "n", "functions_func_0x6e.html", null ], + [ "o", "functions_func_0x6f.html", null ], + [ "p", "functions_func_0x70.html", null ], + [ "q", "functions_func_0x71.html", null ], + [ "r", "functions_func_0x72.html", null ], + [ "s", "functions_func_0x73.html", null ], + [ "t", "functions_func_0x74.html", null ], + [ "v", "functions_func_0x76.html", null ] +]; \ No newline at end of file diff --git a/doc/html/functions_func_0x61.html b/doc/html/functions_func_0x61.html new file mode 100644 index 000000000..0fd5f689b --- /dev/null +++ b/doc/html/functions_func_0x61.html @@ -0,0 +1,154 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - a -

    +
    +
    + diff --git a/doc/html/functions_func_0x62.html b/doc/html/functions_func_0x62.html new file mode 100644 index 000000000..c8ddf26e4 --- /dev/null +++ b/doc/html/functions_func_0x62.html @@ -0,0 +1,147 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - b -

      +
    • build_pagehead() +: App +
      • +
    +
    +
    + diff --git a/doc/html/functions_func_0x63.html b/doc/html/functions_func_0x63.html new file mode 100644 index 000000000..5fafc662b --- /dev/null +++ b/doc/html/functions_func_0x63.html @@ -0,0 +1,189 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - c -

    +
    +
    + diff --git a/doc/html/functions_func_0x64.html b/doc/html/functions_func_0x64.html new file mode 100644 index 000000000..c37b0ea76 --- /dev/null +++ b/doc/html/functions_func_0x64.html @@ -0,0 +1,172 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - d -

    +
    +
    + diff --git a/doc/html/functions_func_0x65.html b/doc/html/functions_func_0x65.html new file mode 100644 index 000000000..34be3e1d0 --- /dev/null +++ b/doc/html/functions_func_0x65.html @@ -0,0 +1,149 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - e -

    +
    +
    + diff --git a/doc/html/functions_func_0x66.html b/doc/html/functions_func_0x66.html new file mode 100644 index 000000000..1c57a8edb --- /dev/null +++ b/doc/html/functions_func_0x66.html @@ -0,0 +1,149 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - f -

    +
    +
    + diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html new file mode 100644 index 000000000..4c3fd466b --- /dev/null +++ b/doc/html/functions_func_0x67.html @@ -0,0 +1,304 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - g -

    +
    +
    + diff --git a/doc/html/functions_func_0x68.html b/doc/html/functions_func_0x68.html new file mode 100644 index 000000000..93aa721d3 --- /dev/null +++ b/doc/html/functions_func_0x68.html @@ -0,0 +1,150 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - h -

      +
    • head_get_icon() +: App +
      • +
    • head_set_icon() +: App +
      • +
    +
    +
    + diff --git a/doc/html/functions_func_0x69.html b/doc/html/functions_func_0x69.html new file mode 100644 index 000000000..5952356db --- /dev/null +++ b/doc/html/functions_func_0x69.html @@ -0,0 +1,177 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - i -

    +
    +
    + diff --git a/doc/html/functions_func_0x6c.html b/doc/html/functions_func_0x6c.html new file mode 100644 index 000000000..3a6959653 --- /dev/null +++ b/doc/html/functions_func_0x6c.html @@ -0,0 +1,161 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - l -

    +
    +
    + diff --git a/doc/html/functions_func_0x6e.html b/doc/html/functions_func_0x6e.html new file mode 100644 index 000000000..9a400dd49 --- /dev/null +++ b/doc/html/functions_func_0x6e.html @@ -0,0 +1,150 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - n -

    +
    +
    + diff --git a/doc/html/functions_func_0x6f.html b/doc/html/functions_func_0x6f.html new file mode 100644 index 000000000..39ccbd89c --- /dev/null +++ b/doc/html/functions_func_0x6f.html @@ -0,0 +1,147 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - o -

    +
    +
    + diff --git a/doc/html/functions_func_0x70.html b/doc/html/functions_func_0x70.html new file mode 100644 index 000000000..2fc9536da --- /dev/null +++ b/doc/html/functions_func_0x70.html @@ -0,0 +1,150 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - p -

    +
    +
    + diff --git a/doc/html/functions_func_0x71.html b/doc/html/functions_func_0x71.html new file mode 100644 index 000000000..3a8b3c931 --- /dev/null +++ b/doc/html/functions_func_0x71.html @@ -0,0 +1,149 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - q -

    +
    +
    + diff --git a/doc/html/functions_func_0x72.html b/doc/html/functions_func_0x72.html new file mode 100644 index 000000000..7253a7d8f --- /dev/null +++ b/doc/html/functions_func_0x72.html @@ -0,0 +1,166 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - r -

    +
    +
    + diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html new file mode 100644 index 000000000..80016b95c --- /dev/null +++ b/doc/html/functions_func_0x73.html @@ -0,0 +1,244 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - s -

    +
    +
    + diff --git a/doc/html/functions_func_0x74.html b/doc/html/functions_func_0x74.html new file mode 100644 index 000000000..dfb6d581f --- /dev/null +++ b/doc/html/functions_func_0x74.html @@ -0,0 +1,147 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - t -

      +
    • template_engine() +: App +
      • +
    +
    +
    + diff --git a/doc/html/functions_func_0x76.html b/doc/html/functions_func_0x76.html new file mode 100644 index 000000000..e2fb97e1a --- /dev/null +++ b/doc/html/functions_func_0x76.html @@ -0,0 +1,150 @@ + + + + + + +The Red Matrix: Class Members - Functions + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - v -

    +
    +
    + diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 8f5649b3e..dfa0b9a78 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -135,6 +135,12 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
  • $argv : App
    • +
  • $attach +: RedInode +
    • +
  • $auth +: RedDirectory +
  • $baseurl : App
    • @@ -151,6 +157,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : App , Item +
  • $channel_id +: RedDirectory +
  • $children : Item
    • @@ -198,8 +207,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : Template
  • $data -: App -, Item +: Item +, RedFile +, App
  • $db : App @@ -209,6 +219,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : dba_driver , Template
    • +
  • $dir_key +: RedDirectory +
  • $done : Template
    • @@ -332,6 +345,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
  • $rdelim : App
    • +
  • $red_path +: RedDirectory +
  • $redirect_url : Item
    • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index bc5f6db3c..9797611b1 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -267,6 +267,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
  • get_rel_link() : text.php
    • +
  • get_rpost_path() +: zot.php +
  • get_tags() : text.php
    • diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 78ec452a9..822fcb6ae 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -279,6 +279,12 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
  • rmagic_post() : rmagic.php
    • +
  • rpost_callback() +: bbcode.php +
    • +
  • rpost_content() +: rpost.php +
  • rsa_sign() : crypto.php
    • diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index df8fe975b..2ad08fdea 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -151,10 +151,10 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');}); : items.php
  • tagadelic() -: taxonomy.php +: taxonomy.php
  • tagblock() -: taxonomy.php +: taxonomy.php
  • tagger_content() : tagger.php diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index bcbb2d949..0c34d1783 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -172,7 +172,10 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');}); : docblox_errorchecker.php
  • widget_profile() -: comanche.php +: widgets.php +
    • +
  • widget_tagcloud() +: widgets.php
  • writepages_widget() : page_widgets.php diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 81e4ad303..69cba7bab 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -266,6 +266,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
  • get_rel_link() : text.php
    • +
  • get_rpost_path() +: zot.php +
  • get_tags() : text.php
    • diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index ec30bc3e8..bab0b23ea 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -254,6 +254,12 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
  • rmagic_post() : rmagic.php
    • +
  • rpost_callback() +: bbcode.php +
    • +
  • rpost_content() +: rpost.php +
  • rsa_sign() : crypto.php
    • diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html index efc157b7f..4b52e7490 100644 --- a/doc/html/globals_func_0x74.html +++ b/doc/html/globals_func_0x74.html @@ -150,10 +150,10 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');}); : items.php
  • tagadelic() -: taxonomy.php +: taxonomy.php
  • tagblock() -: taxonomy.php +: taxonomy.php
  • tagger_content() : tagger.php diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index ef37d259d..110ffab01 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -168,7 +168,10 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');}); : setup.php
  • widget_profile() -: comanche.php +: widgets.php +
    • +
  • widget_tagcloud() +: widgets.php
  • writepages_widget() : page_widgets.php diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index 1394ae17e..7f857db49 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -122,20 +122,29 @@ $(document).ready(function(){initNavTree('hierarchy.html','');}); |oCdba_mysql |\Cdba_mysqli oCenotify -oCITemplateEngine -|oCFriendicaSmartyEngine -|\CTemplate -oCOAuthDataStore -|\CFKOAuthDataStore -oCOAuthServer -|\CFKOAuth1 -oCphoto_driver -|oCphoto_gd -|\Cphoto_imagick -oCProtoDriver -|\CZotDriver -\CSmarty - \CFriendicaSmarty +oCICollection +|\CRedDirectory +oCIFile +|\CRedFile +oCINode +|\CRedInode +oCITemplateEngine +|oCFriendicaSmartyEngine +|\CTemplate +oCNode +|oCRedDirectory +|\CRedFile +oCOAuthDataStore +|\CFKOAuthDataStore +oCOAuthServer +|\CFKOAuth1 +oCphoto_driver +|oCphoto_gd +|\Cphoto_imagick +oCProtoDriver +|\CZotDriver +\CSmarty + \CFriendicaSmarty diff --git a/doc/html/hierarchy.js b/doc/html/hierarchy.js index 3eb426ef0..dcf3e740e 100644 --- a/doc/html/hierarchy.js +++ b/doc/html/hierarchy.js @@ -14,10 +14,23 @@ var hierarchy = [ "dba_mysqli", "classdba__mysqli.html", null ] ] ], [ "enotify", "classenotify.html", null ], + [ "ICollection", null, [ + [ "RedDirectory", "classRedDirectory.html", null ] + ] ], + [ "IFile", null, [ + [ "RedFile", "classRedFile.html", null ] + ] ], + [ "INode", null, [ + [ "RedInode", "classRedInode.html", null ] + ] ], [ "ITemplateEngine", "interfaceITemplateEngine.html", [ [ "FriendicaSmartyEngine", "classFriendicaSmartyEngine.html", null ], [ "Template", "classTemplate.html", null ] ] ], + [ "Node", null, [ + [ "RedDirectory", "classRedDirectory.html", null ], + [ "RedFile", "classRedFile.html", null ] + ] ], [ "OAuthDataStore", null, [ [ "FKOAuthDataStore", "classFKOAuthDataStore.html", null ] ] ], diff --git a/doc/html/html2bbcode_8php.html b/doc/html/html2bbcode_8php.html index 178929237..4d08aa5a1 100644 --- a/doc/html/html2bbcode_8php.html +++ b/doc/html/html2bbcode_8php.html @@ -164,7 +164,7 @@ Functions
    -

    Referenced by api_statuses_mediap(), api_statuses_update(), diaspora2bb(), and get_atom_elements().

    +

    Referenced by api_statuses_mediap(), api_statuses_update(), diaspora2bb(), get_atom_elements(), and rpost_content().

    diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 8852c8bfd..7d3aec9af 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
    -

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), cloud_init(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), unobscure(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    +

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), cloud_init(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), unobscure(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    @@ -324,7 +324,7 @@ Functions
    -

    Referenced by authenticate_success(), App\build_pagehead(), change_channel(), channel_aside(), channel_content(), chanview_content(), community_content(), connect_content(), contact_block(), contact_remove(), conversation(), current_theme(), directory_content(), display_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_theme_uid(), group_content(), intro_content(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_aside(), lastpost_content(), FKOAuth1\loginUser(), message_content(), network_content(), network_init(), notifications_content(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

    +

    Referenced by authenticate_success(), App\build_pagehead(), change_channel(), channel_aside(), channel_content(), chanview_content(), community_content(), connect_content(), contact_block(), contact_remove(), conversation(), current_theme(), directory_content(), display_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_theme_uid(), group_content(), intro_content(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_aside(), lastpost_content(), FKOAuth1\loginUser(), message_content(), network_content(), network_init(), notifications_content(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 2a8c5111f..e2a7be147 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -898,7 +898,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 3ade79271..008efa277 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 532537249..c60cc34a9 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -18,7 +18,7 @@ var NAVTREE = [ "Class Hierarchy", "hierarchy.html", "hierarchy" ], [ "Class Members", "functions.html", [ [ "All", "functions.html", "functions_dup" ], - [ "Functions", "functions_func.html", null ], + [ "Functions", "functions_func.html", "functions_func" ], [ "Variables", "functions_vars.html", null ] ] ] ] ], @@ -36,13 +36,13 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#a9255af5ae9c887520091ea04763c1a88", -"classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6", -"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6", -"globals_vars_0x6c.html", -"items_8php.html#a82955cc578f0fa600acec84475026194", -"probe_8php.html", -"text_8php.html#aca0f589be74fab1a460c57e88dad9779" +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce", +"classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f", +"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353", +"globals_0x74.html", +"interfaceITemplateEngine.html", +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6", +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 4fa9672b8..984d88c4d 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -91,8 +91,9 @@ var NAVTREEINDEX0 = "bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,4], "bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,3], "bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,1], +"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,5], "bbcode_8php.html#a52c45273fbb7ce5ec27094f7936856e1":[5,0,0,10,0], -"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,5], +"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,6], "bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,2], "blocks_8php.html":[5,0,1,7], "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0], @@ -248,6 +249,5 @@ var NAVTREEINDEX0 = "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,106], "boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,231], "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,133], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,127], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,238] +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,127] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index fbeabf921..e5b82b63e 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,6 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,238], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,34], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,152], @@ -248,6 +249,5 @@ var NAVTREEINDEX1 = "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0], "classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a":[4,0,8,13], "classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6":[4,0,8,12], -"classFKOAuth1.html":[4,0,13], -"classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f":[4,0,13,1] +"classFKOAuth1.html":[4,0,13] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index eeb3b7a43..3e4245870 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,6 @@ var NAVTREEINDEX2 = { +"classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f":[4,0,13,1], "classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6":[4,0,13,0], "classFKOAuthDataStore.html":[4,0,14], "classFKOAuthDataStore.html#a1148d47b546350bf440bdd92792c5df1":[4,0,14,1], @@ -73,39 +74,65 @@ var NAVTREEINDEX2 = "classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b":[4,0,22,3], "classRedBasicAuth.html":[4,0,23], "classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b":[4,0,23,0], -"classTemplate.html":[4,0,24], -"classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b":[4,0,24,13], -"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[4,0,24,12], -"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[4,0,24,22], -"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[4,0,24,2], -"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[4,0,24,3], -"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[4,0,24,6], -"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[4,0,24,21], -"classTemplate.html#a6f0efc256688c36110180b501067ff11":[4,0,24,23], -"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[4,0,24,15], -"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[4,0,24,9], -"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[4,0,24,19], -"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[4,0,24,4], -"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[4,0,24,10], -"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[4,0,24,20], -"classTemplate.html#aae9c4d761ea1298e745e8052d7910194":[4,0,24,1], -"classTemplate.html#abbc484016ddf5d818f55b823cae6feb0":[4,0,24,14], -"classTemplate.html#abda4c8d049f70553338eae7c905e9d5c":[4,0,24,17], -"classTemplate.html#abf71098c80fd1f218a59452b3408309e":[4,0,24,7], -"classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4":[4,0,24,0], -"classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8":[4,0,24,18], -"classTemplate.html#ae0836e7d5bd5afceb04f50fd635f1228":[4,0,24,8], -"classTemplate.html#ae791766c3d055f7f1ba5a5e60d647934":[4,0,24,5], -"classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a":[4,0,24,16], -"classTemplate.html#afd97b4b1e7754a550e67c0ea79159059":[4,0,24,11], -"classZotDriver.html":[4,0,25], -"classZotDriver.html#a2e15ff09772f0608203dad1c98299394":[4,0,25,3], -"classZotDriver.html#a3cfdf443da4e5326e205855d7c0054f2":[4,0,25,0], -"classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514":[4,0,25,6], -"classZotDriver.html#a6776935156accb0f170e2e24577133db":[4,0,25,1], -"classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f":[4,0,25,4], -"classZotDriver.html#af65febb26031eb7f39871b9e2a539797":[4,0,25,2], -"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6":[4,0,25,5], +"classRedDirectory.html":[4,0,24], +"classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0":[4,0,24,3], +"classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec":[4,0,24,1], +"classRedDirectory.html#a8d5df814b2f825dd14c628a51b5829b5":[4,0,24,8], +"classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44":[4,0,24,6], +"classRedDirectory.html#a986936910f0216887a25e28916c166c7":[4,0,24,2], +"classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a":[4,0,24,5], +"classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569":[4,0,24,4], +"classRedDirectory.html#acb32b8df27538c57772824a745e751d7":[4,0,24,9], +"classRedDirectory.html#add0bf2c049230fec4913e769d126e6e6":[4,0,24,0], +"classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d":[4,0,24,7], +"classRedFile.html":[4,0,25], +"classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b":[4,0,25,2], +"classRedFile.html#a2ff12032b45538353eded9809d3b7550":[4,0,25,6], +"classRedFile.html#a41a49a583eb276b75626fcf97f4a699c":[4,0,25,5], +"classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535":[4,0,25,1], +"classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f":[4,0,25,4], +"classRedFile.html#ad4588b90004a2741b1a4ced10355904c":[4,0,25,0], +"classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28":[4,0,25,3], +"classRedInode.html":[4,0,26], +"classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb":[4,0,26,0], +"classRedInode.html#a3d76322f25d847b123b3df37a26dd04e":[4,0,26,4], +"classRedInode.html#a5e8f09bc887725c3c448f8d72fe3edfc":[4,0,26,1], +"classRedInode.html#a7b317eb1230930154107ed51e54193f5":[4,0,26,5], +"classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6":[4,0,26,2], +"classRedInode.html#aec5706105400764124db39d4bc68d458":[4,0,26,3], +"classTemplate.html":[4,0,27], +"classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b":[4,0,27,13], +"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[4,0,27,12], +"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[4,0,27,22], +"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[4,0,27,2], +"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[4,0,27,3], +"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[4,0,27,6], +"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[4,0,27,21], +"classTemplate.html#a6f0efc256688c36110180b501067ff11":[4,0,27,23], +"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[4,0,27,15], +"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[4,0,27,9], +"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[4,0,27,19], +"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[4,0,27,4], +"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[4,0,27,10], +"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[4,0,27,20], +"classTemplate.html#aae9c4d761ea1298e745e8052d7910194":[4,0,27,1], +"classTemplate.html#abbc484016ddf5d818f55b823cae6feb0":[4,0,27,14], +"classTemplate.html#abda4c8d049f70553338eae7c905e9d5c":[4,0,27,17], +"classTemplate.html#abf71098c80fd1f218a59452b3408309e":[4,0,27,7], +"classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4":[4,0,27,0], +"classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8":[4,0,27,18], +"classTemplate.html#ae0836e7d5bd5afceb04f50fd635f1228":[4,0,27,8], +"classTemplate.html#ae791766c3d055f7f1ba5a5e60d647934":[4,0,27,5], +"classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a":[4,0,27,16], +"classTemplate.html#afd97b4b1e7754a550e67c0ea79159059":[4,0,27,11], +"classZotDriver.html":[4,0,28], +"classZotDriver.html#a2e15ff09772f0608203dad1c98299394":[4,0,28,3], +"classZotDriver.html#a3cfdf443da4e5326e205855d7c0054f2":[4,0,28,0], +"classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514":[4,0,28,6], +"classZotDriver.html#a6776935156accb0f170e2e24577133db":[4,0,28,1], +"classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f":[4,0,28,4], +"classZotDriver.html#af65febb26031eb7f39871b9e2a539797":[4,0,28,2], +"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6":[4,0,28,5], "classdba__driver.html":[4,0,9], "classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721":[4,0,9,1], "classdba__driver.html#a205f6535e399700b6fca2492f96f2229":[4,0,9,8], @@ -198,7 +225,6 @@ var NAVTREEINDEX2 = "comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,15,3], "comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,15,0], "comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f":[5,0,0,15,6], -"comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,15,8], "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,15,5], "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,15,7], "common_8php.html":[5,0,1,12], @@ -223,31 +249,5 @@ var NAVTREEINDEX2 = "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,18,0], "contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,18,3], "contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,18,2], -"contact__widgets_8php.html":[5,0,0,19], -"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,19,0], -"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,19,2], -"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,19,1], -"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,19,3], -"contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,19,4], -"contactgroup_8php.html":[5,0,1,16], -"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,16,0], -"conversation_8php.html":[5,0,0,20], -"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,20,7], -"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,20,9], -"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,20,20], -"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,20,6], -"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,20,15], -"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,20,14], -"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,20,21], -"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,20,8], -"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,20,13], -"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,20,19], -"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,20,17], -"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,20,10], -"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,20,4], -"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,20,2], -"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,20,18], -"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,20,0], -"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,20,1], -"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,20,11] +"contact__widgets_8php.html":[5,0,0,19] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index ad75c53f1..4b25fc21d 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,31 @@ var NAVTREEINDEX3 = { +"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,19,0], +"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,19,2], +"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,19,1], +"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,19,3], +"contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,19,4], +"contactgroup_8php.html":[5,0,1,16], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,16,0], +"conversation_8php.html":[5,0,0,20], +"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,20,7], +"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,20,9], +"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,20,20], +"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,20,6], +"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,20,15], +"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,20,14], +"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,20,21], +"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,20,8], +"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,20,13], +"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,20,19], +"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,20,17], +"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,20,10], +"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,20,4], +"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,20,2], +"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,20,18], +"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,20,0], +"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,20,1], +"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,20,11], "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,20,5], "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,20,16], "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,20,12], @@ -182,6 +208,25 @@ var NAVTREEINDEX3 = "functions_0x74.html":[4,3,0,18], "functions_0x76.html":[4,3,0,19], "functions_func.html":[4,3,1], +"functions_func.html":[4,3,1,0], +"functions_func_0x61.html":[4,3,1,1], +"functions_func_0x62.html":[4,3,1,2], +"functions_func_0x63.html":[4,3,1,3], +"functions_func_0x64.html":[4,3,1,4], +"functions_func_0x65.html":[4,3,1,5], +"functions_func_0x66.html":[4,3,1,6], +"functions_func_0x67.html":[4,3,1,7], +"functions_func_0x68.html":[4,3,1,8], +"functions_func_0x69.html":[4,3,1,9], +"functions_func_0x6c.html":[4,3,1,10], +"functions_func_0x6e.html":[4,3,1,11], +"functions_func_0x6f.html":[4,3,1,12], +"functions_func_0x70.html":[4,3,1,13], +"functions_func_0x71.html":[4,3,1,14], +"functions_func_0x72.html":[4,3,1,15], +"functions_func_0x73.html":[4,3,1,16], +"functions_func_0x74.html":[4,3,1,17], +"functions_func_0x76.html":[4,3,1,18], "functions_vars.html":[4,3,2], "globals.html":[5,1,0], "globals.html":[5,1,0,0], @@ -204,50 +249,5 @@ var NAVTREEINDEX3 = "globals_0x70.html":[5,1,0,17], "globals_0x71.html":[5,1,0,18], "globals_0x72.html":[5,1,0,19], -"globals_0x73.html":[5,1,0,20], -"globals_0x74.html":[5,1,0,21], -"globals_0x75.html":[5,1,0,22], -"globals_0x76.html":[5,1,0,23], -"globals_0x77.html":[5,1,0,24], -"globals_0x78.html":[5,1,0,25], -"globals_0x7a.html":[5,1,0,26], -"globals_func.html":[5,1,1,0], -"globals_func.html":[5,1,1], -"globals_func_0x61.html":[5,1,1,1], -"globals_func_0x62.html":[5,1,1,2], -"globals_func_0x63.html":[5,1,1,3], -"globals_func_0x64.html":[5,1,1,4], -"globals_func_0x65.html":[5,1,1,5], -"globals_func_0x66.html":[5,1,1,6], -"globals_func_0x67.html":[5,1,1,7], -"globals_func_0x68.html":[5,1,1,8], -"globals_func_0x69.html":[5,1,1,9], -"globals_func_0x6a.html":[5,1,1,10], -"globals_func_0x6b.html":[5,1,1,11], -"globals_func_0x6c.html":[5,1,1,12], -"globals_func_0x6d.html":[5,1,1,13], -"globals_func_0x6e.html":[5,1,1,14], -"globals_func_0x6f.html":[5,1,1,15], -"globals_func_0x70.html":[5,1,1,16], -"globals_func_0x71.html":[5,1,1,17], -"globals_func_0x72.html":[5,1,1,18], -"globals_func_0x73.html":[5,1,1,19], -"globals_func_0x74.html":[5,1,1,20], -"globals_func_0x75.html":[5,1,1,21], -"globals_func_0x76.html":[5,1,1,22], -"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,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], -"globals_vars_0x65.html":[5,1,2,4], -"globals_vars_0x66.html":[5,1,2,5], -"globals_vars_0x67.html":[5,1,2,6], -"globals_vars_0x68.html":[5,1,2,7], -"globals_vars_0x69.html":[5,1,2,8], -"globals_vars_0x6a.html":[5,1,2,9], -"globals_vars_0x6b.html":[5,1,2,10] +"globals_0x73.html":[5,1,0,20] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 9b9b0a658..c95752f74 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,50 @@ var NAVTREEINDEX4 = { +"globals_0x74.html":[5,1,0,21], +"globals_0x75.html":[5,1,0,22], +"globals_0x76.html":[5,1,0,23], +"globals_0x77.html":[5,1,0,24], +"globals_0x78.html":[5,1,0,25], +"globals_0x7a.html":[5,1,0,26], +"globals_func.html":[5,1,1,0], +"globals_func.html":[5,1,1], +"globals_func_0x61.html":[5,1,1,1], +"globals_func_0x62.html":[5,1,1,2], +"globals_func_0x63.html":[5,1,1,3], +"globals_func_0x64.html":[5,1,1,4], +"globals_func_0x65.html":[5,1,1,5], +"globals_func_0x66.html":[5,1,1,6], +"globals_func_0x67.html":[5,1,1,7], +"globals_func_0x68.html":[5,1,1,8], +"globals_func_0x69.html":[5,1,1,9], +"globals_func_0x6a.html":[5,1,1,10], +"globals_func_0x6b.html":[5,1,1,11], +"globals_func_0x6c.html":[5,1,1,12], +"globals_func_0x6d.html":[5,1,1,13], +"globals_func_0x6e.html":[5,1,1,14], +"globals_func_0x6f.html":[5,1,1,15], +"globals_func_0x70.html":[5,1,1,16], +"globals_func_0x71.html":[5,1,1,17], +"globals_func_0x72.html":[5,1,1,18], +"globals_func_0x73.html":[5,1,1,19], +"globals_func_0x74.html":[5,1,1,20], +"globals_func_0x75.html":[5,1,1,21], +"globals_func_0x76.html":[5,1,1,22], +"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_0x61.html":[5,1,2,1], +"globals_vars_0x63.html":[5,1,2,2], +"globals_vars_0x64.html":[5,1,2,3], +"globals_vars_0x65.html":[5,1,2,4], +"globals_vars_0x66.html":[5,1,2,5], +"globals_vars_0x67.html":[5,1,2,6], +"globals_vars_0x68.html":[5,1,2,7], +"globals_vars_0x69.html":[5,1,2,8], +"globals_vars_0x6a.html":[5,1,2,9], +"globals_vars_0x6b.html":[5,1,2,10], "globals_vars_0x6c.html":[5,1,2,11], "globals_vars_0x6d.html":[5,1,2,12], "globals_vars_0x6e.html":[5,1,2,13], @@ -204,50 +249,5 @@ var NAVTREEINDEX4 = "include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,55,6], "include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,55,5], "include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,55,4], -"index.html":[], -"interfaceITemplateEngine.html":[4,0,18], -"interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], -"interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], -"intro_8php.html":[5,0,1,40], -"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,40,1], -"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,40,0], -"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,40,2], -"invite_8php.html":[5,0,1,41], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,41,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,41,1], -"item_8php.html":[5,0,1,42], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,42,0], -"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,42,3], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,42,5], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,42,4], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,42,1], -"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,42,2], -"items_8php.html":[5,0,0,41], -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,54], -"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,41,2], -"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,41,6], -"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,41,28], -"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,41,7], -"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,41,33], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,41,37], -"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,41,25], -"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,41,4], -"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,41,32], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,41,39], -"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,41,3], -"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,41,13], -"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,41,21], -"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,41,0], -"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,41,45], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,41,48], -"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,41,30], -"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,41,20], -"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,41,12], -"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,41,18], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,41,38], -"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,41,16], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,41,36], -"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,41,41], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,41,34], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,41,43] +"index.html":[] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 6fdde53e2..f5db33c9f 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,50 @@ var NAVTREEINDEX5 = { +"interfaceITemplateEngine.html":[4,0,18], +"interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], +"interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], +"intro_8php.html":[5,0,1,40], +"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,40,1], +"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,40,0], +"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,40,2], +"invite_8php.html":[5,0,1,41], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,41,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,41,1], +"item_8php.html":[5,0,1,42], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,42,0], +"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,42,3], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,42,5], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,42,4], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,42,1], +"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,42,2], +"items_8php.html":[5,0,0,41], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,54], +"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,41,2], +"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,41,6], +"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,41,28], +"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,41,7], +"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,41,33], +"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,41,37], +"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,41,25], +"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,41,4], +"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,41,32], +"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,41,39], +"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,41,3], +"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,41,13], +"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,41,21], +"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,41,0], +"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,41,45], +"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,41,48], +"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,41,30], +"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,41,20], +"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,41,12], +"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,41,18], +"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,41,38], +"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,41,16], +"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,41,36], +"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,41,41], +"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,41,34], +"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,41,43], "items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,41,17], "items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,41,14], "items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,41,11], @@ -124,8 +169,8 @@ var NAVTREEINDEX5 = "mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,55,1], "msearch_8php.html":[5,0,1,56], "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,0], -"namespaceFriendica.html":[4,0,1], "namespaceFriendica.html":[3,0,1], +"namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], @@ -136,8 +181,8 @@ var NAVTREEINDEX5 = "namespaces.html":[3,0], "namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[3,0,3], -"namespaceutil.html":[3,0,4], "namespaceutil.html":[4,0,4], +"namespaceutil.html":[3,0,4], "nav_8php.html":[5,0,0,45], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,45,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,45,1], @@ -204,50 +249,5 @@ var NAVTREEINDEX5 = "php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[5,0,2,5,2], "php_2default_8php.html":[5,0,3,0,0], "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], -"php_8php.html":[5,0,1,69], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,0], -"pine_8php.html":[5,0,3,1,0,1,7], -"ping_8php.html":[5,0,1,70], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,70,0], -"plugin_8php.html":[5,0,0,56], -"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,17], -"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,20], -"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,56,8], -"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,13], -"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,15], -"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,56,7], -"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,12], -"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,24], -"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,56,9], -"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,22], -"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,56,11], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,19], -"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,23], -"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,56,4], -"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,56,0], -"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,56,25], -"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,56,1], -"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,56,21], -"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,56,18], -"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,56,14], -"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,56,3], -"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,56,6], -"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,56,2], -"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,56,10], -"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,16], -"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,56,5], -"po2php_8php.html":[5,0,2,6], -"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], -"poco_8php.html":[5,0,1,71], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,71,0], -"poke_8php.html":[5,0,1,72], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,72,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,72,0], -"poller_8php.html":[5,0,0,57], -"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,57,0], -"post_8php.html":[5,0,1,73], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,73,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,73,1], -"pretheme_8php.html":[5,0,1,74], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,74,0] +"php_8php.html":[5,0,1,69] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index cf31bb11c..b24764355 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,50 @@ var NAVTREEINDEX6 = { +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,0], +"pine_8php.html":[5,0,3,1,0,1,7], +"ping_8php.html":[5,0,1,70], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,70,0], +"plugin_8php.html":[5,0,0,56], +"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,17], +"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,20], +"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,56,8], +"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,13], +"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,15], +"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,56,7], +"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,12], +"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,24], +"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,56,9], +"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,22], +"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,56,11], +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,19], +"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,23], +"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,56,4], +"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,56,0], +"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,56,25], +"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,56,1], +"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,56,21], +"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,56,18], +"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,56,14], +"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,56,3], +"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,56,6], +"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,56,2], +"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,56,10], +"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,16], +"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,56,5], +"po2php_8php.html":[5,0,2,6], +"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], +"poco_8php.html":[5,0,1,71], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,71,0], +"poke_8php.html":[5,0,1,72], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,72,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,72,0], +"poller_8php.html":[5,0,0,57], +"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,57,0], +"post_8php.html":[5,0,1,73], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,73,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,73,1], +"pretheme_8php.html":[5,0,1,74], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,74,0], "probe_8php.html":[5,0,1,75], "probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,75,0], "profile_8php.html":[5,0,1,76], @@ -53,6 +98,7 @@ var NAVTREEINDEX6 = "redbasic_2php_2theme_8php.html":[5,0,3,1,1,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,1,0,2,0], "redbasic_8php.html":[5,0,3,1,0,1,8], +"reddav_8php.html":[5,0,0,63], "redir_8php.html":[5,0,1,83], "redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,83,0], "register_8php.html":[5,0,1,84], @@ -68,186 +114,140 @@ var NAVTREEINDEX6 = "rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,87,0], "rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,87,2], "rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,87,1], -"rsd__xml_8php.html":[5,0,1,88], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,88,0], -"search_8php.html":[5,0,1,89], -"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,89,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,89,3], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,89,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,89,1], -"search__ac_8php.html":[5,0,1,90], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,90,0], -"security_8php.html":[5,0,0,63], -"security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,63,11], -"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,63,2], -"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,63,4], -"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,63,5], -"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,63,1], -"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,63,7], -"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,63,3], -"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,63,9], -"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,63,6], -"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,63,0], -"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,63,10], -"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,63,8], -"session_8php.html":[5,0,0,64], -"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,64,4], -"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,64,0], -"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,64,1], -"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,64,8], -"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,64,5], -"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,64,7], -"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,64,6], -"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,64,3], -"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,64,9], -"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,64,2], -"settings_8php.html":[5,0,1,91], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,91,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,91,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,91,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,91,1], -"setup_8php.html":[5,0,1,92], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,92,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,92,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,92,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,92,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,92,9], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,92,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,92,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,92,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,92,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,92,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,92,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,92,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,92,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,92,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,92,14], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,92,6], -"share_8php.html":[5,0,1,93], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,93,0], -"siteinfo_8php.html":[5,0,1,94], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,94,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,94,0], -"sitelist_8php.html":[5,0,1,95], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,95,0], -"smilies_8php.html":[5,0,1,96], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,96,0], -"socgraph_8php.html":[5,0,0,65], -"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,65,0], -"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,65,6], -"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,65,7], -"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,65,8], -"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,65,1], -"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,65,4], -"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,65,2], -"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,65,5], -"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,65,3], -"sources_8php.html":[5,0,1,97], -"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,97,0], -"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,97,1], -"starred_8php.html":[5,0,1,98], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,98,0], -"subthread_8php.html":[5,0,1,99], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,99,0], -"suggest_8php.html":[5,0,1,100], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,100,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,100,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,100,2], -"system__unavailable_8php.html":[5,0,0,66], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,66,0], -"tagger_8php.html":[5,0,1,101], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,101,0], -"tagrm_8php.html":[5,0,1,102], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,102,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,102,0], -"taxonomy_8php.html":[5,0,0,67], -"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,67,8], -"taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,67,10], -"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,67,0], -"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,67,2], -"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,67,6], -"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,67,4], -"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,67,3], -"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,67,9], -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,67,1], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,67,13], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,67,12], -"taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f":[5,0,0,67,11], -"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,67,7], -"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,67,5], -"template__processor_8php.html":[5,0,0,68], -"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,68,3], -"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,68,1], -"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,68,2], -"text_8php.html":[5,0,0,69], -"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,69,39], -"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,69,45], -"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,69,6], -"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,69,16], -"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,69,11], -"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,69,44], -"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,69,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,77], -"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,69,32], -"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,69,35], -"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,69,49], -"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,69,52], -"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,69,46], -"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,69,47], -"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,69,42], -"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,69,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,85], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,74], -"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,69,48], -"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,69,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,87], -"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,69,23], -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,82], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,80], -"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,69,30], -"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,69,41], -"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,71], -"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,69,7], -"text_8php.html#a3ef8c0cf31f35f77462067de8712fa34":[5,0,0,69,28], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,83], -"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,33], -"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,70], -"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,69,31], -"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,69,43], -"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,69,61], -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,69,50], -"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,69,24], -"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,69,60], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,79], -"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,69,9], -"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,69,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,78], -"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,69,40], -"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,69,27], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,75], -"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,69,1], -"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,69,34], -"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,69,26], -"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,76], -"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,69,8], -"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,69,68], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,72], -"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,69,15], -"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,69,20], -"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,69,59], -"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,69,19], -"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,69,3], -"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,69,54], -"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,69,65], -"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,69,63], -"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,69,67], -"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,69,29], -"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,69,17], -"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,69,55], -"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,69,36], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,86], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,81], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,84], -"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,69,56], -"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,69,37] +"rpost_8php.html":[5,0,1,88], +"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,88,0], +"rsd__xml_8php.html":[5,0,1,89], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,89,0], +"search_8php.html":[5,0,1,90], +"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,90,2], +"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,90,3], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,90,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,90,1], +"search__ac_8php.html":[5,0,1,91], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,91,0], +"security_8php.html":[5,0,0,64], +"security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,64,11], +"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,64,2], +"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,64,4], +"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,64,5], +"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,64,1], +"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,64,7], +"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,64,3], +"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,64,9], +"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,64,6], +"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,64,0], +"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,64,10], +"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,64,8], +"session_8php.html":[5,0,0,65], +"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,65,4], +"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,65,0], +"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,65,1], +"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,65,8], +"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,65,5], +"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,65,7], +"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,65,6], +"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,65,3], +"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,65,9], +"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,65,2], +"settings_8php.html":[5,0,1,92], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,92,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,92,2], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,92,3], +"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,92,1], +"setup_8php.html":[5,0,1,93], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,93,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,93,13], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,93,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,93,12], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,93,9], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,93,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,93,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,93,7], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,93,11], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,93,4], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,93,10], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,93,8], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,93,15], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,93,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,93,14], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,93,6], +"share_8php.html":[5,0,1,94], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,94,0], +"siteinfo_8php.html":[5,0,1,95], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,95,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,95,0], +"sitelist_8php.html":[5,0,1,96], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,96,0], +"smilies_8php.html":[5,0,1,97], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,97,0], +"socgraph_8php.html":[5,0,0,66], +"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,66,0], +"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,66,6], +"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,66,7], +"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,66,8], +"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,66,1], +"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,66,4], +"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,66,2], +"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,66,5], +"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,66,3], +"sources_8php.html":[5,0,1,98], +"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,98,0], +"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,98,1], +"starred_8php.html":[5,0,1,99], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,99,0], +"subthread_8php.html":[5,0,1,100], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,100,0], +"suggest_8php.html":[5,0,1,101], +"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,101,0], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,101,1], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,101,2], +"system__unavailable_8php.html":[5,0,0,67], +"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0], +"tagger_8php.html":[5,0,1,102], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,102,0], +"tagrm_8php.html":[5,0,1,103], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,103,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,103,0], +"taxonomy_8php.html":[5,0,0,68], +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,68,8], +"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,68,0], +"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,68,2], +"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,68,6], +"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,68,4], +"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,68,3], +"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,68,9], +"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,68,1], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,68,13], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,68,12], +"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,68,10], +"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,68,7], +"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,68,11], +"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,68,5], +"template__processor_8php.html":[5,0,0,69], +"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,69,3], +"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,69,1], +"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,69,2], +"text_8php.html":[5,0,0,70], +"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,70,39], +"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,70,45], +"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,70,6], +"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,70,16], +"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,70,11], +"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,70,44], +"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,70,5], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,70,77], +"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,70,32], +"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,70,35], +"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,70,49], +"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,70,52], +"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,70,46], +"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,70,47], +"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,70,42], +"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,70,4], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,70,85], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,70,74], +"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,70,48], +"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,70,10], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,70,87], +"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,70,23] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 4e2412492..eb14ce2e3 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,30 +1,78 @@ var NAVTREEINDEX7 = { -"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,69], -"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,69,21], -"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,69,2], -"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,69,13], -"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,69,64], -"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,69,51], -"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,69,38], -"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,69,66], -"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,69,18], -"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,69,57], -"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,69,25], -"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,69,0], -"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,73], -"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,69,62], -"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,69,22], -"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,69,12], -"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,69,58], -"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,69,53], +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,70,82], +"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,70,80], +"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,70,30], +"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,70,41], +"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,70,71], +"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,70,7], +"text_8php.html#a3ef8c0cf31f35f77462067de8712fa34":[5,0,0,70,28], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,70,83], +"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,70,33], +"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,70,70], +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,70,31], +"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,70,43], +"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,70,61], +"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,70,50], +"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,70,24], +"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,70,60], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,70,79], +"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,70,9], +"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,70,14], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,70,78], +"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,70,40], +"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,70,27], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,70,75], +"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,70,1], +"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,70,34], +"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,70,26], +"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,70,76], +"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,70,8], +"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,70,68], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,70,72], +"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,70,15], +"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,70,20], +"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,70,59], +"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,70,19], +"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,70,3], +"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,70,54], +"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,70,65], +"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,70,63], +"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,70,67], +"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,70,29], +"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,70,17], +"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,70,55], +"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,70,36], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,70,86], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,70,81], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,70,84], +"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,70,56], +"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,70,37], +"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,70,69], +"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,70,21], +"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,70,2], +"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,70,13], +"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,70,64], +"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,70,51], +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,70,38], +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,70,66], +"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,70,18], +"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,70,57], +"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,70,25], +"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,70,0], +"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,70,73], +"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,70,62], +"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,70,22], +"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,70,12], +"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,70,58], +"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,70,53], "theme_2apw_2schema_2default_8php.html":[5,0,3,1,0,1,3], "theme__init_8php.html":[5,0,3,0,6], -"thing_8php.html":[5,0,1,103], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,103,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,103,1], -"toggle__mobile_8php.html":[5,0,1,104], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,104,0], +"thing_8php.html":[5,0,1,104], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,104,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,104,1], +"toggle__mobile_8php.html":[5,0,1,105], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,105,0], "tpldebug_8php.html":[5,0,2,7], "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[5,0,2,7,0], "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,7,1], @@ -38,18 +86,18 @@ var NAVTREEINDEX7 = "typohelper_8php.html":[5,0,2,9], "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0], "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,9,1], -"uexport_8php.html":[5,0,1,105], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,105,0], -"update__channel_8php.html":[5,0,1,106], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,106,0], -"update__community_8php.html":[5,0,1,107], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,107,0], -"update__display_8php.html":[5,0,1,108], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,108,0], -"update__network_8php.html":[5,0,1,109], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,109,0], -"update__search_8php.html":[5,0,1,110], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,110,0], +"uexport_8php.html":[5,0,1,106], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,106,0], +"update__channel_8php.html":[5,0,1,107], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,107,0], +"update__community_8php.html":[5,0,1,108], +"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,108,0], +"update__display_8php.html":[5,0,1,109], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,109,0], +"update__network_8php.html":[5,0,1,110], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,110,0], +"update__search_8php.html":[5,0,1,111], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,111,0], "updatetpl_8py.html":[5,0,2,10], "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], @@ -65,64 +113,68 @@ var NAVTREEINDEX7 = "view_2theme_2redbasic_2php_2config_8php.html#a619f3215434e6e1de416edb55b4dc341":[5,0,3,1,1,0,0,0], "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], -"view_8php.html":[5,0,1,111], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,111,0], -"viewconnections_8php.html":[5,0,1,112], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,112,2], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,112,1], -"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,112,0], -"viewsrc_8php.html":[5,0,1,113], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,113,0], -"vote_8php.html":[5,0,1,114], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,114,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,114,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,114,1], -"wall__attach_8php.html":[5,0,1,115], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,115,0], -"wall__upload_8php.html":[5,0,1,116], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,116,0], -"webfinger_8php.html":[5,0,1,117], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,117,0], -"webpages_8php.html":[5,0,1,118], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,118,0], -"wfinger_8php.html":[5,0,1,119], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,119,0], +"view_8php.html":[5,0,1,112], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,112,0], +"viewconnections_8php.html":[5,0,1,113], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,113,2], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,113,1], +"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,113,0], +"viewsrc_8php.html":[5,0,1,114], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,114,0], +"vote_8php.html":[5,0,1,115], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,115,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,115,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,115,1], +"wall__attach_8php.html":[5,0,1,116], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,116,0], +"wall__upload_8php.html":[5,0,1,117], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,117,0], +"webfinger_8php.html":[5,0,1,118], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,118,0], +"webpages_8php.html":[5,0,1,119], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,119,0], +"wfinger_8php.html":[5,0,1,120], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,120,0], "widedarkness_8php.html":[5,0,3,1,0,1,9], -"xchan_8php.html":[5,0,1,120], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,120,0], -"xrd_8php.html":[5,0,1,121], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,121,0], -"zfinger_8php.html":[5,0,1,122], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,122,0], -"zot_8php.html":[5,0,0,70], -"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,70,11], -"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,70,5], -"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,70,13], -"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,70,8], -"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,70,15], -"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,70,3], -"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,70,19], -"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,70,6], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,70,24], -"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,70,16], -"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,70,0], -"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,70,23], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,70,22], -"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,70,17], -"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,70,10], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,70,9], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,70,12], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,70,21], -"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,70,14], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,70,25], -"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,70,7], -"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,70,1], -"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,70,18], -"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,70,2], -"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,70,20], -"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,70,4], -"zotfeed_8php.html":[5,0,1,123], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,123,0], -"zping_8php.html":[5,0,1,124], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,124,0] +"widgets_8php.html":[5,0,0,71], +"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,71,1], +"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,71,0], +"xchan_8php.html":[5,0,1,121], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,121,0], +"xrd_8php.html":[5,0,1,122], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,122,0], +"zfinger_8php.html":[5,0,1,123], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,123,0], +"zot_8php.html":[5,0,0,72], +"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,72,12], +"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,72,6], +"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,72,14], +"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,72,9], +"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,72,16], +"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,72,4], +"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,72,20], +"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,72,7], +"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,72,25], +"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,72,17], +"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,72,0], +"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,72,24], +"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3], +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,23], +"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,18], +"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,11], +"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,10], +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,72,13], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,72,22], +"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,72,15], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,72,26], +"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,72,8], +"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,72,1], +"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,72,19], +"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,72,2], +"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,72,21], +"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,72,5], +"zotfeed_8php.html":[5,0,1,124], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,124,0], +"zping_8php.html":[5,0,1,125], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,125,0] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index f391590d1..733645f51 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -248,7 +248,7 @@ Functions
    -

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

    +

    Referenced by Conversation\add_thread(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedInode\delete(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), RedInode\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), z_readdir(), and zot_feed().

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 643a70f6b..5c078f686 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -282,7 +282,7 @@ Functions
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), rpost_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    diff --git a/doc/html/reddav_8php.html b/doc/html/reddav_8php.html new file mode 100644 index 000000000..2b9d4d7e9 --- /dev/null +++ b/doc/html/reddav_8php.html @@ -0,0 +1,124 @@ + + + + + + +The Red Matrix: include/reddav.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Classes
    +
    +
    reddav.php File Reference
    +
    +
    + + + + + + + + +

    +Classes

    class  RedInode
     
    class  RedDirectory
     
    class  RedFile
     
    +
    +
    + diff --git a/doc/html/rpost_8php.html b/doc/html/rpost_8php.html new file mode 100644 index 000000000..b1f75081d --- /dev/null +++ b/doc/html/rpost_8php.html @@ -0,0 +1,141 @@ + + + + + + +The Red Matrix: mod/rpost.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    rpost.php File Reference
    +
    +
    + + + + +

    +Functions

     rpost_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    rpost_content (& $a)
    +
    +

    remote post

    +

    https://yoursite/rpost?f=&title=&body=&remote_return=

    +

    This can be called via either GET or POST, use POST for long body content as suhosin often limits GET parameter length

    +

    f= placeholder, often required title= Title of post body= Body of post remote_return= absolute URL to return after posting is finished type= choices are 'html' or 'bbcode', default is 'bbcode'

    + +
    +
    +
    +
    + diff --git a/doc/html/rpost_8php.js b/doc/html/rpost_8php.js new file mode 100644 index 000000000..44a898923 --- /dev/null +++ b/doc/html/rpost_8php.js @@ -0,0 +1,4 @@ +var rpost_8php = +[ + [ "rpost_content", "rpost_8php.html#a8190354d789000806d9879aea276728f", null ] +]; \ No newline at end of file diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 191762b91..376f2402a 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -9,6 +9,8 @@ var searchData= ['_24argv',['$argv',['../classApp.html#ab3da757abe5cb45bf88f07cc51a73b58',1,'App']]], ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]], ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]], + ['_24attach',['$attach',['../classRedInode.html#a7b317eb1230930154107ed51e54193f5',1,'RedInode']]], + ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory']]], ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]], ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], ['_24bgcolour',['$bgcolour',['../redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574',1,'style.php']]], @@ -17,6 +19,7 @@ var searchData= ['_24called_5fapi',['$called_api',['../include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d',1,'api.php']]], ['_24category',['$category',['../classApp.html#a5cfc098c061b7d765add58fd2ca97445',1,'App']]], ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()']]], + ['_24channel_5fid',['$channel_id',['../classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d',1,'RedDirectory']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cmd',['$cmd',['../classApp.html#a495ec082c2719314e536070ca1ce073d',1,'App']]], @@ -32,10 +35,11 @@ var searchData= ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]], ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]], ['_24d',['$d',['../classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38',1,'Template']]], - ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()']]], + ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()'],['../classRedFile.html#a2ff12032b45538353eded9809d3b7550',1,'RedFile\$data()']]], ['_24db',['$db',['../classApp.html#a330410a288f3393d53772f5e98f857ea',1,'App\$db()'],['../classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6',1,'dba_driver\$db()']]], ['_24debug',['$debug',['../classdba__driver.html#af48e2afeded5285766bf92e22123ed03',1,'dba_driver\$debug()'],['../classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a',1,'Template\$debug()']]], ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]], + ['_24dir_5fkey',['$dir_key',['../classRedDirectory.html#a8d5df814b2f825dd14c628a51b5829b5',1,'RedDirectory']]], ['_24dirs',['$dirs',['../typo_8php.html#a1b709c1d79631ebc8320b41bda028b54',1,'typo.php']]], ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]], ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]], @@ -99,6 +103,7 @@ var searchData= ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]], ['_24radius',['$radius',['../redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351',1,'style.php']]], ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]], + ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]], ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]], ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], diff --git a/doc/html/search/all_5f.js b/doc/html/search/all_5f.js index 0742802a1..889fced66 100644 --- a/doc/html/search/all_5f.js +++ b/doc/html/search/all_5f.js @@ -1,6 +1,6 @@ var searchData= [ - ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()']]], + ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb',1,'RedInode\__construct()'],['../classRedDirectory.html#add0bf2c049230fec4913e769d126e6e6',1,'RedDirectory\__construct()'],['../classRedFile.html#ad4588b90004a2741b1a4ced10355904c',1,'RedFile\__construct()']]], ['_5f_5fdestruct',['__destruct',['../classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721',1,'dba_driver\__destruct()'],['../classphoto__driver.html#ae4501abdc9651359f81d036b63625686',1,'photo_driver\__destruct()']]], ['_5fbuild_5fnodes',['_build_nodes',['../classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4',1,'Template']]], ['_5fget_5fvar',['_get_var',['../classTemplate.html#aae9c4d761ea1298e745e8052d7910194',1,'Template']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index ca665ba76..580f6ed45 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -11,8 +11,8 @@ var searchData= ['chanlink_5fcid',['chanlink_cid',['../text_8php.html#a85e3a4851c16674834010d8419a5d7ca',1,'text.php']]], ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]], ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]], - ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], ['chanman_2ephp',['chanman.php',['../include_2chanman_8php.html',1,'']]], + ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['channel_5faside',['channel_aside',['../channel_8php.html#aea8e189f2fbabfda779349dd94082e8e',1,'channel.php']]], @@ -45,6 +45,7 @@ var searchData= ['check_5fsmarty3',['check_smarty3',['../setup_8php.html#afd8b0b3ade1507c45325caf377bf459d',1,'setup.php']]], ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]], ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]], + ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]], ['clean_5furls',['clean_urls',['../boot_8php.html#ab79b8b4555cae20d03f8200666d89d63',1,'boot.php']]], ['clear',['clear',['../classCache.html#ab14d0f4bdf7116a94d545c574b38f568',1,'Cache']]], ['cleardiv',['cleardiv',['../text_8php.html#afe18627c4983ee5f7c940a0992818cd5',1,'text.php']]], @@ -130,6 +131,8 @@ var searchData= ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], ['create_5fdir_5faccount',['create_dir_account',['../identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd',1,'identity.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], + ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], + ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], ['crepair_2ephp',['crepair.php',['../crepair_8php.html',1,'']]], ['crepair_5fcontent',['crepair_content',['../crepair_8php.html#a29464c01838e209c8059cfcd2d195caa',1,'crepair.php']]], ['crepair_5finit',['crepair_init',['../crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198',1,'crepair.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index c81ee7b8d..a8b3e471e 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -33,6 +33,7 @@ var searchData= ['del_5fxconfig',['del_xconfig',['../include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72',1,'config.php']]], ['delegate_2ephp',['delegate.php',['../delegate_8php.html',1,'']]], ['delegate_5fcontent',['delegate_content',['../delegate_8php.html#a943eea8996ef348eb845c498f9f354dd',1,'delegate.php']]], + ['delete',['delete',['../classRedInode.html#a5e8f09bc887725c3c448f8d72fe3edfc',1,'RedInode']]], ['delete_5fimported_5fitem',['delete_imported_item',['../zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72',1,'zot.php']]], ['delete_5fitem_5flowlevel',['delete_item_lowlevel',['../items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259',1,'items.php']]], ['deletenode',['deletenode',['../html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2',1,'html2bbcode.php']]], @@ -51,8 +52,8 @@ var searchData= ['dir_5fsort_5flinks',['dir_sort_links',['../dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774',1,'dir_fns.php']]], ['dir_5ftagadelic',['dir_tagadelic',['../taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332',1,'taxonomy.php']]], ['dir_5ftagblock',['dir_tagblock',['../taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1',1,'taxonomy.php']]], - ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]], + ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]], ['directory_5faside',['directory_aside',['../mod_2directory_8php.html#aa1d928543212871491706216742dd73c',1,'directory.php']]], ['directory_5fcontent',['directory_content',['../mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44',1,'directory.php']]], ['directory_5ffallback_5fmaster',['DIRECTORY_FALLBACK_MASTER',['../boot_8php.html#abedd940e664017c61b48c6efa31d0cb8',1,'boot.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index ffbccd6c4..5a91b9bed 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -3,7 +3,7 @@ var searchData= ['gen_5ftoken',['gen_token',['../classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819',1,'FKOAuthDataStore']]], ['gender_5fselector',['gender_selector',['../profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355',1,'profile_selectors.php']]], ['generate_5fuser_5fguid',['generate_user_guid',['../text_8php.html#ae4f6881d7e13623f8eded6277595112a',1,'text.php']]], - ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache']]], + ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535',1,'RedFile\get()']]], ['get_5faccount',['get_account',['../classApp.html#a08bc87aff64f39fbc084e9d6545cee4d',1,'App']]], ['get_5faccount_5fid',['get_account_id',['../boot_8php.html#afe88b920aa285982edb817a0dd44eb37',1,'boot.php']]], ['get_5fall_5fperms',['get_all_perms',['../permissions_8php.html#aeca9b280f3dc3358c89976d81d690008',1,'permissions.php']]], @@ -69,6 +69,7 @@ var searchData= ['get_5fpublic_5ffeed',['get_public_feed',['../items_8php.html#a079e099e15d88d47aeb6ca6d60da7107',1,'items.php']]], ['get_5fredirect_5furl',['get_redirect_url',['../classItem.html#a428f448f89a8629055ea3294eb942aea',1,'Item']]], ['get_5frel_5flink',['get_rel_link',['../text_8php.html#a3972701c5c83624ec4e2d06242f614e7',1,'text.php']]], + ['get_5frpost_5fpath',['get_rpost_path',['../zot_8php.html#a8e22dbc6f884be3644a892a876cbd972',1,'zot.php']]], ['get_5ftags',['get_tags',['../text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623',1,'text.php']]], ['get_5ftemplate',['get_template',['../classItem.html#aba23a0a9d89e316d2b343cc46d695d91',1,'Item']]], ['get_5ftemplate_5fdata',['get_template_data',['../classConversation.html#a2a96b7a6573ae53db861624659e831cb',1,'Conversation\get_template_data()'],['../classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8',1,'Item\get_template_data()']]], @@ -83,9 +84,16 @@ var searchData= ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]], ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]], ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]], + ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]], + ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]], + ['getcontenttype',['getContentType',['../classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b',1,'RedFile']]], + ['getetag',['getETag',['../classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28',1,'RedFile']]], ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]], ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]], ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], + ['getlastmodified',['getLastModified',['../classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6',1,'RedInode']]], + ['getname',['getName',['../classRedInode.html#aec5706105400764124db39d4bc68d458',1,'RedInode']]], + ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], ['goaway',['goaway',['../boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1',1,'boot.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 796639478..4f026488c 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -161,5 +161,6 @@ var searchData= ['pubsites_2ephp',['pubsites.php',['../pubsites_8php.html',1,'']]], ['pubsites_5fcontent',['pubsites_content',['../pubsites_8php.html#af614e279aab54065345bda6b03eafdf0',1,'pubsites.php']]], ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]], - ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]] + ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]], + ['put',['put',['../classRedFile.html#a41a49a583eb276b75626fcf97f4a699c',1,'RedFile']]] ]; diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 59da13ffb..6c5199a79 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -17,6 +17,10 @@ var searchData= ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a619f3215434e6e1de416edb55b4dc341',1,'config.php']]], ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]], ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]], + ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], + ['reddirectory',['RedDirectory',['../classRedDirectory.html',1,'']]], + ['redfile',['RedFile',['../classRedFile.html',1,'']]], + ['redinode',['RedInode',['../classRedInode.html',1,'']]], ['redir_2ephp',['redir.php',['../redir_8php.html',1,'']]], ['redir_5finit',['redir_init',['../redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5',1,'redir.php']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], @@ -60,6 +64,9 @@ var searchData= ['rmagic_5finit',['rmagic_init',['../rmagic_8php.html#a95455edd43f1bff39446a57388cdde16',1,'rmagic.php']]], ['rmagic_5fpost',['rmagic_post',['../rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f',1,'rmagic.php']]], ['rotate',['rotate',['../classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec',1,'photo_driver\rotate()'],['../classphoto__gd.html#a77f87730b11093b76980c541159df37d',1,'photo_gd\rotate()'],['../classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f',1,'photo_imagick\rotate()']]], + ['rpost_2ephp',['rpost.php',['../rpost_8php.html',1,'']]], + ['rpost_5fcallback',['rpost_callback',['../bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7',1,'bbcode.php']]], + ['rpost_5fcontent',['rpost_content',['../rpost_8php.html#a8190354d789000806d9879aea276728f',1,'rpost.php']]], ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]], ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]], ['rsd_5fxml_2ephp',['rsd_xml.php',['../rsd__xml_8php.html',1,'']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index b79d4005c..fe610e392 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -53,6 +53,7 @@ var searchData= ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]], ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]], ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]], + ['setname',['setName',['../classRedInode.html#a3d76322f25d847b123b3df37a26dd04e',1,'RedInode']]], ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]], ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], @@ -99,8 +100,8 @@ var searchData= ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]], ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], - ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index 3c25fd0c2..cc61f9996 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -2,8 +2,8 @@ var searchData= [ ['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]], ['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]], - ['tagadelic',['tagadelic',['../taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4',1,'taxonomy.php']]], - ['tagblock',['tagblock',['../taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f',1,'taxonomy.php']]], + ['tagadelic',['tagadelic',['../taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a',1,'taxonomy.php']]], + ['tagblock',['tagblock',['../taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2',1,'taxonomy.php']]], ['tagger_2ephp',['tagger.php',['../tagger_8php.html',1,'']]], ['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]], ['tagrm_2ephp',['tagrm.php',['../tagrm_8php.html',1,'']]], diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index 8eeca0a6a..3223b0d56 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -15,6 +15,8 @@ var searchData= ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], ['while',['while',['../docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d',1,'docblox_errorchecker.php']]], ['widedarkness_2ephp',['widedarkness.php',['../widedarkness_8php.html',1,'']]], - ['widget_5fprofile',['widget_profile',['../comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'comanche.php']]], + ['widget_5fprofile',['widget_profile',['../widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'widgets.php']]], + ['widget_5ftagcloud',['widget_tagcloud',['../widgets_8php.html#a6dbc227aac750774284ee39c45f0a200',1,'widgets.php']]], + ['widgets_2ephp',['widgets.php',['../widgets_8php.html',1,'']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/search/classes_72.js b/doc/html/search/classes_72.js index 5f5e0d4e8..2e6d22e86 100644 --- a/doc/html/search/classes_72.js +++ b/doc/html/search/classes_72.js @@ -1,4 +1,7 @@ var searchData= [ - ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]] + ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]], + ['reddirectory',['RedDirectory',['../classRedDirectory.html',1,'']]], + ['redfile',['RedFile',['../classRedFile.html',1,'']]], + ['redinode',['RedInode',['../classRedInode.html',1,'']]] ]; diff --git a/doc/html/search/files_72.js b/doc/html/search/files_72.js index b06cb00f7..76466a56a 100644 --- a/doc/html/search/files_72.js +++ b/doc/html/search/files_72.js @@ -3,10 +3,12 @@ var searchData= ['randprof_2ephp',['randprof.php',['../randprof_8php.html',1,'']]], ['readme_2emd',['README.md',['../README_8md.html',1,'']]], ['redbasic_2ephp',['redbasic.php',['../redbasic_8php.html',1,'']]], + ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], ['redir_2ephp',['redir.php',['../redir_8php.html',1,'']]], ['register_2ephp',['register.php',['../register_8php.html',1,'']]], ['regmod_2ephp',['regmod.php',['../regmod_8php.html',1,'']]], ['removeme_2ephp',['removeme.php',['../removeme_8php.html',1,'']]], ['rmagic_2ephp',['rmagic.php',['../rmagic_8php.html',1,'']]], + ['rpost_2ephp',['rpost.php',['../rpost_8php.html',1,'']]], ['rsd_5fxml_2ephp',['rsd_xml.php',['../rsd__xml_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_77.js b/doc/html/search/files_77.js index 31df95ae0..8a870ac3f 100644 --- a/doc/html/search/files_77.js +++ b/doc/html/search/files_77.js @@ -5,5 +5,6 @@ var searchData= ['webfinger_2ephp',['webfinger.php',['../webfinger_8php.html',1,'']]], ['webpages_2ephp',['webpages.php',['../webpages_8php.html',1,'']]], ['wfinger_2ephp',['wfinger.php',['../wfinger_8php.html',1,'']]], - ['widedarkness_2ephp',['widedarkness.php',['../widedarkness_8php.html',1,'']]] + ['widedarkness_2ephp',['widedarkness.php',['../widedarkness_8php.html',1,'']]], + ['widgets_2ephp',['widgets.php',['../widgets_8php.html',1,'']]] ]; diff --git a/doc/html/search/functions_5f.js b/doc/html/search/functions_5f.js index 82a0e2ca9..ada7b7fbb 100644 --- a/doc/html/search/functions_5f.js +++ b/doc/html/search/functions_5f.js @@ -1,6 +1,6 @@ var searchData= [ - ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()']]], + ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb',1,'RedInode\__construct()'],['../classRedDirectory.html#add0bf2c049230fec4913e769d126e6e6',1,'RedDirectory\__construct()'],['../classRedFile.html#ad4588b90004a2741b1a4ced10355904c',1,'RedFile\__construct()']]], ['_5f_5fdestruct',['__destruct',['../classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721',1,'dba_driver\__destruct()'],['../classphoto__driver.html#ae4501abdc9651359f81d036b63625686',1,'photo_driver\__destruct()']]], ['_5fbuild_5fnodes',['_build_nodes',['../classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4',1,'Template']]], ['_5fget_5fvar',['_get_var',['../classTemplate.html#aae9c4d761ea1298e745e8052d7910194',1,'Template']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 89761fa6a..db6f6b013 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -39,6 +39,7 @@ var searchData= ['check_5fsmarty3',['check_smarty3',['../setup_8php.html#afd8b0b3ade1507c45325caf377bf459d',1,'setup.php']]], ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]], ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]], + ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]], ['clean_5furls',['clean_urls',['../boot_8php.html#ab79b8b4555cae20d03f8200666d89d63',1,'boot.php']]], ['clear',['clear',['../classCache.html#ab14d0f4bdf7116a94d545c574b38f568',1,'Cache']]], ['cleardiv',['cleardiv',['../text_8php.html#afe18627c4983ee5f7c940a0992818cd5',1,'text.php']]], @@ -100,6 +101,8 @@ var searchData= ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], ['create_5fdir_5faccount',['create_dir_account',['../identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd',1,'identity.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], + ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], + ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], ['crepair_5fcontent',['crepair_content',['../crepair_8php.html#a29464c01838e209c8059cfcd2d195caa',1,'crepair.php']]], ['crepair_5finit',['crepair_init',['../crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198',1,'crepair.php']]], ['crepair_5fpost',['crepair_post',['../crepair_8php.html#acc4493e1ffd1462a605dd9b870034513',1,'crepair.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 18a462b18..f7d6f8196 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -16,6 +16,7 @@ var searchData= ['del_5fpconfig',['del_pconfig',['../include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941',1,'config.php']]], ['del_5fxconfig',['del_xconfig',['../include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72',1,'config.php']]], ['delegate_5fcontent',['delegate_content',['../delegate_8php.html#a943eea8996ef348eb845c498f9f354dd',1,'delegate.php']]], + ['delete',['delete',['../classRedInode.html#a5e8f09bc887725c3c448f8d72fe3edfc',1,'RedInode']]], ['delete_5fimported_5fitem',['delete_imported_item',['../zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72',1,'zot.php']]], ['delete_5fitem_5flowlevel',['delete_item_lowlevel',['../items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259',1,'items.php']]], ['deletenode',['deletenode',['../html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2',1,'html2bbcode.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 7cb9e5fdf..cc952ffa7 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -3,7 +3,7 @@ var searchData= ['gen_5ftoken',['gen_token',['../classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819',1,'FKOAuthDataStore']]], ['gender_5fselector',['gender_selector',['../profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355',1,'profile_selectors.php']]], ['generate_5fuser_5fguid',['generate_user_guid',['../text_8php.html#ae4f6881d7e13623f8eded6277595112a',1,'text.php']]], - ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache']]], + ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535',1,'RedFile\get()']]], ['get_5faccount',['get_account',['../classApp.html#a08bc87aff64f39fbc084e9d6545cee4d',1,'App']]], ['get_5faccount_5fid',['get_account_id',['../boot_8php.html#afe88b920aa285982edb817a0dd44eb37',1,'boot.php']]], ['get_5fall_5fperms',['get_all_perms',['../permissions_8php.html#aeca9b280f3dc3358c89976d81d690008',1,'permissions.php']]], @@ -69,6 +69,7 @@ var searchData= ['get_5fpublic_5ffeed',['get_public_feed',['../items_8php.html#a079e099e15d88d47aeb6ca6d60da7107',1,'items.php']]], ['get_5fredirect_5furl',['get_redirect_url',['../classItem.html#a428f448f89a8629055ea3294eb942aea',1,'Item']]], ['get_5frel_5flink',['get_rel_link',['../text_8php.html#a3972701c5c83624ec4e2d06242f614e7',1,'text.php']]], + ['get_5frpost_5fpath',['get_rpost_path',['../zot_8php.html#a8e22dbc6f884be3644a892a876cbd972',1,'zot.php']]], ['get_5ftags',['get_tags',['../text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623',1,'text.php']]], ['get_5ftemplate',['get_template',['../classItem.html#aba23a0a9d89e316d2b343cc46d695d91',1,'Item']]], ['get_5ftemplate_5fdata',['get_template_data',['../classConversation.html#a2a96b7a6573ae53db861624659e831cb',1,'Conversation\get_template_data()'],['../classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8',1,'Item\get_template_data()']]], @@ -83,9 +84,16 @@ var searchData= ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]], ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]], ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]], + ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]], + ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]], + ['getcontenttype',['getContentType',['../classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b',1,'RedFile']]], + ['getetag',['getETag',['../classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28',1,'RedFile']]], ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]], ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]], ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], + ['getlastmodified',['getLastModified',['../classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6',1,'RedInode']]], + ['getname',['getName',['../classRedInode.html#aec5706105400764124db39d4bc68d458',1,'RedInode']]], + ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], ['goaway',['goaway',['../boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1',1,'boot.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index d9f5ca8ce..54a0df5d4 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -85,5 +85,6 @@ var searchData= ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]], ['pubsites_5fcontent',['pubsites_content',['../pubsites_8php.html#af614e279aab54065345bda6b03eafdf0',1,'pubsites.php']]], ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]], - ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]] + ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]], + ['put',['put',['../classRedFile.html#a41a49a583eb276b75626fcf97f4a699c',1,'RedFile']]] ]; diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index c4b264096..3ed8064bd 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -42,6 +42,8 @@ var searchData= ['rmagic_5finit',['rmagic_init',['../rmagic_8php.html#a95455edd43f1bff39446a57388cdde16',1,'rmagic.php']]], ['rmagic_5fpost',['rmagic_post',['../rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f',1,'rmagic.php']]], ['rotate',['rotate',['../classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec',1,'photo_driver\rotate()'],['../classphoto__gd.html#a77f87730b11093b76980c541159df37d',1,'photo_gd\rotate()'],['../classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f',1,'photo_imagick\rotate()']]], + ['rpost_5fcallback',['rpost_callback',['../bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7',1,'bbcode.php']]], + ['rpost_5fcontent',['rpost_content',['../rpost_8php.html#a8190354d789000806d9879aea276728f',1,'rpost.php']]], ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]], ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]], ['rsd_5fxml_5fcontent',['rsd_xml_content',['../rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82',1,'rsd_xml.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 175d43577..7c271fa19 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -49,6 +49,7 @@ var searchData= ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]], ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]], ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]], + ['setname',['setName',['../classRedInode.html#a3d76322f25d847b123b3df37a26dd04e',1,'RedInode']]], ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index dba912e89..18768d27e 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -2,8 +2,8 @@ var searchData= [ ['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]], ['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]], - ['tagadelic',['tagadelic',['../taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4',1,'taxonomy.php']]], - ['tagblock',['tagblock',['../taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f',1,'taxonomy.php']]], + ['tagadelic',['tagadelic',['../taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a',1,'taxonomy.php']]], + ['tagblock',['tagblock',['../taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2',1,'taxonomy.php']]], ['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]], ['tagrm_5fcontent',['tagrm_content',['../tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a',1,'tagrm.php']]], ['tagrm_5fpost',['tagrm_post',['../tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78',1,'tagrm.php']]], diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index c2752ebb3..85ab44b93 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -8,6 +8,7 @@ var searchData= ['webpages_5fcontent',['webpages_content',['../webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d',1,'webpages.php']]], ['wfinger_5finit',['wfinger_init',['../wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3',1,'wfinger.php']]], ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], - ['widget_5fprofile',['widget_profile',['../comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'comanche.php']]], + ['widget_5fprofile',['widget_profile',['../widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'widgets.php']]], + ['widget_5ftagcloud',['widget_tagcloud',['../widgets_8php.html#a6dbc227aac750774284ee39c45f0a200',1,'widgets.php']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 191762b91..376f2402a 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -9,6 +9,8 @@ var searchData= ['_24argv',['$argv',['../classApp.html#ab3da757abe5cb45bf88f07cc51a73b58',1,'App']]], ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]], ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]], + ['_24attach',['$attach',['../classRedInode.html#a7b317eb1230930154107ed51e54193f5',1,'RedInode']]], + ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory']]], ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]], ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], ['_24bgcolour',['$bgcolour',['../redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574',1,'style.php']]], @@ -17,6 +19,7 @@ var searchData= ['_24called_5fapi',['$called_api',['../include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d',1,'api.php']]], ['_24category',['$category',['../classApp.html#a5cfc098c061b7d765add58fd2ca97445',1,'App']]], ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()']]], + ['_24channel_5fid',['$channel_id',['../classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d',1,'RedDirectory']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cmd',['$cmd',['../classApp.html#a495ec082c2719314e536070ca1ce073d',1,'App']]], @@ -32,10 +35,11 @@ var searchData= ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]], ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]], ['_24d',['$d',['../classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38',1,'Template']]], - ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()']]], + ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()'],['../classRedFile.html#a2ff12032b45538353eded9809d3b7550',1,'RedFile\$data()']]], ['_24db',['$db',['../classApp.html#a330410a288f3393d53772f5e98f857ea',1,'App\$db()'],['../classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6',1,'dba_driver\$db()']]], ['_24debug',['$debug',['../classdba__driver.html#af48e2afeded5285766bf92e22123ed03',1,'dba_driver\$debug()'],['../classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a',1,'Template\$debug()']]], ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]], + ['_24dir_5fkey',['$dir_key',['../classRedDirectory.html#a8d5df814b2f825dd14c628a51b5829b5',1,'RedDirectory']]], ['_24dirs',['$dirs',['../typo_8php.html#a1b709c1d79631ebc8320b41bda028b54',1,'typo.php']]], ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]], ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]], @@ -99,6 +103,7 @@ var searchData= ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]], ['_24radius',['$radius',['../redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351',1,'style.php']]], ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]], + ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]], ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]], ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 1113fe9a1..3d3255bc9 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -361,7 +361,7 @@ Functions

    Profile owner - everything is visible

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

    -

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

    +

    Referenced by channel_content(), items_fetch(), lastpost_content(), pdl_selector(), share_init(), and zot_feed().

    diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index 1df3300c3..937249bf9 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -126,14 +126,14 @@ Functions    format_term_for_display ($term)   - tagadelic ($uid, $count=0, $authors= '', $flags=0, $type=TERM_HASHTAG) -  + tagadelic ($uid, $count=0, $authors= '', $flags=0, $restrict=0, $type=TERM_HASHTAG) +   tags_sort ($a, $b)    dir_tagadelic ($count=0)   - tagblock ($link, $uid, $count=0, $authors= '', $flags=0, $type=TERM_HASHTAG) -  + tagblock ($link, $uid, $count=0, $authors= '', $flags=0, $restrict=0, $type=TERM_HASHTAG) +   dir_tagblock ($link, $r)    obj_verbs () @@ -387,7 +387,7 @@ Functions - +
    @@ -415,6 +415,12 @@ Functions + + + + + + @@ -429,11 +435,11 @@ Functions
      $flags = 0,
     $restrict = 0,
    -

    Referenced by tagblock().

    +

    Referenced by tagblock(), and widget_tagcloud().

    - +
    @@ -467,6 +473,12 @@ Functions + + + + + + diff --git a/doc/html/taxonomy_8php.js b/doc/html/taxonomy_8php.js index 570f9c400..d2025fb8a 100644 --- a/doc/html/taxonomy_8php.js +++ b/doc/html/taxonomy_8php.js @@ -10,8 +10,8 @@ var taxonomy_8php = [ "obj_verb_selector", "taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2", null ], [ "obj_verbs", "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce", null ], [ "store_item_tag", "taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd", null ], - [ "tagadelic", "taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4", null ], - [ "tagblock", "taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f", null ], + [ "tagadelic", "taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a", null ], + [ "tagblock", "taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2", null ], [ "tags_sort", "taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43", null ], [ "term_query", "taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c", null ] ]; \ No newline at end of file diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index b326f7161..b33a4b2f7 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1772,7 +1772,7 @@ Variables
    Returns
    string substituted string
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), rpost_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    @@ -1938,7 +1938,7 @@ Variables
      $flags = 0,
     $restrict = 0,
    -

    Referenced by expand_groups(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().

    +

    Referenced by expand_groups(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index a2a48af11..fca3fe98c 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(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blocks_content(), build_sync_packet(), 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(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), contact_block(), contact_select(), conversation(), 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(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), fix_private_photos(), follow_init(), follow_widget(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), 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_photo_menu(), item_post(), items_fetch(), lang_selector(), lastpost_aside(), lastpost_content(), lastpost_init(), layouts_content(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), menu_content(), message_aside(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), 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(), onedirsync_run(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), 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(), redir_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_init(), settings_post(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), 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(), thing_init(), 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(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_profile(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    +

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blocks_content(), build_sync_packet(), 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(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), contact_block(), contact_select(), conversation(), 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(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), fix_private_photos(), follow_init(), follow_widget(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), 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_photo_menu(), item_post(), items_fetch(), lang_selector(), lastpost_aside(), lastpost_content(), lastpost_init(), layouts_content(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), menu_content(), message_aside(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), 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(), onedirsync_run(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), 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(), redir_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), 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_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), 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(), thing_init(), 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(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_profile(), widget_tagcloud(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    diff --git a/doc/html/widgets_8php.html b/doc/html/widgets_8php.html new file mode 100644 index 000000000..20905a013 --- /dev/null +++ b/doc/html/widgets_8php.html @@ -0,0 +1,155 @@ + + + + + + +The Red Matrix: include/widgets.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    widgets.php File Reference
    +
    +
    + + + + + + +

    +Functions

     widget_profile ($args)
     
     widget_tagcloud ($args)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    widget_profile ( $args)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_tagcloud ( $args)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js new file mode 100644 index 000000000..0b1db1013 --- /dev/null +++ b/doc/html/widgets_8php.js @@ -0,0 +1,5 @@ +var widgets_8php = +[ + [ "widget_profile", "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ], + [ "widget_tagcloud", "widgets_8php.html#a6dbc227aac750774284ee39c45f0a200", null ] +]; \ No newline at end of file diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index f660104ba..ae895864c 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -164,6 +164,8 @@ Functions    process_channel_sync_delivery ($sender, $arr, $deliveries)   + get_rpost_path ($observer) + 

    Function Documentation

    @@ -245,6 +247,24 @@ Functions

    Referenced by process_delivery().

    + + + +
    +
    + + + + + + + + +
    get_rpost_path ( $observer)
    +
    + +

    Referenced by rpost_callback(), and rpost_content().

    +
    diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index d829f1054..3b7b0c60b 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -3,6 +3,7 @@ var zot_8php = [ "allowed_public_recips", "zot_8php.html#a703f528ade8382cf374e4119bd6f7859", null ], [ "build_sync_packet", "zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7", null ], [ "delete_imported_item", "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72", null ], + [ "get_rpost_path", "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972", null ], [ "import_directory_keywords", "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a", null ], [ "import_directory_profile", "zot_8php.html#aeec89da5b6ff090c63a79de4de884a35", null ], [ "import_site", "zot_8php.html#a2657e141d62d5f67ad3c87651b585299", null ], diff --git a/mod/invite.php b/mod/invite.php index cb8cd1f63..bceca4515 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -139,7 +139,7 @@ function invite_content(&$a) { '$invite' => t('Send invitations'), '$addr_text' => t('Enter email addresses, one per line:'), '$msg_text' => t('Your message:'), - '$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised social and information tool.') . "\r\n" . "\r\n" + '$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool.') . "\r\n" . "\r\n" . $linktxt . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') @@ -147,7 +147,7 @@ function invite_content(&$a) { . "\r\n" . "\r\n" . z_root() . "/channel/" . $channel['channel_address'] . "\r\n" . "\r\n" - . t('Once you have registered, please connect with my Red Matrix channel address:') + . t('Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:') . "\r\n" . "\r\n" . $ob['xchan_addr'] . "\r\n" . "\r\n" . t('For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com') . "\r\n" . "\r\n" , '$submit' => t('Submit') diff --git a/util/messages.po b/util/messages.po index ae2d1aa47..f4ab00317 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-10-25.477\n" +"Project-Id-Version: 2013-11-01.484\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-25 00:03-0700\n" +"POT-Creation-Date: 2013-11-01 00:02-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -248,9 +248,9 @@ msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 #: ../../mod/webpages.php:98 ../../mod/settings.php:710 ../../mod/menu.php:55 -#: ../../mod/layouts.php:89 ../../mod/editlayout.php:100 -#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:92 -#: ../../mod/editpost.php:94 ../../mod/editblock.php:114 +#: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 +#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 +#: ../../mod/editpost.php:96 ../../mod/editblock.php:114 msgid "Edit" msgstr "" @@ -297,7 +297,7 @@ msgstr "" msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:249 +#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:251 msgid "like" msgstr "" @@ -305,7 +305,7 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:250 +#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:252 msgid "dislike" msgstr "" @@ -343,37 +343,42 @@ msgstr "" msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:245 ../../include/conversation.php:704 -#: ../../include/conversation.php:1104 ../../mod/photos.php:1061 +#: ../../include/ItemObject.php:219 ../../include/conversation.php:688 +#, php-format +msgid "last edited: %s" +msgstr "" + +#: ../../include/ItemObject.php:246 ../../include/conversation.php:705 +#: ../../include/conversation.php:1110 ../../mod/photos.php:1061 #: ../../mod/message.php:321 ../../mod/message.php:498 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 -#: ../../mod/editpost.php:103 ../../mod/editblock.php:123 +#: ../../mod/editpost.php:105 ../../mod/editblock.php:123 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:266 +#: ../../include/ItemObject.php:267 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:267 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 #: ../../include/contact_widgets.php:148 msgid "show more" msgstr "" -#: ../../include/ItemObject.php:526 ../../mod/photos.php:1077 +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077 #: ../../mod/photos.php:1163 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:528 ../../include/js_strings.php:6 +#: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 #: ../../mod/photos.php:1079 ../../mod/photos.php:1165 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:529 ../../mod/events.php:458 +#: ../../include/ItemObject.php:530 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:283 #: ../../mod/setup.php:326 ../../mod/settings.php:648 #: ../../mod/settings.php:760 ../../mod/settings.php:788 @@ -393,48 +398,48 @@ msgstr "" msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:530 +#: ../../include/ItemObject.php:531 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:531 +#: ../../include/ItemObject.php:532 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:532 +#: ../../include/ItemObject.php:533 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:533 +#: ../../include/ItemObject.php:534 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:534 +#: ../../include/ItemObject.php:535 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:535 +#: ../../include/ItemObject.php:536 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:536 +#: ../../include/ItemObject.php:537 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:537 +#: ../../include/ItemObject.php:538 msgid "Video" msgstr "" -#: ../../include/ItemObject.php:538 ../../include/conversation.php:1124 +#: ../../include/ItemObject.php:539 ../../include/conversation.php:1077 #: ../../mod/webpages.php:102 ../../mod/photos.php:1081 #: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150 -#: ../../mod/editpost.php:123 ../../mod/editblock.php:144 +#: ../../mod/editpost.php:125 ../../mod/editblock.php:144 msgid "Preview" msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:185 -#: ../../boot.php:1716 +#: ../../boot.php:1721 msgid "Connect" msgstr "" @@ -446,21 +451,21 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:492 ../../include/conversation.php:932 +#: ../../include/Contact.php:492 ../../include/conversation.php:933 msgid "Poke" msgstr "" -#: ../../include/Contact.php:493 ../../include/conversation.php:926 +#: ../../include/Contact.php:493 ../../include/conversation.php:927 msgid "View Status" msgstr "" #: ../../include/Contact.php:494 ../../include/nav.php:75 -#: ../../include/conversation.php:927 ../../mod/connections.php:304 +#: ../../include/conversation.php:928 ../../mod/connections.php:304 #: ../../mod/connections.php:418 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:495 ../../include/conversation.php:928 +#: ../../include/Contact.php:495 ../../include/conversation.php:929 msgid "View Photos" msgstr "" @@ -468,11 +473,11 @@ msgstr "" msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:497 ../../include/conversation.php:930 +#: ../../include/Contact.php:497 ../../include/conversation.php:931 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:498 ../../include/conversation.php:931 +#: ../../include/Contact.php:498 ../../include/conversation.php:932 msgid "Send PM" msgstr "" @@ -537,7 +542,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:673 -#: ../../mod/admin.php:682 ../../boot.php:1444 +#: ../../mod/admin.php:682 ../../boot.php:1449 msgid "Email" msgstr "" @@ -672,7 +677,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:160 ../../boot.php:1766 +#: ../../mod/events.php:450 ../../mod/directory.php:160 ../../boot.php:1771 msgid "Location:" msgstr "" @@ -1045,7 +1050,7 @@ msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:162 -#: ../../boot.php:1768 +#: ../../boot.php:1773 msgid "Gender:" msgstr "" @@ -1066,7 +1071,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:164 -#: ../../boot.php:1769 +#: ../../boot.php:1774 msgid "Status:" msgstr "" @@ -1080,7 +1085,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:166 -#: ../../boot.php:1770 +#: ../../boot.php:1775 msgid "Homepage:" msgstr "" @@ -1518,8 +1523,8 @@ msgstr "" msgid "Friends" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:451 -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:94 ../../include/bbcode.php:462 +#: ../../include/bbcode.php:465 msgid "Image/photo" msgstr "" @@ -1532,11 +1537,11 @@ msgstr "" msgid "post" msgstr "" -#: ../../include/bbcode.php:411 ../../include/bbcode.php:431 +#: ../../include/bbcode.php:422 ../../include/bbcode.php:442 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:458 ../../include/bbcode.php:459 +#: ../../include/bbcode.php:469 ../../include/bbcode.php:470 msgid "Encrypted content" msgstr "" @@ -1605,7 +1610,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../boot.php:2217 +#: ../../include/photos.php:288 ../../boot.php:2222 msgid "Photo Albums" msgstr "" @@ -1880,7 +1885,7 @@ msgstr "" msgid "Path not available." msgstr "" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1441 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1446 msgid "Logout" msgstr "" @@ -1908,7 +1913,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2214 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2219 msgid "Photos" msgstr "" @@ -1916,7 +1921,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:84 ../../boot.php:1442 +#: ../../include/nav.php:84 ../../boot.php:1447 msgid "Login" msgstr "" @@ -1937,7 +1942,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:124 ../../mod/register.php:187 ../../boot.php:1417 +#: ../../include/nav.php:124 ../../mod/register.php:187 ../../boot.php:1423 msgid "Register" msgstr "" @@ -2061,7 +2066,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:173 ../../mod/events.php:348 ../../boot.php:2225 +#: ../../include/nav.php:173 ../../mod/events.php:348 ../../boot.php:2230 msgid "Events" msgstr "" @@ -2260,7 +2265,7 @@ msgstr "" msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:110 +#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 msgid "Categories" msgstr "" @@ -2387,35 +2392,35 @@ msgstr "" msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/taxonomy.php:208 +#: ../../include/taxonomy.php:210 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:222 +#: ../../include/taxonomy.php:224 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:247 +#: ../../include/taxonomy.php:249 msgid "have" msgstr "" -#: ../../include/taxonomy.php:247 +#: ../../include/taxonomy.php:249 msgid "has" msgstr "" -#: ../../include/taxonomy.php:248 +#: ../../include/taxonomy.php:250 msgid "want" msgstr "" -#: ../../include/taxonomy.php:248 +#: ../../include/taxonomy.php:250 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:249 +#: ../../include/taxonomy.php:251 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:250 +#: ../../include/taxonomy.php:252 msgid "dislikes" msgstr "" @@ -2431,7 +2436,7 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/comanche.php:34 ../../view/theme/redbasic/php/config.php:43 +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:43 #: ../../view/theme/apw/php/config.php:119 msgid "Default" msgstr "" @@ -2478,209 +2483,209 @@ msgstr "" msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:702 +#: ../../include/conversation.php:703 msgid "View in context" msgstr "" -#: ../../include/conversation.php:828 +#: ../../include/conversation.php:829 msgid "remove" msgstr "" -#: ../../include/conversation.php:832 +#: ../../include/conversation.php:833 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:833 +#: ../../include/conversation.php:834 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:924 +#: ../../include/conversation.php:925 msgid "View Source" msgstr "" -#: ../../include/conversation.php:925 +#: ../../include/conversation.php:926 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:929 +#: ../../include/conversation.php:930 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:994 +#: ../../include/conversation.php:995 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:994 +#: ../../include/conversation.php:995 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:998 +#: ../../include/conversation.php:999 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1000 +#: ../../include/conversation.php:1001 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1007 msgid "and" msgstr "" -#: ../../include/conversation.php:1009 +#: ../../include/conversation.php:1010 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1011 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1011 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1060 +#: ../../include/conversation.php:1061 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1061 ../../mod/message.php:271 +#: ../../include/conversation.php:1062 ../../mod/message.php:271 #: ../../mod/message.php:398 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1063 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1063 +#: ../../include/conversation.php:1064 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1064 +#: ../../include/conversation.php:1065 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1065 ../../mod/filer.php:35 +#: ../../include/conversation.php:1066 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1066 +#: ../../include/conversation.php:1067 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1081 ../../mod/photos.php:1060 +#: ../../include/conversation.php:1087 ../../mod/photos.php:1060 msgid "Share" msgstr "" -#: ../../include/conversation.php:1083 +#: ../../include/conversation.php:1089 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1085 ../../mod/message.php:318 +#: ../../include/conversation.php:1091 ../../mod/message.php:318 #: ../../mod/message.php:494 ../../mod/editlayout.php:101 -#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:95 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 #: ../../mod/editblock.php:115 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1086 +#: ../../include/conversation.php:1092 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1087 ../../mod/message.php:319 +#: ../../include/conversation.php:1093 ../../mod/message.php:319 #: ../../mod/message.php:495 ../../mod/editlayout.php:102 -#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:96 +#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:98 #: ../../mod/editblock.php:116 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1088 +#: ../../include/conversation.php:1094 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1089 ../../mod/message.php:320 +#: ../../include/conversation.php:1095 ../../mod/message.php:320 #: ../../mod/message.php:496 ../../mod/editlayout.php:103 -#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:97 +#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:99 #: ../../mod/editblock.php:117 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1090 +#: ../../include/conversation.php:1096 msgid "web link" msgstr "" -#: ../../include/conversation.php:1091 +#: ../../include/conversation.php:1097 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1092 +#: ../../include/conversation.php:1098 msgid "video link" msgstr "" -#: ../../include/conversation.php:1093 +#: ../../include/conversation.php:1099 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1094 +#: ../../include/conversation.php:1100 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1095 ../../mod/editlayout.php:107 -#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:101 +#: ../../include/conversation.php:1101 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:103 #: ../../mod/editblock.php:121 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1096 +#: ../../include/conversation.php:1102 msgid "set location" msgstr "" -#: ../../include/conversation.php:1097 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:102 +#: ../../include/conversation.php:1103 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 #: ../../mod/editblock.php:122 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1098 +#: ../../include/conversation.php:1104 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1100 ../../mod/editlayout.php:121 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:115 +#: ../../include/conversation.php:1106 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 #: ../../mod/editblock.php:136 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1103 ../../mod/editlayout.php:123 -#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:117 +#: ../../include/conversation.php:1109 ../../mod/editlayout.php:123 +#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:119 #: ../../mod/editblock.php:138 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1105 ../../mod/editlayout.php:110 -#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:104 +#: ../../include/conversation.php:1111 ../../mod/editlayout.php:110 +#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:106 #: ../../mod/editblock.php:124 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1106 +#: ../../include/conversation.php:1112 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1114 ../../mod/editlayout.php:118 -#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:112 +#: ../../include/conversation.php:1120 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:114 #: ../../mod/editblock.php:133 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1116 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:118 +#: ../../include/conversation.php:1122 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:120 #: ../../mod/editblock.php:139 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2935,11 +2940,12 @@ msgstr "" #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1615 +#: ../../boot.php:1620 msgid "Requested profile is not available." msgstr "" -#: ../../mod/webpages.php:101 ../../mod/layouts.php:92 ../../mod/blocks.php:95 +#: ../../mod/webpages.php:101 ../../mod/layouts.php:105 +#: ../../mod/blocks.php:96 msgid "View" msgstr "" @@ -3334,6 +3340,10 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" +#: ../../mod/rpost.php:83 ../../mod/editpost.php:42 +msgid "Edit post" +msgstr "" + #: ../../mod/subthread.php:105 #, php-format msgid "%1$s is following %2$s's %3$s" @@ -4809,11 +4819,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1833 ../../boot.php:1913 +#: ../../mod/ping.php:230 ../../boot.php:1838 ../../boot.php:1918 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1879 ../../boot.php:1954 +#: ../../mod/ping.php:252 ../../boot.php:1884 ../../boot.php:1959 msgid "[today]" msgstr "" @@ -5005,6 +5015,18 @@ msgstr "" msgid "No profile" msgstr "" +#: ../../mod/layouts.php:52 +msgid "Layout Help" +msgstr "" + +#: ../../mod/layouts.php:55 +msgid "Help with this feature" +msgstr "" + +#: ../../mod/layouts.php:74 +msgid "Layout Name" +msgstr "" + #: ../../mod/help.php:30 msgid "Help:" msgstr "" @@ -5013,7 +5035,7 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:229 +#: ../../mod/help.php:41 ../../mod/display.php:92 ../../index.php:229 msgid "Page not found." msgstr "" @@ -5635,7 +5657,7 @@ msgstr "" msgid "Address" msgstr "" -#: ../../mod/profiles.php:367 +#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 msgid "Location" msgstr "" @@ -5806,23 +5828,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1730 +#: ../../mod/profiles.php:624 ../../boot.php:1735 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1737 +#: ../../mod/profiles.php:625 ../../boot.php:1742 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1751 +#: ../../mod/profiles.php:636 ../../boot.php:1756 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1754 +#: ../../mod/profiles.php:639 ../../boot.php:1759 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1755 +#: ../../mod/profiles.php:640 ../../boot.php:1760 msgid "Edit visibility" msgstr "" @@ -5903,7 +5925,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1452 +#: ../../mod/lostpass.php:85 ../../boot.php:1457 msgid "Password Reset" msgstr "" @@ -6165,17 +6187,17 @@ msgid "Edit Layout" msgstr "" #: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123 -#: ../../mod/editpost.php:98 ../../mod/editblock.php:118 +#: ../../mod/editpost.php:100 ../../mod/editblock.php:118 msgid "Insert YouTube video" msgstr "" #: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 -#: ../../mod/editpost.php:99 ../../mod/editblock.php:119 +#: ../../mod/editpost.php:101 ../../mod/editblock.php:119 msgid "Insert Vorbis [.ogg] video" msgstr "" #: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 -#: ../../mod/editpost.php:100 ../../mod/editblock.php:120 +#: ../../mod/editpost.php:102 ../../mod/editblock.php:120 msgid "Insert Vorbis [.ogg] audio" msgstr "" @@ -6405,6 +6427,10 @@ msgstr "" msgid "Home Notifications" msgstr "" +#: ../../mod/blocks.php:65 +msgid "Block Name" +msgstr "" + #: ../../mod/oexchange.php:23 msgid "Unable to find your hub." msgstr "" @@ -6417,10 +6443,6 @@ msgstr "" msgid "Item is not editable" msgstr "" -#: ../../mod/editpost.php:40 -msgid "Edit post" -msgstr "" - #: ../../mod/profile.php:111 msgid "Access to this profile has been restricted." msgstr "" @@ -6593,15 +6615,23 @@ msgstr "" msgid "Public Sites" msgstr "" -#: ../../mod/pubsites.php:28 +#: ../../mod/pubsites.php:25 +msgid "" +"The listed sites allow public registration into the Red Matrix. All sites in " +"the matrix are interlinked so membership on any of them conveys membership " +"in the matrix as a whole. Some sites may require subscription or provide " +"tiered service plans. The provider links may provide additional details." +msgstr "" + +#: ../../mod/pubsites.php:31 msgid "Site URL" msgstr "" -#: ../../mod/pubsites.php:28 +#: ../../mod/pubsites.php:31 msgid "Access Type" msgstr "" -#: ../../mod/pubsites.php:28 +#: ../../mod/pubsites.php:31 msgid "Registration Policy" msgstr "" @@ -6880,104 +6910,105 @@ msgstr "" msgid "Right offset of the aside element" msgstr "" -#: ../../boot.php:1255 +#: ../../boot.php:1262 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1258 +#: ../../boot.php:1265 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1416 -msgid "Create a New Account" +#: ../../boot.php:1422 +msgid "" +"Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1445 +#: ../../boot.php:1450 msgid "Password" msgstr "" -#: ../../boot.php:1446 +#: ../../boot.php:1451 msgid "Remember me" msgstr "" -#: ../../boot.php:1451 +#: ../../boot.php:1456 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1570 +#: ../../boot.php:1575 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1582 +#: ../../boot.php:1587 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1736 +#: ../../boot.php:1741 msgid "Profiles" msgstr "" -#: ../../boot.php:1736 +#: ../../boot.php:1741 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1740 +#: ../../boot.php:1745 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1834 ../../boot.php:1914 +#: ../../boot.php:1839 ../../boot.php:1919 msgid "F d" msgstr "" -#: ../../boot.php:1891 +#: ../../boot.php:1896 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1892 +#: ../../boot.php:1897 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1947 +#: ../../boot.php:1952 msgid "[No description]" msgstr "" -#: ../../boot.php:1965 +#: ../../boot.php:1970 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1966 +#: ../../boot.php:1971 msgid "Events this week:" msgstr "" -#: ../../boot.php:2200 +#: ../../boot.php:2205 msgid "Channel" msgstr "" -#: ../../boot.php:2203 +#: ../../boot.php:2208 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2207 +#: ../../boot.php:2212 msgid "About" msgstr "" -#: ../../boot.php:2210 +#: ../../boot.php:2215 msgid "Profile Details" msgstr "" -#: ../../boot.php:2228 +#: ../../boot.php:2233 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2233 +#: ../../boot.php:2238 msgid "Webpages" msgstr "" -#: ../../boot.php:2236 +#: ../../boot.php:2241 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2518 +#: ../../boot.php:2523 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index e00c683b5..46f2ffbce 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-31.483 +2013-11-02.485 -- cgit v1.2.3 From 9158909fa3e938d04ebf06d2c2dba9417b36ffa6 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 2 Nov 2013 23:56:29 -0700 Subject: return a login form on some protoected pages if not logged in. --- mod/connections.php | 6 +++--- mod/message.php | 2 +- mod/settings.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/connections.php b/mod/connections.php index efdf0fd55..1ad9fedbc 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -32,8 +32,8 @@ function connections_init(&$a) { function connections_aside(&$a) { -if (! local_user()) - return; + if (! local_user()) + return; if(x($a->data,'abook')) { $a->set_widget('vcard',vcard_from_xchan($a->data['abook'],$a->get_observer())); @@ -175,7 +175,7 @@ function connections_content(&$a) { if(! local_user()) { notice( t('Permission denied.') . EOL); - return; + return login(); } if(argc() == 3) { diff --git a/mod/message.php b/mod/message.php index bd2545ea5..a4d73e6b0 100644 --- a/mod/message.php +++ b/mod/message.php @@ -205,7 +205,7 @@ function message_content(&$a) { if(! local_user()) { notice( t('Permission denied.') . EOL); - return; + return login(); } $channel = $a->get_channel(); diff --git a/mod/settings.php b/mod/settings.php index ab3ac4f12..4e122607b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -625,7 +625,7 @@ function settings_content(&$a) { if(! local_user()) { notice( t('Permission denied.') . EOL ); - return; + return login(); } -- cgit v1.2.3 From 8a75e9202032fd789b6b62484df976eb48b1ce16 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 00:38:11 -0700 Subject: rev update and de string fix --- version.inc | 2 +- view/de/strings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 46f2ffbce..3c41a6753 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-02.485 +2013-11-03.486 diff --git a/view/de/strings.php b/view/de/strings.php index 7d7639966..2aa913484 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ $a->strings["Visible to everybody"] = "Für jeden sichtbar"; $a->strings["show"] = "zeigen"; $a->strings["don't show"] = "Verbergen"; -$a->strings[" and "] = "und"; +$a->strings[" and "] = " und "; $a->strings["public profile"] = "öffentliches Profil"; $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert"; $a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s"; -- cgit v1.2.3 From 5ba813397b7112df64e35ee45eef1c2f0b12d617 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 14:26:42 -0800 Subject: provide nav_min_opacity which allows the navbar to fade or even vanish until hovered with a value of for instance '0'; --- view/theme/redbasic/css/style.css | 28 ++++++++++++++++++---------- view/theme/redbasic/php/config.php | 9 +++++++-- view/theme/redbasic/php/style.php | 16 +++++++++++++--- view/theme/redbasic/tpl/theme_settings.tpl | 1 + 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 669f73f42..ba0aabf8d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -118,21 +118,29 @@ blockquote { filter:alpha(opacity=100); } -nav {background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); +nav { + background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); + background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + opacity: $nav_float_min_opacity; + filter:alpha(opacity=$nav_percent_min_opacity); + } section {width: $section_width; } -nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); +nav:hover { + background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + opacity: 1.0; + filter:alpha(opacity=100); + } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 053940219..dc79b654f 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -14,8 +14,9 @@ function theme_content(&$a) { $radius = get_pconfig(local_user(),'redbasic', 'radius' ); $shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); $section_width=get_pconfig(local_user(),"redbasic","section_width"); + $nav_min_opacity=get_pconfig(local_user(),"redbasic","nav_min_opacity"); return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width); + $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity); } function theme_post(&$a) { @@ -33,11 +34,14 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']); + set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); } } +// FIXME - this really should be an array + function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width) { + $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity) { $scheme_choices = array(); $scheme_choices["---"] = t("Default"); @@ -78,6 +82,7 @@ if(feature_enabled(local_user(),'expert')) '$radius' => array('redbasic_radius', t('Set radius of corners'), $radius), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow), '$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width), + '$nav_min_opacity' => array('nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$nav_min_opacity), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c4bd2e15a..88bd660c9 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -22,6 +22,7 @@ $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); $section_width=get_pconfig($uid,"redbasic","section_width"); + $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema @@ -72,8 +73,15 @@ $active_colour = '#FFFFFF'; if (! $section_width) $section_width="72%"; - - + if($nav_min_opacity === false) { + $nav_float_min_opacity = 1.0; + $nav_percent_min_opacity = 100; + } + else { + $nav_float_min_opacity = (float) $nav_min_opacity; + $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; + } + // Nav colours have nested values, so we have to define the actual variables // used in the CSS from the higher level "red", "black", etc here @@ -117,7 +125,9 @@ $options = array ( '$radius' => $radius, '$shadow' => $shadow, '$active_colour' => $active_colour, -'$section_width' => $section_width +'$section_width' => $section_width, +'$nav_float_min_opacity' => $nav_float_min_opacity, +'$nav_percent_min_opacity' => $nav_percent_min_opacity ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 4e4b6002c..7a5e4a390 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -14,6 +14,7 @@ {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$section_width}} +{{include file="field_input.tpl" field=$nav_min_opacity}}
    -- cgit v1.2.3 From 4d470f2d7017fcee94d0d5a548ff40018b358542 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 14:57:29 -0800 Subject: add sloppy photo setting and fix default navbar hide setting --- view/theme/redbasic/css/sloppy_photos.css | 58 ++++++++++++++++++++++++++++++ view/theme/redbasic/css/style.css | 58 ------------------------------ view/theme/redbasic/php/config.php | 9 +++-- view/theme/redbasic/php/style.php | 7 +++- view/theme/redbasic/tpl/theme_settings.tpl | 1 + view/tpl/photo_top.tpl | 4 +-- 6 files changed, 73 insertions(+), 64 deletions(-) create mode 100644 view/theme/redbasic/css/sloppy_photos.css diff --git a/view/theme/redbasic/css/sloppy_photos.css b/view/theme/redbasic/css/sloppy_photos.css new file mode 100644 index 000000000..78aedc9cc --- /dev/null +++ b/view/theme/redbasic/css/sloppy_photos.css @@ -0,0 +1,58 @@ + +.rotleft1 { +-webkit-transform: rotate(-1deg); +-moz-transform: rotate(-1deg); +-ms-transform: rotate(-1deg); +-o-transform: rotate(-1deg); +} + +.rotleft2 { +-webkit-transform: rotate(-2deg); +-moz-transform: rotate(-2deg); +-ms-transform: rotate(-2deg); +-o-transform: rotate(-2deg); +} + +.rotleft3 { +-webkit-transform: rotate(-3deg); +-moz-transform: rotate(-3deg); +-ms-transform: rotate(-3deg); +-o-transform: rotate(-3deg); +} + +.rotleft4 { +-webkit-transform: rotate(-4deg); +-moz-transform: rotate(-4deg); +-ms-transform: rotate(-4deg); +-o-transform: rotate(-4deg); +} + + +.rotright1 { +-webkit-transform: rotate(1deg); +-moz-transform: rotate(1deg); +-ms-transform: rotate(1deg); +-o-transform: rotate(1deg); +} + +.rotright2 { +-webkit-transform: rotate(2deg); +-moz-transform: rotate(2deg); +-ms-transform: rotate(2deg); +-o-transform: rotate(2deg); +} + +.rotright3 { +-webkit-transform: rotate(3deg); +-moz-transform: rotate(3deg); +-ms-transform: rotate(3deg); +-o-transform: rotate(3deg); +} + +.rotright4 { +-webkit-transform: rotate(4deg); +-moz-transform: rotate(4deg); +-ms-transform: rotate(4deg); +-o-transform: rotate(4deg); +} + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba0aabf8d..b672b572c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1513,64 +1513,6 @@ tr.mceLast { border: 1px solid #888888; } -.rotleft1 { --webkit-transform: rotate(-1deg); --moz-transform: rotate(-1deg); --ms-transform: rotate(-1deg); --o-transform: rotate(-1deg); -} - -.rotleft2 { --webkit-transform: rotate(-2deg); --moz-transform: rotate(-2deg); --ms-transform: rotate(-2deg); --o-transform: rotate(-2deg); -} - -.rotleft3 { --webkit-transform: rotate(-3deg); --moz-transform: rotate(-3deg); --ms-transform: rotate(-3deg); --o-transform: rotate(-3deg); -} - -.rotleft4 { --webkit-transform: rotate(-4deg); --moz-transform: rotate(-4deg); --ms-transform: rotate(-4deg); --o-transform: rotate(-4deg); -} - - -.rotright1 { --webkit-transform: rotate(1deg); --moz-transform: rotate(1deg); --ms-transform: rotate(1deg); --o-transform: rotate(1deg); -} - -.rotright2 { --webkit-transform: rotate(2deg); --moz-transform: rotate(2deg); --ms-transform: rotate(2deg); --o-transform: rotate(2deg); -} - -.rotright3 { --webkit-transform: rotate(3deg); --moz-transform: rotate(3deg); --ms-transform: rotate(3deg); --o-transform: rotate(3deg); -} - -.rotright4 { --webkit-transform: rotate(4deg); --moz-transform: rotate(4deg); --ms-transform: rotate(4deg); --o-transform: rotate(4deg); -} - - .photos-end { clear: both; diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index dc79b654f..0007d8c24 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -15,8 +15,9 @@ function theme_content(&$a) { $shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); $section_width=get_pconfig(local_user(),"redbasic","section_width"); $nav_min_opacity=get_pconfig(local_user(),"redbasic","nav_min_opacity"); + $sloppy_photos=get_pconfig(local_user(),"redbasic","sloppy_photos"); return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity); + $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos); } function theme_post(&$a) { @@ -35,13 +36,14 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']); set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); + set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']); } } // FIXME - this really should be an array function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity) { + $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos) { $scheme_choices = array(); $scheme_choices["---"] = t("Default"); @@ -82,7 +84,8 @@ if(feature_enabled(local_user(),'expert')) '$radius' => array('redbasic_radius', t('Set radius of corners'), $radius), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow), '$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width), - '$nav_min_opacity' => array('nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$nav_min_opacity), + '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$nav_min_opacity), + '$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$sloppy_photos,t('Are you a clean desk or a messy desk person?')), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 88bd660c9..56df0f4f2 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -23,6 +23,7 @@ $shadow = get_pconfig($uid,"redbasic","photo_shadow"); $section_width=get_pconfig($uid,"redbasic","section_width"); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); + $sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos'); // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema @@ -73,7 +74,7 @@ $active_colour = '#FFFFFF'; if (! $section_width) $section_width="72%"; - if($nav_min_opacity === false) { + if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; } @@ -133,3 +134,7 @@ $options = array ( echo str_replace(array_keys($options), array_values($options), $x); } + +if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { + echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); +} \ No newline at end of file diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 7a5e4a390..c7f2bf124 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -15,6 +15,7 @@ {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$section_width}} {{include file="field_input.tpl" field=$nav_min_opacity}} +{{include file="field_checkbox.tpl" field=$sloppy_photos}}
    diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 902f74232..944928f85 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,6 +1,6 @@ -
    + -- cgit v1.2.3 From 72287b24783edcaf44d1d93bb901729d1af0375a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 15:14:31 -0800 Subject: fix the saved search term delete icons in redbasic so they are hidden by default. This is a bit harder using font-based icons than it was with images that could easily be hidden. We'll do it with opacity instead of visibility or display css settings. --- view/theme/redbasic/css/style.css | 6 +++++- view/theme/redbasic/js/redbasic.js | 34 ++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b672b572c..9ecb23f5e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3448,4 +3448,8 @@ text-decoration: none; #menulist { list-style-type: none; -} \ No newline at end of file +} + +.savedsearchdrop { + opacity: 0; +} diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e7a682911..a97e906bf 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -66,24 +66,22 @@ $('.sidebar-group-element').hover( ); -//$('.saved-search-li a').hover( -// function() { -// id = $(this).attr('id'); -// $('#dropicon-' + id).css('visibility','visible');}, -// function() { -// id = $(this).attr('id'); -// $('#dropicon-' + id).css('visibility','hidden');} -// ); - -//$('.savedsearchterm').hover( -// function() { -// id = $(this).attr('id'); -// $('#dropicon-' + id).css('visibility','visible');}, -// -// function() { -// id = $(this).attr('id'); -// $('#dropicon-' + id).css('visibility','hidden'); -// }); +$('.savedsearchdrop').hover( + function() { + $(this).css('opacity','1.0');}, + function() { + $(this).css('opacity','0');} + ); + +$('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#dropicon-' + id).css('opacity','1.0');}, + + function() { + id = $(this).attr('id'); + $('#dropicon-' + id).css('opacity','0'); + }); }); -- cgit v1.2.3 From cea11c94984f0f824bc5f1da260bd8ee4ea109cd Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 15:20:40 -0800 Subject: make date order the default for the directory --- mod/dirsearch.php | 2 +- view/tpl/dir_sort_links.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 66f9a6f4c..9f8ff6a86 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -131,7 +131,7 @@ function dirsearch_content(&$a) { } - if($sort_order == 'date') + if($sort_order == 'normal') $order = " order by xchan_name_date desc "; elseif($sort_order == 'reverse') $order = " order by xchan_name desc "; diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 58498e4d8..d78aec1f5 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,6 +1,6 @@ -- cgit v1.2.3 From a966e53ee40316792efa9926deb740ee736fbc21 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 15:22:22 -0800 Subject: hmmph. That's why the sort order didn't change... --- mod/dirsearch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 9f8ff6a86..08a0bab96 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -132,11 +132,11 @@ function dirsearch_content(&$a) { if($sort_order == 'normal') - $order = " order by xchan_name_date desc "; + $order = " order by xchan_name asc "; elseif($sort_order == 'reverse') $order = " order by xchan_name desc "; else - $order = " order by xchan_name asc "; + $order = " order by xchan_name_date desc "; if($sync) { -- cgit v1.2.3 From d783183572d26585983959564a1b38b6e63b95ff Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 20:55:58 -0800 Subject: add attach_mkdir() --- include/attach.php | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/include/attach.php b/include/attach.php index da08154c6..152489179 100644 --- a/include/attach.php +++ b/include/attach.php @@ -500,4 +500,75 @@ function z_readdir($channel_id,$observer_hash,$pathname, $parent_hash = '') { $ret['success'] = true; $ret['data'] = $r; return $ret; +} + + +/** + * @function attach_mkdir($channel,$observer_hash,$arr); + * + * Create directory + * + * @param $channel channel array of owner + * @param $observer_hash hash of current observer + * @param $arr parameter array to fulfil request + * + * Required: + * $arr['filename'] + * $arr['folder'] // hash of parent directory, empty string for root directory + * + * Optional: + * $arr['hash'] // precumputed hash for this node + * $arr['allow_cid'] + * $arr['allow_gid'] + * $arr['deny_cid'] + * $arr['deny_gid'] + */ + +function attach_mkdir($channel,$observer_hash,$arr = null) { + + $ret = array('success' => false); + $channel_id = $channel['channel_id']; + $sql_options = ''; + + if(! perm_is_allowed($channel_id,get_observer_hash(),'write_storage')) { + $ret['message'] = t('Permission denied.'); + return $ret; + } + + // Walk the directory tree from root to parent to make sure the parent is valid and name is unique. + // FIXME + + + $arr['hash'] = (($arr['hash']) ? $arr['hash'] : random_string()); + $created = datetime_convert(); + + $r = q("INSERT INTO attach ( aid, uid, hash, filename, filetype, filesize, revision, folder, flags, data, created, edited, allow_cid, allow_gid,deny_cid, deny_gid ) + VALUES ( %d, %d, '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", + intval($channel['channel_account_id']), + intval($channel_id), + dbesc($arr['hash']), + dbesc($arr['filename']), + dbesc('multipart/mixed'), + intval(0), + intval(0), + dbesc($arr['folder']), + intval(ATTACH_FLAGS_DIR), + dbesc(''), + dbesc($created), + dbesc($created), + dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : '<' . $channel['channel_hash'] . '>'), + dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : ''), + dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : ''), + dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : '') + ); + + if(! $r) + $ret['message'] = t('database storage failed.'); + else { + $ret['success'] = true; + $ret['data'] = $arr; + } + + return $ret; + } \ No newline at end of file -- cgit v1.2.3 From c61a0d9dabfa7c615e33c721cbf57582939b157b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Nov 2013 16:44:23 -0800 Subject: private tagged posts weren't creating second delivery chain - they were incorrectly being marked as "in a reshare" due to being obscured. --- include/items.php | 15 ++++++++++++++- mod/item.php | 2 +- version.inc | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 18aab93fa..5fcbb0cc5 100755 --- a/include/items.php +++ b/include/items.php @@ -2216,10 +2216,23 @@ function tag_deliver($uid,$item_id) { intval($item_id) ); + + // At this point we've determined that the person receiving this post was mentioned in it or it is a union. // Now let's check if this mention was inside a reshare so we don't spam a forum + // If it's private we may have to unobscure it momentarily so that we can parse it. + + $body = ''; + + if($item['item_flags'] & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + if($item['body']) + $body = aes_unencapsulate(json_decode_plus($item['body']),$key); + } + else + $body = $item['body']; - $body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']); + $body = preg_replace('/\[share(.*?)\[\/share\]/','',$body); $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; diff --git a/mod/item.php b/mod/item.php index 218e9c174..2b8de1247 100644 --- a/mod/item.php +++ b/mod/item.php @@ -411,7 +411,7 @@ function item_post(&$a) { * owner from seeing it. This is because the permissions may not yet have been * set for the post. If it's private, the photo permissions should be set * appropriately. But we didn't know the final permissions on the post until - * now. So now we'll look for links of uploaded messages that are in the + * now. So now we'll look for links of uploaded photos and attachments that are in the * post and set them to the same permissions as the post itself. * */ diff --git a/version.inc b/version.inc index 3c41a6753..bd47e9407 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-03.486 +2013-11-04.487 -- cgit v1.2.3 From 372a92533f9dc73ffea2d32c981fa62c86488e02 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Nov 2013 16:53:42 -0800 Subject: tag notifications for private posts contain obscured data - they should be blank --- include/enotify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/enotify.php b/include/enotify.php index 147023f41..35a554f60 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -60,6 +60,7 @@ function notification($params) { localize_item($i); $title = $i['title']; $body = $i['body']; + $private = $i['item_private']; } else { $title = $params['item']['title']; @@ -196,7 +197,6 @@ function notification($params) { return; } - $subject = sprintf( t('[Red:Notify] %s tagged you') , $sender['xchan_name']); $preamble = sprintf( t('%1$s tagged you at %2$s') , $sender['xchan_name'], $sitename); $epreamble = sprintf( t('%1$s [zrl=%2$s]tagged you[/zrl].') , -- cgit v1.2.3 From 1c5e2b86457144a6feb7b672d522939e9a2db0f8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Nov 2013 19:08:34 -0800 Subject: solid progress on attach_mkdir - but we need to figure out where to store default file permissions. This should be separate from post/item permissions and we won't be able to set permissions from the DAV interface so if we want something private we have to provide these permissions in our preferences. --- include/attach.php | 84 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 73 insertions(+), 11 deletions(-) diff --git a/include/attach.php b/include/attach.php index 152489179..2f77460a4 100644 --- a/include/attach.php +++ b/include/attach.php @@ -530,19 +530,75 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { $channel_id = $channel['channel_id']; $sql_options = ''; - if(! perm_is_allowed($channel_id,get_observer_hash(),'write_storage')) { + $basepath = 'store/' . $channel['channel_address']; + if(! is_dir($basepath)) + @mkdir($basepath,0700,true); + + + if(! perm_is_allowed($channel_id, get_observer_hash(),'write_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } - // Walk the directory tree from root to parent to make sure the parent is valid and name is unique. - // FIXME + if(! $arr['filename']) { + $ret['message'] = t('Empty pathname'); + return $ret; + } $arr['hash'] = (($arr['hash']) ? $arr['hash'] : random_string()); + + + // Check for duplicate name. + // Check both the filename and the hash as we will be making use of both. + + $r = q("select hash from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1", + dbesc($arr['filename']), + dbesc($arr['hash']), + dbesc($arr['folder']), + intval($channel['channel_id']) + ); + if($r) { + $ret['message'] = t('duplicate filename or path'); + return $ret; + } + + if($arr['folder']) { + + // Walk the directory tree from parent back to root to make sure the parent is valid and name is unique and we + // have permission to see this path. This implies the root directory itself is public since we won't have permissions + // set on the psuedo-directory. We can however set permissions for anything and everything contained within it. + + $lpath = ''; + $lfile = $arr['folder']; + $sql_options = permissions_sql($channel); + + do { + $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d ) + $sql_options limit 1", + intval($channel['channel_id']), + dbesc($lfile), + intval(ATTACH_FLAG_DIR) + ); + if(! $r) { + $ret['message'] = t('Path not found.'); + return $ret; + } + if($lfile) + $lpath = $r[0]['hash'] . '/' . $lpath; + $lfile = $r[0]['folder']; + } while ( ($r[0]['folder']) && ($r[0]['flags'] & ATTACH_FLAG_DIR)) ; + $path = $basepath . '/' . $lpath; + + } + else + $path = $basepath . '/'; + + $path .= $arr['hash']; + $created = datetime_convert(); - $r = q("INSERT INTO attach ( aid, uid, hash, filename, filetype, filesize, revision, folder, flags, data, created, edited, allow_cid, allow_gid,deny_cid, deny_gid ) + $r = q("INSERT INTO attach ( aid, uid, hash, filename, filetype, filesize, revision, folder, flags, data, created, edited, allow_cid, allow_gid, deny_cid, deny_gid ) VALUES ( %d, %d, '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", intval($channel['channel_account_id']), intval($channel_id), @@ -552,22 +608,28 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { intval(0), intval(0), dbesc($arr['folder']), - intval(ATTACH_FLAGS_DIR), + intval(ATTACH_FLAG_DIR), dbesc(''), dbesc($created), dbesc($created), - dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : '<' . $channel['channel_hash'] . '>'), + dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : ''), dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : ''), dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : ''), dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : '') ); - if(! $r) - $ret['message'] = t('database storage failed.'); - else { - $ret['success'] = true; - $ret['data'] = $arr; + if($r) { + if(mkdir($path,0700)) { + $ret['success'] = true; + $ret['data'] = $arr; + } + else { + logger('attach_mkdir: ' . mkdir . ' ' . $path . 'failed.'); + $ret['message'] = t('mkdir failed.'); + } } + else + $ret['message'] = t('database storage failed.'); return $ret; -- cgit v1.2.3 From f89e7b2bd549474439e684c052623af7e2e8d27d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Nov 2013 19:21:09 -0800 Subject: make the storage permissions tweakable for hosted environments where they may require tweaking. --- boot.php | 15 +++++++++++++++ include/attach.php | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index aa56aff3d..99ec5de32 100755 --- a/boot.php +++ b/boot.php @@ -90,6 +90,21 @@ define ( 'LANGUAGE_DETECT_MIN_LENGTH', 128 ); define ( 'LANGUAGE_DETECT_MIN_CONFIDENCE', 0.01 ); +/** + * Default permissions for file-based storage (webDAV, etc.) + * These files will be owned by the webserver who will need write + * access to the "storage" folder. + * Ideally you should make this 700, however some hosted platforms + * may not let you change ownership of this directory so we're + * defaulting to both owner-write and group-write privilege. + * This should work for most cases without modification. + * Over-ride this in your .htconfig.php if you need something + * either more or less restrictive. + */ + +define ( 'STORAGE_DEFAULT_PERMISSIONS', 0770 ); + + /** * * An alternate way of limiting picture upload sizes. Specify the maximum pixel diff --git a/include/attach.php b/include/attach.php index 2f77460a4..0c748cba6 100644 --- a/include/attach.php +++ b/include/attach.php @@ -532,7 +532,7 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { $basepath = 'store/' . $channel['channel_address']; if(! is_dir($basepath)) - @mkdir($basepath,0700,true); + @mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS,true); if(! perm_is_allowed($channel_id, get_observer_hash(),'write_storage')) { @@ -619,7 +619,7 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { ); if($r) { - if(mkdir($path,0700)) { + if(mkdir($path,STORAGE_DEFAULT_PERMISSIONS)) { $ret['success'] = true; $ret['data'] = $arr; } -- cgit v1.2.3 From 727e8cc2989d47bfd8ef5fcadc62b1473a323a10 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Nov 2013 20:43:32 -0800 Subject: don't store update records if we're not a directory server of some kind --- include/zot.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/zot.php b/include/zot.php index c4dce5ceb..c7c5c52b7 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1567,6 +1567,11 @@ function import_directory_keywords($hash,$keywords) { function update_modtime($hash,$guid,$addr,$flags = 0) { + $dirmode = intval(get_config('system','directory_mode')); + + if($dirmode == DIRECTORY_MODE_NORMAL) + return; + if($flags) { q("insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )", dbesc($hash), -- cgit v1.2.3 From 5b48ab772b24102a72945fe3a4f141f8380dcf86 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 14:26:31 -0800 Subject: fix private group delivery --- include/group.php | 7 ++++--- version.inc | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/group.php b/include/group.php index 7ba14a49d..eece07983 100644 --- a/include/group.php +++ b/include/group.php @@ -298,12 +298,13 @@ function expand_groups($a) { if(! (is_array($a) && count($a))) return array(); $x = $a; - stringify_array_elms($x); + stringify_array_elms($x,true); $groups = implode(',', $x); - $groups = dbesc($groups); + if($groups) - $r = q("SELECT xchan FROM group_member WHERE gid IN ( $groups )"); + $r = q("SELECT xchan FROM group_member WHERE gid IN ( select id from `group` where hash in ( $groups ))"); $ret = array(); + if($r) foreach($r as $rr) $ret[] = $rr['xchan']; diff --git a/version.inc b/version.inc index bd47e9407..812f6d03e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-04.487 +2013-11-05.488 -- cgit v1.2.3 From 37e8be8d3bfcb5e7c1069231c8711b29ce3aab7c Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Tue, 5 Nov 2013 23:30:21 +0100 Subject: Fix Nginx config for Nginx 1.4.x --- doc/install/sample-nginx.conf | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf index 718524ee3..57a0e63b5 100644 --- a/doc/install/sample-nginx.conf +++ b/doc/install/sample-nginx.conf @@ -6,8 +6,9 @@ # /etc/nginx/sites-available # # Then customize to your needs. To enable the configuration -# symlink it to /etc/nginx/sites-enabled and reload Nginx -# using /etc/init.d/nginx reload +# symlink it to /etc/nginx/sites-enabled and reload Nginx using +# +# service nginx reload ## ## @@ -29,7 +30,9 @@ ## server { + listen 80; server_name red.example.net; + index index.php; root /var/www/red; rewrite ^ https://red.example.net$request_uri? permanent; @@ -45,22 +48,21 @@ server { ## server { - listen 80; listen 443 ssl; - ssl on; server_name red.example.net; + + ssl on; ssl_certificate /etc/nginx/ssl/red.example.net.chain.pem; ssl_certificate_key /etc/nginx/ssl/example.net.key; ssl_session_timeout 5m; ssl_protocols SSLv3 TLSv1; ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; ssl_prefer_server_ciphers on; - - + index index.php; charset utf-8; root /var/www/red; - access_log /var/log/nginx/red.log main; + access_log /var/log/nginx/red.log; #Uncomment the following line to include a standard configuration file #include standard.conf # allow uploads up to 20MB in size @@ -94,6 +96,7 @@ server { } # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # or a unix socket location ~* \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini -- cgit v1.2.3 From 93a63abcd64d069be126f46e49089112153315a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 15:00:33 -0800 Subject: bit of README cleanup --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7bc8ace56..3fbfedae7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ The Red Matrix -============== +============== -Got Zot? +***"Connected Websites"*** The modern web is "missing" a few important pieces which would make it much more useful. Many corporations have stepped in with products to supply these missing pieces, but with a loss of freedom and privacy and increased **centralisation**. @@ -19,15 +19,15 @@ These missing pieces are (in no particular order): -The Red Matrix (sometimes referred to as just "Red") is a collection of web servers and services which provides these missing pieces, but within a decentralised identity and messaging framework (known as "Zot"). Red operates as an independent network within the larger internet where all the nodes or servers (we call them "hubs") are able to fully interact with each other in ways that are simply not possible using other services. Additionally the owners of each network hub have the ability to set their own rules with regard to communications and privacy and data ownership, because each operates with complete independence. These hubs require only slightly more resources than a blog or content management system, and the software is being designed with the ability to natively incorporate both kinds of functionality, as well as cloud storage. +The Red Matrix (sometimes referred to as just "Red") is a collection of web servers and services which provides these missing pieces, but within a decentralised identity and messaging framework (known as "Zot"). Red operates as an independent network within the larger internet where all the nodes or servers (we call them "hubs") are able to fully interact with each other in ways that are simply not possible using other services. Additionally the owners of each network hub have the ability to set their own rules with regard to communications privacy and data ownership, because each operates with complete independence. These hubs require only slightly more resources than a blog or content management system, and the software is being designed with the ability to natively incorporate both kinds of functionality, as well as cloud storage. ![The Red Matrix model](images/red_antiprism.png) -A weakness of existing decentralised network models is the binding of network identity with the physical server where it resides; for example if you are "eric@example.website", your identity is often tied permanently to "example.website". We see this as a problem. Many hubs on the Indie Web are run by enthusiasts with varying skill levels and financial resources - and the technology is changing quite rapidly. Often the cost or workload involved in maintaining these services becomes a burden (or hardware fails) and people or entire social communities are left stranded when their server goes offline. They may have to "start over" building their social circle from scratch when this happens. In some cases communities are unable to recover from this kind of disruption and the entire community dissolves. +Whilst other decentralised communications networks exist, an additional weakness we've found in the implementation of these systems is the binding of network identity with the physical server where it resides; for example if you are "eric@example.website", your identity is often tied permanently to "example.website". We see this as a problem. Many hubs on the Indie Web are run by enthusiasts with varying skill levels and financial resources - and the technology is changing quite rapidly. Often the cost or workload involved in maintaining these services becomes a burden (or hardware fails) and people or entire social communities are left stranded when their server goes offline. Their identity no longer exists. They may have to "start over" building their social circle from scratch when this happens. In some cases communities are unable to recover from this kind of disruption and the entire community dissolves. We've been working on decentralisation for several years and have seen this happen time and time again. -Within the Red Matrix, identity is nomadic. You can take your identity, and all your friends and associates with you - to any other hub in the network, at any time. If your hub goes offline for any reason, you have the ability to relocate to any other hub and carry on as if nothing happened. You still have all your friends and associations. +Within the Red Matrix, identity is nomadic. It defines you and it belongs to you - and is not locked to a particular network address. You can take your identity, and all your friends and associates with you - to any other hub in the network, at any time. If your hub goes offline for any reason, you have the ability to relocate to any other hub and carry on as if nothing happened. You still have all your friends and associations. The Red Matrix is free and open source distributed under the MIT license. -- cgit v1.2.3 From 9dfa7c6030d673a05a5c9bc692c579ec7eeeb7db Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 6 Nov 2013 00:16:02 +0100 Subject: make the font-colour for the banner adjustable as well --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/config.php | 7 +++++-- view/theme/redbasic/php/style.php | 6 +++++- view/theme/redbasic/tpl/theme_settings.tpl | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9ecb23f5e..a19630292 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -188,7 +188,7 @@ header #banner { text-align: center; font-size: 1.4em; font-family: tahoma, "Lucida Sans", sans; - color: #FFF; + color: $banner_colour; font-weight: bold; margin-top: 1px; } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 0007d8c24..fa441e15e 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -5,6 +5,7 @@ function theme_content(&$a) { $schema = get_pconfig(local_user(),'redbasic', 'schema' ); $nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $banner_colour = get_pconfig(local_user(),'redbasic', 'banner_colour' ); $bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' ); $background_image = get_pconfig(local_user(),'redbasic', 'background_image' ); $item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' ); @@ -16,7 +17,7 @@ function theme_content(&$a) { $section_width=get_pconfig(local_user(),"redbasic","section_width"); $nav_min_opacity=get_pconfig(local_user(),"redbasic","nav_min_opacity"); $sloppy_photos=get_pconfig(local_user(),"redbasic","sloppy_photos"); - return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, + return redbasic_form($a, $schema, $nav_colour, $banner_colour, $bgcolour, $background_image, $item_colour, $item_opacity, $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos); } @@ -27,6 +28,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); + set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); @@ -42,7 +44,7 @@ function theme_post(&$a) { // FIXME - this really should be an array -function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, +function redbasic_form(&$a, $schema, $nav_colour, $banner_colour, $bgcolour, $background_image, $item_colour, $item_opacity, $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos) { $scheme_choices = array(); @@ -75,6 +77,7 @@ if(feature_enabled(local_user(),'expert')) '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $schema, '', $scheme_choices), '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $nav_colour, '', $nav_colours), + '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $banner_colour), '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $bgcolour), '$background_image' => array('redbasic_background_image', t('Set the background image'), $background_image), '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $item_colour), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 56df0f4f2..6ea6faadc 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -12,6 +12,7 @@ $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); // Load the owners pconfig + $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); @@ -54,6 +55,8 @@ $nav_bg_3 = "#f00"; $nav_bg_4 = "#b00"; } + if (! $banner_colour) + $banner_colour = "fff"; if (! $bgcolour) $bgcolour = "fff"; if (! $background_image) @@ -116,6 +119,7 @@ $options = array ( '$nav_bg_2' => $nav_bg_2, '$nav_bg_3' => $nav_bg_3, '$nav_bg_4' => $nav_bg_4, +'$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, '$background_image' => $background_image, @@ -137,4 +141,4 @@ echo str_replace(array_keys($options), array_values($options), $x); if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); -} \ No newline at end of file +} diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index c7f2bf124..48b9c07c3 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -5,6 +5,7 @@ {{if $expert}} {{include file="field_select.tpl" field=$nav_colour}} +{{include file="field_input.tpl" field=$banner_colour}} {{include file="field_input.tpl" field=$bgcolour}} {{include file="field_input.tpl" field=$background_image}} {{include file="field_input.tpl" field=$item_colour}} @@ -19,4 +20,4 @@
    -{{/if}} \ No newline at end of file +{{/if}} -- cgit v1.2.3 From b4f8c247a21d02e5fb2d85e761d37b8d8a02cf9b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 15:29:44 -0800 Subject: soften the colours a wee bit for the default case --- view/theme/redbasic/php/style.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 56df0f4f2..3b2c3860b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -55,17 +55,17 @@ $nav_bg_4 = "#b00"; } if (! $bgcolour) - $bgcolour = "fff"; + $bgcolour = "#f5f5f5"; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "fff"; + $item_colour = "#f5f5f5"; if (! $item_opacity) $item_opacity = "1"; if (! $font_size) $font_size = "12"; if (! $font_colour) - $font_colour = "000"; + $font_colour = "#4D4D4D"; if (! $radius) $radius = "5"; if (! $shadow) -- cgit v1.2.3 From b15c9de1e50437065fbdd1ac7e487687a4feda8d Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 15:34:17 -0800 Subject: soften the background a bit more --- view/theme/redbasic/php/style.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index bf98cbcce..426453cb7 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -58,11 +58,11 @@ if (! $banner_colour) $banner_colour = "fff"; if (! $bgcolour) - $bgcolour = "#f5f5f5"; + $bgcolour = "#f8f8f8"; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "#f5f5f5"; + $item_colour = "#f8f8f8"; if (! $item_opacity) $item_opacity = "1"; if (! $font_size) -- cgit v1.2.3 From f4cb145f3c248aab9188900baebaa5659fa4e343 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 16:21:38 -0800 Subject: redbasic - allow changing icon colours --- view/theme/redbasic/css/style.css | 17 ++++--- view/theme/redbasic/php/config.php | 81 ++++++++++++++++-------------- view/theme/redbasic/php/style.php | 8 +++ view/theme/redbasic/tpl/theme_settings.tpl | 2 + view/tpl/conv_item.tpl | 2 +- 5 files changed, 66 insertions(+), 44 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a19630292..32d33ad70 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -930,7 +930,8 @@ footer { font-size: 1.4em; left: 105px; position: absolute; - top: 1px; + top: 1px; + color: $toolicon_colour; } .comment .wall-item-lock { left: 65px; @@ -958,17 +959,21 @@ footer { margin-right: 8px; font-size: 1.2em; cursor: pointer; - color: #777; + color: $toolicon_colour; } .item-tool:hover { - color: #000; + color: $toolicon_activecolour; +} + +.drop-icons.item-tool { + color: $toolicon_colour; } .like-rotator { float: left; margin: 8px; - color: #777; + color: $toolicon_colour; } .wall-item-delete-wrapper { @@ -3390,12 +3395,12 @@ margin-right: 50px; .comment-icon, .jot-icons { font-size: 1.2em; - color: #777; + color: $toolicon_colour; } .comment-icon:hover, .jot-icons:hover { - color: #000; + color: $toolicon_activecolour; } .nav-icon { diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index fa441e15e..eb583d9bf 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -3,22 +3,25 @@ function theme_content(&$a) { if(!local_user()) { return;} - $schema = get_pconfig(local_user(),'redbasic', 'schema' ); - $nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' ); - $banner_colour = get_pconfig(local_user(),'redbasic', 'banner_colour' ); - $bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' ); - $background_image = get_pconfig(local_user(),'redbasic', 'background_image' ); - $item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' ); - $item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' ); - $font_size = get_pconfig(local_user(),'redbasic', 'font_size' ); - $font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' ); - $radius = get_pconfig(local_user(),'redbasic', 'radius' ); - $shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); - $section_width=get_pconfig(local_user(),"redbasic","section_width"); - $nav_min_opacity=get_pconfig(local_user(),"redbasic","nav_min_opacity"); - $sloppy_photos=get_pconfig(local_user(),"redbasic","sloppy_photos"); - return redbasic_form($a, $schema, $nav_colour, $banner_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos); + $arr = array(); + + $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); + $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); + $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); + $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); + $arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' ); + $arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' ); + $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); + $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); + $arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' ); + $arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' ); + $arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' ); + $arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); + $arr['section_width']=get_pconfig(local_user(),"redbasic","section_width"); + $arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity"); + $arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos"); + return redbasic_form($a, $arr); } function theme_post(&$a) { @@ -32,6 +35,8 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); + set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); + set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); @@ -42,10 +47,10 @@ function theme_post(&$a) { } } -// FIXME - this really should be an array -function redbasic_form(&$a, $schema, $nav_colour, $banner_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow, $section_width,$nav_min_opacity,$sloppy_photos) { + +function redbasic_form(&$a, $arr) { + $scheme_choices = array(); $scheme_choices["---"] = t("Default"); @@ -60,10 +65,10 @@ function redbasic_form(&$a, $schema, $nav_colour, $banner_colour, $bgcolour, $ba $nav_colours = array ( - '' => 'Scheme Default', - 'red' => 'red', - 'black' => 'black', - 'silver' => 'silver', + '' => t('Scheme Default'), + 'red' => t('red'), + 'black' => t('black'), + 'silver' => t('silver'), ); if(feature_enabled(local_user(),'expert')) @@ -75,20 +80,22 @@ if(feature_enabled(local_user(),'expert')) '$baseurl' => $a->get_baseurl(), '$expert' => $expert, '$title' => t("Theme settings"), - '$schema' => array('redbasic_schema', t('Set scheme'), $schema, '', $scheme_choices), - '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $nav_colour, '', $nav_colours), - '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $banner_colour), - '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $bgcolour), - '$background_image' => array('redbasic_background_image', t('Set the background image'), $background_image), - '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $item_colour), - '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $item_opacity), - '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size), - '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour), - '$radius' => array('redbasic_radius', t('Set radius of corners'), $radius), - '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow), - '$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width), - '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$nav_min_opacity), - '$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$sloppy_photos,t('Are you a clean desk or a messy desk person?')), + '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), + '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), + '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), + '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), + '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), + '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']), + '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']), + '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']), + '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), + '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']), + '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), + '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), + '$section_width' => array('redbasic_section_width',t('Set width of main section'),$arr['section_width']), + '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), + '$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 426453cb7..6a1b9c65e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -16,6 +16,8 @@ $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); + $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); + $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); $item_colour = get_pconfig($uid, "redbasic", "item_colour"); $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); $font_size = get_pconfig($uid, "redbasic", "font_size"); @@ -63,6 +65,10 @@ $background_image =''; if (! $item_colour) $item_colour = "#f8f8f8"; + if (! $toolicon_colour) + $toolicon_colour = '#777777'; + if (! $toolicon_activecolour) + $toolicon_activecolour = '#000'; if (! $item_opacity) $item_opacity = "1"; if (! $font_size) @@ -125,6 +131,8 @@ $options = array ( '$background_image' => $background_image, '$item_colour' => $item_colour, '$item_opacity' => $item_opacity, +'$toolicon_colour' => $toolicon_colour, +'$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, '$radius' => $radius, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 48b9c07c3..237637770 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -10,6 +10,8 @@ {{include file="field_input.tpl" field=$background_image}} {{include file="field_input.tpl" field=$item_colour}} {{include file="field_input.tpl" field=$item_opacity}} +{{include file="field_input.tpl" field=$toolicon_colour}} +{{include file="field_input.tpl" field=$toolicon_activecolour}} {{include file="field_input.tpl" field=$font_size}} {{include file="field_input.tpl" field=$font_colour}} {{include file="field_input.tpl" field=$radius}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 6927eb9e4..781746b4b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -89,7 +89,7 @@
    - {{if $item.drop.dropping}}{{/if}} + {{if $item.drop.dropping}}{{/if}}
    {{if $item.drop.pagedrop}}{{/if}}
    -- cgit v1.2.3 From 5b3adf7755f7bd648c97969ec8b0183797bb2722 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 17:43:32 -0800 Subject: more work on channel removal - it might sort of work now but I'm expecting lots of issues. Hence there is still no code in chanman to start the process rolling and make it happen. Will need a barrage of test cases. --- include/Contact.php | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 46c84aab6..de4ac6ff7 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -216,11 +216,12 @@ function channel_remove($channel_id, $local = true) { // FIXME notify all contacts - $r = q("update channel set channel_pageflags = (channel_pageflags | %d), channel_r_stream = 0, channel_r_profile = 0, + $r = q("update channel set channel_deleted = '%s', channel_pageflags = (channel_pageflags | %d), channel_r_stream = 0, channel_r_profile = 0, channel_r_photos = 0, channel_r_abook = 0, channel_w_stream = 0, channel_w_wall = 0, channel_w_tagwall = 0, channel_w_comment = 0, channel_w_mail = 0, channel_w_photos = 0, channel_w_chat = 0, channel_a_delegate = 0, channel_r_storage = 0, channel_w_storage = 0, channel_r_pages = 0, channel_w_pages = 0, channel_a_republish = 0 where channel_id = %d limit 1", + dbesc(datetime_convert()), intval(PAGE_REMOVED), intval($channel_id) ); @@ -230,6 +231,11 @@ function channel_remove($channel_id, $local = true) { dbesc($channel['channel_hash']) ); + $r = q("update xchan set xchan_flags = xchan_flags | %d where xchan_hash = '%s'", + intval(XCHAN_FLAGS_DELETED), + dbesc($channel['channel_hash']) + ); + proc_run('php','include/notifier.php','purge_all',$channel_id); @@ -248,13 +254,25 @@ function channel_remove($channel_id, $local = true) { q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($channel_id)); q("DELETE FROM `spam` WHERE `uid` = %d", intval($channel_id)); - // We also need a timestamp in the channel DB so we know when to remove the entry. - - $r = q("update channel set channel_pageflags = (channel_pageflags | %d) where channel_id = %d limit 1", + $r = q("update channel set channel_deleted = '%s', channel_pageflags = (channel_pageflags | %d) where channel_id = %d limit 1", + dbesc(datetime_convert()), intval(PAGE_REMOVED), intval($channel_id) ); + $r = q("update hubloc set hubloc_flags = hubloc_flags | %d where hubloc_hash = '%s' and hubloc_url = '%s' ", + intval(HUBLOC_FLAGS_DELETED), + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + + $r = q("update xchan set xchan_flags = xchan_flags | %d where xchan_hash = '%s' ", + intval(XCHAN_FLAGS_DELETED), + dbesc($channel['channel_hash']) + ); + + + proc_run('php','include/directory.php',$channel_id); if($channel_id == local_user()) { unset($_SESSION['authenticated']); -- cgit v1.2.3 From 5c71ccba987f1d83482025508b356a22dcf5151c Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 18:20:37 -0800 Subject: add shameless plug if they've not got zot, and add photo favicon to photos pages --- boot.php | 8 +++++++- mod/photos.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 99ec5de32..e2129f6f5 100755 --- a/boot.php +++ b/boot.php @@ -1530,8 +1530,14 @@ function remote_user() { function notice($s) { $a = get_app(); if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array(); - if($a->interactive) + if($a->interactive) { + // shameless plug, permission is denied and they have no identity. + // There's a fairly good chance that they've not got zot. + if((stristr($s,t('permission denied'))) && (! get_observer_hash())) { + $s .= '
    ' . t('Got Zot?') . ''; + } $_SESSION['sysmsg'][] = $s; + } } diff --git a/mod/photos.php b/mod/photos.php index 075d01cf2..fe5777fe9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -36,7 +36,7 @@ function photos_init(&$a) { $a->set_widget('vcard',vcard_from_xchan($a->data['channel'],$observer)); - + head_set_icon($a->data['channel']['xchan_photo_s']); if($a->data['perms']['view_photos']) { $a->data['albums'] = photos_albums_list($a->data['channel'],$observer); $a->set_widget('photo_albums',photos_album_widget($a->data['channel'],$observer,$a->data['albums'])); -- cgit v1.2.3 From 310ccfda997449dcc08c0d37d194c12b6f929c6d Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 19:45:02 -0800 Subject: INSTALL for dummies - step 1: ensure that we throw an ugly error message in their face if there's an ugly error when we first try to install. DON'T white screen until after they've got it running. --- install/htconfig.sample.php | 11 +++++++++++ mod/setup.php | 19 +++++++++++++++++++ view/en/htconfig.tpl | 11 +++++++++++ 3 files changed, 41 insertions(+) diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index 14ae23676..33258cf41 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -71,3 +71,14 @@ $a->config['system']['php_path'] = 'php'; $a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// PHP error logging setup +// Before doing this ensure that the webserver has permission +// to create and write to php.out in the top level Red directory, +// or change the name (below) to a file/path where this is allowed. + +// Uncomment the following 4 lines to turn on PHP error logging. +//error_reporting(E_ERROR | E_WARNING | E_PARSE ); +//ini_set('error_log','php.out'); +//ini_set('log_errors','1'); +//ini_set('display_errors', '0'); diff --git a/mod/setup.php b/mod/setup.php index b825b5e0d..429be43af 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -4,7 +4,25 @@ $install_wizard_pass=1; function setup_init(&$a){ + + // Ensure that if somebody hasn't read the install documentation and doesn't have all + // the required modules or has a totally borked shared hosting provider and they can't + // figure out what the hell is going on - that we at least spit out an error message which + // we can inquire about when they write to tell us that our software doesn't work. + + // The worst thing we can do at this point is throw a white screen of death and rely on + // them knowing about servers and php modules and logfiles enough so that we can guess + // at the source of the problem. As ugly as it may be, we need to throw a technically worded + // PHP error message in their face. Once installation is complete application errors will + // throw a white screen because these error messages divulge information which can + // potentially be useful to hackers. + + error_reporting(E_ERROR | E_WARNING | E_PARSE ); + ini_set('log_errors','0'); + ini_set('display_errors', '1'); + + // $baseurl/setup/testrwrite to test if rewite in .htaccess is working if (argc() ==2 && argv(1)=="testrewrite") { echo "ok"; @@ -14,6 +32,7 @@ function setup_init(&$a){ if (x($_POST,'pass')) $install_wizard_pass = intval($_POST['pass']); + } function setup_post(&$a) { diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 4896376e5..28fdd04f0 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -88,3 +88,14 @@ $a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; $a->config['system']['theme'] = 'redbasic'; + +// PHP error logging setup +// Before doing this ensure that the webserver has permission +// to create and write to php.out in the top level Red directory, +// or change the name (below) to a file/path where this is allowed. + +// Uncomment the following 4 lines to turn on PHP error logging. +//error_reporting(E_ERROR | E_WARNING | E_PARSE ); +//ini_set('error_log','php.out'); +//ini_set('log_errors','1'); +//ini_set('display_errors', '0'); -- cgit v1.2.3 From c2cf3254c8e05161eb3f78d92d74aeaa7e3ac72a Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 6 Nov 2013 17:17:12 +0000 Subject: Don't fart if we've got a schema that doesn't exist at this hub. --- view/theme/redbasic/php/style.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6a1b9c65e..716a2dd9e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -33,10 +33,13 @@ // Setting $scheme to '' wasn't working for some reason, so we'll check it's // not --- like the mobile theme does instead. - if (($schema) && ($schema != '---')) { + if (($schema) && ($schema != '---')) { + // Check it exists, because this setting gets distributed to clones + if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) { $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; require_once ($schemefile); } + } // If we haven't got a schema, load the default. We shouldn't touch this - we // should leave it for admins to define for themselves. if (! $schema) { -- cgit v1.2.3 From 8b9633e46b7cdd4241e369d8f9cf10cec14956d2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 6 Nov 2013 17:27:51 -0800 Subject: DB - allow private messages to expire --- boot.php | 2 +- install/database.sql | 37 +++++++++++++++++++------------------ install/update.php | 10 +++++++++- mod/dirsearch.php | 4 ++-- version.inc | 2 +- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/boot.php b/boot.php index e2129f6f5..96b73eaaa 100755 --- a/boot.php +++ b/boot.php @@ -45,7 +45,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1080 ); +define ( 'DB_UPDATE_VERSION', 1081 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 0d371d4b8..3a05c28ec 100644 --- a/install/database.sql +++ b/install/database.sql @@ -182,7 +182,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128', `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128', `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '128', - `channel_a_republish` int(1) unsigned NOT NULL DEFAULT '128', + `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '128', PRIMARY KEY (`channel_id`), UNIQUE KEY `channel_address_unique` (`channel_address`), KEY `channel_account_id` (`channel_account_id`), @@ -193,7 +193,6 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_theme` (`channel_theme`), KEY `channel_notifyflags` (`channel_notifyflags`), KEY `channel_pageflags` (`channel_pageflags`), - KEY `channel_dirdate` (`channel_dirdate`), KEY `channel_max_anon_mail` (`channel_max_anon_mail`), KEY `channel_max_friend_req` (`channel_max_friend_req`), KEY `channel_default_gid` (`channel_default_group`), @@ -216,8 +215,9 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_w_storage` (`channel_w_storage`), KEY `channel_r_pages` (`channel_r_pages`), KEY `channel_w_pages` (`channel_w_pages`), + KEY `channel_deleted` (`channel_deleted`), KEY `channel_a_republish` (`channel_a_republish`), - KEY `channel_deleted` (`channel_deleted`) + KEY `channel_dirdate` (`channel_dirdate`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `clients` ( @@ -352,7 +352,7 @@ CREATE TABLE IF NOT EXISTS `group_member` ( KEY `uid` (`uid`), KEY `gid` (`gid`), KEY `xchan` (`xchan`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `hook` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -384,12 +384,12 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( KEY `hubloc_url` (`hubloc_url`), KEY `hubloc_guid` (`hubloc_guid`), KEY `hubloc_flags` (`hubloc_flags`), - KEY `hubloc_status` (`hubloc_status`), KEY `hubloc_connect` (`hubloc_connect`), KEY `hubloc_host` (`hubloc_host`), KEY `hubloc_addr` (`hubloc_addr`), KEY `hubloc_updated` (`hubloc_updated`), - KEY `hubloc_connected` (`hubloc_connected`) + KEY `hubloc_connected` (`hubloc_connected`), + KEY `hubloc_status` (`hubloc_status`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `issue` ( @@ -444,7 +444,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `resource_id` char(255) NOT NULL DEFAULT '', `resource_type` char(16) NOT NULL DEFAULT '', `attach` mediumtext NOT NULL, - `sig` text NOT NULL DEFAULT '', + `sig` text NOT NULL, `location` char(255) NOT NULL DEFAULT '', `coord` char(255) NOT NULL DEFAULT '', `comment_policy` char(255) NOT NULL DEFAULT '', @@ -500,7 +500,7 @@ CREATE TABLE IF NOT EXISTS `item_id` ( KEY `sid` (`sid`), KEY `service` (`service`), KEY `iid` (`iid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `mail` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -515,6 +515,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `mid` char(255) NOT NULL, `parent_mid` char(255) NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), KEY `created` (`created`), KEY `mail_flags` (`mail_flags`), @@ -523,7 +524,8 @@ CREATE TABLE IF NOT EXISTS `mail` ( KEY `from_xchan` (`from_xchan`), KEY `to_xchan` (`to_xchan`), KEY `mid` (`mid`), - KEY `parent_mid` (`parent_mid`) + KEY `parent_mid` (`parent_mid`), + KEY `expires` (`expires`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `manage` ( @@ -834,11 +836,11 @@ CREATE TABLE IF NOT EXISTS `site` ( `site_sellpage` char(255) NOT NULL DEFAULT '', `site_location` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`site_url`), - KEY `site_access` (`site_access`), KEY `site_flags` (`site_flags`), KEY `site_update` (`site_update`), KEY `site_directory` (`site_directory`), KEY `site_register` (`site_register`), + KEY `site_access` (`site_access`), KEY `site_sellpage` (`site_sellpage`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -852,7 +854,7 @@ CREATE TABLE IF NOT EXISTS `source` ( KEY `src_channel_id` (`src_channel_id`), KEY `src_channel_xchan` (`src_channel_xchan`), KEY `src_xchan` (`src_xchan`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `spam` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -890,7 +892,7 @@ CREATE TABLE IF NOT EXISTS `term` ( KEY `imgurl` (`imgurl`), KEY `term_hash` (`term_hash`), KEY `parent_hash` (`parent_hash`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `tokens` ( `id` varchar(40) NOT NULL, @@ -914,13 +916,13 @@ CREATE TABLE IF NOT EXISTS `updates` ( `ud_flags` int(11) NOT NULL DEFAULT '0', `ud_addr` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`ud_id`), - KEY `ud_hash` (`ud_hash`), - KEY `ud_guid` (`ud_guid`), KEY `ud_date` (`ud_date`), + KEY `ud_guid` (`ud_guid`), + KEY `ud_hash` (`ud_hash`), KEY `ud_flags` (`ud_flags`), KEY `ud_addr` (`ud_addr`), KEY `ud_last` (`ud_last`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `verify` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -977,9 +979,8 @@ CREATE TABLE IF NOT EXISTS `xchan` ( KEY `xchan_url` (`xchan_url`), KEY `xchan_flags` (`xchan_flags`), KEY `xchan_connurl` (`xchan_connurl`), - KEY `xchan_follow` (`xchan_follow`), - KEY `xchan_connpage` (`xchan_connpage`), - KEY `xchan_instance_url` (`xchan_instance_url`) + KEY `xchan_instance_url` (`xchan_instance_url`), + KEY `xchan_follow` (`xchan_follow`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xconfig` ( diff --git a/install/update.php b/install/update.php index 53d487f91..e1fd8c7a4 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 6 Nov 2013 18:28:36 -0800 Subject: allow private mail sender to set an expiration on their messages. Once expired the message is destroyed at both ends (subject to the granularity of the polling interval) and is gone. Officially it takes some form of language independent string like 2013/11/22, but English speakers can use anything that strtotime() understands, like "+30 minutes" or "next Tuesday". --- include/items.php | 6 ++++++ include/message.php | 13 +++++++++---- include/poller.php | 5 +++++ mod/message.php | 12 ++++++------ view/theme/redbasic/css/style.css | 2 +- view/tpl/prv_message.tpl | 7 +++++-- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/include/items.php b/include/items.php index 5fcbb0cc5..520ea7230 100755 --- a/include/items.php +++ b/include/items.php @@ -910,6 +910,7 @@ function encode_mail($item) { $x['message_id'] = $item['mid']; $x['message_parent'] = $item['parent_mid']; $x['created'] = $item['created']; + $x['expires'] = $item['expires']; $x['title'] = $item['title']; $x['body'] = $item['body']; $x['from'] = encode_item_xchan($item['from']); @@ -939,6 +940,10 @@ function get_mail_elements($x) { $arr['title'] = (($x['title'])? htmlentities($x['title'],ENT_COMPAT,'UTF-8',false) : ''); $arr['created'] = datetime_convert('UTC','UTC',$x['created']); + if((! array_key_exists('expires',$x)) || ($x['expires'] === '0000-00-00 00:00:00')) + $arr['expires'] = '0000-00-00 00:00:00'; + else + $arr['expires'] = datetime_convert('UTC','UTC',$x['expires']); $arr['mail_flags'] = 0; @@ -2465,6 +2470,7 @@ function mail_store($arr) { $arr['from_xchan'] = ((x($arr,'from_xchan')) ? notags(trim($arr['from_xchan'])) : ''); $arr['to_xchan'] = ((x($arr,'to_xchan')) ? notags(trim($arr['to_xchan'])) : ''); $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); + $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : '0000-00-00 00:00:00'); $arr['title'] = ((x($arr,'title')) ? notags(trim($arr['title'])) : ''); $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); diff --git a/include/message.php b/include/message.php index e54a6cd83..3bcd5e209 100644 --- a/include/message.php +++ b/include/message.php @@ -8,7 +8,7 @@ require_once('include/attach.php'); // send a private message -function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=''){ +function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='',$expires = ''){ $ret = array('success' => false); @@ -22,6 +22,10 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' if(! strlen($subject)) $subject = t('[no subject]'); +// if(! $expires) +// $expires = '0000-00-00 00:00:00'; +// else +// $expires = datetime_convert(date_default_timezone_get(),'UTC',$expires); if($uid) { $r = q("select * from channel where channel_id = %d limit 1", @@ -111,8 +115,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' - $r = q("INSERT INTO mail ( account_id, mail_flags, channel_id, from_xchan, to_xchan, title, body, attach, mid, parent_mid, created ) - VALUES ( %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", + $r = q("INSERT INTO mail ( account_id, mail_flags, channel_id, from_xchan, to_xchan, title, body, attach, mid, parent_mid, created, expires ) + VALUES ( %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", intval($channel['channel_account_id']), intval(MAIL_OBSCURED), intval($channel['channel_id']), @@ -123,7 +127,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' dbesc($jattach), dbesc($mid), dbesc($replyto), - dbesc(datetime_convert()) + dbesc(datetime_convert()), + dbesc($expires) ); // verify the save diff --git a/include/poller.php b/include/poller.php index f3a997913..b1f89955c 100644 --- a/include/poller.php +++ b/include/poller.php @@ -42,6 +42,11 @@ function poller_run($argv, $argc){ intval(ACCOUNT_EXPIRED), intval(ACCOUNT_EXPIRED) ); + + // expire any expired mail + + q("delete from mail where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() "); + // Ensure that every channel pings a directory server once a month. This way we can discover // channels and sites that quietly vanished and prevent the directory from accumulating stale diff --git a/mod/message.php b/mod/message.php index a4d73e6b0..e31d903a7 100644 --- a/mod/message.php +++ b/mod/message.php @@ -40,6 +40,7 @@ function message_post(&$a) { $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); $recipient = ((x($_REQUEST,'messageto')) ? notags(trim($_REQUEST['messageto'])) : ''); $rstr = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : ''); + $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : '0000-00-00 00:00:00'); // If we have a raw string for a recipient which hasn't been auto-filled, // it means they probably aren't in our address book, hence we don't know @@ -111,7 +112,7 @@ function message_post(&$a) { // We have a local_user, let send_message use the session channel and save a lookup - $ret = send_message(0, $recipient, $body, $subject, $replyto); + $ret = send_message(0, $recipient, $body, $subject, $replyto, $expires); if(! $ret['success']) { notice($ret['message']); @@ -322,7 +323,8 @@ function message_content(&$a) { '$attach' => t('Attach file'), '$insert' => t('Insert web link'), '$wait' => t('Please wait'), - '$submit' => t('Submit') + '$submit' => t('Submit'), + '$expires' => t('Expires: (leave blank for never)') )); return $o; @@ -463,8 +465,6 @@ function message_content(&$a) { } - logger('mails: ' . print_r($mails,true), LOGGER_DATA); - $recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to' : 'from'); // FIXME - move this HTML to template @@ -498,8 +498,8 @@ function message_content(&$a) { '$attach' => t('Attach file'), '$insert' => t('Insert web link'), '$submit' => t('Submit'), - '$wait' => t('Please wait') - + '$wait' => t('Please wait'), + '$expires' => t('Expires: (leave blank for never)') )); return $o; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 32d33ad70..c5d41d7ba 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1693,7 +1693,7 @@ tr.mceLast { } -#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { +#prvmail-to-label, #prvmail-subject-label, #prvmail-expires-label, #prvmail-message-label { margin-bottom: 10px; margin-top: 20px; } diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index d65bc3570..494eec48c 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -17,12 +17,15 @@
    {{$subject}}
    +
    {{$expires}}
    + +
    {{$yourmessage}}
    - +
    - +
    -- cgit v1.2.3 From 7381326b7a7a271da52464d15774a1309adb2bd5 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 00:47:50 -0800 Subject: provide expire feature on post and comments as well as private messages. This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone. --- include/conversation.php | 6 +++++- include/features.php | 4 ++-- include/poller.php | 8 +++++++- mod/editblock.php | 3 +++ mod/editlayout.php | 3 +++ mod/editpost.php | 6 +++++- mod/editwebpage.php | 4 ++++ mod/item.php | 8 +++----- mod/message.php | 6 ++++-- version.inc | 2 +- view/theme/redbasic/css/style.css | 7 ++++++- view/tpl/jot-header.tpl | 7 +++++++ view/tpl/jot.tpl | 6 ++++++ view/tpl/prv_message.tpl | 2 ++ 14 files changed, 58 insertions(+), 14 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index e8b41e775..fc0ae98e6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1064,7 +1064,8 @@ function status_editor($a,$x,$popup=false) { '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), '$fileas' => t('Save to Folder:'), - '$whereareu' => t('Where are you right now?') + '$whereareu' => t('Where are you right now?'), + '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') )); @@ -1130,6 +1131,9 @@ function status_editor($a,$x,$popup=false) { '$preview' => $preview, '$sourceapp' => t($a->sourcename), '$jotplugins' => $jotplugins, + '$defexpire' => '', + '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'), + '$expires' => t('Set expiration date'), )); diff --git a/include/features.php b/include/features.php index 9950039c0..bf3323b56 100644 --- a/include/features.php +++ b/include/features.php @@ -19,8 +19,8 @@ function get_features() { // General 'general' => array( t('General Features'), -// uncomment when expire is fixed -// array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')), +// This is per post, and different from fixed expiration 'expire' which isn't working yet + array('content_expire', t('Content Expiration'), t('Remove posts/comments and/or private messages at a future time')), array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel')), array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), diff --git a/include/poller.php b/include/poller.php index b1f89955c..e5a274758 100644 --- a/include/poller.php +++ b/include/poller.php @@ -46,7 +46,13 @@ function poller_run($argv, $argc){ // expire any expired mail q("delete from mail where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() "); - + + $r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() "); + if($r) { + require_once('include/items.php'); + foreach($r as $rr) + drop_item($rr['id'],false); + } // Ensure that every channel pings a directory server once a month. This way we can discover // channels and sites that quietly vanished and prevent the directory from accumulating stale diff --git a/mod/editblock.php b/mod/editblock.php index a111f6666..9c691640b 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -144,6 +144,9 @@ function editblock_content(&$a) { '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), + '$defexpire' => '', + '$feature_expire' => 'none', + '$expires' => t('Set expiration date'), )); diff --git a/mod/editlayout.php b/mod/editlayout.php index 7bcd02512..f8906d981 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -129,6 +129,9 @@ function editlayout_content(&$a) { '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), + '$defexpire' => '', + '$feature_expire' => 'none', + '$expires' => t('Set expiration date'), )); $ob = get_observer_hash(); diff --git a/mod/editpost.php b/mod/editpost.php index 161e8f301..81eef2782 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -48,7 +48,8 @@ function editpost_content(&$a) { '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$ispublic' => ' ', // t('Visible to everybody'), '$geotag' => $geotag, - '$nickname' => $channel['channel_address'] + '$nickname' => $channel['channel_address'], + '$expireswhen' => t('Expires YYYY-MM-DD HH:MM'), )); @@ -126,6 +127,9 @@ function editpost_content(&$a) { '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), '$catsenabled' => $catsenabled, + '$defexpire' => $itm[0]['expires'], + '$feature_expire' => 'none', + '$expires' => t('Set expiration date'), )); return $o; diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 44ac0bc85..5a21aa78d 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -150,6 +150,10 @@ function editwebpage_content(&$a) { '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), + '$defexpire' => '', + '$feature_expire' => 'none', + '$expires' => t('Set expiration date'), + )); $ob = get_observer_hash(); diff --git a/mod/item.php b/mod/item.php index 2b8de1247..be24d242c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -327,11 +327,9 @@ function item_post(&$a) { $expires = '0000-00-00 00:00:00'; - if(feature_enabled($profile_uid,'expire')) { - // expire_quantity, e.g. '3' - // expire_units, e.g. days, weeks, months - if(x($_REQUEST,'expire_quantity') && (x($_REQUEST,'expire_units'))) { - $expire = datetime_convert('UTC','UTC', 'now + ' . $_REQUEST['expire_quantity'] . ' ' . $_REQUEST['expire_units']); + if(feature_enabled($profile_uid,'content_expire')) { + if(x($_REQUEST,'expire')) { + $expires = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expire']); if($expires <= datetime_convert()) $expires = '0000-00-00 00:00:00'; } diff --git a/mod/message.php b/mod/message.php index e31d903a7..dbbe8836b 100644 --- a/mod/message.php +++ b/mod/message.php @@ -324,7 +324,8 @@ function message_content(&$a) { '$insert' => t('Insert web link'), '$wait' => t('Please wait'), '$submit' => t('Submit'), - '$expires' => t('Expires: (leave blank for never)') + '$expires' => t('Expires: (leave blank for never)'), + '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? '1' : ''), )); return $o; @@ -499,7 +500,8 @@ function message_content(&$a) { '$insert' => t('Insert web link'), '$submit' => t('Submit'), '$wait' => t('Please wait'), - '$expires' => t('Expires: (leave blank for never)') + '$expires' => t('Expires: (leave blank for never)'), + '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? '1' : ''), )); return $o; diff --git a/version.inc b/version.inc index 0cbb9a0a6..259a60c9a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-06.489 +2013-11-07.490 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c5d41d7ba..1a556df06 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -319,7 +319,8 @@ footer { #profile-video, #profile-audio, #profile-link, -#profile-title, +#profile-title, +#profile-expires, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -1137,6 +1138,10 @@ footer { float: left; margin-left: 15px; } +#profile-expire-wrapper { + float: left; + margin-left: 15px; +} #jot-preview-link { float: left; margin-left: 45px; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 527db4e4f..05928bc32 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -191,6 +191,13 @@ function enableOnUser(){ } } + function jotGetExpiry() { + reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + if(reply && reply.length) { + $('#jot-expire').val(reply); + } + } + function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 12978038c..f7dd12758 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -5,6 +5,7 @@ + @@ -50,6 +51,11 @@ +
    + +
    + +
    diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 494eec48c..35f50da00 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -17,8 +17,10 @@
    {{$subject}}
    +{{if $feature_expire}}
    {{$expires}}
    +{{/if}}
    {{$yourmessage}}
    -- cgit v1.2.3 From cb37c0ce1421ecf5ddd00baee39b227307bb10b5 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 15:30:59 -0800 Subject: make PM expiry UI match the main post editor, e.g. JS input triggered by an icon rather than a scary looking text field --- mod/message.php | 16 ++++++++++------ view/theme/redbasic/css/style.css | 2 ++ view/tpl/msg-header.tpl | 7 +++++++ view/tpl/prv_message.tpl | 18 ++++++++++-------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/mod/message.php b/mod/message.php index dbbe8836b..c03875e24 100644 --- a/mod/message.php +++ b/mod/message.php @@ -272,7 +272,8 @@ function message_content(&$a) { '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$nickname' => $channel['channel_address'], - '$linkurl' => t('Please enter a link URL:') + '$linkurl' => t('Please enter a link URL:'), + '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') )); $preselect = (isset($a->argv[2])?array($a->argv[2]):false); @@ -324,8 +325,9 @@ function message_content(&$a) { '$insert' => t('Insert web link'), '$wait' => t('Please wait'), '$submit' => t('Submit'), - '$expires' => t('Expires: (leave blank for never)'), - '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? '1' : ''), + '$defexpire' => '', + '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'), + '$expires' => t('Set expiration date'), )); return $o; @@ -401,7 +403,8 @@ function message_content(&$a) { '$nickname' => $channel['channel_addr'], '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$linkurl' => t('Please enter a link URL:') + '$linkurl' => t('Please enter a link URL:'), + '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') )); @@ -500,8 +503,9 @@ function message_content(&$a) { '$insert' => t('Insert web link'), '$submit' => t('Submit'), '$wait' => t('Please wait'), - '$expires' => t('Expires: (leave blank for never)'), - '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? '1' : ''), + '$defexpire' => '', + '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'), + '$expires' => t('Set expiration date'), )); return $o; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1a556df06..a7e8f0717 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1711,11 +1711,13 @@ tr.mceLast { #prvmail-upload-wrapper, #prvmail-attach-wrapper, #prvmail-link-wrapper, +#prvmail-expire-wrapper, #prvmail-rotator-wrapper { float: left; margin-top: 10px; margin-right: 10px; width: 24px; + cursor: pointer; } #prvmail-end { diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 5e2597605..79f9e23c1 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -85,6 +85,13 @@ else } } + function prvmailGetExpiry() { + reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val()); + if(reply && reply.length) { + $('#inp-prvmail-expires').val(reply); + } + } + function linkdropper(event) { var linkFound = event.dataTransfer.types.contains("text/uri-list"); if(linkFound) diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 35f50da00..621f56be7 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -14,20 +14,17 @@ {{$select}} {{/if}} + +
    {{$subject}}
    -{{if $feature_expire}} -
    {{$expires}}
    - -{{/if}} -
    {{$yourmessage}}
    - +
    - +
    @@ -36,10 +33,15 @@
    - + +
    + +
    + +
    -- cgit v1.2.3 From fc317172d5c6632df50aa8e25509ee2b6b830d2f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 20:18:52 -0800 Subject: more e2ee infrastructure - at this point if somebody wants it they're going to have to work for it. --- include/bbcode.php | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 9ca8e3f03..14d0ce14a 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -99,6 +99,43 @@ function bb_replace_images($body, $images) { }} + +function bb_parse_crypt($match) { + + $attributes = $match[1]; + + $algorithm = ""; + preg_match("/alg='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $algorithm = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + + preg_match("/alg=\"\;(.*?)\"\;/ism", $attributes, $matches); + if ($matches[1] != "") + $algorithm = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + + $hint = ""; + preg_match("/hint='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + preg_match("/hint=\"\;(.*?)\"\;/ism", $attributes, $matches); + if ($matches[1] != "") + $hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + + // Next we really should link to a JS routine based on the algorithm which prompts for a key + // something like zdecrypt_{algorithm}, which will be a no-op if the decryption algorithm is not present + // We can either pass the text or pass a message ID and let the decryption module call /viewsrc or something + // to get the text. The text might be large so the message ID might be preferable. But if we pass the + // text directly we won't have to do a network fetch; and can potentially display the results in a popup. + + + $Text = '
    ' . t('Encrypted content') . '
    ' . t('Algorithm: ') . $algorithm . '
    ' . t('Key hint: ') . $hint . '
    '; + + return $Text; + +} + + + function bb_ShareAttributes($match) { $attributes = $match[1]; @@ -465,9 +502,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text); } - if (strpos($Text,'[crypt]') !== false) { + if (strpos($Text,'[/crypt]') !== false) { $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
    ' . t('Encrypted content') . '
    ', $Text); - $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'
    ' . t('Encrypted content') . '
    ', $Text); + $Text = preg_replace_callback("/\[crypt (.*?)\](.*?)\[\/crypt\]/ism", 'bb_parse_crypt', $Text); } // Try to Oembed if ($tryoembed) { -- cgit v1.2.3 From 4b3db9b5234eb2c85d9d29305abb73e81f7558b6 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 20:48:46 -0800 Subject: update smilies --- include/text.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/text.php b/include/text.php index 1ff9d27cb..985262fe8 100755 --- a/include/text.php +++ b/include/text.php @@ -878,6 +878,7 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'red#', + 'r#', '~friendica' ); @@ -916,6 +917,7 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'red# the Red Matrix', + 'r# the Red Matrix', '~friendica ~friendica' ); -- cgit v1.2.3 From 90ab0d963bf5074643c6f275dbb8595b6c51a03d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 22:45:13 -0800 Subject: we should probably only expire things once... --- include/poller.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index e5a274758..3c4e6402c 100644 --- a/include/poller.php +++ b/include/poller.php @@ -47,7 +47,10 @@ function poller_run($argv, $argc){ q("delete from mail where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() "); - $r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() "); + $r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() + and not ( item_restrict & %d ) ", + intval(ITEM_DELETED) + ); if($r) { require_once('include/items.php'); foreach($r as $rr) -- cgit v1.2.3 From 3a9cbcaf011f5c5d423e1cd99b43442669692129 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 23:25:13 -0800 Subject: Wankers. --- library/cryptojs/README | 1 + library/cryptojs/components/aes-min.js | 10 + library/cryptojs/components/aes.js | 213 +++++ library/cryptojs/components/cipher-core-min.js | 14 + library/cryptojs/components/cipher-core.js | 863 +++++++++++++++++++++ library/cryptojs/components/core-min.js | 13 + library/cryptojs/components/core.js | 712 +++++++++++++++++ library/cryptojs/components/enc-base64-min.js | 8 + library/cryptojs/components/enc-base64.js | 109 +++ library/cryptojs/components/enc-utf16-min.js | 8 + library/cryptojs/components/enc-utf16.js | 135 ++++ library/cryptojs/components/evpkdf-min.js | 8 + library/cryptojs/components/evpkdf.js | 118 +++ library/cryptojs/components/format-hex-min.js | 7 + library/cryptojs/components/format-hex.js | 52 ++ library/cryptojs/components/hmac-min.js | 8 + library/cryptojs/components/hmac.js | 131 ++++ library/cryptojs/components/lib-typedarrays-min.js | 8 + library/cryptojs/components/lib-typedarrays.js | 62 ++ library/cryptojs/components/md5-min.js | 12 + library/cryptojs/components/md5.js | 254 ++++++ library/cryptojs/components/mode-cfb-min.js | 7 + library/cryptojs/components/mode-cfb.js | 64 ++ .../cryptojs/components/mode-ctr-gladman-min.js | 14 + library/cryptojs/components/mode-ctr-gladman.js | 102 +++ library/cryptojs/components/mode-ctr-min.js | 7 + library/cryptojs/components/mode-ctr.js | 44 ++ library/cryptojs/components/mode-ecb-min.js | 7 + library/cryptojs/components/mode-ecb.js | 26 + library/cryptojs/components/mode-ofb-min.js | 7 + library/cryptojs/components/mode-ofb.js | 40 + library/cryptojs/components/pad-ansix923-min.js | 7 + library/cryptojs/components/pad-ansix923.js | 35 + library/cryptojs/components/pad-iso10126-min.js | 7 + library/cryptojs/components/pad-iso10126.js | 30 + library/cryptojs/components/pad-iso97971-min.js | 7 + library/cryptojs/components/pad-iso97971.js | 26 + library/cryptojs/components/pad-nopadding-min.js | 7 + library/cryptojs/components/pad-nopadding.js | 16 + library/cryptojs/components/pad-zeropadding-min.js | 7 + library/cryptojs/components/pad-zeropadding.js | 31 + library/cryptojs/components/pbkdf2-min.js | 8 + library/cryptojs/components/pbkdf2.js | 131 ++++ library/cryptojs/components/rabbit-legacy-min.js | 11 + library/cryptojs/components/rabbit-legacy.js | 176 +++++ library/cryptojs/components/rabbit-min.js | 11 + library/cryptojs/components/rabbit.js | 178 +++++ library/cryptojs/components/rc4-min.js | 8 + library/cryptojs/components/rc4.js | 125 +++ library/cryptojs/components/ripemd160-min.js | 22 + library/cryptojs/components/ripemd160.js | 253 ++++++ library/cryptojs/components/sha1-min.js | 8 + library/cryptojs/components/sha1.js | 136 ++++ library/cryptojs/components/sha224-min.js | 7 + library/cryptojs/components/sha224.js | 66 ++ library/cryptojs/components/sha256-min.js | 9 + library/cryptojs/components/sha256.js | 185 +++++ library/cryptojs/components/sha3-min.js | 11 + library/cryptojs/components/sha3.js | 309 ++++++++ library/cryptojs/components/sha384-min.js | 8 + library/cryptojs/components/sha384.js | 69 ++ library/cryptojs/components/sha512-min.js | 15 + library/cryptojs/components/sha512.js | 309 ++++++++ library/cryptojs/components/tripledes-min.js | 26 + library/cryptojs/components/tripledes.js | 756 ++++++++++++++++++ library/cryptojs/components/x64-core-min.js | 7 + library/cryptojs/components/x64-core.js | 290 +++++++ library/cryptojs/rollups/aes.js | 35 + library/cryptojs/rollups/hmac-md5.js | 21 + library/cryptojs/rollups/hmac-ripemd160.js | 31 + library/cryptojs/rollups/hmac-sha1.js | 17 + library/cryptojs/rollups/hmac-sha224.js | 19 + library/cryptojs/rollups/hmac-sha256.js | 18 + library/cryptojs/rollups/hmac-sha3.js | 21 + library/cryptojs/rollups/hmac-sha384.js | 27 + library/cryptojs/rollups/hmac-sha512.js | 25 + library/cryptojs/rollups/md5.js | 19 + library/cryptojs/rollups/pbkdf2.js | 19 + library/cryptojs/rollups/rabbit-legacy.js | 36 + library/cryptojs/rollups/rabbit.js | 36 + library/cryptojs/rollups/rc4.js | 33 + library/cryptojs/rollups/ripemd160.js | 29 + library/cryptojs/rollups/sha1.js | 15 + library/cryptojs/rollups/sha224.js | 17 + library/cryptojs/rollups/sha256.js | 16 + library/cryptojs/rollups/sha3.js | 19 + library/cryptojs/rollups/sha384.js | 25 + library/cryptojs/rollups/sha512.js | 23 + library/cryptojs/rollups/tripledes.js | 51 ++ 89 files changed, 6923 insertions(+) create mode 100644 library/cryptojs/README create mode 100644 library/cryptojs/components/aes-min.js create mode 100644 library/cryptojs/components/aes.js create mode 100644 library/cryptojs/components/cipher-core-min.js create mode 100644 library/cryptojs/components/cipher-core.js create mode 100644 library/cryptojs/components/core-min.js create mode 100644 library/cryptojs/components/core.js create mode 100644 library/cryptojs/components/enc-base64-min.js create mode 100644 library/cryptojs/components/enc-base64.js create mode 100644 library/cryptojs/components/enc-utf16-min.js create mode 100644 library/cryptojs/components/enc-utf16.js create mode 100644 library/cryptojs/components/evpkdf-min.js create mode 100644 library/cryptojs/components/evpkdf.js create mode 100644 library/cryptojs/components/format-hex-min.js create mode 100644 library/cryptojs/components/format-hex.js create mode 100644 library/cryptojs/components/hmac-min.js create mode 100644 library/cryptojs/components/hmac.js create mode 100644 library/cryptojs/components/lib-typedarrays-min.js create mode 100644 library/cryptojs/components/lib-typedarrays.js create mode 100644 library/cryptojs/components/md5-min.js create mode 100644 library/cryptojs/components/md5.js create mode 100644 library/cryptojs/components/mode-cfb-min.js create mode 100644 library/cryptojs/components/mode-cfb.js create mode 100644 library/cryptojs/components/mode-ctr-gladman-min.js create mode 100644 library/cryptojs/components/mode-ctr-gladman.js create mode 100644 library/cryptojs/components/mode-ctr-min.js create mode 100644 library/cryptojs/components/mode-ctr.js create mode 100644 library/cryptojs/components/mode-ecb-min.js create mode 100644 library/cryptojs/components/mode-ecb.js create mode 100644 library/cryptojs/components/mode-ofb-min.js create mode 100644 library/cryptojs/components/mode-ofb.js create mode 100644 library/cryptojs/components/pad-ansix923-min.js create mode 100644 library/cryptojs/components/pad-ansix923.js create mode 100644 library/cryptojs/components/pad-iso10126-min.js create mode 100644 library/cryptojs/components/pad-iso10126.js create mode 100644 library/cryptojs/components/pad-iso97971-min.js create mode 100644 library/cryptojs/components/pad-iso97971.js create mode 100644 library/cryptojs/components/pad-nopadding-min.js create mode 100644 library/cryptojs/components/pad-nopadding.js create mode 100644 library/cryptojs/components/pad-zeropadding-min.js create mode 100644 library/cryptojs/components/pad-zeropadding.js create mode 100644 library/cryptojs/components/pbkdf2-min.js create mode 100644 library/cryptojs/components/pbkdf2.js create mode 100644 library/cryptojs/components/rabbit-legacy-min.js create mode 100644 library/cryptojs/components/rabbit-legacy.js create mode 100644 library/cryptojs/components/rabbit-min.js create mode 100644 library/cryptojs/components/rabbit.js create mode 100644 library/cryptojs/components/rc4-min.js create mode 100644 library/cryptojs/components/rc4.js create mode 100644 library/cryptojs/components/ripemd160-min.js create mode 100644 library/cryptojs/components/ripemd160.js create mode 100644 library/cryptojs/components/sha1-min.js create mode 100644 library/cryptojs/components/sha1.js create mode 100644 library/cryptojs/components/sha224-min.js create mode 100644 library/cryptojs/components/sha224.js create mode 100644 library/cryptojs/components/sha256-min.js create mode 100644 library/cryptojs/components/sha256.js create mode 100644 library/cryptojs/components/sha3-min.js create mode 100644 library/cryptojs/components/sha3.js create mode 100644 library/cryptojs/components/sha384-min.js create mode 100644 library/cryptojs/components/sha384.js create mode 100644 library/cryptojs/components/sha512-min.js create mode 100644 library/cryptojs/components/sha512.js create mode 100644 library/cryptojs/components/tripledes-min.js create mode 100644 library/cryptojs/components/tripledes.js create mode 100644 library/cryptojs/components/x64-core-min.js create mode 100644 library/cryptojs/components/x64-core.js create mode 100644 library/cryptojs/rollups/aes.js create mode 100644 library/cryptojs/rollups/hmac-md5.js create mode 100644 library/cryptojs/rollups/hmac-ripemd160.js create mode 100644 library/cryptojs/rollups/hmac-sha1.js create mode 100644 library/cryptojs/rollups/hmac-sha224.js create mode 100644 library/cryptojs/rollups/hmac-sha256.js create mode 100644 library/cryptojs/rollups/hmac-sha3.js create mode 100644 library/cryptojs/rollups/hmac-sha384.js create mode 100644 library/cryptojs/rollups/hmac-sha512.js create mode 100644 library/cryptojs/rollups/md5.js create mode 100644 library/cryptojs/rollups/pbkdf2.js create mode 100644 library/cryptojs/rollups/rabbit-legacy.js create mode 100644 library/cryptojs/rollups/rabbit.js create mode 100644 library/cryptojs/rollups/rc4.js create mode 100644 library/cryptojs/rollups/ripemd160.js create mode 100644 library/cryptojs/rollups/sha1.js create mode 100644 library/cryptojs/rollups/sha224.js create mode 100644 library/cryptojs/rollups/sha256.js create mode 100644 library/cryptojs/rollups/sha3.js create mode 100644 library/cryptojs/rollups/sha384.js create mode 100644 library/cryptojs/rollups/sha512.js create mode 100644 library/cryptojs/rollups/tripledes.js diff --git a/library/cryptojs/README b/library/cryptojs/README new file mode 100644 index 000000000..4fbf57034 --- /dev/null +++ b/library/cryptojs/README @@ -0,0 +1 @@ +http://code.google.com/p/crypto-js/ diff --git a/library/cryptojs/components/aes-min.js b/library/cryptojs/components/aes-min.js new file mode 100644 index 000000000..8b34064d3 --- /dev/null +++ b/library/cryptojs/components/aes-min.js @@ -0,0 +1,10 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){for(var q=CryptoJS,x=q.lib.BlockCipher,r=q.algo,j=[],y=[],z=[],A=[],B=[],C=[],s=[],u=[],v=[],w=[],g=[],k=0;256>k;k++)g[k]=128>k?k<<1:k<<1^283;for(var n=0,l=0,k=0;256>k;k++){var f=l^l<<1^l<<2^l<<3^l<<4,f=f>>>8^f&255^99;j[n]=f;y[f]=n;var t=g[n],D=g[t],E=g[D],b=257*g[f]^16843008*f;z[n]=b<<24|b>>>8;A[n]=b<<16|b>>>16;B[n]=b<<8|b>>>24;C[n]=b;b=16843009*E^65537*D^257*t^16843008*n;s[f]=b<<24|b>>>8;u[f]=b<<16|b>>>16;v[f]=b<<8|b>>>24;w[f]=b;n?(n=t^g[g[g[E^t]]],l^=g[g[l]]):n=l=1}var F=[0,1,2,4,8, +16,32,64,128,27,54],r=r.AES=x.extend({_doReset:function(){for(var c=this._key,e=c.words,a=c.sigBytes/4,c=4*((this._nRounds=a+6)+1),b=this._keySchedule=[],h=0;h>>24]<<24|j[d>>>16&255]<<16|j[d>>>8&255]<<8|j[d&255]):(d=d<<8|d>>>24,d=j[d>>>24]<<24|j[d>>>16&255]<<16|j[d>>>8&255]<<8|j[d&255],d^=F[h/a|0]<<24);b[h]=b[h-a]^d}e=this._invKeySchedule=[];for(a=0;aa||4>=h?d:s[j[d>>>24]]^u[j[d>>>16&255]]^v[j[d>>> +8&255]]^w[j[d&255]]},encryptBlock:function(c,e){this._doCryptBlock(c,e,this._keySchedule,z,A,B,C,j)},decryptBlock:function(c,e){var a=c[e+1];c[e+1]=c[e+3];c[e+3]=a;this._doCryptBlock(c,e,this._invKeySchedule,s,u,v,w,y);a=c[e+1];c[e+1]=c[e+3];c[e+3]=a},_doCryptBlock:function(c,e,a,b,h,d,j,m){for(var n=this._nRounds,f=c[e]^a[0],g=c[e+1]^a[1],k=c[e+2]^a[2],p=c[e+3]^a[3],l=4,t=1;t>>24]^h[g>>>16&255]^d[k>>>8&255]^j[p&255]^a[l++],r=b[g>>>24]^h[k>>>16&255]^d[p>>>8&255]^j[f&255]^a[l++],s= +b[k>>>24]^h[p>>>16&255]^d[f>>>8&255]^j[g&255]^a[l++],p=b[p>>>24]^h[f>>>16&255]^d[g>>>8&255]^j[k&255]^a[l++],f=q,g=r,k=s;q=(m[f>>>24]<<24|m[g>>>16&255]<<16|m[k>>>8&255]<<8|m[p&255])^a[l++];r=(m[g>>>24]<<24|m[k>>>16&255]<<16|m[p>>>8&255]<<8|m[f&255])^a[l++];s=(m[k>>>24]<<24|m[p>>>16&255]<<16|m[f>>>8&255]<<8|m[g&255])^a[l++];p=(m[p>>>24]<<24|m[f>>>16&255]<<16|m[g>>>8&255]<<8|m[k&255])^a[l++];c[e]=q;c[e+1]=r;c[e+2]=s;c[e+3]=p},keySize:8});q.AES=x._createHelper(r)})(); diff --git a/library/cryptojs/components/aes.js b/library/cryptojs/components/aes.js new file mode 100644 index 000000000..13bfd80a2 --- /dev/null +++ b/library/cryptojs/components/aes.js @@ -0,0 +1,213 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var BlockCipher = C_lib.BlockCipher; + var C_algo = C.algo; + + // Lookup tables + var SBOX = []; + var INV_SBOX = []; + var SUB_MIX_0 = []; + var SUB_MIX_1 = []; + var SUB_MIX_2 = []; + var SUB_MIX_3 = []; + var INV_SUB_MIX_0 = []; + var INV_SUB_MIX_1 = []; + var INV_SUB_MIX_2 = []; + var INV_SUB_MIX_3 = []; + + // Compute lookup tables + (function () { + // Compute double table + var d = []; + for (var i = 0; i < 256; i++) { + if (i < 128) { + d[i] = i << 1; + } else { + d[i] = (i << 1) ^ 0x11b; + } + } + + // Walk GF(2^8) + var x = 0; + var xi = 0; + for (var i = 0; i < 256; i++) { + // Compute sbox + var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4); + sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63; + SBOX[x] = sx; + INV_SBOX[sx] = x; + + // Compute multiplication + var x2 = d[x]; + var x4 = d[x2]; + var x8 = d[x4]; + + // Compute sub bytes, mix columns tables + var t = (d[sx] * 0x101) ^ (sx * 0x1010100); + SUB_MIX_0[x] = (t << 24) | (t >>> 8); + SUB_MIX_1[x] = (t << 16) | (t >>> 16); + SUB_MIX_2[x] = (t << 8) | (t >>> 24); + SUB_MIX_3[x] = t; + + // Compute inv sub bytes, inv mix columns tables + var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100); + INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8); + INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16); + INV_SUB_MIX_2[sx] = (t << 8) | (t >>> 24); + INV_SUB_MIX_3[sx] = t; + + // Compute next counter + if (!x) { + x = xi = 1; + } else { + x = x2 ^ d[d[d[x8 ^ x2]]]; + xi ^= d[d[xi]]; + } + } + }()); + + // Precomputed Rcon lookup + var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36]; + + /** + * AES block cipher algorithm. + */ + var AES = C_algo.AES = BlockCipher.extend({ + _doReset: function () { + // Shortcuts + var key = this._key; + var keyWords = key.words; + var keySize = key.sigBytes / 4; + + // Compute number of rounds + var nRounds = this._nRounds = keySize + 6 + + // Compute number of key schedule rows + var ksRows = (nRounds + 1) * 4; + + // Compute key schedule + var keySchedule = this._keySchedule = []; + for (var ksRow = 0; ksRow < ksRows; ksRow++) { + if (ksRow < keySize) { + keySchedule[ksRow] = keyWords[ksRow]; + } else { + var t = keySchedule[ksRow - 1]; + + if (!(ksRow % keySize)) { + // Rot word + t = (t << 8) | (t >>> 24); + + // Sub word + t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff]; + + // Mix Rcon + t ^= RCON[(ksRow / keySize) | 0] << 24; + } else if (keySize > 6 && ksRow % keySize == 4) { + // Sub word + t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff]; + } + + keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t; + } + } + + // Compute inv key schedule + var invKeySchedule = this._invKeySchedule = []; + for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) { + var ksRow = ksRows - invKsRow; + + if (invKsRow % 4) { + var t = keySchedule[ksRow]; + } else { + var t = keySchedule[ksRow - 4]; + } + + if (invKsRow < 4 || ksRow <= 4) { + invKeySchedule[invKsRow] = t; + } else { + invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^ + INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]]; + } + } + }, + + encryptBlock: function (M, offset) { + this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX); + }, + + decryptBlock: function (M, offset) { + // Swap 2nd and 4th rows + var t = M[offset + 1]; + M[offset + 1] = M[offset + 3]; + M[offset + 3] = t; + + this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX); + + // Inv swap 2nd and 4th rows + var t = M[offset + 1]; + M[offset + 1] = M[offset + 3]; + M[offset + 3] = t; + }, + + _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) { + // Shortcut + var nRounds = this._nRounds; + + // Get input, add round key + var s0 = M[offset] ^ keySchedule[0]; + var s1 = M[offset + 1] ^ keySchedule[1]; + var s2 = M[offset + 2] ^ keySchedule[2]; + var s3 = M[offset + 3] ^ keySchedule[3]; + + // Key schedule row counter + var ksRow = 4; + + // Rounds + for (var round = 1; round < nRounds; round++) { + // Shift rows, sub bytes, mix columns, add round key + var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++]; + var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++]; + var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++]; + var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++]; + + // Update state + s0 = t0; + s1 = t1; + s2 = t2; + s3 = t3; + } + + // Shift rows, sub bytes, add round key + var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++]; + var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++]; + var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++]; + var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++]; + + // Set output + M[offset] = t0; + M[offset + 1] = t1; + M[offset + 2] = t2; + M[offset + 3] = t3; + }, + + keySize: 256/32 + }); + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.AES.encrypt(message, key, cfg); + * var plaintext = CryptoJS.AES.decrypt(ciphertext, key, cfg); + */ + C.AES = BlockCipher._createHelper(AES); +}()); diff --git a/library/cryptojs/components/cipher-core-min.js b/library/cryptojs/components/cipher-core-min.js new file mode 100644 index 000000000..917939c8b --- /dev/null +++ b/library/cryptojs/components/cipher-core-min.js @@ -0,0 +1,14 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.lib.Cipher||function(u){var g=CryptoJS,f=g.lib,k=f.Base,l=f.WordArray,q=f.BufferedBlockAlgorithm,r=g.enc.Base64,v=g.algo.EvpKDF,n=f.Cipher=q.extend({cfg:k.extend(),createEncryptor:function(a,b){return this.create(this._ENC_XFORM_MODE,a,b)},createDecryptor:function(a,b){return this.create(this._DEC_XFORM_MODE,a,b)},init:function(a,b,c){this.cfg=this.cfg.extend(c);this._xformMode=a;this._key=b;this.reset()},reset:function(){q.reset.call(this);this._doReset()},process:function(a){this._append(a); +return this._process()},finalize:function(a){a&&this._append(a);return this._doFinalize()},keySize:4,ivSize:4,_ENC_XFORM_MODE:1,_DEC_XFORM_MODE:2,_createHelper:function(a){return{encrypt:function(b,c,d){return("string"==typeof c?s:j).encrypt(a,b,c,d)},decrypt:function(b,c,d){return("string"==typeof c?s:j).decrypt(a,b,c,d)}}}});f.StreamCipher=n.extend({_doFinalize:function(){return this._process(!0)},blockSize:1});var m=g.mode={},t=function(a,b,c){var d=this._iv;d?this._iv=u:d=this._prevBlock;for(var e= +0;e>>2]&255}};f.BlockCipher=n.extend({cfg:n.cfg.extend({mode:m,padding:h}),reset:function(){n.reset.call(this);var a=this.cfg,b=a.iv,a=a.mode;if(this._xformMode==this._ENC_XFORM_MODE)var c=a.createEncryptor;else c=a.createDecryptor,this._minBufferSize=1; +this._mode=c.call(a,this,b&&b.words)},_doProcessBlock:function(a,b){this._mode.processBlock(a,b)},_doFinalize:function(){var a=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){a.pad(this._data,this.blockSize);var b=this._process(!0)}else b=this._process(!0),a.unpad(b);return b},blockSize:4});var p=f.CipherParams=k.extend({init:function(a){this.mixIn(a)},toString:function(a){return(a||this.formatter).stringify(this)}}),m=(g.format={}).OpenSSL={stringify:function(a){var b=a.ciphertext;a=a.salt; +return(a?l.create([1398893684,1701076831]).concat(a).concat(b):b).toString(r)},parse:function(a){a=r.parse(a);var b=a.words;if(1398893684==b[0]&&1701076831==b[1]){var c=l.create(b.slice(2,4));b.splice(0,4);a.sigBytes-=16}return p.create({ciphertext:a,salt:c})}},j=f.SerializableCipher=k.extend({cfg:k.extend({format:m}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);var e=a.createEncryptor(c,d);b=e.finalize(b);e=e.cfg;return p.create({ciphertext:b,key:c,iv:e.iv,algorithm:a,mode:e.mode,padding:e.padding, +blockSize:a.blockSize,formatter:d.format})},decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);return a.createDecryptor(c,d).finalize(b.ciphertext)},_parse:function(a,b){return"string"==typeof a?b.parse(a,this):a}}),g=(g.kdf={}).OpenSSL={execute:function(a,b,c,d){d||(d=l.random(8));a=v.create({keySize:b+c}).compute(a,d);c=l.create(a.words.slice(b),4*c);a.sigBytes=4*b;return p.create({key:a,iv:c,salt:d})}},s=f.PasswordBasedCipher=j.extend({cfg:j.cfg.extend({kdf:g}),encrypt:function(a, +b,c,d){d=this.cfg.extend(d);c=d.kdf.execute(c,a.keySize,a.ivSize);d.iv=c.iv;a=j.encrypt.call(this,a,b,c.key,d);a.mixIn(c);return a},decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);c=d.kdf.execute(c,a.keySize,a.ivSize,b.salt);d.iv=c.iv;return j.decrypt.call(this,a,b,c.key,d)}})}(); diff --git a/library/cryptojs/components/cipher-core.js b/library/cryptojs/components/cipher-core.js new file mode 100644 index 000000000..09862098f --- /dev/null +++ b/library/cryptojs/components/cipher-core.js @@ -0,0 +1,863 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** + * Cipher core components. + */ +CryptoJS.lib.Cipher || (function (undefined) { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var Base = C_lib.Base; + var WordArray = C_lib.WordArray; + var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm; + var C_enc = C.enc; + var Utf8 = C_enc.Utf8; + var Base64 = C_enc.Base64; + var C_algo = C.algo; + var EvpKDF = C_algo.EvpKDF; + + /** + * Abstract base cipher template. + * + * @property {number} keySize This cipher's key size. Default: 4 (128 bits) + * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits) + * @property {number} _ENC_XFORM_MODE A constant representing encryption mode. + * @property {number} _DEC_XFORM_MODE A constant representing decryption mode. + */ + var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({ + /** + * Configuration options. + * + * @property {WordArray} iv The IV to use for this operation. + */ + cfg: Base.extend(), + + /** + * Creates this cipher in encryption mode. + * + * @param {WordArray} key The key. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @return {Cipher} A cipher instance. + * + * @static + * + * @example + * + * var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray }); + */ + createEncryptor: function (key, cfg) { + return this.create(this._ENC_XFORM_MODE, key, cfg); + }, + + /** + * Creates this cipher in decryption mode. + * + * @param {WordArray} key The key. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @return {Cipher} A cipher instance. + * + * @static + * + * @example + * + * var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray }); + */ + createDecryptor: function (key, cfg) { + return this.create(this._DEC_XFORM_MODE, key, cfg); + }, + + /** + * Initializes a newly created cipher. + * + * @param {number} xformMode Either the encryption or decryption transormation mode constant. + * @param {WordArray} key The key. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @example + * + * var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray }); + */ + init: function (xformMode, key, cfg) { + // Apply config defaults + this.cfg = this.cfg.extend(cfg); + + // Store transform mode and key + this._xformMode = xformMode; + this._key = key; + + // Set initial values + this.reset(); + }, + + /** + * Resets this cipher to its initial state. + * + * @example + * + * cipher.reset(); + */ + reset: function () { + // Reset data buffer + BufferedBlockAlgorithm.reset.call(this); + + // Perform concrete-cipher logic + this._doReset(); + }, + + /** + * Adds data to be encrypted or decrypted. + * + * @param {WordArray|string} dataUpdate The data to encrypt or decrypt. + * + * @return {WordArray} The data after processing. + * + * @example + * + * var encrypted = cipher.process('data'); + * var encrypted = cipher.process(wordArray); + */ + process: function (dataUpdate) { + // Append + this._append(dataUpdate); + + // Process available blocks + return this._process(); + }, + + /** + * Finalizes the encryption or decryption process. + * Note that the finalize operation is effectively a destructive, read-once operation. + * + * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt. + * + * @return {WordArray} The data after final processing. + * + * @example + * + * var encrypted = cipher.finalize(); + * var encrypted = cipher.finalize('data'); + * var encrypted = cipher.finalize(wordArray); + */ + finalize: function (dataUpdate) { + // Final data update + if (dataUpdate) { + this._append(dataUpdate); + } + + // Perform concrete-cipher logic + var finalProcessedData = this._doFinalize(); + + return finalProcessedData; + }, + + keySize: 128/32, + + ivSize: 128/32, + + _ENC_XFORM_MODE: 1, + + _DEC_XFORM_MODE: 2, + + /** + * Creates shortcut functions to a cipher's object interface. + * + * @param {Cipher} cipher The cipher to create a helper for. + * + * @return {Object} An object with encrypt and decrypt shortcut functions. + * + * @static + * + * @example + * + * var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES); + */ + _createHelper: (function () { + function selectCipherStrategy(key) { + if (typeof key == 'string') { + return PasswordBasedCipher; + } else { + return SerializableCipher; + } + } + + return function (cipher) { + return { + encrypt: function (message, key, cfg) { + return selectCipherStrategy(key).encrypt(cipher, message, key, cfg); + }, + + decrypt: function (ciphertext, key, cfg) { + return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg); + } + }; + }; + }()) + }); + + /** + * Abstract base stream cipher template. + * + * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits) + */ + var StreamCipher = C_lib.StreamCipher = Cipher.extend({ + _doFinalize: function () { + // Process partial blocks + var finalProcessedBlocks = this._process(!!'flush'); + + return finalProcessedBlocks; + }, + + blockSize: 1 + }); + + /** + * Mode namespace. + */ + var C_mode = C.mode = {}; + + /** + * Abstract base block cipher mode template. + */ + var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({ + /** + * Creates this mode for encryption. + * + * @param {Cipher} cipher A block cipher instance. + * @param {Array} iv The IV words. + * + * @static + * + * @example + * + * var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words); + */ + createEncryptor: function (cipher, iv) { + return this.Encryptor.create(cipher, iv); + }, + + /** + * Creates this mode for decryption. + * + * @param {Cipher} cipher A block cipher instance. + * @param {Array} iv The IV words. + * + * @static + * + * @example + * + * var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words); + */ + createDecryptor: function (cipher, iv) { + return this.Decryptor.create(cipher, iv); + }, + + /** + * Initializes a newly created mode. + * + * @param {Cipher} cipher A block cipher instance. + * @param {Array} iv The IV words. + * + * @example + * + * var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words); + */ + init: function (cipher, iv) { + this._cipher = cipher; + this._iv = iv; + } + }); + + /** + * Cipher Block Chaining mode. + */ + var CBC = C_mode.CBC = (function () { + /** + * Abstract base CBC mode. + */ + var CBC = BlockCipherMode.extend(); + + /** + * CBC encryptor. + */ + CBC.Encryptor = CBC.extend({ + /** + * Processes the data block at offset. + * + * @param {Array} words The data words to operate on. + * @param {number} offset The offset where the block starts. + * + * @example + * + * mode.processBlock(data.words, offset); + */ + processBlock: function (words, offset) { + // Shortcuts + var cipher = this._cipher; + var blockSize = cipher.blockSize; + + // XOR and encrypt + xorBlock.call(this, words, offset, blockSize); + cipher.encryptBlock(words, offset); + + // Remember this block to use with next block + this._prevBlock = words.slice(offset, offset + blockSize); + } + }); + + /** + * CBC decryptor. + */ + CBC.Decryptor = CBC.extend({ + /** + * Processes the data block at offset. + * + * @param {Array} words The data words to operate on. + * @param {number} offset The offset where the block starts. + * + * @example + * + * mode.processBlock(data.words, offset); + */ + processBlock: function (words, offset) { + // Shortcuts + var cipher = this._cipher; + var blockSize = cipher.blockSize; + + // Remember this block to use with next block + var thisBlock = words.slice(offset, offset + blockSize); + + // Decrypt and XOR + cipher.decryptBlock(words, offset); + xorBlock.call(this, words, offset, blockSize); + + // This block becomes the previous block + this._prevBlock = thisBlock; + } + }); + + function xorBlock(words, offset, blockSize) { + // Shortcut + var iv = this._iv; + + // Choose mixing block + if (iv) { + var block = iv; + + // Remove IV for subsequent blocks + this._iv = undefined; + } else { + var block = this._prevBlock; + } + + // XOR blocks + for (var i = 0; i < blockSize; i++) { + words[offset + i] ^= block[i]; + } + } + + return CBC; + }()); + + /** + * Padding namespace. + */ + var C_pad = C.pad = {}; + + /** + * PKCS #5/7 padding strategy. + */ + var Pkcs7 = C_pad.Pkcs7 = { + /** + * Pads data using the algorithm defined in PKCS #5/7. + * + * @param {WordArray} data The data to pad. + * @param {number} blockSize The multiple that the data should be padded to. + * + * @static + * + * @example + * + * CryptoJS.pad.Pkcs7.pad(wordArray, 4); + */ + pad: function (data, blockSize) { + // Shortcut + var blockSizeBytes = blockSize * 4; + + // Count padding bytes + var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes; + + // Create padding word + var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes; + + // Create padding + var paddingWords = []; + for (var i = 0; i < nPaddingBytes; i += 4) { + paddingWords.push(paddingWord); + } + var padding = WordArray.create(paddingWords, nPaddingBytes); + + // Add padding + data.concat(padding); + }, + + /** + * Unpads data that had been padded using the algorithm defined in PKCS #5/7. + * + * @param {WordArray} data The data to unpad. + * + * @static + * + * @example + * + * CryptoJS.pad.Pkcs7.unpad(wordArray); + */ + unpad: function (data) { + // Get number of padding bytes from last byte + var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff; + + // Remove padding + data.sigBytes -= nPaddingBytes; + } + }; + + /** + * Abstract base block cipher template. + * + * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits) + */ + var BlockCipher = C_lib.BlockCipher = Cipher.extend({ + /** + * Configuration options. + * + * @property {Mode} mode The block mode to use. Default: CBC + * @property {Padding} padding The padding strategy to use. Default: Pkcs7 + */ + cfg: Cipher.cfg.extend({ + mode: CBC, + padding: Pkcs7 + }), + + reset: function () { + // Reset cipher + Cipher.reset.call(this); + + // Shortcuts + var cfg = this.cfg; + var iv = cfg.iv; + var mode = cfg.mode; + + // Reset block mode + if (this._xformMode == this._ENC_XFORM_MODE) { + var modeCreator = mode.createEncryptor; + } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ { + var modeCreator = mode.createDecryptor; + + // Keep at least one block in the buffer for unpadding + this._minBufferSize = 1; + } + this._mode = modeCreator.call(mode, this, iv && iv.words); + }, + + _doProcessBlock: function (words, offset) { + this._mode.processBlock(words, offset); + }, + + _doFinalize: function () { + // Shortcut + var padding = this.cfg.padding; + + // Finalize + if (this._xformMode == this._ENC_XFORM_MODE) { + // Pad data + padding.pad(this._data, this.blockSize); + + // Process final blocks + var finalProcessedBlocks = this._process(!!'flush'); + } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ { + // Process final blocks + var finalProcessedBlocks = this._process(!!'flush'); + + // Unpad data + padding.unpad(finalProcessedBlocks); + } + + return finalProcessedBlocks; + }, + + blockSize: 128/32 + }); + + /** + * A collection of cipher parameters. + * + * @property {WordArray} ciphertext The raw ciphertext. + * @property {WordArray} key The key to this ciphertext. + * @property {WordArray} iv The IV used in the ciphering operation. + * @property {WordArray} salt The salt used with a key derivation function. + * @property {Cipher} algorithm The cipher algorithm. + * @property {Mode} mode The block mode used in the ciphering operation. + * @property {Padding} padding The padding scheme used in the ciphering operation. + * @property {number} blockSize The block size of the cipher. + * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string. + */ + var CipherParams = C_lib.CipherParams = Base.extend({ + /** + * Initializes a newly created cipher params object. + * + * @param {Object} cipherParams An object with any of the possible cipher parameters. + * + * @example + * + * var cipherParams = CryptoJS.lib.CipherParams.create({ + * ciphertext: ciphertextWordArray, + * key: keyWordArray, + * iv: ivWordArray, + * salt: saltWordArray, + * algorithm: CryptoJS.algo.AES, + * mode: CryptoJS.mode.CBC, + * padding: CryptoJS.pad.PKCS7, + * blockSize: 4, + * formatter: CryptoJS.format.OpenSSL + * }); + */ + init: function (cipherParams) { + this.mixIn(cipherParams); + }, + + /** + * Converts this cipher params object to a string. + * + * @param {Format} formatter (Optional) The formatting strategy to use. + * + * @return {string} The stringified cipher params. + * + * @throws Error If neither the formatter nor the default formatter is set. + * + * @example + * + * var string = cipherParams + ''; + * var string = cipherParams.toString(); + * var string = cipherParams.toString(CryptoJS.format.OpenSSL); + */ + toString: function (formatter) { + return (formatter || this.formatter).stringify(this); + } + }); + + /** + * Format namespace. + */ + var C_format = C.format = {}; + + /** + * OpenSSL formatting strategy. + */ + var OpenSSLFormatter = C_format.OpenSSL = { + /** + * Converts a cipher params object to an OpenSSL-compatible string. + * + * @param {CipherParams} cipherParams The cipher params object. + * + * @return {string} The OpenSSL-compatible string. + * + * @static + * + * @example + * + * var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams); + */ + stringify: function (cipherParams) { + // Shortcuts + var ciphertext = cipherParams.ciphertext; + var salt = cipherParams.salt; + + // Format + if (salt) { + var wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext); + } else { + var wordArray = ciphertext; + } + + return wordArray.toString(Base64); + }, + + /** + * Converts an OpenSSL-compatible string to a cipher params object. + * + * @param {string} openSSLStr The OpenSSL-compatible string. + * + * @return {CipherParams} The cipher params object. + * + * @static + * + * @example + * + * var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString); + */ + parse: function (openSSLStr) { + // Parse base64 + var ciphertext = Base64.parse(openSSLStr); + + // Shortcut + var ciphertextWords = ciphertext.words; + + // Test for salt + if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) { + // Extract salt + var salt = WordArray.create(ciphertextWords.slice(2, 4)); + + // Remove salt from ciphertext + ciphertextWords.splice(0, 4); + ciphertext.sigBytes -= 16; + } + + return CipherParams.create({ ciphertext: ciphertext, salt: salt }); + } + }; + + /** + * A cipher wrapper that returns ciphertext as a serializable cipher params object. + */ + var SerializableCipher = C_lib.SerializableCipher = Base.extend({ + /** + * Configuration options. + * + * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL + */ + cfg: Base.extend({ + format: OpenSSLFormatter + }), + + /** + * Encrypts a message. + * + * @param {Cipher} cipher The cipher algorithm to use. + * @param {WordArray|string} message The message to encrypt. + * @param {WordArray} key The key. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @return {CipherParams} A cipher params object. + * + * @static + * + * @example + * + * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key); + * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv }); + * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL }); + */ + encrypt: function (cipher, message, key, cfg) { + // Apply config defaults + cfg = this.cfg.extend(cfg); + + // Encrypt + var encryptor = cipher.createEncryptor(key, cfg); + var ciphertext = encryptor.finalize(message); + + // Shortcut + var cipherCfg = encryptor.cfg; + + // Create and return serializable cipher params + return CipherParams.create({ + ciphertext: ciphertext, + key: key, + iv: cipherCfg.iv, + algorithm: cipher, + mode: cipherCfg.mode, + padding: cipherCfg.padding, + blockSize: cipher.blockSize, + formatter: cfg.format + }); + }, + + /** + * Decrypts serialized ciphertext. + * + * @param {Cipher} cipher The cipher algorithm to use. + * @param {CipherParams|string} ciphertext The ciphertext to decrypt. + * @param {WordArray} key The key. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @return {WordArray} The plaintext. + * + * @static + * + * @example + * + * var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL }); + * var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL }); + */ + decrypt: function (cipher, ciphertext, key, cfg) { + // Apply config defaults + cfg = this.cfg.extend(cfg); + + // Convert string to CipherParams + ciphertext = this._parse(ciphertext, cfg.format); + + // Decrypt + var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext); + + return plaintext; + }, + + /** + * Converts serialized ciphertext to CipherParams, + * else assumed CipherParams already and returns ciphertext unchanged. + * + * @param {CipherParams|string} ciphertext The ciphertext. + * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext. + * + * @return {CipherParams} The unserialized ciphertext. + * + * @static + * + * @example + * + * var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format); + */ + _parse: function (ciphertext, format) { + if (typeof ciphertext == 'string') { + return format.parse(ciphertext, this); + } else { + return ciphertext; + } + } + }); + + /** + * Key derivation function namespace. + */ + var C_kdf = C.kdf = {}; + + /** + * OpenSSL key derivation function. + */ + var OpenSSLKdf = C_kdf.OpenSSL = { + /** + * Derives a key and IV from a password. + * + * @param {string} password The password to derive from. + * @param {number} keySize The size in words of the key to generate. + * @param {number} ivSize The size in words of the IV to generate. + * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly. + * + * @return {CipherParams} A cipher params object with the key, IV, and salt. + * + * @static + * + * @example + * + * var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32); + * var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt'); + */ + execute: function (password, keySize, ivSize, salt) { + // Generate random salt + if (!salt) { + salt = WordArray.random(64/8); + } + + // Derive key and IV + var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt); + + // Separate key and IV + var iv = WordArray.create(key.words.slice(keySize), ivSize * 4); + key.sigBytes = keySize * 4; + + // Return params + return CipherParams.create({ key: key, iv: iv, salt: salt }); + } + }; + + /** + * A serializable cipher wrapper that derives the key from a password, + * and returns ciphertext as a serializable cipher params object. + */ + var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({ + /** + * Configuration options. + * + * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL + */ + cfg: SerializableCipher.cfg.extend({ + kdf: OpenSSLKdf + }), + + /** + * Encrypts a message using a password. + * + * @param {Cipher} cipher The cipher algorithm to use. + * @param {WordArray|string} message The message to encrypt. + * @param {string} password The password. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @return {CipherParams} A cipher params object. + * + * @static + * + * @example + * + * var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password'); + * var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL }); + */ + encrypt: function (cipher, message, password, cfg) { + // Apply config defaults + cfg = this.cfg.extend(cfg); + + // Derive key and other params + var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize); + + // Add IV to config + cfg.iv = derivedParams.iv; + + // Encrypt + var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg); + + // Mix in derived params + ciphertext.mixIn(derivedParams); + + return ciphertext; + }, + + /** + * Decrypts serialized ciphertext using a password. + * + * @param {Cipher} cipher The cipher algorithm to use. + * @param {CipherParams|string} ciphertext The ciphertext to decrypt. + * @param {string} password The password. + * @param {Object} cfg (Optional) The configuration options to use for this operation. + * + * @return {WordArray} The plaintext. + * + * @static + * + * @example + * + * var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL }); + * var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL }); + */ + decrypt: function (cipher, ciphertext, password, cfg) { + // Apply config defaults + cfg = this.cfg.extend(cfg); + + // Convert string to CipherParams + ciphertext = this._parse(ciphertext, cfg.format); + + // Derive key and other params + var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt); + + // Add IV to config + cfg.iv = derivedParams.iv; + + // Decrypt + var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg); + + return plaintext; + } + }); +}()); diff --git a/library/cryptojs/components/core-min.js b/library/cryptojs/components/core-min.js new file mode 100644 index 000000000..3f191b431 --- /dev/null +++ b/library/cryptojs/components/core-min.js @@ -0,0 +1,13 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(h,r){var k={},l=k.lib={},n=function(){},f=l.Base={extend:function(a){n.prototype=this;var b=new n;a&&b.mixIn(a);b.hasOwnProperty("init")||(b.init=function(){b.$super.init.apply(this,arguments)});b.init.prototype=b;b.$super=this;return b},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var b in a)a.hasOwnProperty(b)&&(this[b]=a[b]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +j=l.WordArray=f.extend({init:function(a,b){a=this.words=a||[];this.sigBytes=b!=r?b:4*a.length},toString:function(a){return(a||s).stringify(this)},concat:function(a){var b=this.words,d=a.words,c=this.sigBytes;a=a.sigBytes;this.clamp();if(c%4)for(var e=0;e>>2]|=(d[e>>>2]>>>24-8*(e%4)&255)<<24-8*((c+e)%4);else if(65535>>2]=d[e>>>2];else b.push.apply(b,d);this.sigBytes+=a;return this},clamp:function(){var a=this.words,b=this.sigBytes;a[b>>>2]&=4294967295<< +32-8*(b%4);a.length=h.ceil(b/4)},clone:function(){var a=f.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var b=[],d=0;d>>2]>>>24-8*(c%4)&255;d.push((e>>>4).toString(16));d.push((e&15).toString(16))}return d.join("")},parse:function(a){for(var b=a.length,d=[],c=0;c>>3]|=parseInt(a.substr(c, +2),16)<<24-4*(c%8);return new j.init(d,b/2)}},p=m.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var d=[],c=0;c>>2]>>>24-8*(c%4)&255));return d.join("")},parse:function(a){for(var b=a.length,d=[],c=0;c>>2]|=(a.charCodeAt(c)&255)<<24-8*(c%4);return new j.init(d,b)}},t=m.Utf8={stringify:function(a){try{return decodeURIComponent(escape(p.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return p.parse(unescape(encodeURIComponent(a)))}}, +q=l.BufferedBlockAlgorithm=f.extend({reset:function(){this._data=new j.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=t.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,d=b.words,c=b.sigBytes,e=this.blockSize,f=c/(4*e),f=a?h.ceil(f):h.max((f|0)-this._minBufferSize,0);a=f*e;c=h.min(4*a,c);if(a){for(var g=0;g>> 2] >>> (24 - (i % 4) * 8)) & 0xff; + thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8); + } + } else if (thatWords.length > 0xffff) { + // Copy one word at a time + for (var i = 0; i < thatSigBytes; i += 4) { + thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2]; + } + } else { + // Copy all words at once + thisWords.push.apply(thisWords, thatWords); + } + this.sigBytes += thatSigBytes; + + // Chainable + return this; + }, + + /** + * Removes insignificant bits. + * + * @example + * + * wordArray.clamp(); + */ + clamp: function () { + // Shortcuts + var words = this.words; + var sigBytes = this.sigBytes; + + // Clamp + words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8); + words.length = Math.ceil(sigBytes / 4); + }, + + /** + * Creates a copy of this word array. + * + * @return {WordArray} The clone. + * + * @example + * + * var clone = wordArray.clone(); + */ + clone: function () { + var clone = Base.clone.call(this); + clone.words = this.words.slice(0); + + return clone; + }, + + /** + * Creates a word array filled with random bytes. + * + * @param {number} nBytes The number of random bytes to generate. + * + * @return {WordArray} The random word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.lib.WordArray.random(16); + */ + random: function (nBytes) { + var words = []; + for (var i = 0; i < nBytes; i += 4) { + words.push((Math.random() * 0x100000000) | 0); + } + + return new WordArray.init(words, nBytes); + } + }); + + /** + * Encoder namespace. + */ + var C_enc = C.enc = {}; + + /** + * Hex encoding strategy. + */ + var Hex = C_enc.Hex = { + /** + * Converts a word array to a hex string. + * + * @param {WordArray} wordArray The word array. + * + * @return {string} The hex string. + * + * @static + * + * @example + * + * var hexString = CryptoJS.enc.Hex.stringify(wordArray); + */ + stringify: function (wordArray) { + // Shortcuts + var words = wordArray.words; + var sigBytes = wordArray.sigBytes; + + // Convert + var hexChars = []; + for (var i = 0; i < sigBytes; i++) { + var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; + hexChars.push((bite >>> 4).toString(16)); + hexChars.push((bite & 0x0f).toString(16)); + } + + return hexChars.join(''); + }, + + /** + * Converts a hex string to a word array. + * + * @param {string} hexStr The hex string. + * + * @return {WordArray} The word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.enc.Hex.parse(hexString); + */ + parse: function (hexStr) { + // Shortcut + var hexStrLength = hexStr.length; + + // Convert + var words = []; + for (var i = 0; i < hexStrLength; i += 2) { + words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4); + } + + return new WordArray.init(words, hexStrLength / 2); + } + }; + + /** + * Latin1 encoding strategy. + */ + var Latin1 = C_enc.Latin1 = { + /** + * Converts a word array to a Latin1 string. + * + * @param {WordArray} wordArray The word array. + * + * @return {string} The Latin1 string. + * + * @static + * + * @example + * + * var latin1String = CryptoJS.enc.Latin1.stringify(wordArray); + */ + stringify: function (wordArray) { + // Shortcuts + var words = wordArray.words; + var sigBytes = wordArray.sigBytes; + + // Convert + var latin1Chars = []; + for (var i = 0; i < sigBytes; i++) { + var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; + latin1Chars.push(String.fromCharCode(bite)); + } + + return latin1Chars.join(''); + }, + + /** + * Converts a Latin1 string to a word array. + * + * @param {string} latin1Str The Latin1 string. + * + * @return {WordArray} The word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.enc.Latin1.parse(latin1String); + */ + parse: function (latin1Str) { + // Shortcut + var latin1StrLength = latin1Str.length; + + // Convert + var words = []; + for (var i = 0; i < latin1StrLength; i++) { + words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8); + } + + return new WordArray.init(words, latin1StrLength); + } + }; + + /** + * UTF-8 encoding strategy. + */ + var Utf8 = C_enc.Utf8 = { + /** + * Converts a word array to a UTF-8 string. + * + * @param {WordArray} wordArray The word array. + * + * @return {string} The UTF-8 string. + * + * @static + * + * @example + * + * var utf8String = CryptoJS.enc.Utf8.stringify(wordArray); + */ + stringify: function (wordArray) { + try { + return decodeURIComponent(escape(Latin1.stringify(wordArray))); + } catch (e) { + throw new Error('Malformed UTF-8 data'); + } + }, + + /** + * Converts a UTF-8 string to a word array. + * + * @param {string} utf8Str The UTF-8 string. + * + * @return {WordArray} The word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.enc.Utf8.parse(utf8String); + */ + parse: function (utf8Str) { + return Latin1.parse(unescape(encodeURIComponent(utf8Str))); + } + }; + + /** + * Abstract buffered block algorithm template. + * + * The property blockSize must be implemented in a concrete subtype. + * + * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0 + */ + var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({ + /** + * Resets this block algorithm's data buffer to its initial state. + * + * @example + * + * bufferedBlockAlgorithm.reset(); + */ + reset: function () { + // Initial values + this._data = new WordArray.init(); + this._nDataBytes = 0; + }, + + /** + * Adds new data to this block algorithm's buffer. + * + * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8. + * + * @example + * + * bufferedBlockAlgorithm._append('data'); + * bufferedBlockAlgorithm._append(wordArray); + */ + _append: function (data) { + // Convert string to WordArray, else assume WordArray already + if (typeof data == 'string') { + data = Utf8.parse(data); + } + + // Append + this._data.concat(data); + this._nDataBytes += data.sigBytes; + }, + + /** + * Processes available data blocks. + * + * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype. + * + * @param {boolean} doFlush Whether all blocks and partial blocks should be processed. + * + * @return {WordArray} The processed data. + * + * @example + * + * var processedData = bufferedBlockAlgorithm._process(); + * var processedData = bufferedBlockAlgorithm._process(!!'flush'); + */ + _process: function (doFlush) { + // Shortcuts + var data = this._data; + var dataWords = data.words; + var dataSigBytes = data.sigBytes; + var blockSize = this.blockSize; + var blockSizeBytes = blockSize * 4; + + // Count blocks ready + var nBlocksReady = dataSigBytes / blockSizeBytes; + if (doFlush) { + // Round up to include partial blocks + nBlocksReady = Math.ceil(nBlocksReady); + } else { + // Round down to include only full blocks, + // less the number of blocks that must remain in the buffer + nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0); + } + + // Count words ready + var nWordsReady = nBlocksReady * blockSize; + + // Count bytes ready + var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes); + + // Process blocks + if (nWordsReady) { + for (var offset = 0; offset < nWordsReady; offset += blockSize) { + // Perform concrete-algorithm logic + this._doProcessBlock(dataWords, offset); + } + + // Remove processed words + var processedWords = dataWords.splice(0, nWordsReady); + data.sigBytes -= nBytesReady; + } + + // Return processed words + return new WordArray.init(processedWords, nBytesReady); + }, + + /** + * Creates a copy of this object. + * + * @return {Object} The clone. + * + * @example + * + * var clone = bufferedBlockAlgorithm.clone(); + */ + clone: function () { + var clone = Base.clone.call(this); + clone._data = this._data.clone(); + + return clone; + }, + + _minBufferSize: 0 + }); + + /** + * Abstract hasher template. + * + * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits) + */ + var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({ + /** + * Configuration options. + */ + cfg: Base.extend(), + + /** + * Initializes a newly created hasher. + * + * @param {Object} cfg (Optional) The configuration options to use for this hash computation. + * + * @example + * + * var hasher = CryptoJS.algo.SHA256.create(); + */ + init: function (cfg) { + // Apply config defaults + this.cfg = this.cfg.extend(cfg); + + // Set initial values + this.reset(); + }, + + /** + * Resets this hasher to its initial state. + * + * @example + * + * hasher.reset(); + */ + reset: function () { + // Reset data buffer + BufferedBlockAlgorithm.reset.call(this); + + // Perform concrete-hasher logic + this._doReset(); + }, + + /** + * Updates this hasher with a message. + * + * @param {WordArray|string} messageUpdate The message to append. + * + * @return {Hasher} This hasher. + * + * @example + * + * hasher.update('message'); + * hasher.update(wordArray); + */ + update: function (messageUpdate) { + // Append + this._append(messageUpdate); + + // Update the hash + this._process(); + + // Chainable + return this; + }, + + /** + * Finalizes the hash computation. + * Note that the finalize operation is effectively a destructive, read-once operation. + * + * @param {WordArray|string} messageUpdate (Optional) A final message update. + * + * @return {WordArray} The hash. + * + * @example + * + * var hash = hasher.finalize(); + * var hash = hasher.finalize('message'); + * var hash = hasher.finalize(wordArray); + */ + finalize: function (messageUpdate) { + // Final message update + if (messageUpdate) { + this._append(messageUpdate); + } + + // Perform concrete-hasher logic + var hash = this._doFinalize(); + + return hash; + }, + + blockSize: 512/32, + + /** + * Creates a shortcut function to a hasher's object interface. + * + * @param {Hasher} hasher The hasher to create a helper for. + * + * @return {Function} The shortcut function. + * + * @static + * + * @example + * + * var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256); + */ + _createHelper: function (hasher) { + return function (message, cfg) { + return new hasher.init(cfg).finalize(message); + }; + }, + + /** + * Creates a shortcut function to the HMAC's object interface. + * + * @param {Hasher} hasher The hasher to use in this HMAC helper. + * + * @return {Function} The shortcut function. + * + * @static + * + * @example + * + * var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256); + */ + _createHmacHelper: function (hasher) { + return function (message, key) { + return new C_algo.HMAC.init(hasher, key).finalize(message); + }; + } + }); + + /** + * Algorithm namespace. + */ + var C_algo = C.algo = {}; + + return C; +}(Math)); diff --git a/library/cryptojs/components/enc-base64-min.js b/library/cryptojs/components/enc-base64-min.js new file mode 100644 index 000000000..7ab054d94 --- /dev/null +++ b/library/cryptojs/components/enc-base64-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var h=CryptoJS,j=h.lib.WordArray;h.enc.Base64={stringify:function(b){var e=b.words,f=b.sigBytes,c=this._map;b.clamp();b=[];for(var a=0;a>>2]>>>24-8*(a%4)&255)<<16|(e[a+1>>>2]>>>24-8*((a+1)%4)&255)<<8|e[a+2>>>2]>>>24-8*((a+2)%4)&255,g=0;4>g&&a+0.75*g>>6*(3-g)&63));if(e=c.charAt(64))for(;b.length%4;)b.push(e);return b.join("")},parse:function(b){var e=b.length,f=this._map,c=f.charAt(64);c&&(c=b.indexOf(c),-1!=c&&(e=c));for(var c=[],a=0,d=0;d< +e;d++)if(d%4){var g=f.indexOf(b.charAt(d-1))<<2*(d%4),h=f.indexOf(b.charAt(d))>>>6-2*(d%4);c[a>>>2]|=(g|h)<<24-8*(a%4);a++}return j.create(c,a)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); diff --git a/library/cryptojs/components/enc-base64.js b/library/cryptojs/components/enc-base64.js new file mode 100644 index 000000000..739f4a845 --- /dev/null +++ b/library/cryptojs/components/enc-base64.js @@ -0,0 +1,109 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var C_enc = C.enc; + + /** + * Base64 encoding strategy. + */ + var Base64 = C_enc.Base64 = { + /** + * Converts a word array to a Base64 string. + * + * @param {WordArray} wordArray The word array. + * + * @return {string} The Base64 string. + * + * @static + * + * @example + * + * var base64String = CryptoJS.enc.Base64.stringify(wordArray); + */ + stringify: function (wordArray) { + // Shortcuts + var words = wordArray.words; + var sigBytes = wordArray.sigBytes; + var map = this._map; + + // Clamp excess bits + wordArray.clamp(); + + // Convert + var base64Chars = []; + for (var i = 0; i < sigBytes; i += 3) { + var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; + var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff; + var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff; + + var triplet = (byte1 << 16) | (byte2 << 8) | byte3; + + for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) { + base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f)); + } + } + + // Add padding + var paddingChar = map.charAt(64); + if (paddingChar) { + while (base64Chars.length % 4) { + base64Chars.push(paddingChar); + } + } + + return base64Chars.join(''); + }, + + /** + * Converts a Base64 string to a word array. + * + * @param {string} base64Str The Base64 string. + * + * @return {WordArray} The word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.enc.Base64.parse(base64String); + */ + parse: function (base64Str) { + // Shortcuts + var base64StrLength = base64Str.length; + var map = this._map; + + // Ignore padding + var paddingChar = map.charAt(64); + if (paddingChar) { + var paddingIndex = base64Str.indexOf(paddingChar); + if (paddingIndex != -1) { + base64StrLength = paddingIndex; + } + } + + // Convert + var words = []; + var nBytes = 0; + for (var i = 0; i < base64StrLength; i++) { + if (i % 4) { + var bits1 = map.indexOf(base64Str.charAt(i - 1)) << ((i % 4) * 2); + var bits2 = map.indexOf(base64Str.charAt(i)) >>> (6 - (i % 4) * 2); + words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8); + nBytes++; + } + } + + return WordArray.create(words, nBytes); + }, + + _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=' + }; +}()); diff --git a/library/cryptojs/components/enc-utf16-min.js b/library/cryptojs/components/enc-utf16-min.js new file mode 100644 index 000000000..b84d40110 --- /dev/null +++ b/library/cryptojs/components/enc-utf16-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var e=CryptoJS,f=e.lib.WordArray,e=e.enc;e.Utf16=e.Utf16BE={stringify:function(b){var d=b.words;b=b.sigBytes;for(var c=[],a=0;a>>2]>>>16-8*(a%4)&65535));return c.join("")},parse:function(b){for(var d=b.length,c=[],a=0;a>>1]|=b.charCodeAt(a)<<16-16*(a%2);return f.create(c,2*d)}};e.Utf16LE={stringify:function(b){var d=b.words;b=b.sigBytes;for(var c=[],a=0;a>>2]>>>16-8*(a%4)&65535)<<8&4278255360|(d[a>>> +2]>>>16-8*(a%4)&65535)>>>8&16711935));return c.join("")},parse:function(b){for(var d=b.length,c=[],a=0;a>>1,j=e[g],h=b.charCodeAt(a)<<16-16*(a%2);e[g]=j|h<<8&4278255360|h>>>8&16711935}return f.create(c,2*d)}}})(); diff --git a/library/cryptojs/components/enc-utf16.js b/library/cryptojs/components/enc-utf16.js new file mode 100644 index 000000000..295d24e5e --- /dev/null +++ b/library/cryptojs/components/enc-utf16.js @@ -0,0 +1,135 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var C_enc = C.enc; + + /** + * UTF-16 BE encoding strategy. + */ + var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = { + /** + * Converts a word array to a UTF-16 BE string. + * + * @param {WordArray} wordArray The word array. + * + * @return {string} The UTF-16 BE string. + * + * @static + * + * @example + * + * var utf16String = CryptoJS.enc.Utf16.stringify(wordArray); + */ + stringify: function (wordArray) { + // Shortcuts + var words = wordArray.words; + var sigBytes = wordArray.sigBytes; + + // Convert + var utf16Chars = []; + for (var i = 0; i < sigBytes; i += 2) { + var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff; + utf16Chars.push(String.fromCharCode(codePoint)); + } + + return utf16Chars.join(''); + }, + + /** + * Converts a UTF-16 BE string to a word array. + * + * @param {string} utf16Str The UTF-16 BE string. + * + * @return {WordArray} The word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.enc.Utf16.parse(utf16String); + */ + parse: function (utf16Str) { + // Shortcut + var utf16StrLength = utf16Str.length; + + // Convert + var words = []; + for (var i = 0; i < utf16StrLength; i++) { + words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16); + } + + return WordArray.create(words, utf16StrLength * 2); + } + }; + + /** + * UTF-16 LE encoding strategy. + */ + C_enc.Utf16LE = { + /** + * Converts a word array to a UTF-16 LE string. + * + * @param {WordArray} wordArray The word array. + * + * @return {string} The UTF-16 LE string. + * + * @static + * + * @example + * + * var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray); + */ + stringify: function (wordArray) { + // Shortcuts + var words = wordArray.words; + var sigBytes = wordArray.sigBytes; + + // Convert + var utf16Chars = []; + for (var i = 0; i < sigBytes; i += 2) { + var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff); + utf16Chars.push(String.fromCharCode(codePoint)); + } + + return utf16Chars.join(''); + }, + + /** + * Converts a UTF-16 LE string to a word array. + * + * @param {string} utf16Str The UTF-16 LE string. + * + * @return {WordArray} The word array. + * + * @static + * + * @example + * + * var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str); + */ + parse: function (utf16Str) { + // Shortcut + var utf16StrLength = utf16Str.length; + + // Convert + var words = []; + for (var i = 0; i < utf16StrLength; i++) { + words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16)); + } + + return WordArray.create(words, utf16StrLength * 2); + } + }; + + function swapEndian(word) { + return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff); + } +}()); diff --git a/library/cryptojs/components/evpkdf-min.js b/library/cryptojs/components/evpkdf-min.js new file mode 100644 index 000000000..6c914b6a1 --- /dev/null +++ b/library/cryptojs/components/evpkdf-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var b=CryptoJS,a=b.lib,f=a.Base,k=a.WordArray,a=b.algo,l=a.EvpKDF=f.extend({cfg:f.extend({keySize:4,hasher:a.MD5,iterations:1}),init:function(a){this.cfg=this.cfg.extend(a)},compute:function(a,b){for(var c=this.cfg,d=c.hasher.create(),g=k.create(),f=g.words,h=c.keySize,c=c.iterations;f.lengthe&&(b=a.finalize(b));b.clamp();for(var f=this._oKey=b.clone(),g=this._iKey=b.clone(),h=f.words,j=g.words,d=0;d hasherBlockSizeBytes) { + key = hasher.finalize(key); + } + + // Clamp excess bits + key.clamp(); + + // Clone key for inner and outer pads + var oKey = this._oKey = key.clone(); + var iKey = this._iKey = key.clone(); + + // Shortcuts + var oKeyWords = oKey.words; + var iKeyWords = iKey.words; + + // XOR keys with pad constants + for (var i = 0; i < hasherBlockSize; i++) { + oKeyWords[i] ^= 0x5c5c5c5c; + iKeyWords[i] ^= 0x36363636; + } + oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes; + + // Set initial values + this.reset(); + }, + + /** + * Resets this HMAC to its initial state. + * + * @example + * + * hmacHasher.reset(); + */ + reset: function () { + // Shortcut + var hasher = this._hasher; + + // Reset + hasher.reset(); + hasher.update(this._iKey); + }, + + /** + * Updates this HMAC with a message. + * + * @param {WordArray|string} messageUpdate The message to append. + * + * @return {HMAC} This HMAC instance. + * + * @example + * + * hmacHasher.update('message'); + * hmacHasher.update(wordArray); + */ + update: function (messageUpdate) { + this._hasher.update(messageUpdate); + + // Chainable + return this; + }, + + /** + * Finalizes the HMAC computation. + * Note that the finalize operation is effectively a destructive, read-once operation. + * + * @param {WordArray|string} messageUpdate (Optional) A final message update. + * + * @return {WordArray} The HMAC. + * + * @example + * + * var hmac = hmacHasher.finalize(); + * var hmac = hmacHasher.finalize('message'); + * var hmac = hmacHasher.finalize(wordArray); + */ + finalize: function (messageUpdate) { + // Shortcut + var hasher = this._hasher; + + // Compute HMAC + var innerHash = hasher.finalize(messageUpdate); + hasher.reset(); + var hmac = hasher.finalize(this._oKey.clone().concat(innerHash)); + + return hmac; + } + }); +}()); diff --git a/library/cryptojs/components/lib-typedarrays-min.js b/library/cryptojs/components/lib-typedarrays-min.js new file mode 100644 index 000000000..7eee4b2ec --- /dev/null +++ b/library/cryptojs/components/lib-typedarrays-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){if("function"==typeof ArrayBuffer){var b=CryptoJS.lib.WordArray,e=b.init;(b.init=function(a){a instanceof ArrayBuffer&&(a=new Uint8Array(a));if(a instanceof Int8Array||a instanceof Uint8ClampedArray||a instanceof Int16Array||a instanceof Uint16Array||a instanceof Int32Array||a instanceof Uint32Array||a instanceof Float32Array||a instanceof Float64Array)a=new Uint8Array(a.buffer,a.byteOffset,a.byteLength);if(a instanceof Uint8Array){for(var b=a.byteLength,d=[],c=0;c>>2]|=a[c]<< +24-8*(c%4);e.call(this,d,b)}else e.apply(this,arguments)}).prototype=b}})(); diff --git a/library/cryptojs/components/lib-typedarrays.js b/library/cryptojs/components/lib-typedarrays.js new file mode 100644 index 000000000..a9ae5d4ed --- /dev/null +++ b/library/cryptojs/components/lib-typedarrays.js @@ -0,0 +1,62 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Check if typed arrays are supported + if (typeof ArrayBuffer != 'function') { + return; + } + + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + + // Reference original init + var superInit = WordArray.init; + + // Augment WordArray.init to handle typed arrays + var subInit = WordArray.init = function (typedArray) { + // Convert buffers to uint8 + if (typedArray instanceof ArrayBuffer) { + typedArray = new Uint8Array(typedArray); + } + + // Convert other array views to uint8 + if ( + typedArray instanceof Int8Array || + typedArray instanceof Uint8ClampedArray || + typedArray instanceof Int16Array || + typedArray instanceof Uint16Array || + typedArray instanceof Int32Array || + typedArray instanceof Uint32Array || + typedArray instanceof Float32Array || + typedArray instanceof Float64Array + ) { + typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength); + } + + // Handle Uint8Array + if (typedArray instanceof Uint8Array) { + // Shortcut + var typedArrayByteLength = typedArray.byteLength; + + // Extract bytes + var words = []; + for (var i = 0; i < typedArrayByteLength; i++) { + words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8); + } + + // Initialize this word array + superInit.call(this, words, typedArrayByteLength); + } else { + // Else call normal init + superInit.apply(this, arguments); + } + }; + + subInit.prototype = WordArray; +}()); diff --git a/library/cryptojs/components/md5-min.js b/library/cryptojs/components/md5-min.js new file mode 100644 index 000000000..ac725fce8 --- /dev/null +++ b/library/cryptojs/components/md5-min.js @@ -0,0 +1,12 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(E){function h(a,f,g,j,p,h,k){a=a+(f&g|~f&j)+p+k;return(a<>>32-h)+f}function k(a,f,g,j,p,h,k){a=a+(f&j|g&~j)+p+k;return(a<>>32-h)+f}function l(a,f,g,j,h,k,l){a=a+(f^g^j)+h+l;return(a<>>32-k)+f}function n(a,f,g,j,h,k,l){a=a+(g^(f|~j))+h+l;return(a<>>32-k)+f}for(var r=CryptoJS,q=r.lib,F=q.WordArray,s=q.Hasher,q=r.algo,a=[],t=0;64>t;t++)a[t]=4294967296*E.abs(E.sin(t+1))|0;q=q.MD5=s.extend({_doReset:function(){this._hash=new F.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(m,f){for(var g=0;16>g;g++){var j=f+g,p=m[j];m[j]=(p<<8|p>>>24)&16711935|(p<<24|p>>>8)&4278255360}var g=this._hash.words,j=m[f+0],p=m[f+1],q=m[f+2],r=m[f+3],s=m[f+4],t=m[f+5],u=m[f+6],v=m[f+7],w=m[f+8],x=m[f+9],y=m[f+10],z=m[f+11],A=m[f+12],B=m[f+13],C=m[f+14],D=m[f+15],b=g[0],c=g[1],d=g[2],e=g[3],b=h(b,c,d,e,j,7,a[0]),e=h(e,b,c,d,p,12,a[1]),d=h(d,e,b,c,q,17,a[2]),c=h(c,d,e,b,r,22,a[3]),b=h(b,c,d,e,s,7,a[4]),e=h(e,b,c,d,t,12,a[5]),d=h(d,e,b,c,u,17,a[6]),c=h(c,d,e,b,v,22,a[7]), +b=h(b,c,d,e,w,7,a[8]),e=h(e,b,c,d,x,12,a[9]),d=h(d,e,b,c,y,17,a[10]),c=h(c,d,e,b,z,22,a[11]),b=h(b,c,d,e,A,7,a[12]),e=h(e,b,c,d,B,12,a[13]),d=h(d,e,b,c,C,17,a[14]),c=h(c,d,e,b,D,22,a[15]),b=k(b,c,d,e,p,5,a[16]),e=k(e,b,c,d,u,9,a[17]),d=k(d,e,b,c,z,14,a[18]),c=k(c,d,e,b,j,20,a[19]),b=k(b,c,d,e,t,5,a[20]),e=k(e,b,c,d,y,9,a[21]),d=k(d,e,b,c,D,14,a[22]),c=k(c,d,e,b,s,20,a[23]),b=k(b,c,d,e,x,5,a[24]),e=k(e,b,c,d,C,9,a[25]),d=k(d,e,b,c,r,14,a[26]),c=k(c,d,e,b,w,20,a[27]),b=k(b,c,d,e,B,5,a[28]),e=k(e,b, +c,d,q,9,a[29]),d=k(d,e,b,c,v,14,a[30]),c=k(c,d,e,b,A,20,a[31]),b=l(b,c,d,e,t,4,a[32]),e=l(e,b,c,d,w,11,a[33]),d=l(d,e,b,c,z,16,a[34]),c=l(c,d,e,b,C,23,a[35]),b=l(b,c,d,e,p,4,a[36]),e=l(e,b,c,d,s,11,a[37]),d=l(d,e,b,c,v,16,a[38]),c=l(c,d,e,b,y,23,a[39]),b=l(b,c,d,e,B,4,a[40]),e=l(e,b,c,d,j,11,a[41]),d=l(d,e,b,c,r,16,a[42]),c=l(c,d,e,b,u,23,a[43]),b=l(b,c,d,e,x,4,a[44]),e=l(e,b,c,d,A,11,a[45]),d=l(d,e,b,c,D,16,a[46]),c=l(c,d,e,b,q,23,a[47]),b=n(b,c,d,e,j,6,a[48]),e=n(e,b,c,d,v,10,a[49]),d=n(d,e,b,c, +C,15,a[50]),c=n(c,d,e,b,t,21,a[51]),b=n(b,c,d,e,A,6,a[52]),e=n(e,b,c,d,r,10,a[53]),d=n(d,e,b,c,y,15,a[54]),c=n(c,d,e,b,p,21,a[55]),b=n(b,c,d,e,w,6,a[56]),e=n(e,b,c,d,D,10,a[57]),d=n(d,e,b,c,u,15,a[58]),c=n(c,d,e,b,B,21,a[59]),b=n(b,c,d,e,s,6,a[60]),e=n(e,b,c,d,z,10,a[61]),d=n(d,e,b,c,q,15,a[62]),c=n(c,d,e,b,x,21,a[63]);g[0]=g[0]+b|0;g[1]=g[1]+c|0;g[2]=g[2]+d|0;g[3]=g[3]+e|0},_doFinalize:function(){var a=this._data,f=a.words,g=8*this._nDataBytes,j=8*a.sigBytes;f[j>>>5]|=128<<24-j%32;var h=E.floor(g/ +4294967296);f[(j+64>>>9<<4)+15]=(h<<8|h>>>24)&16711935|(h<<24|h>>>8)&4278255360;f[(j+64>>>9<<4)+14]=(g<<8|g>>>24)&16711935|(g<<24|g>>>8)&4278255360;a.sigBytes=4*(f.length+1);this._process();a=this._hash;f=a.words;for(g=0;4>g;g++)j=f[g],f[g]=(j<<8|j>>>24)&16711935|(j<<24|j>>>8)&4278255360;return a},clone:function(){var a=s.clone.call(this);a._hash=this._hash.clone();return a}});r.MD5=s._createHelper(q);r.HmacMD5=s._createHmacHelper(q)})(Math); diff --git a/library/cryptojs/components/md5.js b/library/cryptojs/components/md5.js new file mode 100644 index 000000000..f4c46b968 --- /dev/null +++ b/library/cryptojs/components/md5.js @@ -0,0 +1,254 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function (Math) { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var Hasher = C_lib.Hasher; + var C_algo = C.algo; + + // Constants table + var T = []; + + // Compute constants + (function () { + for (var i = 0; i < 64; i++) { + T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0; + } + }()); + + /** + * MD5 hash algorithm. + */ + var MD5 = C_algo.MD5 = Hasher.extend({ + _doReset: function () { + this._hash = new WordArray.init([ + 0x67452301, 0xefcdab89, + 0x98badcfe, 0x10325476 + ]); + }, + + _doProcessBlock: function (M, offset) { + // Swap endian + for (var i = 0; i < 16; i++) { + // Shortcuts + var offset_i = offset + i; + var M_offset_i = M[offset_i]; + + M[offset_i] = ( + (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) | + (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00) + ); + } + + // Shortcuts + var H = this._hash.words; + + var M_offset_0 = M[offset + 0]; + var M_offset_1 = M[offset + 1]; + var M_offset_2 = M[offset + 2]; + var M_offset_3 = M[offset + 3]; + var M_offset_4 = M[offset + 4]; + var M_offset_5 = M[offset + 5]; + var M_offset_6 = M[offset + 6]; + var M_offset_7 = M[offset + 7]; + var M_offset_8 = M[offset + 8]; + var M_offset_9 = M[offset + 9]; + var M_offset_10 = M[offset + 10]; + var M_offset_11 = M[offset + 11]; + var M_offset_12 = M[offset + 12]; + var M_offset_13 = M[offset + 13]; + var M_offset_14 = M[offset + 14]; + var M_offset_15 = M[offset + 15]; + + // Working varialbes + var a = H[0]; + var b = H[1]; + var c = H[2]; + var d = H[3]; + + // Computation + a = FF(a, b, c, d, M_offset_0, 7, T[0]); + d = FF(d, a, b, c, M_offset_1, 12, T[1]); + c = FF(c, d, a, b, M_offset_2, 17, T[2]); + b = FF(b, c, d, a, M_offset_3, 22, T[3]); + a = FF(a, b, c, d, M_offset_4, 7, T[4]); + d = FF(d, a, b, c, M_offset_5, 12, T[5]); + c = FF(c, d, a, b, M_offset_6, 17, T[6]); + b = FF(b, c, d, a, M_offset_7, 22, T[7]); + a = FF(a, b, c, d, M_offset_8, 7, T[8]); + d = FF(d, a, b, c, M_offset_9, 12, T[9]); + c = FF(c, d, a, b, M_offset_10, 17, T[10]); + b = FF(b, c, d, a, M_offset_11, 22, T[11]); + a = FF(a, b, c, d, M_offset_12, 7, T[12]); + d = FF(d, a, b, c, M_offset_13, 12, T[13]); + c = FF(c, d, a, b, M_offset_14, 17, T[14]); + b = FF(b, c, d, a, M_offset_15, 22, T[15]); + + a = GG(a, b, c, d, M_offset_1, 5, T[16]); + d = GG(d, a, b, c, M_offset_6, 9, T[17]); + c = GG(c, d, a, b, M_offset_11, 14, T[18]); + b = GG(b, c, d, a, M_offset_0, 20, T[19]); + a = GG(a, b, c, d, M_offset_5, 5, T[20]); + d = GG(d, a, b, c, M_offset_10, 9, T[21]); + c = GG(c, d, a, b, M_offset_15, 14, T[22]); + b = GG(b, c, d, a, M_offset_4, 20, T[23]); + a = GG(a, b, c, d, M_offset_9, 5, T[24]); + d = GG(d, a, b, c, M_offset_14, 9, T[25]); + c = GG(c, d, a, b, M_offset_3, 14, T[26]); + b = GG(b, c, d, a, M_offset_8, 20, T[27]); + a = GG(a, b, c, d, M_offset_13, 5, T[28]); + d = GG(d, a, b, c, M_offset_2, 9, T[29]); + c = GG(c, d, a, b, M_offset_7, 14, T[30]); + b = GG(b, c, d, a, M_offset_12, 20, T[31]); + + a = HH(a, b, c, d, M_offset_5, 4, T[32]); + d = HH(d, a, b, c, M_offset_8, 11, T[33]); + c = HH(c, d, a, b, M_offset_11, 16, T[34]); + b = HH(b, c, d, a, M_offset_14, 23, T[35]); + a = HH(a, b, c, d, M_offset_1, 4, T[36]); + d = HH(d, a, b, c, M_offset_4, 11, T[37]); + c = HH(c, d, a, b, M_offset_7, 16, T[38]); + b = HH(b, c, d, a, M_offset_10, 23, T[39]); + a = HH(a, b, c, d, M_offset_13, 4, T[40]); + d = HH(d, a, b, c, M_offset_0, 11, T[41]); + c = HH(c, d, a, b, M_offset_3, 16, T[42]); + b = HH(b, c, d, a, M_offset_6, 23, T[43]); + a = HH(a, b, c, d, M_offset_9, 4, T[44]); + d = HH(d, a, b, c, M_offset_12, 11, T[45]); + c = HH(c, d, a, b, M_offset_15, 16, T[46]); + b = HH(b, c, d, a, M_offset_2, 23, T[47]); + + a = II(a, b, c, d, M_offset_0, 6, T[48]); + d = II(d, a, b, c, M_offset_7, 10, T[49]); + c = II(c, d, a, b, M_offset_14, 15, T[50]); + b = II(b, c, d, a, M_offset_5, 21, T[51]); + a = II(a, b, c, d, M_offset_12, 6, T[52]); + d = II(d, a, b, c, M_offset_3, 10, T[53]); + c = II(c, d, a, b, M_offset_10, 15, T[54]); + b = II(b, c, d, a, M_offset_1, 21, T[55]); + a = II(a, b, c, d, M_offset_8, 6, T[56]); + d = II(d, a, b, c, M_offset_15, 10, T[57]); + c = II(c, d, a, b, M_offset_6, 15, T[58]); + b = II(b, c, d, a, M_offset_13, 21, T[59]); + a = II(a, b, c, d, M_offset_4, 6, T[60]); + d = II(d, a, b, c, M_offset_11, 10, T[61]); + c = II(c, d, a, b, M_offset_2, 15, T[62]); + b = II(b, c, d, a, M_offset_9, 21, T[63]); + + // Intermediate hash value + H[0] = (H[0] + a) | 0; + H[1] = (H[1] + b) | 0; + H[2] = (H[2] + c) | 0; + H[3] = (H[3] + d) | 0; + }, + + _doFinalize: function () { + // Shortcuts + var data = this._data; + var dataWords = data.words; + + var nBitsTotal = this._nDataBytes * 8; + var nBitsLeft = data.sigBytes * 8; + + // Add padding + dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32); + + var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000); + var nBitsTotalL = nBitsTotal; + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = ( + (((nBitsTotalH << 8) | (nBitsTotalH >>> 24)) & 0x00ff00ff) | + (((nBitsTotalH << 24) | (nBitsTotalH >>> 8)) & 0xff00ff00) + ); + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = ( + (((nBitsTotalL << 8) | (nBitsTotalL >>> 24)) & 0x00ff00ff) | + (((nBitsTotalL << 24) | (nBitsTotalL >>> 8)) & 0xff00ff00) + ); + + data.sigBytes = (dataWords.length + 1) * 4; + + // Hash final blocks + this._process(); + + // Shortcuts + var hash = this._hash; + var H = hash.words; + + // Swap endian + for (var i = 0; i < 4; i++) { + // Shortcut + var H_i = H[i]; + + H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) | + (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00); + } + + // Return final computed hash + return hash; + }, + + clone: function () { + var clone = Hasher.clone.call(this); + clone._hash = this._hash.clone(); + + return clone; + } + }); + + function FF(a, b, c, d, x, s, t) { + var n = a + ((b & c) | (~b & d)) + x + t; + return ((n << s) | (n >>> (32 - s))) + b; + } + + function GG(a, b, c, d, x, s, t) { + var n = a + ((b & d) | (c & ~d)) + x + t; + return ((n << s) | (n >>> (32 - s))) + b; + } + + function HH(a, b, c, d, x, s, t) { + var n = a + (b ^ c ^ d) + x + t; + return ((n << s) | (n >>> (32 - s))) + b; + } + + function II(a, b, c, d, x, s, t) { + var n = a + (c ^ (b | ~d)) + x + t; + return ((n << s) | (n >>> (32 - s))) + b; + } + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.MD5('message'); + * var hash = CryptoJS.MD5(wordArray); + */ + C.MD5 = Hasher._createHelper(MD5); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacMD5(message, key); + */ + C.HmacMD5 = Hasher._createHmacHelper(MD5); +}(Math)); diff --git a/library/cryptojs/components/mode-cfb-min.js b/library/cryptojs/components/mode-cfb-min.js new file mode 100644 index 000000000..da0da2143 --- /dev/null +++ b/library/cryptojs/components/mode-cfb-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.mode.CFB=function(){function g(c,b,e,a){var d=this._iv;d?(d=d.slice(0),this._iv=void 0):d=this._prevBlock;a.encryptBlock(d,0);for(a=0;a>24&255)){var c=a>>16&255,b=a>>8&255,e=a&255;255===c?(c=0,255===b?(b=0,255===e?e=0:++e):++b):++c;a=0+(c<<16)+(b<<8);a+=e}else a+=16777216;return a}var g=CryptoJS.lib.BlockCipherMode.extend(),j=g.Encryptor=g.extend({processBlock:function(a,c){var b=this._cipher,e=b.blockSize,d=this._iv,f=this._counter;d&&(f=this._counter=d.slice(0),this._iv=void 0);d=f;if(0===(d[0]=h(d[0])))d[1]=h(d[1]);f=f.slice(0);b.encryptBlock(f,0);for(b=0;b> 24) & 0xff) === 0xff) { //overflow + var b1 = (word >> 16)&0xff; + var b2 = (word >> 8)&0xff; + var b3 = word & 0xff; + + if (b1 === 0xff) // overflow b1 + { + b1 = 0; + if (b2 === 0xff) + { + b2 = 0; + if (b3 === 0xff) + { + b3 = 0; + } + else + { + ++b3; + } + } + else + { + ++b2; + } + } + else + { + ++b1; + } + + word = 0; + word += (b1 << 16); + word += (b2 << 8); + word += b3; + } + else + { + word += (0x01 << 24); + } + return word; + } + + function incCounter(counter) + { + if ((counter[0] = incWord(counter[0])) === 0) + { + // encr_data in fileenc.c from Dr Brian Gladman's counts only with DWORD j < 8 + counter[1] = incWord(counter[1]); + } + return counter; + } + + var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({ + processBlock: function (words, offset) { + // Shortcuts + var cipher = this._cipher + var blockSize = cipher.blockSize; + var iv = this._iv; + var counter = this._counter; + + // Generate keystream + if (iv) { + counter = this._counter = iv.slice(0); + + // Remove IV for subsequent blocks + this._iv = undefined; + } + + incCounter(counter); + + var keystream = counter.slice(0); + cipher.encryptBlock(keystream, 0); + + // Encrypt + for (var i = 0; i < blockSize; i++) { + words[offset + i] ^= keystream[i]; + } + } + }); + + CTRGladman.Decryptor = Encryptor; + + return CTRGladman; +}()); + + diff --git a/library/cryptojs/components/mode-ctr-min.js b/library/cryptojs/components/mode-ctr-min.js new file mode 100644 index 000000000..dfa8b1f9a --- /dev/null +++ b/library/cryptojs/components/mode-ctr-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.mode.CTR=function(){var b=CryptoJS.lib.BlockCipherMode.extend(),g=b.Encryptor=b.extend({processBlock:function(b,f){var a=this._cipher,e=a.blockSize,c=this._iv,d=this._counter;c&&(d=this._counter=c.slice(0),this._iv=void 0);c=d.slice(0);a.encryptBlock(c,0);d[e-1]=d[e-1]+1|0;for(a=0;a>>2]|=c<<24-8*(b%4);a.sigBytes+=c},unpad:function(a){a.sigBytes-=a.words[a.sigBytes-1>>>2]&255}}; diff --git a/library/cryptojs/components/pad-ansix923.js b/library/cryptojs/components/pad-ansix923.js new file mode 100644 index 000000000..4da25d68e --- /dev/null +++ b/library/cryptojs/components/pad-ansix923.js @@ -0,0 +1,35 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** + * ANSI X.923 padding strategy. + */ +CryptoJS.pad.AnsiX923 = { + pad: function (data, blockSize) { + // Shortcuts + var dataSigBytes = data.sigBytes; + var blockSizeBytes = blockSize * 4; + + // Count padding bytes + var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes; + + // Compute last byte position + var lastBytePos = dataSigBytes + nPaddingBytes - 1; + + // Pad + data.clamp(); + data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8); + data.sigBytes += nPaddingBytes; + }, + + unpad: function (data) { + // Get number of padding bytes from last byte + var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff; + + // Remove padding + data.sigBytes -= nPaddingBytes; + } +}; diff --git a/library/cryptojs/components/pad-iso10126-min.js b/library/cryptojs/components/pad-iso10126-min.js new file mode 100644 index 000000000..adef4b34d --- /dev/null +++ b/library/cryptojs/components/pad-iso10126-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.pad.Iso10126={pad:function(a,c){var b=4*c,b=b-a.sigBytes%b;a.concat(CryptoJS.lib.WordArray.random(b-1)).concat(CryptoJS.lib.WordArray.create([b<<24],1))},unpad:function(a){a.sigBytes-=a.words[a.sigBytes-1>>>2]&255}}; diff --git a/library/cryptojs/components/pad-iso10126.js b/library/cryptojs/components/pad-iso10126.js new file mode 100644 index 000000000..ce7e1bbcb --- /dev/null +++ b/library/cryptojs/components/pad-iso10126.js @@ -0,0 +1,30 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** + * ISO 10126 padding strategy. + */ +CryptoJS.pad.Iso10126 = { + pad: function (data, blockSize) { + // Shortcut + var blockSizeBytes = blockSize * 4; + + // Count padding bytes + var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes; + + // Pad + data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)). + concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1)); + }, + + unpad: function (data) { + // Get number of padding bytes from last byte + var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff; + + // Remove padding + data.sigBytes -= nPaddingBytes; + } +}; diff --git a/library/cryptojs/components/pad-iso97971-min.js b/library/cryptojs/components/pad-iso97971-min.js new file mode 100644 index 000000000..1edf02dc1 --- /dev/null +++ b/library/cryptojs/components/pad-iso97971-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.pad.Iso97971={pad:function(a,b){a.concat(CryptoJS.lib.WordArray.create([2147483648],1));CryptoJS.pad.ZeroPadding.pad(a,b)},unpad:function(a){CryptoJS.pad.ZeroPadding.unpad(a);a.sigBytes--}}; diff --git a/library/cryptojs/components/pad-iso97971.js b/library/cryptojs/components/pad-iso97971.js new file mode 100644 index 000000000..a60e23192 --- /dev/null +++ b/library/cryptojs/components/pad-iso97971.js @@ -0,0 +1,26 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** + * ISO/IEC 9797-1 Padding Method 2. + */ +CryptoJS.pad.Iso97971 = { + pad: function (data, blockSize) { + // Add 0x80 byte + data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1)); + + // Zero pad the rest + CryptoJS.pad.ZeroPadding.pad(data, blockSize); + }, + + unpad: function (data) { + // Remove zero padding + CryptoJS.pad.ZeroPadding.unpad(data); + + // Remove one more byte -- the 0x80 byte + data.sigBytes--; + } +}; diff --git a/library/cryptojs/components/pad-nopadding-min.js b/library/cryptojs/components/pad-nopadding-min.js new file mode 100644 index 000000000..6f5eb595c --- /dev/null +++ b/library/cryptojs/components/pad-nopadding-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.pad.NoPadding={pad:function(){},unpad:function(){}}; diff --git a/library/cryptojs/components/pad-nopadding.js b/library/cryptojs/components/pad-nopadding.js new file mode 100644 index 000000000..3bd587420 --- /dev/null +++ b/library/cryptojs/components/pad-nopadding.js @@ -0,0 +1,16 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** + * A noop padding strategy. + */ +CryptoJS.pad.NoPadding = { + pad: function () { + }, + + unpad: function () { + } +}; diff --git a/library/cryptojs/components/pad-zeropadding-min.js b/library/cryptojs/components/pad-zeropadding-min.js new file mode 100644 index 000000000..18f43efca --- /dev/null +++ b/library/cryptojs/components/pad-zeropadding-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +CryptoJS.pad.ZeroPadding={pad:function(a,c){var b=4*c;a.clamp();a.sigBytes+=b-(a.sigBytes%b||b)},unpad:function(a){for(var c=a.words,b=a.sigBytes-1;!(c[b>>>2]>>>24-8*(b%4)&255);)b--;a.sigBytes=b+1}}; diff --git a/library/cryptojs/components/pad-zeropadding.js b/library/cryptojs/components/pad-zeropadding.js new file mode 100644 index 000000000..e4b5acb99 --- /dev/null +++ b/library/cryptojs/components/pad-zeropadding.js @@ -0,0 +1,31 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** + * Zero padding strategy. + */ +CryptoJS.pad.ZeroPadding = { + pad: function (data, blockSize) { + // Shortcut + var blockSizeBytes = blockSize * 4; + + // Pad + data.clamp(); + data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes); + }, + + unpad: function (data) { + // Shortcut + var dataWords = data.words; + + // Unpad + var i = data.sigBytes - 1; + while (!((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) { + i--; + } + data.sigBytes = i + 1; + } +}; diff --git a/library/cryptojs/components/pbkdf2-min.js b/library/cryptojs/components/pbkdf2-min.js new file mode 100644 index 000000000..2f0941c5d --- /dev/null +++ b/library/cryptojs/components/pbkdf2-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var b=CryptoJS,a=b.lib,d=a.Base,m=a.WordArray,a=b.algo,q=a.HMAC,l=a.PBKDF2=d.extend({cfg:d.extend({keySize:4,hasher:a.SHA1,iterations:1}),init:function(a){this.cfg=this.cfg.extend(a)},compute:function(a,b){for(var c=this.cfg,f=q.create(c.hasher,a),g=m.create(),d=m.create([1]),l=g.words,r=d.words,n=c.keySize,c=c.iterations;l.lengthc;c++)f[c]=d[c];d[0]=d[0]+1295307597+this._b|0;d[1]=d[1]+3545052371+(d[0]>>>0>>0?1:0)|0;d[2]=d[2]+886263092+(d[1]>>>0>>0?1:0)|0;d[3]=d[3]+1295307597+(d[2]>>>0>>0?1:0)|0;d[4]=d[4]+3545052371+(d[3]>>>0>>0?1:0)|0;d[5]=d[5]+886263092+(d[4]>>>0>>0?1:0)|0;d[6]=d[6]+1295307597+(d[5]>>>0>>0?1:0)|0;d[7]=d[7]+3545052371+(d[6]>>>0>>0?1:0)|0;this._b=d[7]>>>0>>0?1:0;for(c=0;8>c;c++){var h=a[c]+d[c],e=h&65535, +g=h>>>16;b[c]=((e*e>>>17)+e*g>>>15)+g*g^((h&4294901760)*h|0)+((h&65535)*h|0)}a[0]=b[0]+(b[7]<<16|b[7]>>>16)+(b[6]<<16|b[6]>>>16)|0;a[1]=b[1]+(b[0]<<8|b[0]>>>24)+b[7]|0;a[2]=b[2]+(b[1]<<16|b[1]>>>16)+(b[0]<<16|b[0]>>>16)|0;a[3]=b[3]+(b[2]<<8|b[2]>>>24)+b[1]|0;a[4]=b[4]+(b[3]<<16|b[3]>>>16)+(b[2]<<16|b[2]>>>16)|0;a[5]=b[5]+(b[4]<<8|b[4]>>>24)+b[3]|0;a[6]=b[6]+(b[5]<<16|b[5]>>>16)+(b[4]<<16|b[4]>>>16)|0;a[7]=b[7]+(b[6]<<8|b[6]>>>24)+b[5]|0}var j=CryptoJS,k=j.lib.StreamCipher,e=[],f=[],b=[],l=j.algo.RabbitLegacy= +k.extend({_doReset:function(){for(var a=this._key.words,d=this.cfg.iv,c=this._X=[a[0],a[3]<<16|a[2]>>>16,a[1],a[0]<<16|a[3]>>>16,a[2],a[1]<<16|a[0]>>>16,a[3],a[2]<<16|a[1]>>>16],a=this._C=[a[2]<<16|a[2]>>>16,a[0]&4294901760|a[1]&65535,a[3]<<16|a[3]>>>16,a[1]&4294901760|a[2]&65535,a[0]<<16|a[0]>>>16,a[2]&4294901760|a[3]&65535,a[1]<<16|a[1]>>>16,a[3]&4294901760|a[0]&65535],b=this._b=0;4>b;b++)g.call(this);for(b=0;8>b;b++)a[b]^=c[b+4&7];if(d){var c=d.words,d=c[0],c=c[1],d=(d<<8|d>>>24)&16711935|(d<< +24|d>>>8)&4278255360,c=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360,b=d>>>16|c&4294901760,e=c<<16|d&65535;a[0]^=d;a[1]^=b;a[2]^=c;a[3]^=e;a[4]^=d;a[5]^=b;a[6]^=c;a[7]^=e;for(b=0;4>b;b++)g.call(this)}},_doProcessBlock:function(a,b){var c=this._X;g.call(this);e[0]=c[0]^c[5]>>>16^c[3]<<16;e[1]=c[2]^c[7]>>>16^c[5]<<16;e[2]=c[4]^c[1]>>>16^c[7]<<16;e[3]=c[6]^c[3]>>>16^c[1]<<16;for(c=0;4>c;c++)e[c]=(e[c]<<8|e[c]>>>24)&16711935|(e[c]<<24|e[c]>>>8)&4278255360,a[b+c]^=e[c]},blockSize:4,ivSize:2});j.RabbitLegacy= +k._createHelper(l)})(); diff --git a/library/cryptojs/components/rabbit-legacy.js b/library/cryptojs/components/rabbit-legacy.js new file mode 100644 index 000000000..1766fefac --- /dev/null +++ b/library/cryptojs/components/rabbit-legacy.js @@ -0,0 +1,176 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var StreamCipher = C_lib.StreamCipher; + var C_algo = C.algo; + + // Reusable objects + var S = []; + var C_ = []; + var G = []; + + /** + * Rabbit stream cipher algorithm. + * + * This is a legacy version that neglected to convert the key to little-endian. + * This error doesn't affect the cipher's security, + * but it does affect its compatibility with other implementations. + */ + var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({ + _doReset: function () { + // Shortcuts + var K = this._key.words; + var iv = this.cfg.iv; + + // Generate initial state values + var X = this._X = [ + K[0], (K[3] << 16) | (K[2] >>> 16), + K[1], (K[0] << 16) | (K[3] >>> 16), + K[2], (K[1] << 16) | (K[0] >>> 16), + K[3], (K[2] << 16) | (K[1] >>> 16) + ]; + + // Generate initial counter values + var C = this._C = [ + (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff), + (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff), + (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff), + (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff) + ]; + + // Carry bit + this._b = 0; + + // Iterate the system four times + for (var i = 0; i < 4; i++) { + nextState.call(this); + } + + // Modify the counters + for (var i = 0; i < 8; i++) { + C[i] ^= X[(i + 4) & 7]; + } + + // IV setup + if (iv) { + // Shortcuts + var IV = iv.words; + var IV_0 = IV[0]; + var IV_1 = IV[1]; + + // Generate four subvectors + var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00); + var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00); + var i1 = (i0 >>> 16) | (i2 & 0xffff0000); + var i3 = (i2 << 16) | (i0 & 0x0000ffff); + + // Modify counter values + C[0] ^= i0; + C[1] ^= i1; + C[2] ^= i2; + C[3] ^= i3; + C[4] ^= i0; + C[5] ^= i1; + C[6] ^= i2; + C[7] ^= i3; + + // Iterate the system four times + for (var i = 0; i < 4; i++) { + nextState.call(this); + } + } + }, + + _doProcessBlock: function (M, offset) { + // Shortcut + var X = this._X; + + // Iterate the system + nextState.call(this); + + // Generate four keystream words + S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16); + S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16); + S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16); + S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16); + + for (var i = 0; i < 4; i++) { + // Swap endian + S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) | + (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00); + + // Encrypt + M[offset + i] ^= S[i]; + } + }, + + blockSize: 128/32, + + ivSize: 64/32 + }); + + function nextState() { + // Shortcuts + var X = this._X; + var C = this._C; + + // Save old counter values + for (var i = 0; i < 8; i++) { + C_[i] = C[i]; + } + + // Calculate new counter values + C[0] = (C[0] + 0x4d34d34d + this._b) | 0; + C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0; + C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0; + C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0; + C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0; + C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0; + C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0; + C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0; + this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0; + + // Calculate the g-values + for (var i = 0; i < 8; i++) { + var gx = X[i] + C[i]; + + // Construct high and low argument for squaring + var ga = gx & 0xffff; + var gb = gx >>> 16; + + // Calculate high and low result of squaring + var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb; + var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0); + + // High XOR low + G[i] = gh ^ gl; + } + + // Calculate new state values + X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0; + X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0; + X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0; + X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0; + X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0; + X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0; + X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0; + X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0; + } + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg); + * var plaintext = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg); + */ + C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy); +}()); diff --git a/library/cryptojs/components/rabbit-min.js b/library/cryptojs/components/rabbit-min.js new file mode 100644 index 000000000..128943174 --- /dev/null +++ b/library/cryptojs/components/rabbit-min.js @@ -0,0 +1,11 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){function g(){for(var b=this._X,d=this._C,a=0;8>a;a++)f[a]=d[a];d[0]=d[0]+1295307597+this._b|0;d[1]=d[1]+3545052371+(d[0]>>>0>>0?1:0)|0;d[2]=d[2]+886263092+(d[1]>>>0>>0?1:0)|0;d[3]=d[3]+1295307597+(d[2]>>>0>>0?1:0)|0;d[4]=d[4]+3545052371+(d[3]>>>0>>0?1:0)|0;d[5]=d[5]+886263092+(d[4]>>>0>>0?1:0)|0;d[6]=d[6]+1295307597+(d[5]>>>0>>0?1:0)|0;d[7]=d[7]+3545052371+(d[6]>>>0>>0?1:0)|0;this._b=d[7]>>>0>>0?1:0;for(a=0;8>a;a++){var h=b[a]+d[a],e=h&65535, +g=h>>>16;c[a]=((e*e>>>17)+e*g>>>15)+g*g^((h&4294901760)*h|0)+((h&65535)*h|0)}b[0]=c[0]+(c[7]<<16|c[7]>>>16)+(c[6]<<16|c[6]>>>16)|0;b[1]=c[1]+(c[0]<<8|c[0]>>>24)+c[7]|0;b[2]=c[2]+(c[1]<<16|c[1]>>>16)+(c[0]<<16|c[0]>>>16)|0;b[3]=c[3]+(c[2]<<8|c[2]>>>24)+c[1]|0;b[4]=c[4]+(c[3]<<16|c[3]>>>16)+(c[2]<<16|c[2]>>>16)|0;b[5]=c[5]+(c[4]<<8|c[4]>>>24)+c[3]|0;b[6]=c[6]+(c[5]<<16|c[5]>>>16)+(c[4]<<16|c[4]>>>16)|0;b[7]=c[7]+(c[6]<<8|c[6]>>>24)+c[5]|0}var j=CryptoJS,k=j.lib.StreamCipher,e=[],f=[],c=[],l=j.algo.Rabbit= +k.extend({_doReset:function(){for(var b=this._key.words,d=this.cfg.iv,a=0;4>a;a++)b[a]=(b[a]<<8|b[a]>>>24)&16711935|(b[a]<<24|b[a]>>>8)&4278255360;for(var c=this._X=[b[0],b[3]<<16|b[2]>>>16,b[1],b[0]<<16|b[3]>>>16,b[2],b[1]<<16|b[0]>>>16,b[3],b[2]<<16|b[1]>>>16],b=this._C=[b[2]<<16|b[2]>>>16,b[0]&4294901760|b[1]&65535,b[3]<<16|b[3]>>>16,b[1]&4294901760|b[2]&65535,b[0]<<16|b[0]>>>16,b[2]&4294901760|b[3]&65535,b[1]<<16|b[1]>>>16,b[3]&4294901760|b[0]&65535],a=this._b=0;4>a;a++)g.call(this);for(a=0;8> +a;a++)b[a]^=c[a+4&7];if(d){var a=d.words,d=a[0],a=a[1],d=(d<<8|d>>>24)&16711935|(d<<24|d>>>8)&4278255360,a=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360,c=d>>>16|a&4294901760,e=a<<16|d&65535;b[0]^=d;b[1]^=c;b[2]^=a;b[3]^=e;b[4]^=d;b[5]^=c;b[6]^=a;b[7]^=e;for(a=0;4>a;a++)g.call(this)}},_doProcessBlock:function(b,c){var a=this._X;g.call(this);e[0]=a[0]^a[5]>>>16^a[3]<<16;e[1]=a[2]^a[7]>>>16^a[5]<<16;e[2]=a[4]^a[1]>>>16^a[7]<<16;e[3]=a[6]^a[3]>>>16^a[1]<<16;for(a=0;4>a;a++)e[a]=(e[a]<<8|e[a]>>>24)& +16711935|(e[a]<<24|e[a]>>>8)&4278255360,b[c+a]^=e[a]},blockSize:4,ivSize:2});j.Rabbit=k._createHelper(l)})(); diff --git a/library/cryptojs/components/rabbit.js b/library/cryptojs/components/rabbit.js new file mode 100644 index 000000000..af8cec88e --- /dev/null +++ b/library/cryptojs/components/rabbit.js @@ -0,0 +1,178 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var StreamCipher = C_lib.StreamCipher; + var C_algo = C.algo; + + // Reusable objects + var S = []; + var C_ = []; + var G = []; + + /** + * Rabbit stream cipher algorithm + */ + var Rabbit = C_algo.Rabbit = StreamCipher.extend({ + _doReset: function () { + // Shortcuts + var K = this._key.words; + var iv = this.cfg.iv; + + // Swap endian + for (var i = 0; i < 4; i++) { + K[i] = (((K[i] << 8) | (K[i] >>> 24)) & 0x00ff00ff) | + (((K[i] << 24) | (K[i] >>> 8)) & 0xff00ff00); + } + + // Generate initial state values + var X = this._X = [ + K[0], (K[3] << 16) | (K[2] >>> 16), + K[1], (K[0] << 16) | (K[3] >>> 16), + K[2], (K[1] << 16) | (K[0] >>> 16), + K[3], (K[2] << 16) | (K[1] >>> 16) + ]; + + // Generate initial counter values + var C = this._C = [ + (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff), + (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff), + (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff), + (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff) + ]; + + // Carry bit + this._b = 0; + + // Iterate the system four times + for (var i = 0; i < 4; i++) { + nextState.call(this); + } + + // Modify the counters + for (var i = 0; i < 8; i++) { + C[i] ^= X[(i + 4) & 7]; + } + + // IV setup + if (iv) { + // Shortcuts + var IV = iv.words; + var IV_0 = IV[0]; + var IV_1 = IV[1]; + + // Generate four subvectors + var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00); + var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00); + var i1 = (i0 >>> 16) | (i2 & 0xffff0000); + var i3 = (i2 << 16) | (i0 & 0x0000ffff); + + // Modify counter values + C[0] ^= i0; + C[1] ^= i1; + C[2] ^= i2; + C[3] ^= i3; + C[4] ^= i0; + C[5] ^= i1; + C[6] ^= i2; + C[7] ^= i3; + + // Iterate the system four times + for (var i = 0; i < 4; i++) { + nextState.call(this); + } + } + }, + + _doProcessBlock: function (M, offset) { + // Shortcut + var X = this._X; + + // Iterate the system + nextState.call(this); + + // Generate four keystream words + S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16); + S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16); + S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16); + S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16); + + for (var i = 0; i < 4; i++) { + // Swap endian + S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) | + (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00); + + // Encrypt + M[offset + i] ^= S[i]; + } + }, + + blockSize: 128/32, + + ivSize: 64/32 + }); + + function nextState() { + // Shortcuts + var X = this._X; + var C = this._C; + + // Save old counter values + for (var i = 0; i < 8; i++) { + C_[i] = C[i]; + } + + // Calculate new counter values + C[0] = (C[0] + 0x4d34d34d + this._b) | 0; + C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0; + C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0; + C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0; + C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0; + C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0; + C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0; + C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0; + this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0; + + // Calculate the g-values + for (var i = 0; i < 8; i++) { + var gx = X[i] + C[i]; + + // Construct high and low argument for squaring + var ga = gx & 0xffff; + var gb = gx >>> 16; + + // Calculate high and low result of squaring + var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb; + var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0); + + // High XOR low + G[i] = gh ^ gl; + } + + // Calculate new state values + X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0; + X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0; + X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0; + X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0; + X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0; + X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0; + X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0; + X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0; + } + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg); + * var plaintext = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg); + */ + C.Rabbit = StreamCipher._createHelper(Rabbit); +}()); diff --git a/library/cryptojs/components/rc4-min.js b/library/cryptojs/components/rc4-min.js new file mode 100644 index 000000000..e14e018fc --- /dev/null +++ b/library/cryptojs/components/rc4-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){function l(){for(var a=this._S,d=this._i,c=this._j,b=0,e=0;4>e;e++){var d=(d+1)%256,c=(c+a[d])%256,f=a[d];a[d]=a[c];a[c]=f;b|=a[(a[d]+a[c])%256]<<24-8*e}this._i=d;this._j=c;return b}var g=CryptoJS,k=g.lib.StreamCipher,h=g.algo,j=h.RC4=k.extend({_doReset:function(){for(var a=this._key,d=a.words,a=a.sigBytes,c=this._S=[],b=0;256>b;b++)c[b]=b;for(var e=b=0;256>b;b++){var f=b%a,e=(e+c[b]+(d[f>>>2]>>>24-8*(f%4)&255))%256,f=c[b];c[b]=c[e];c[e]=f}this._i=this._j=0},_doProcessBlock:function(a, +d){a[d]^=l.call(this)},keySize:8,ivSize:0});g.RC4=k._createHelper(j);h=h.RC4Drop=j.extend({cfg:j.cfg.extend({drop:192}),_doReset:function(){j._doReset.call(this);for(var a=this.cfg.drop;0>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff; + + j = (j + S[i] + keyByte) % 256; + + // Swap + var t = S[i]; + S[i] = S[j]; + S[j] = t; + } + + // Counters + this._i = this._j = 0; + }, + + _doProcessBlock: function (M, offset) { + M[offset] ^= generateKeystreamWord.call(this); + }, + + keySize: 256/32, + + ivSize: 0 + }); + + function generateKeystreamWord() { + // Shortcuts + var S = this._S; + var i = this._i; + var j = this._j; + + // Generate keystream word + var keystreamWord = 0; + for (var n = 0; n < 4; n++) { + i = (i + 1) % 256; + j = (j + S[i]) % 256; + + // Swap + var t = S[i]; + S[i] = S[j]; + S[j] = t; + + keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8); + } + + // Update counters + this._i = i; + this._j = j; + + return keystreamWord; + } + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg); + * var plaintext = CryptoJS.RC4.decrypt(ciphertext, key, cfg); + */ + C.RC4 = StreamCipher._createHelper(RC4); + + /** + * Modified RC4 stream cipher algorithm. + */ + var RC4Drop = C_algo.RC4Drop = RC4.extend({ + /** + * Configuration options. + * + * @property {number} drop The number of keystream words to drop. Default 192 + */ + cfg: RC4.cfg.extend({ + drop: 192 + }), + + _doReset: function () { + RC4._doReset.call(this); + + // Drop + for (var i = this.cfg.drop; i > 0; i--) { + generateKeystreamWord.call(this); + } + } + }); + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg); + * var plaintext = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg); + */ + C.RC4Drop = StreamCipher._createHelper(RC4Drop); +}()); diff --git a/library/cryptojs/components/ripemd160-min.js b/library/cryptojs/components/ripemd160-min.js new file mode 100644 index 000000000..a29165119 --- /dev/null +++ b/library/cryptojs/components/ripemd160-min.js @@ -0,0 +1,22 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/* + +(c) 2012 by C?dric Mesnil. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +(function(){var q=CryptoJS,d=q.lib,n=d.WordArray,p=d.Hasher,d=q.algo,x=n.create([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,7,4,13,1,10,6,15,3,12,0,9,5,2,14,11,8,3,10,14,4,9,15,8,1,2,7,0,6,13,11,5,12,1,9,11,10,0,8,12,4,13,3,7,15,14,5,6,2,4,0,5,9,7,12,2,10,14,1,3,8,11,6,15,13]),y=n.create([5,14,7,0,9,2,11,4,13,6,15,8,1,10,3,12,6,11,3,7,0,13,5,10,14,15,8,12,4,9,1,2,15,5,1,3,7,14,6,9,11,8,12,2,10,0,4,13,8,6,4,1,3,11,15,0,5,12,2,13,9,7,10,14,12,15,10,4,1,5,8,7,6,2,13,14,0,3,9,11]),z=n.create([11,14,15,12, +5,8,7,9,11,13,14,15,6,7,9,8,7,6,8,13,11,9,7,15,7,12,15,9,11,7,13,12,11,13,6,7,14,9,13,15,14,8,13,6,5,12,7,5,11,12,14,15,14,15,9,8,9,14,5,6,8,6,5,12,9,15,5,11,6,8,13,12,5,12,13,14,11,8,5,6]),A=n.create([8,9,9,11,13,15,15,5,7,7,8,11,14,14,12,6,9,13,15,7,12,8,9,11,7,7,12,7,6,15,13,11,9,7,15,11,8,6,6,14,12,13,5,14,13,13,7,5,15,5,8,11,14,14,6,14,6,9,12,9,12,5,15,8,8,5,12,9,12,5,14,6,8,13,6,5,15,13,11,11]),B=n.create([0,1518500249,1859775393,2400959708,2840853838]),C=n.create([1352829926,1548603684,1836072691, +2053994217,0]),d=d.RIPEMD160=p.extend({_doReset:function(){this._hash=n.create([1732584193,4023233417,2562383102,271733878,3285377520])},_doProcessBlock:function(e,v){for(var b=0;16>b;b++){var c=v+b,f=e[c];e[c]=(f<<8|f>>>24)&16711935|(f<<24|f>>>8)&4278255360}var c=this._hash.words,f=B.words,d=C.words,n=x.words,q=y.words,p=z.words,w=A.words,t,g,h,j,r,u,k,l,m,s;u=t=c[0];k=g=c[1];l=h=c[2];m=j=c[3];s=r=c[4];for(var a,b=0;80>b;b+=1)a=t+e[v+n[b]]|0,a=16>b?a+((g^h^j)+f[0]):32>b?a+((g&h|~g&j)+f[1]):48>b? +a+(((g|~h)^j)+f[2]):64>b?a+((g&j|h&~j)+f[3]):a+((g^(h|~j))+f[4]),a|=0,a=a<>>32-p[b],a=a+r|0,t=r,r=j,j=h<<10|h>>>22,h=g,g=a,a=u+e[v+q[b]]|0,a=16>b?a+((k^(l|~m))+d[0]):32>b?a+((k&m|l&~m)+d[1]):48>b?a+(((k|~l)^m)+d[2]):64>b?a+((k&l|~k&m)+d[3]):a+((k^l^m)+d[4]),a|=0,a=a<>>32-w[b],a=a+s|0,u=s,s=m,m=l<<10|l>>>22,l=k,k=a;a=c[1]+h+m|0;c[1]=c[2]+j+s|0;c[2]=c[3]+r+u|0;c[3]=c[4]+t+k|0;c[4]=c[0]+g+l|0;c[0]=a},_doFinalize:function(){var e=this._data,d=e.words,b=8*this._nDataBytes,c=8*e.sigBytes; +d[c>>>5]|=128<<24-c%32;d[(c+64>>>9<<4)+14]=(b<<8|b>>>24)&16711935|(b<<24|b>>>8)&4278255360;e.sigBytes=4*(d.length+1);this._process();e=this._hash;d=e.words;for(b=0;5>b;b++)c=d[b],d[b]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360;return e},clone:function(){var d=p.clone.call(this);d._hash=this._hash.clone();return d}});q.RIPEMD160=p._createHelper(d);q.HmacRIPEMD160=p._createHmacHelper(d)})(Math); diff --git a/library/cryptojs/components/ripemd160.js b/library/cryptojs/components/ripemd160.js new file mode 100644 index 000000000..4acab8b3c --- /dev/null +++ b/library/cryptojs/components/ripemd160.js @@ -0,0 +1,253 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** @preserve +(c) 2012 by Cédric Mesnil. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +(function (Math) { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var Hasher = C_lib.Hasher; + var C_algo = C.algo; + + // Constants table + var _zl = WordArray.create([ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8, + 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12, + 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2, + 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13]); + var _zr = WordArray.create([ + 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12, + 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2, + 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13, + 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14, + 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11]); + var _sl = WordArray.create([ + 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8, + 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12, + 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5, + 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, + 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 ]); + var _sr = WordArray.create([ + 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, + 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, + 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, + 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, + 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 ]); + + var _hl = WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]); + var _hr = WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]); + + /** + * RIPEMD160 hash algorithm. + */ + var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({ + _doReset: function () { + this._hash = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]); + }, + + _doProcessBlock: function (M, offset) { + + // Swap endian + for (var i = 0; i < 16; i++) { + // Shortcuts + var offset_i = offset + i; + var M_offset_i = M[offset_i]; + + // Swap + M[offset_i] = ( + (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) | + (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00) + ); + } + // Shortcut + var H = this._hash.words; + var hl = _hl.words; + var hr = _hr.words; + var zl = _zl.words; + var zr = _zr.words; + var sl = _sl.words; + var sr = _sr.words; + + // Working variables + var al, bl, cl, dl, el; + var ar, br, cr, dr, er; + + ar = al = H[0]; + br = bl = H[1]; + cr = cl = H[2]; + dr = dl = H[3]; + er = el = H[4]; + // Computation + var t; + for (var i = 0; i < 80; i += 1) { + t = (al + M[offset+zl[i]])|0; + if (i<16){ + t += f1(bl,cl,dl) + hl[0]; + } else if (i<32) { + t += f2(bl,cl,dl) + hl[1]; + } else if (i<48) { + t += f3(bl,cl,dl) + hl[2]; + } else if (i<64) { + t += f4(bl,cl,dl) + hl[3]; + } else {// if (i<80) { + t += f5(bl,cl,dl) + hl[4]; + } + t = t|0; + t = rotl(t,sl[i]); + t = (t+el)|0; + al = el; + el = dl; + dl = rotl(cl, 10); + cl = bl; + bl = t; + + t = (ar + M[offset+zr[i]])|0; + if (i<16){ + t += f5(br,cr,dr) + hr[0]; + } else if (i<32) { + t += f4(br,cr,dr) + hr[1]; + } else if (i<48) { + t += f3(br,cr,dr) + hr[2]; + } else if (i<64) { + t += f2(br,cr,dr) + hr[3]; + } else {// if (i<80) { + t += f1(br,cr,dr) + hr[4]; + } + t = t|0; + t = rotl(t,sr[i]) ; + t = (t+er)|0; + ar = er; + er = dr; + dr = rotl(cr, 10); + cr = br; + br = t; + } + // Intermediate hash value + t = (H[1] + cl + dr)|0; + H[1] = (H[2] + dl + er)|0; + H[2] = (H[3] + el + ar)|0; + H[3] = (H[4] + al + br)|0; + H[4] = (H[0] + bl + cr)|0; + H[0] = t; + }, + + _doFinalize: function () { + // Shortcuts + var data = this._data; + var dataWords = data.words; + + var nBitsTotal = this._nDataBytes * 8; + var nBitsLeft = data.sigBytes * 8; + + // Add padding + dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32); + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = ( + (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) | + (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00) + ); + data.sigBytes = (dataWords.length + 1) * 4; + + // Hash final blocks + this._process(); + + // Shortcuts + var hash = this._hash; + var H = hash.words; + + // Swap endian + for (var i = 0; i < 5; i++) { + // Shortcut + var H_i = H[i]; + + // Swap + H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) | + (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00); + } + + // Return final computed hash + return hash; + }, + + clone: function () { + var clone = Hasher.clone.call(this); + clone._hash = this._hash.clone(); + + return clone; + } + }); + + + function f1(x, y, z) { + return ((x) ^ (y) ^ (z)); + + } + + function f2(x, y, z) { + return (((x)&(y)) | ((~x)&(z))); + } + + function f3(x, y, z) { + return (((x) | (~(y))) ^ (z)); + } + + function f4(x, y, z) { + return (((x) & (z)) | ((y)&(~(z)))); + } + + function f5(x, y, z) { + return ((x) ^ ((y) |(~(z)))); + + } + + function rotl(x,n) { + return (x<>>(32-n)); + } + + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.RIPEMD160('message'); + * var hash = CryptoJS.RIPEMD160(wordArray); + */ + C.RIPEMD160 = Hasher._createHelper(RIPEMD160); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacRIPEMD160(message, key); + */ + C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160); +}(Math)); diff --git a/library/cryptojs/components/sha1-min.js b/library/cryptojs/components/sha1-min.js new file mode 100644 index 000000000..3ae0311e2 --- /dev/null +++ b/library/cryptojs/components/sha1-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var k=CryptoJS,b=k.lib,m=b.WordArray,l=b.Hasher,d=[],b=k.algo.SHA1=l.extend({_doReset:function(){this._hash=new m.init([1732584193,4023233417,2562383102,271733878,3285377520])},_doProcessBlock:function(n,p){for(var a=this._hash.words,e=a[0],f=a[1],h=a[2],j=a[3],b=a[4],c=0;80>c;c++){if(16>c)d[c]=n[p+c]|0;else{var g=d[c-3]^d[c-8]^d[c-14]^d[c-16];d[c]=g<<1|g>>>31}g=(e<<5|e>>>27)+b+d[c];g=20>c?g+((f&h|~f&j)+1518500249):40>c?g+((f^h^j)+1859775393):60>c?g+((f&h|f&j|h&j)-1894007588):g+((f^h^ +j)-899497514);b=j;j=h;h=f<<30|f>>>2;f=e;e=g}a[0]=a[0]+e|0;a[1]=a[1]+f|0;a[2]=a[2]+h|0;a[3]=a[3]+j|0;a[4]=a[4]+b|0},_doFinalize:function(){var b=this._data,d=b.words,a=8*this._nDataBytes,e=8*b.sigBytes;d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=Math.floor(a/4294967296);d[(e+64>>>9<<4)+15]=a;b.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var b=l.clone.call(this);b._hash=this._hash.clone();return b}});k.SHA1=l._createHelper(b);k.HmacSHA1=l._createHmacHelper(b)})(); diff --git a/library/cryptojs/components/sha1.js b/library/cryptojs/components/sha1.js new file mode 100644 index 000000000..01861f472 --- /dev/null +++ b/library/cryptojs/components/sha1.js @@ -0,0 +1,136 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var Hasher = C_lib.Hasher; + var C_algo = C.algo; + + // Reusable object + var W = []; + + /** + * SHA-1 hash algorithm. + */ + var SHA1 = C_algo.SHA1 = Hasher.extend({ + _doReset: function () { + this._hash = new WordArray.init([ + 0x67452301, 0xefcdab89, + 0x98badcfe, 0x10325476, + 0xc3d2e1f0 + ]); + }, + + _doProcessBlock: function (M, offset) { + // Shortcut + var H = this._hash.words; + + // Working variables + var a = H[0]; + var b = H[1]; + var c = H[2]; + var d = H[3]; + var e = H[4]; + + // Computation + for (var i = 0; i < 80; i++) { + if (i < 16) { + W[i] = M[offset + i] | 0; + } else { + var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16]; + W[i] = (n << 1) | (n >>> 31); + } + + var t = ((a << 5) | (a >>> 27)) + e + W[i]; + if (i < 20) { + t += ((b & c) | (~b & d)) + 0x5a827999; + } else if (i < 40) { + t += (b ^ c ^ d) + 0x6ed9eba1; + } else if (i < 60) { + t += ((b & c) | (b & d) | (c & d)) - 0x70e44324; + } else /* if (i < 80) */ { + t += (b ^ c ^ d) - 0x359d3e2a; + } + + e = d; + d = c; + c = (b << 30) | (b >>> 2); + b = a; + a = t; + } + + // Intermediate hash value + H[0] = (H[0] + a) | 0; + H[1] = (H[1] + b) | 0; + H[2] = (H[2] + c) | 0; + H[3] = (H[3] + d) | 0; + H[4] = (H[4] + e) | 0; + }, + + _doFinalize: function () { + // Shortcuts + var data = this._data; + var dataWords = data.words; + + var nBitsTotal = this._nDataBytes * 8; + var nBitsLeft = data.sigBytes * 8; + + // Add padding + dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32); + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000); + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal; + data.sigBytes = dataWords.length * 4; + + // Hash final blocks + this._process(); + + // Return final computed hash + return this._hash; + }, + + clone: function () { + var clone = Hasher.clone.call(this); + clone._hash = this._hash.clone(); + + return clone; + } + }); + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.SHA1('message'); + * var hash = CryptoJS.SHA1(wordArray); + */ + C.SHA1 = Hasher._createHelper(SHA1); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacSHA1(message, key); + */ + C.HmacSHA1 = Hasher._createHmacHelper(SHA1); +}()); diff --git a/library/cryptojs/components/sha224-min.js b/library/cryptojs/components/sha224-min.js new file mode 100644 index 000000000..b0bc65dd5 --- /dev/null +++ b/library/cryptojs/components/sha224-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var b=CryptoJS,d=b.lib.WordArray,a=b.algo,c=a.SHA256,a=a.SHA224=c.extend({_doReset:function(){this._hash=new d.init([3238371032,914150663,812702999,4144912697,4290775857,1750603025,1694076839,3204075428])},_doFinalize:function(){var a=c._doFinalize.call(this);a.sigBytes-=4;return a}});b.SHA224=c._createHelper(a);b.HmacSHA224=c._createHmacHelper(a)})(); diff --git a/library/cryptojs/components/sha224.js b/library/cryptojs/components/sha224.js new file mode 100644 index 000000000..289f31d55 --- /dev/null +++ b/library/cryptojs/components/sha224.js @@ -0,0 +1,66 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var C_algo = C.algo; + var SHA256 = C_algo.SHA256; + + /** + * SHA-224 hash algorithm. + */ + var SHA224 = C_algo.SHA224 = SHA256.extend({ + _doReset: function () { + this._hash = new WordArray.init([ + 0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, + 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4 + ]); + }, + + _doFinalize: function () { + var hash = SHA256._doFinalize.call(this); + + hash.sigBytes -= 4; + + return hash; + } + }); + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.SHA224('message'); + * var hash = CryptoJS.SHA224(wordArray); + */ + C.SHA224 = SHA256._createHelper(SHA224); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacSHA224(message, key); + */ + C.HmacSHA224 = SHA256._createHmacHelper(SHA224); +}()); diff --git a/library/cryptojs/components/sha256-min.js b/library/cryptojs/components/sha256-min.js new file mode 100644 index 000000000..e0fe20900 --- /dev/null +++ b/library/cryptojs/components/sha256-min.js @@ -0,0 +1,9 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(k){for(var g=CryptoJS,h=g.lib,v=h.WordArray,j=h.Hasher,h=g.algo,s=[],t=[],u=function(q){return 4294967296*(q-(q|0))|0},l=2,b=0;64>b;){var d;a:{d=l;for(var w=k.sqrt(d),r=2;r<=w;r++)if(!(d%r)){d=!1;break a}d=!0}d&&(8>b&&(s[b]=u(k.pow(l,0.5))),t[b]=u(k.pow(l,1/3)),b++);l++}var n=[],h=h.SHA256=j.extend({_doReset:function(){this._hash=new v.init(s.slice(0))},_doProcessBlock:function(q,h){for(var a=this._hash.words,c=a[0],d=a[1],b=a[2],k=a[3],f=a[4],g=a[5],j=a[6],l=a[7],e=0;64>e;e++){if(16>e)n[e]= +q[h+e]|0;else{var m=n[e-15],p=n[e-2];n[e]=((m<<25|m>>>7)^(m<<14|m>>>18)^m>>>3)+n[e-7]+((p<<15|p>>>17)^(p<<13|p>>>19)^p>>>10)+n[e-16]}m=l+((f<<26|f>>>6)^(f<<21|f>>>11)^(f<<7|f>>>25))+(f&g^~f&j)+t[e]+n[e];p=((c<<30|c>>>2)^(c<<19|c>>>13)^(c<<10|c>>>22))+(c&d^c&b^d&b);l=j;j=g;g=f;f=k+m|0;k=b;b=d;d=c;c=m+p|0}a[0]=a[0]+c|0;a[1]=a[1]+d|0;a[2]=a[2]+b|0;a[3]=a[3]+k|0;a[4]=a[4]+f|0;a[5]=a[5]+g|0;a[6]=a[6]+j|0;a[7]=a[7]+l|0},_doFinalize:function(){var d=this._data,b=d.words,a=8*this._nDataBytes,c=8*d.sigBytes; +b[c>>>5]|=128<<24-c%32;b[(c+64>>>9<<4)+14]=k.floor(a/4294967296);b[(c+64>>>9<<4)+15]=a;d.sigBytes=4*b.length;this._process();return this._hash},clone:function(){var b=j.clone.call(this);b._hash=this._hash.clone();return b}});g.SHA256=j._createHelper(h);g.HmacSHA256=j._createHmacHelper(h)})(Math); diff --git a/library/cryptojs/components/sha256.js b/library/cryptojs/components/sha256.js new file mode 100644 index 000000000..16cee0cfd --- /dev/null +++ b/library/cryptojs/components/sha256.js @@ -0,0 +1,185 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function (Math) { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var Hasher = C_lib.Hasher; + var C_algo = C.algo; + + // Initialization and round constants tables + var H = []; + var K = []; + + // Compute constants + (function () { + function isPrime(n) { + var sqrtN = Math.sqrt(n); + for (var factor = 2; factor <= sqrtN; factor++) { + if (!(n % factor)) { + return false; + } + } + + return true; + } + + function getFractionalBits(n) { + return ((n - (n | 0)) * 0x100000000) | 0; + } + + var n = 2; + var nPrime = 0; + while (nPrime < 64) { + if (isPrime(n)) { + if (nPrime < 8) { + H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2)); + } + K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3)); + + nPrime++; + } + + n++; + } + }()); + + // Reusable object + var W = []; + + /** + * SHA-256 hash algorithm. + */ + var SHA256 = C_algo.SHA256 = Hasher.extend({ + _doReset: function () { + this._hash = new WordArray.init(H.slice(0)); + }, + + _doProcessBlock: function (M, offset) { + // Shortcut + var H = this._hash.words; + + // Working variables + var a = H[0]; + var b = H[1]; + var c = H[2]; + var d = H[3]; + var e = H[4]; + var f = H[5]; + var g = H[6]; + var h = H[7]; + + // Computation + for (var i = 0; i < 64; i++) { + if (i < 16) { + W[i] = M[offset + i] | 0; + } else { + var gamma0x = W[i - 15]; + var gamma0 = ((gamma0x << 25) | (gamma0x >>> 7)) ^ + ((gamma0x << 14) | (gamma0x >>> 18)) ^ + (gamma0x >>> 3); + + var gamma1x = W[i - 2]; + var gamma1 = ((gamma1x << 15) | (gamma1x >>> 17)) ^ + ((gamma1x << 13) | (gamma1x >>> 19)) ^ + (gamma1x >>> 10); + + W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]; + } + + var ch = (e & f) ^ (~e & g); + var maj = (a & b) ^ (a & c) ^ (b & c); + + var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22)); + var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7) | (e >>> 25)); + + var t1 = h + sigma1 + ch + K[i] + W[i]; + var t2 = sigma0 + maj; + + h = g; + g = f; + f = e; + e = (d + t1) | 0; + d = c; + c = b; + b = a; + a = (t1 + t2) | 0; + } + + // Intermediate hash value + H[0] = (H[0] + a) | 0; + H[1] = (H[1] + b) | 0; + H[2] = (H[2] + c) | 0; + H[3] = (H[3] + d) | 0; + H[4] = (H[4] + e) | 0; + H[5] = (H[5] + f) | 0; + H[6] = (H[6] + g) | 0; + H[7] = (H[7] + h) | 0; + }, + + _doFinalize: function () { + // Shortcuts + var data = this._data; + var dataWords = data.words; + + var nBitsTotal = this._nDataBytes * 8; + var nBitsLeft = data.sigBytes * 8; + + // Add padding + dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32); + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000); + dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal; + data.sigBytes = dataWords.length * 4; + + // Hash final blocks + this._process(); + + // Return final computed hash + return this._hash; + }, + + clone: function () { + var clone = Hasher.clone.call(this); + clone._hash = this._hash.clone(); + + return clone; + } + }); + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.SHA256('message'); + * var hash = CryptoJS.SHA256(wordArray); + */ + C.SHA256 = Hasher._createHelper(SHA256); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacSHA256(message, key); + */ + C.HmacSHA256 = Hasher._createHmacHelper(SHA256); +}(Math)); diff --git a/library/cryptojs/components/sha3-min.js b/library/cryptojs/components/sha3-min.js new file mode 100644 index 000000000..9783779fe --- /dev/null +++ b/library/cryptojs/components/sha3-min.js @@ -0,0 +1,11 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(y){for(var p=CryptoJS,m=p.lib,z=m.WordArray,q=m.Hasher,s=p.x64.Word,m=p.algo,v=[],w=[],x=[],c=1,d=0,l=0;24>l;l++){v[c+5*d]=(l+1)*(l+2)/2%64;var r=(2*c+3*d)%5,c=d%5,d=r}for(c=0;5>c;c++)for(d=0;5>d;d++)w[c+5*d]=d+5*((2*c+3*d)%5);c=1;for(d=0;24>d;d++){for(var t=r=l=0;7>t;t++){if(c&1){var u=(1<u?r^=1<c;c++)j[c]=s.create();m=m.SHA3=q.extend({cfg:q.cfg.extend({outputLength:512}),_doReset:function(){for(var c=this._state= +[],n=0;25>n;n++)c[n]=new s.init;this.blockSize=(1600-2*this.cfg.outputLength)/32},_doProcessBlock:function(c,n){for(var h=this._state,d=this.blockSize/2,b=0;b>>24)&16711935|(e<<24|e>>>8)&4278255360,f=(f<<8|f>>>24)&16711935|(f<<24|f>>>8)&4278255360,a=h[b];a.high^=f;a.low^=e}for(d=0;24>d;d++){for(b=0;5>b;b++){for(var k=e=0,g=0;5>g;g++)a=h[b+5*g],e^=a.high,k^=a.low;a=j[b];a.high=e;a.low=k}for(b=0;5>b;b++){a=j[(b+4)%5];e=j[(b+1)%5];f=e.high;g=e.low;e=a.high^ +(f<<1|g>>>31);k=a.low^(g<<1|f>>>31);for(g=0;5>g;g++)a=h[b+5*g],a.high^=e,a.low^=k}for(f=1;25>f;f++)a=h[f],b=a.high,a=a.low,g=v[f],32>g?(e=b<>>32-g,k=a<>>32-g):(e=a<>>64-g,k=b<>>64-g),a=j[w[f]],a.high=e,a.low=k;a=j[0];b=h[0];a.high=b.high;a.low=b.low;for(b=0;5>b;b++)for(g=0;5>g;g++)f=b+5*g,a=h[f],e=j[f],f=j[(b+1)%5+5*g],k=j[(b+2)%5+5*g],a.high=e.high^~f.high&k.high,a.low=e.low^~f.low&k.low;a=h[0];b=x[d];a.high^=b.high;a.low^=b.low}},_doFinalize:function(){var c=this._data, +d=c.words,h=8*c.sigBytes,j=32*this.blockSize;d[h>>>5]|=1<<24-h%32;d[(y.ceil((h+1)/j)*j>>>5)-1]|=128;c.sigBytes=4*d.length;this._process();for(var c=this._state,d=this.cfg.outputLength/8,h=d/8,j=[],b=0;b>>24)&16711935|(f<<24|f>>>8)&4278255360,e=(e<<8|e>>>24)&16711935|(e<<24|e>>>8)&4278255360;j.push(e);j.push(f)}return new z.init(j,d)},clone:function(){for(var c=q.clone.call(this),d=c._state=this._state.slice(0),h=0;25>h;h++)d[h]=d[h].clone();return c}}); +p.SHA3=q._createHelper(m);p.HmacSHA3=q._createHmacHelper(m)})(Math); diff --git a/library/cryptojs/components/sha3.js b/library/cryptojs/components/sha3.js new file mode 100644 index 000000000..1504bfb31 --- /dev/null +++ b/library/cryptojs/components/sha3.js @@ -0,0 +1,309 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function (Math) { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var Hasher = C_lib.Hasher; + var C_x64 = C.x64; + var X64Word = C_x64.Word; + var C_algo = C.algo; + + // Constants tables + var RHO_OFFSETS = []; + var PI_INDEXES = []; + var ROUND_CONSTANTS = []; + + // Compute Constants + (function () { + // Compute rho offset constants + var x = 1, y = 0; + for (var t = 0; t < 24; t++) { + RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64; + + var newX = y % 5; + var newY = (2 * x + 3 * y) % 5; + x = newX; + y = newY; + } + + // Compute pi index constants + for (var x = 0; x < 5; x++) { + for (var y = 0; y < 5; y++) { + PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5; + } + } + + // Compute round constants + var LFSR = 0x01; + for (var i = 0; i < 24; i++) { + var roundConstantMsw = 0; + var roundConstantLsw = 0; + + for (var j = 0; j < 7; j++) { + if (LFSR & 0x01) { + var bitPosition = (1 << j) - 1; + if (bitPosition < 32) { + roundConstantLsw ^= 1 << bitPosition; + } else /* if (bitPosition >= 32) */ { + roundConstantMsw ^= 1 << (bitPosition - 32); + } + } + + // Compute next LFSR + if (LFSR & 0x80) { + // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1 + LFSR = (LFSR << 1) ^ 0x71; + } else { + LFSR <<= 1; + } + } + + ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw); + } + }()); + + // Reusable objects for temporary values + var T = []; + (function () { + for (var i = 0; i < 25; i++) { + T[i] = X64Word.create(); + } + }()); + + /** + * SHA-3 hash algorithm. + */ + var SHA3 = C_algo.SHA3 = Hasher.extend({ + /** + * Configuration options. + * + * @property {number} outputLength + * The desired number of bits in the output hash. + * Only values permitted are: 224, 256, 384, 512. + * Default: 512 + */ + cfg: Hasher.cfg.extend({ + outputLength: 512 + }), + + _doReset: function () { + var state = this._state = [] + for (var i = 0; i < 25; i++) { + state[i] = new X64Word.init(); + } + + this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32; + }, + + _doProcessBlock: function (M, offset) { + // Shortcuts + var state = this._state; + var nBlockSizeLanes = this.blockSize / 2; + + // Absorb + for (var i = 0; i < nBlockSizeLanes; i++) { + // Shortcuts + var M2i = M[offset + 2 * i]; + var M2i1 = M[offset + 2 * i + 1]; + + // Swap endian + M2i = ( + (((M2i << 8) | (M2i >>> 24)) & 0x00ff00ff) | + (((M2i << 24) | (M2i >>> 8)) & 0xff00ff00) + ); + M2i1 = ( + (((M2i1 << 8) | (M2i1 >>> 24)) & 0x00ff00ff) | + (((M2i1 << 24) | (M2i1 >>> 8)) & 0xff00ff00) + ); + + // Absorb message into state + var lane = state[i]; + lane.high ^= M2i1; + lane.low ^= M2i; + } + + // Rounds + for (var round = 0; round < 24; round++) { + // Theta + for (var x = 0; x < 5; x++) { + // Mix column lanes + var tMsw = 0, tLsw = 0; + for (var y = 0; y < 5; y++) { + var lane = state[x + 5 * y]; + tMsw ^= lane.high; + tLsw ^= lane.low; + } + + // Temporary values + var Tx = T[x]; + Tx.high = tMsw; + Tx.low = tLsw; + } + for (var x = 0; x < 5; x++) { + // Shortcuts + var Tx4 = T[(x + 4) % 5]; + var Tx1 = T[(x + 1) % 5]; + var Tx1Msw = Tx1.high; + var Tx1Lsw = Tx1.low; + + // Mix surrounding columns + var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31)); + var tLsw = Tx4.low ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31)); + for (var y = 0; y < 5; y++) { + var lane = state[x + 5 * y]; + lane.high ^= tMsw; + lane.low ^= tLsw; + } + } + + // Rho Pi + for (var laneIndex = 1; laneIndex < 25; laneIndex++) { + // Shortcuts + var lane = state[laneIndex]; + var laneMsw = lane.high; + var laneLsw = lane.low; + var rhoOffset = RHO_OFFSETS[laneIndex]; + + // Rotate lanes + if (rhoOffset < 32) { + var tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset)); + var tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset)); + } else /* if (rhoOffset >= 32) */ { + var tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset)); + var tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset)); + } + + // Transpose lanes + var TPiLane = T[PI_INDEXES[laneIndex]]; + TPiLane.high = tMsw; + TPiLane.low = tLsw; + } + + // Rho pi at x = y = 0 + var T0 = T[0]; + var state0 = state[0]; + T0.high = state0.high; + T0.low = state0.low; + + // Chi + for (var x = 0; x < 5; x++) { + for (var y = 0; y < 5; y++) { + // Shortcuts + var laneIndex = x + 5 * y; + var lane = state[laneIndex]; + var TLane = T[laneIndex]; + var Tx1Lane = T[((x + 1) % 5) + 5 * y]; + var Tx2Lane = T[((x + 2) % 5) + 5 * y]; + + // Mix rows + lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high); + lane.low = TLane.low ^ (~Tx1Lane.low & Tx2Lane.low); + } + } + + // Iota + var lane = state[0]; + var roundConstant = ROUND_CONSTANTS[round]; + lane.high ^= roundConstant.high; + lane.low ^= roundConstant.low;; + } + }, + + _doFinalize: function () { + // Shortcuts + var data = this._data; + var dataWords = data.words; + var nBitsTotal = this._nDataBytes * 8; + var nBitsLeft = data.sigBytes * 8; + var blockSizeBits = this.blockSize * 32; + + // Add padding + dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32); + dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80; + data.sigBytes = dataWords.length * 4; + + // Hash final blocks + this._process(); + + // Shortcuts + var state = this._state; + var outputLengthBytes = this.cfg.outputLength / 8; + var outputLengthLanes = outputLengthBytes / 8; + + // Squeeze + var hashWords = []; + for (var i = 0; i < outputLengthLanes; i++) { + // Shortcuts + var lane = state[i]; + var laneMsw = lane.high; + var laneLsw = lane.low; + + // Swap endian + laneMsw = ( + (((laneMsw << 8) | (laneMsw >>> 24)) & 0x00ff00ff) | + (((laneMsw << 24) | (laneMsw >>> 8)) & 0xff00ff00) + ); + laneLsw = ( + (((laneLsw << 8) | (laneLsw >>> 24)) & 0x00ff00ff) | + (((laneLsw << 24) | (laneLsw >>> 8)) & 0xff00ff00) + ); + + // Squeeze state to retrieve hash + hashWords.push(laneLsw); + hashWords.push(laneMsw); + } + + // Return final computed hash + return new WordArray.init(hashWords, outputLengthBytes); + }, + + clone: function () { + var clone = Hasher.clone.call(this); + + var state = clone._state = this._state.slice(0); + for (var i = 0; i < 25; i++) { + state[i] = state[i].clone(); + } + + return clone; + } + }); + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.SHA3('message'); + * var hash = CryptoJS.SHA3(wordArray); + */ + C.SHA3 = Hasher._createHelper(SHA3); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacSHA3(message, key); + */ + C.HmacSHA3 = Hasher._createHmacHelper(SHA3); +}(Math)); diff --git a/library/cryptojs/components/sha384-min.js b/library/cryptojs/components/sha384-min.js new file mode 100644 index 000000000..d29bb2046 --- /dev/null +++ b/library/cryptojs/components/sha384-min.js @@ -0,0 +1,8 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){var c=CryptoJS,a=c.x64,b=a.Word,e=a.WordArray,a=c.algo,d=a.SHA512,a=a.SHA384=d.extend({_doReset:function(){this._hash=new e.init([new b.init(3418070365,3238371032),new b.init(1654270250,914150663),new b.init(2438529370,812702999),new b.init(355462360,4144912697),new b.init(1731405415,4290775857),new b.init(2394180231,1750603025),new b.init(3675008525,1694076839),new b.init(1203062813,3204075428)])},_doFinalize:function(){var a=d._doFinalize.call(this);a.sigBytes-=16;return a}});c.SHA384= +d._createHelper(a);c.HmacSHA384=d._createHmacHelper(a)})(); diff --git a/library/cryptojs/components/sha384.js b/library/cryptojs/components/sha384.js new file mode 100644 index 000000000..8106959bd --- /dev/null +++ b/library/cryptojs/components/sha384.js @@ -0,0 +1,69 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_x64 = C.x64; + var X64Word = C_x64.Word; + var X64WordArray = C_x64.WordArray; + var C_algo = C.algo; + var SHA512 = C_algo.SHA512; + + /** + * SHA-384 hash algorithm. + */ + var SHA384 = C_algo.SHA384 = SHA512.extend({ + _doReset: function () { + this._hash = new X64WordArray.init([ + new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507), + new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939), + new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511), + new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4) + ]); + }, + + _doFinalize: function () { + var hash = SHA512._doFinalize.call(this); + + hash.sigBytes -= 16; + + return hash; + } + }); + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.SHA384('message'); + * var hash = CryptoJS.SHA384(wordArray); + */ + C.SHA384 = SHA512._createHelper(SHA384); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacSHA384(message, key); + */ + C.HmacSHA384 = SHA512._createHmacHelper(SHA384); +}()); diff --git a/library/cryptojs/components/sha512-min.js b/library/cryptojs/components/sha512-min.js new file mode 100644 index 000000000..5df4b7076 --- /dev/null +++ b/library/cryptojs/components/sha512-min.js @@ -0,0 +1,15 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){function a(){return d.create.apply(d,arguments)}for(var n=CryptoJS,r=n.lib.Hasher,e=n.x64,d=e.Word,T=e.WordArray,e=n.algo,ea=[a(1116352408,3609767458),a(1899447441,602891725),a(3049323471,3964484399),a(3921009573,2173295548),a(961987163,4081628472),a(1508970993,3053834265),a(2453635748,2937671579),a(2870763221,3664609560),a(3624381080,2734883394),a(310598401,1164996542),a(607225278,1323610764),a(1426881987,3590304994),a(1925078388,4068182383),a(2162078206,991336113),a(2614888103,633803317), +a(3248222580,3479774868),a(3835390401,2666613458),a(4022224774,944711139),a(264347078,2341262773),a(604807628,2007800933),a(770255983,1495990901),a(1249150122,1856431235),a(1555081692,3175218132),a(1996064986,2198950837),a(2554220882,3999719339),a(2821834349,766784016),a(2952996808,2566594879),a(3210313671,3203337956),a(3336571891,1034457026),a(3584528711,2466948901),a(113926993,3758326383),a(338241895,168717936),a(666307205,1188179964),a(773529912,1546045734),a(1294757372,1522805485),a(1396182291, +2643833823),a(1695183700,2343527390),a(1986661051,1014477480),a(2177026350,1206759142),a(2456956037,344077627),a(2730485921,1290863460),a(2820302411,3158454273),a(3259730800,3505952657),a(3345764771,106217008),a(3516065817,3606008344),a(3600352804,1432725776),a(4094571909,1467031594),a(275423344,851169720),a(430227734,3100823752),a(506948616,1363258195),a(659060556,3750685593),a(883997877,3785050280),a(958139571,3318307427),a(1322822218,3812723403),a(1537002063,2003034995),a(1747873779,3602036899), +a(1955562222,1575990012),a(2024104815,1125592928),a(2227730452,2716904306),a(2361852424,442776044),a(2428436474,593698344),a(2756734187,3733110249),a(3204031479,2999351573),a(3329325298,3815920427),a(3391569614,3928383900),a(3515267271,566280711),a(3940187606,3454069534),a(4118630271,4000239992),a(116418474,1914138554),a(174292421,2731055270),a(289380356,3203993006),a(460393269,320620315),a(685471733,587496836),a(852142971,1086792851),a(1017036298,365543100),a(1126000580,2618297676),a(1288033470, +3409855158),a(1501505948,4234509866),a(1607167915,987167468),a(1816402316,1246189591)],v=[],w=0;80>w;w++)v[w]=a();e=e.SHA512=r.extend({_doReset:function(){this._hash=new T.init([new d.init(1779033703,4089235720),new d.init(3144134277,2227873595),new d.init(1013904242,4271175723),new d.init(2773480762,1595750129),new d.init(1359893119,2917565137),new d.init(2600822924,725511199),new d.init(528734635,4215389547),new d.init(1541459225,327033209)])},_doProcessBlock:function(a,d){for(var f=this._hash.words, +F=f[0],e=f[1],n=f[2],r=f[3],G=f[4],H=f[5],I=f[6],f=f[7],w=F.high,J=F.low,X=e.high,K=e.low,Y=n.high,L=n.low,Z=r.high,M=r.low,$=G.high,N=G.low,aa=H.high,O=H.low,ba=I.high,P=I.low,ca=f.high,Q=f.low,k=w,g=J,z=X,x=K,A=Y,y=L,U=Z,B=M,l=$,h=N,R=aa,C=O,S=ba,D=P,V=ca,E=Q,m=0;80>m;m++){var s=v[m];if(16>m)var j=s.high=a[d+2*m]|0,b=s.low=a[d+2*m+1]|0;else{var j=v[m-15],b=j.high,p=j.low,j=(b>>>1|p<<31)^(b>>>8|p<<24)^b>>>7,p=(p>>>1|b<<31)^(p>>>8|b<<24)^(p>>>7|b<<25),u=v[m-2],b=u.high,c=u.low,u=(b>>>19|c<<13)^(b<< +3|c>>>29)^b>>>6,c=(c>>>19|b<<13)^(c<<3|b>>>29)^(c>>>6|b<<26),b=v[m-7],W=b.high,t=v[m-16],q=t.high,t=t.low,b=p+b.low,j=j+W+(b>>>0

    >>0?1:0),b=b+c,j=j+u+(b>>>0>>0?1:0),b=b+t,j=j+q+(b>>>0>>0?1:0);s.high=j;s.low=b}var W=l&R^~l&S,t=h&C^~h&D,s=k&z^k&A^z&A,T=g&x^g&y^x&y,p=(k>>>28|g<<4)^(k<<30|g>>>2)^(k<<25|g>>>7),u=(g>>>28|k<<4)^(g<<30|k>>>2)^(g<<25|k>>>7),c=ea[m],fa=c.high,da=c.low,c=E+((h>>>14|l<<18)^(h>>>18|l<<14)^(h<<23|l>>>9)),q=V+((l>>>14|h<<18)^(l>>>18|h<<14)^(l<<23|h>>>9))+(c>>>0>>0?1: +0),c=c+t,q=q+W+(c>>>0>>0?1:0),c=c+da,q=q+fa+(c>>>0>>0?1:0),c=c+b,q=q+j+(c>>>0>>0?1:0),b=u+T,s=p+s+(b>>>0>>0?1:0),V=S,E=D,S=R,D=C,R=l,C=h,h=B+c|0,l=U+q+(h>>>0>>0?1:0)|0,U=A,B=y,A=z,y=x,z=k,x=g,g=c+b|0,k=q+s+(g>>>0>>0?1:0)|0}J=F.low=J+g;F.high=w+k+(J>>>0>>0?1:0);K=e.low=K+x;e.high=X+z+(K>>>0>>0?1:0);L=n.low=L+y;n.high=Y+A+(L>>>0>>0?1:0);M=r.low=M+B;r.high=Z+U+(M>>>0>>0?1:0);N=G.low=N+h;G.high=$+l+(N>>>0>>0?1:0);O=H.low=O+C;H.high=aa+R+(O>>>0>>0?1:0);P=I.low=P+D; +I.high=ba+S+(P>>>0>>0?1:0);Q=f.low=Q+E;f.high=ca+V+(Q>>>0>>0?1:0)},_doFinalize:function(){var a=this._data,d=a.words,f=8*this._nDataBytes,e=8*a.sigBytes;d[e>>>5]|=128<<24-e%32;d[(e+128>>>10<<5)+30]=Math.floor(f/4294967296);d[(e+128>>>10<<5)+31]=f;a.sigBytes=4*d.length;this._process();return this._hash.toX32()},clone:function(){var a=r.clone.call(this);a._hash=this._hash.clone();return a},blockSize:32});n.SHA512=r._createHelper(e);n.HmacSHA512=r._createHmacHelper(e)})(); diff --git a/library/cryptojs/components/sha512.js b/library/cryptojs/components/sha512.js new file mode 100644 index 000000000..4c6940cb7 --- /dev/null +++ b/library/cryptojs/components/sha512.js @@ -0,0 +1,309 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var Hasher = C_lib.Hasher; + var C_x64 = C.x64; + var X64Word = C_x64.Word; + var X64WordArray = C_x64.WordArray; + var C_algo = C.algo; + + function X64Word_create() { + return X64Word.create.apply(X64Word, arguments); + } + + // Constants + var K = [ + X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd), + X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc), + X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019), + X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118), + X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe), + X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2), + X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1), + X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694), + X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3), + X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65), + X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483), + X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5), + X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210), + X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4), + X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725), + X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70), + X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926), + X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df), + X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8), + X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b), + X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001), + X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30), + X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910), + X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8), + X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53), + X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8), + X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb), + X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3), + X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60), + X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec), + X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9), + X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b), + X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207), + X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178), + X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6), + X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b), + X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493), + X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c), + X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a), + X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817) + ]; + + // Reusable objects + var W = []; + (function () { + for (var i = 0; i < 80; i++) { + W[i] = X64Word_create(); + } + }()); + + /** + * SHA-512 hash algorithm. + */ + var SHA512 = C_algo.SHA512 = Hasher.extend({ + _doReset: function () { + this._hash = new X64WordArray.init([ + new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b), + new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1), + new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f), + new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179) + ]); + }, + + _doProcessBlock: function (M, offset) { + // Shortcuts + var H = this._hash.words; + + var H0 = H[0]; + var H1 = H[1]; + var H2 = H[2]; + var H3 = H[3]; + var H4 = H[4]; + var H5 = H[5]; + var H6 = H[6]; + var H7 = H[7]; + + var H0h = H0.high; + var H0l = H0.low; + var H1h = H1.high; + var H1l = H1.low; + var H2h = H2.high; + var H2l = H2.low; + var H3h = H3.high; + var H3l = H3.low; + var H4h = H4.high; + var H4l = H4.low; + var H5h = H5.high; + var H5l = H5.low; + var H6h = H6.high; + var H6l = H6.low; + var H7h = H7.high; + var H7l = H7.low; + + // Working variables + var ah = H0h; + var al = H0l; + var bh = H1h; + var bl = H1l; + var ch = H2h; + var cl = H2l; + var dh = H3h; + var dl = H3l; + var eh = H4h; + var el = H4l; + var fh = H5h; + var fl = H5l; + var gh = H6h; + var gl = H6l; + var hh = H7h; + var hl = H7l; + + // Rounds + for (var i = 0; i < 80; i++) { + // Shortcut + var Wi = W[i]; + + // Extend message + if (i < 16) { + var Wih = Wi.high = M[offset + i * 2] | 0; + var Wil = Wi.low = M[offset + i * 2 + 1] | 0; + } else { + // Gamma0 + var gamma0x = W[i - 15]; + var gamma0xh = gamma0x.high; + var gamma0xl = gamma0x.low; + var gamma0h = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7); + var gamma0l = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25)); + + // Gamma1 + var gamma1x = W[i - 2]; + var gamma1xh = gamma1x.high; + var gamma1xl = gamma1x.low; + var gamma1h = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6); + var gamma1l = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26)); + + // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16] + var Wi7 = W[i - 7]; + var Wi7h = Wi7.high; + var Wi7l = Wi7.low; + + var Wi16 = W[i - 16]; + var Wi16h = Wi16.high; + var Wi16l = Wi16.low; + + var Wil = gamma0l + Wi7l; + var Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0); + var Wil = Wil + gamma1l; + var Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0); + var Wil = Wil + Wi16l; + var Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0); + + Wi.high = Wih; + Wi.low = Wil; + } + + var chh = (eh & fh) ^ (~eh & gh); + var chl = (el & fl) ^ (~el & gl); + var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch); + var majl = (al & bl) ^ (al & cl) ^ (bl & cl); + + var sigma0h = ((ah >>> 28) | (al << 4)) ^ ((ah << 30) | (al >>> 2)) ^ ((ah << 25) | (al >>> 7)); + var sigma0l = ((al >>> 28) | (ah << 4)) ^ ((al << 30) | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7)); + var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9)); + var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9)); + + // t1 = h + sigma1 + ch + K[i] + W[i] + var Ki = K[i]; + var Kih = Ki.high; + var Kil = Ki.low; + + var t1l = hl + sigma1l; + var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0); + var t1l = t1l + chl; + var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0); + var t1l = t1l + Kil; + var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0); + var t1l = t1l + Wil; + var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0); + + // t2 = sigma0 + maj + var t2l = sigma0l + majl; + var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0); + + // Update working variables + hh = gh; + hl = gl; + gh = fh; + gl = fl; + fh = eh; + fl = el; + el = (dl + t1l) | 0; + eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0; + dh = ch; + dl = cl; + ch = bh; + cl = bl; + bh = ah; + bl = al; + al = (t1l + t2l) | 0; + ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0; + } + + // Intermediate hash value + H0l = H0.low = (H0l + al); + H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0)); + H1l = H1.low = (H1l + bl); + H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0)); + H2l = H2.low = (H2l + cl); + H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0)); + H3l = H3.low = (H3l + dl); + H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0)); + H4l = H4.low = (H4l + el); + H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0)); + H5l = H5.low = (H5l + fl); + H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0)); + H6l = H6.low = (H6l + gl); + H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0)); + H7l = H7.low = (H7l + hl); + H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0)); + }, + + _doFinalize: function () { + // Shortcuts + var data = this._data; + var dataWords = data.words; + + var nBitsTotal = this._nDataBytes * 8; + var nBitsLeft = data.sigBytes * 8; + + // Add padding + dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32); + dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000); + dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal; + data.sigBytes = dataWords.length * 4; + + // Hash final blocks + this._process(); + + // Convert hash to 32-bit word array before returning + var hash = this._hash.toX32(); + + // Return final computed hash + return hash; + }, + + clone: function () { + var clone = Hasher.clone.call(this); + clone._hash = this._hash.clone(); + + return clone; + }, + + blockSize: 1024/32 + }); + + /** + * Shortcut function to the hasher's object interface. + * + * @param {WordArray|string} message The message to hash. + * + * @return {WordArray} The hash. + * + * @static + * + * @example + * + * var hash = CryptoJS.SHA512('message'); + * var hash = CryptoJS.SHA512(wordArray); + */ + C.SHA512 = Hasher._createHelper(SHA512); + + /** + * Shortcut function to the HMAC's object interface. + * + * @param {WordArray|string} message The message to hash. + * @param {WordArray|string} key The secret key. + * + * @return {WordArray} The HMAC. + * + * @static + * + * @example + * + * var hmac = CryptoJS.HmacSHA512(message, key); + */ + C.HmacSHA512 = Hasher._createHmacHelper(SHA512); +}()); diff --git a/library/cryptojs/components/tripledes-min.js b/library/cryptojs/components/tripledes-min.js new file mode 100644 index 000000000..a669dd326 --- /dev/null +++ b/library/cryptojs/components/tripledes-min.js @@ -0,0 +1,26 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(){function j(b,c){var a=(this._lBlock>>>b^this._rBlock)&c;this._rBlock^=a;this._lBlock^=a<>>b^this._lBlock)&c;this._lBlock^=a;this._rBlock^=a<a;a++){var f=q[a]-1;c[a]=b[f>>>5]>>>31-f%32&1}b=this._subKeys=[];for(f=0;16>f;f++){for(var d=b[f]=[],e=r[f],a=0;24>a;a++)d[a/6|0]|=c[(p[a]-1+e)%28]<<31-a%6,d[4+(a/6|0)]|=c[28+(p[a+24]-1+e)%28]<<31-a%6;d[0]=d[0]<<1|d[0]>>>31;for(a=1;7>a;a++)d[a]>>>= +4*(a-1)+3;d[7]=d[7]<<5|d[7]>>>27}c=this._invSubKeys=[];for(a=0;16>a;a++)c[a]=b[15-a]},encryptBlock:function(b,c){this._doCryptBlock(b,c,this._subKeys)},decryptBlock:function(b,c){this._doCryptBlock(b,c,this._invSubKeys)},_doCryptBlock:function(b,c,a){this._lBlock=b[c];this._rBlock=b[c+1];j.call(this,4,252645135);j.call(this,16,65535);l.call(this,2,858993459);l.call(this,8,16711935);j.call(this,1,1431655765);for(var f=0;16>f;f++){for(var d=a[f],e=this._lBlock,h=this._rBlock,g=0,k=0;8>k;k++)g|=s[k][((h^ +d[k])&t[k])>>>0];this._lBlock=h;this._rBlock=e^g}a=this._lBlock;this._lBlock=this._rBlock;this._rBlock=a;j.call(this,1,1431655765);l.call(this,8,16711935);l.call(this,2,858993459);j.call(this,16,65535);j.call(this,4,252645135);b[c]=this._lBlock;b[c+1]=this._rBlock},keySize:2,ivSize:2,blockSize:2});h.DES=e._createHelper(m);g=g.TripleDES=e.extend({_doReset:function(){var b=this._key.words;this._des1=m.createEncryptor(n.create(b.slice(0,2)));this._des2=m.createEncryptor(n.create(b.slice(2,4)));this._des3= +m.createEncryptor(n.create(b.slice(4,6)))},encryptBlock:function(b,c){this._des1.encryptBlock(b,c);this._des2.decryptBlock(b,c);this._des3.encryptBlock(b,c)},decryptBlock:function(b,c){this._des3.decryptBlock(b,c);this._des2.encryptBlock(b,c);this._des1.decryptBlock(b,c)},keySize:6,ivSize:2,blockSize:2});h.TripleDES=e._createHelper(g)})(); diff --git a/library/cryptojs/components/tripledes.js b/library/cryptojs/components/tripledes.js new file mode 100644 index 000000000..f52377294 --- /dev/null +++ b/library/cryptojs/components/tripledes.js @@ -0,0 +1,756 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function () { + // Shortcuts + var C = CryptoJS; + var C_lib = C.lib; + var WordArray = C_lib.WordArray; + var BlockCipher = C_lib.BlockCipher; + var C_algo = C.algo; + + // Permuted Choice 1 constants + var PC1 = [ + 57, 49, 41, 33, 25, 17, 9, 1, + 58, 50, 42, 34, 26, 18, 10, 2, + 59, 51, 43, 35, 27, 19, 11, 3, + 60, 52, 44, 36, 63, 55, 47, 39, + 31, 23, 15, 7, 62, 54, 46, 38, + 30, 22, 14, 6, 61, 53, 45, 37, + 29, 21, 13, 5, 28, 20, 12, 4 + ]; + + // Permuted Choice 2 constants + var PC2 = [ + 14, 17, 11, 24, 1, 5, + 3, 28, 15, 6, 21, 10, + 23, 19, 12, 4, 26, 8, + 16, 7, 27, 20, 13, 2, + 41, 52, 31, 37, 47, 55, + 30, 40, 51, 45, 33, 48, + 44, 49, 39, 56, 34, 53, + 46, 42, 50, 36, 29, 32 + ]; + + // Cumulative bit shift constants + var BIT_SHIFTS = [1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28]; + + // SBOXes and round permutation constants + var SBOX_P = [ + { + 0x0: 0x808200, + 0x10000000: 0x8000, + 0x20000000: 0x808002, + 0x30000000: 0x2, + 0x40000000: 0x200, + 0x50000000: 0x808202, + 0x60000000: 0x800202, + 0x70000000: 0x800000, + 0x80000000: 0x202, + 0x90000000: 0x800200, + 0xa0000000: 0x8200, + 0xb0000000: 0x808000, + 0xc0000000: 0x8002, + 0xd0000000: 0x800002, + 0xe0000000: 0x0, + 0xf0000000: 0x8202, + 0x8000000: 0x0, + 0x18000000: 0x808202, + 0x28000000: 0x8202, + 0x38000000: 0x8000, + 0x48000000: 0x808200, + 0x58000000: 0x200, + 0x68000000: 0x808002, + 0x78000000: 0x2, + 0x88000000: 0x800200, + 0x98000000: 0x8200, + 0xa8000000: 0x808000, + 0xb8000000: 0x800202, + 0xc8000000: 0x800002, + 0xd8000000: 0x8002, + 0xe8000000: 0x202, + 0xf8000000: 0x800000, + 0x1: 0x8000, + 0x10000001: 0x2, + 0x20000001: 0x808200, + 0x30000001: 0x800000, + 0x40000001: 0x808002, + 0x50000001: 0x8200, + 0x60000001: 0x200, + 0x70000001: 0x800202, + 0x80000001: 0x808202, + 0x90000001: 0x808000, + 0xa0000001: 0x800002, + 0xb0000001: 0x8202, + 0xc0000001: 0x202, + 0xd0000001: 0x800200, + 0xe0000001: 0x8002, + 0xf0000001: 0x0, + 0x8000001: 0x808202, + 0x18000001: 0x808000, + 0x28000001: 0x800000, + 0x38000001: 0x200, + 0x48000001: 0x8000, + 0x58000001: 0x800002, + 0x68000001: 0x2, + 0x78000001: 0x8202, + 0x88000001: 0x8002, + 0x98000001: 0x800202, + 0xa8000001: 0x202, + 0xb8000001: 0x808200, + 0xc8000001: 0x800200, + 0xd8000001: 0x0, + 0xe8000001: 0x8200, + 0xf8000001: 0x808002 + }, + { + 0x0: 0x40084010, + 0x1000000: 0x4000, + 0x2000000: 0x80000, + 0x3000000: 0x40080010, + 0x4000000: 0x40000010, + 0x5000000: 0x40084000, + 0x6000000: 0x40004000, + 0x7000000: 0x10, + 0x8000000: 0x84000, + 0x9000000: 0x40004010, + 0xa000000: 0x40000000, + 0xb000000: 0x84010, + 0xc000000: 0x80010, + 0xd000000: 0x0, + 0xe000000: 0x4010, + 0xf000000: 0x40080000, + 0x800000: 0x40004000, + 0x1800000: 0x84010, + 0x2800000: 0x10, + 0x3800000: 0x40004010, + 0x4800000: 0x40084010, + 0x5800000: 0x40000000, + 0x6800000: 0x80000, + 0x7800000: 0x40080010, + 0x8800000: 0x80010, + 0x9800000: 0x0, + 0xa800000: 0x4000, + 0xb800000: 0x40080000, + 0xc800000: 0x40000010, + 0xd800000: 0x84000, + 0xe800000: 0x40084000, + 0xf800000: 0x4010, + 0x10000000: 0x0, + 0x11000000: 0x40080010, + 0x12000000: 0x40004010, + 0x13000000: 0x40084000, + 0x14000000: 0x40080000, + 0x15000000: 0x10, + 0x16000000: 0x84010, + 0x17000000: 0x4000, + 0x18000000: 0x4010, + 0x19000000: 0x80000, + 0x1a000000: 0x80010, + 0x1b000000: 0x40000010, + 0x1c000000: 0x84000, + 0x1d000000: 0x40004000, + 0x1e000000: 0x40000000, + 0x1f000000: 0x40084010, + 0x10800000: 0x84010, + 0x11800000: 0x80000, + 0x12800000: 0x40080000, + 0x13800000: 0x4000, + 0x14800000: 0x40004000, + 0x15800000: 0x40084010, + 0x16800000: 0x10, + 0x17800000: 0x40000000, + 0x18800000: 0x40084000, + 0x19800000: 0x40000010, + 0x1a800000: 0x40004010, + 0x1b800000: 0x80010, + 0x1c800000: 0x0, + 0x1d800000: 0x4010, + 0x1e800000: 0x40080010, + 0x1f800000: 0x84000 + }, + { + 0x0: 0x104, + 0x100000: 0x0, + 0x200000: 0x4000100, + 0x300000: 0x10104, + 0x400000: 0x10004, + 0x500000: 0x4000004, + 0x600000: 0x4010104, + 0x700000: 0x4010000, + 0x800000: 0x4000000, + 0x900000: 0x4010100, + 0xa00000: 0x10100, + 0xb00000: 0x4010004, + 0xc00000: 0x4000104, + 0xd00000: 0x10000, + 0xe00000: 0x4, + 0xf00000: 0x100, + 0x80000: 0x4010100, + 0x180000: 0x4010004, + 0x280000: 0x0, + 0x380000: 0x4000100, + 0x480000: 0x4000004, + 0x580000: 0x10000, + 0x680000: 0x10004, + 0x780000: 0x104, + 0x880000: 0x4, + 0x980000: 0x100, + 0xa80000: 0x4010000, + 0xb80000: 0x10104, + 0xc80000: 0x10100, + 0xd80000: 0x4000104, + 0xe80000: 0x4010104, + 0xf80000: 0x4000000, + 0x1000000: 0x4010100, + 0x1100000: 0x10004, + 0x1200000: 0x10000, + 0x1300000: 0x4000100, + 0x1400000: 0x100, + 0x1500000: 0x4010104, + 0x1600000: 0x4000004, + 0x1700000: 0x0, + 0x1800000: 0x4000104, + 0x1900000: 0x4000000, + 0x1a00000: 0x4, + 0x1b00000: 0x10100, + 0x1c00000: 0x4010000, + 0x1d00000: 0x104, + 0x1e00000: 0x10104, + 0x1f00000: 0x4010004, + 0x1080000: 0x4000000, + 0x1180000: 0x104, + 0x1280000: 0x4010100, + 0x1380000: 0x0, + 0x1480000: 0x10004, + 0x1580000: 0x4000100, + 0x1680000: 0x100, + 0x1780000: 0x4010004, + 0x1880000: 0x10000, + 0x1980000: 0x4010104, + 0x1a80000: 0x10104, + 0x1b80000: 0x4000004, + 0x1c80000: 0x4000104, + 0x1d80000: 0x4010000, + 0x1e80000: 0x4, + 0x1f80000: 0x10100 + }, + { + 0x0: 0x80401000, + 0x10000: 0x80001040, + 0x20000: 0x401040, + 0x30000: 0x80400000, + 0x40000: 0x0, + 0x50000: 0x401000, + 0x60000: 0x80000040, + 0x70000: 0x400040, + 0x80000: 0x80000000, + 0x90000: 0x400000, + 0xa0000: 0x40, + 0xb0000: 0x80001000, + 0xc0000: 0x80400040, + 0xd0000: 0x1040, + 0xe0000: 0x1000, + 0xf0000: 0x80401040, + 0x8000: 0x80001040, + 0x18000: 0x40, + 0x28000: 0x80400040, + 0x38000: 0x80001000, + 0x48000: 0x401000, + 0x58000: 0x80401040, + 0x68000: 0x0, + 0x78000: 0x80400000, + 0x88000: 0x1000, + 0x98000: 0x80401000, + 0xa8000: 0x400000, + 0xb8000: 0x1040, + 0xc8000: 0x80000000, + 0xd8000: 0x400040, + 0xe8000: 0x401040, + 0xf8000: 0x80000040, + 0x100000: 0x400040, + 0x110000: 0x401000, + 0x120000: 0x80000040, + 0x130000: 0x0, + 0x140000: 0x1040, + 0x150000: 0x80400040, + 0x160000: 0x80401000, + 0x170000: 0x80001040, + 0x180000: 0x80401040, + 0x190000: 0x80000000, + 0x1a0000: 0x80400000, + 0x1b0000: 0x401040, + 0x1c0000: 0x80001000, + 0x1d0000: 0x400000, + 0x1e0000: 0x40, + 0x1f0000: 0x1000, + 0x108000: 0x80400000, + 0x118000: 0x80401040, + 0x128000: 0x0, + 0x138000: 0x401000, + 0x148000: 0x400040, + 0x158000: 0x80000000, + 0x168000: 0x80001040, + 0x178000: 0x40, + 0x188000: 0x80000040, + 0x198000: 0x1000, + 0x1a8000: 0x80001000, + 0x1b8000: 0x80400040, + 0x1c8000: 0x1040, + 0x1d8000: 0x80401000, + 0x1e8000: 0x400000, + 0x1f8000: 0x401040 + }, + { + 0x0: 0x80, + 0x1000: 0x1040000, + 0x2000: 0x40000, + 0x3000: 0x20000000, + 0x4000: 0x20040080, + 0x5000: 0x1000080, + 0x6000: 0x21000080, + 0x7000: 0x40080, + 0x8000: 0x1000000, + 0x9000: 0x20040000, + 0xa000: 0x20000080, + 0xb000: 0x21040080, + 0xc000: 0x21040000, + 0xd000: 0x0, + 0xe000: 0x1040080, + 0xf000: 0x21000000, + 0x800: 0x1040080, + 0x1800: 0x21000080, + 0x2800: 0x80, + 0x3800: 0x1040000, + 0x4800: 0x40000, + 0x5800: 0x20040080, + 0x6800: 0x21040000, + 0x7800: 0x20000000, + 0x8800: 0x20040000, + 0x9800: 0x0, + 0xa800: 0x21040080, + 0xb800: 0x1000080, + 0xc800: 0x20000080, + 0xd800: 0x21000000, + 0xe800: 0x1000000, + 0xf800: 0x40080, + 0x10000: 0x40000, + 0x11000: 0x80, + 0x12000: 0x20000000, + 0x13000: 0x21000080, + 0x14000: 0x1000080, + 0x15000: 0x21040000, + 0x16000: 0x20040080, + 0x17000: 0x1000000, + 0x18000: 0x21040080, + 0x19000: 0x21000000, + 0x1a000: 0x1040000, + 0x1b000: 0x20040000, + 0x1c000: 0x40080, + 0x1d000: 0x20000080, + 0x1e000: 0x0, + 0x1f000: 0x1040080, + 0x10800: 0x21000080, + 0x11800: 0x1000000, + 0x12800: 0x1040000, + 0x13800: 0x20040080, + 0x14800: 0x20000000, + 0x15800: 0x1040080, + 0x16800: 0x80, + 0x17800: 0x21040000, + 0x18800: 0x40080, + 0x19800: 0x21040080, + 0x1a800: 0x0, + 0x1b800: 0x21000000, + 0x1c800: 0x1000080, + 0x1d800: 0x40000, + 0x1e800: 0x20040000, + 0x1f800: 0x20000080 + }, + { + 0x0: 0x10000008, + 0x100: 0x2000, + 0x200: 0x10200000, + 0x300: 0x10202008, + 0x400: 0x10002000, + 0x500: 0x200000, + 0x600: 0x200008, + 0x700: 0x10000000, + 0x800: 0x0, + 0x900: 0x10002008, + 0xa00: 0x202000, + 0xb00: 0x8, + 0xc00: 0x10200008, + 0xd00: 0x202008, + 0xe00: 0x2008, + 0xf00: 0x10202000, + 0x80: 0x10200000, + 0x180: 0x10202008, + 0x280: 0x8, + 0x380: 0x200000, + 0x480: 0x202008, + 0x580: 0x10000008, + 0x680: 0x10002000, + 0x780: 0x2008, + 0x880: 0x200008, + 0x980: 0x2000, + 0xa80: 0x10002008, + 0xb80: 0x10200008, + 0xc80: 0x0, + 0xd80: 0x10202000, + 0xe80: 0x202000, + 0xf80: 0x10000000, + 0x1000: 0x10002000, + 0x1100: 0x10200008, + 0x1200: 0x10202008, + 0x1300: 0x2008, + 0x1400: 0x200000, + 0x1500: 0x10000000, + 0x1600: 0x10000008, + 0x1700: 0x202000, + 0x1800: 0x202008, + 0x1900: 0x0, + 0x1a00: 0x8, + 0x1b00: 0x10200000, + 0x1c00: 0x2000, + 0x1d00: 0x10002008, + 0x1e00: 0x10202000, + 0x1f00: 0x200008, + 0x1080: 0x8, + 0x1180: 0x202000, + 0x1280: 0x200000, + 0x1380: 0x10000008, + 0x1480: 0x10002000, + 0x1580: 0x2008, + 0x1680: 0x10202008, + 0x1780: 0x10200000, + 0x1880: 0x10202000, + 0x1980: 0x10200008, + 0x1a80: 0x2000, + 0x1b80: 0x202008, + 0x1c80: 0x200008, + 0x1d80: 0x0, + 0x1e80: 0x10000000, + 0x1f80: 0x10002008 + }, + { + 0x0: 0x100000, + 0x10: 0x2000401, + 0x20: 0x400, + 0x30: 0x100401, + 0x40: 0x2100401, + 0x50: 0x0, + 0x60: 0x1, + 0x70: 0x2100001, + 0x80: 0x2000400, + 0x90: 0x100001, + 0xa0: 0x2000001, + 0xb0: 0x2100400, + 0xc0: 0x2100000, + 0xd0: 0x401, + 0xe0: 0x100400, + 0xf0: 0x2000000, + 0x8: 0x2100001, + 0x18: 0x0, + 0x28: 0x2000401, + 0x38: 0x2100400, + 0x48: 0x100000, + 0x58: 0x2000001, + 0x68: 0x2000000, + 0x78: 0x401, + 0x88: 0x100401, + 0x98: 0x2000400, + 0xa8: 0x2100000, + 0xb8: 0x100001, + 0xc8: 0x400, + 0xd8: 0x2100401, + 0xe8: 0x1, + 0xf8: 0x100400, + 0x100: 0x2000000, + 0x110: 0x100000, + 0x120: 0x2000401, + 0x130: 0x2100001, + 0x140: 0x100001, + 0x150: 0x2000400, + 0x160: 0x2100400, + 0x170: 0x100401, + 0x180: 0x401, + 0x190: 0x2100401, + 0x1a0: 0x100400, + 0x1b0: 0x1, + 0x1c0: 0x0, + 0x1d0: 0x2100000, + 0x1e0: 0x2000001, + 0x1f0: 0x400, + 0x108: 0x100400, + 0x118: 0x2000401, + 0x128: 0x2100001, + 0x138: 0x1, + 0x148: 0x2000000, + 0x158: 0x100000, + 0x168: 0x401, + 0x178: 0x2100400, + 0x188: 0x2000001, + 0x198: 0x2100000, + 0x1a8: 0x0, + 0x1b8: 0x2100401, + 0x1c8: 0x100401, + 0x1d8: 0x400, + 0x1e8: 0x2000400, + 0x1f8: 0x100001 + }, + { + 0x0: 0x8000820, + 0x1: 0x20000, + 0x2: 0x8000000, + 0x3: 0x20, + 0x4: 0x20020, + 0x5: 0x8020820, + 0x6: 0x8020800, + 0x7: 0x800, + 0x8: 0x8020000, + 0x9: 0x8000800, + 0xa: 0x20800, + 0xb: 0x8020020, + 0xc: 0x820, + 0xd: 0x0, + 0xe: 0x8000020, + 0xf: 0x20820, + 0x80000000: 0x800, + 0x80000001: 0x8020820, + 0x80000002: 0x8000820, + 0x80000003: 0x8000000, + 0x80000004: 0x8020000, + 0x80000005: 0x20800, + 0x80000006: 0x20820, + 0x80000007: 0x20, + 0x80000008: 0x8000020, + 0x80000009: 0x820, + 0x8000000a: 0x20020, + 0x8000000b: 0x8020800, + 0x8000000c: 0x0, + 0x8000000d: 0x8020020, + 0x8000000e: 0x8000800, + 0x8000000f: 0x20000, + 0x10: 0x20820, + 0x11: 0x8020800, + 0x12: 0x20, + 0x13: 0x800, + 0x14: 0x8000800, + 0x15: 0x8000020, + 0x16: 0x8020020, + 0x17: 0x20000, + 0x18: 0x0, + 0x19: 0x20020, + 0x1a: 0x8020000, + 0x1b: 0x8000820, + 0x1c: 0x8020820, + 0x1d: 0x20800, + 0x1e: 0x820, + 0x1f: 0x8000000, + 0x80000010: 0x20000, + 0x80000011: 0x800, + 0x80000012: 0x8020020, + 0x80000013: 0x20820, + 0x80000014: 0x20, + 0x80000015: 0x8020000, + 0x80000016: 0x8000000, + 0x80000017: 0x8000820, + 0x80000018: 0x8020820, + 0x80000019: 0x8000020, + 0x8000001a: 0x8000800, + 0x8000001b: 0x0, + 0x8000001c: 0x20800, + 0x8000001d: 0x820, + 0x8000001e: 0x20020, + 0x8000001f: 0x8020800 + } + ]; + + // Masks that select the SBOX input + var SBOX_MASK = [ + 0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000, + 0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f + ]; + + /** + * DES block cipher algorithm. + */ + var DES = C_algo.DES = BlockCipher.extend({ + _doReset: function () { + // Shortcuts + var key = this._key; + var keyWords = key.words; + + // Select 56 bits according to PC1 + var keyBits = []; + for (var i = 0; i < 56; i++) { + var keyBitPos = PC1[i] - 1; + keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1; + } + + // Assemble 16 subkeys + var subKeys = this._subKeys = []; + for (var nSubKey = 0; nSubKey < 16; nSubKey++) { + // Create subkey + var subKey = subKeys[nSubKey] = []; + + // Shortcut + var bitShift = BIT_SHIFTS[nSubKey]; + + // Select 48 bits according to PC2 + for (var i = 0; i < 24; i++) { + // Select from the left 28 key bits + subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6); + + // Select from the right 28 key bits + subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6); + } + + // Since each subkey is applied to an expanded 32-bit input, + // the subkey can be broken into 8 values scaled to 32-bits, + // which allows the key to be used without expansion + subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31); + for (var i = 1; i < 7; i++) { + subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3); + } + subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27); + } + + // Compute inverse subkeys + var invSubKeys = this._invSubKeys = []; + for (var i = 0; i < 16; i++) { + invSubKeys[i] = subKeys[15 - i]; + } + }, + + encryptBlock: function (M, offset) { + this._doCryptBlock(M, offset, this._subKeys); + }, + + decryptBlock: function (M, offset) { + this._doCryptBlock(M, offset, this._invSubKeys); + }, + + _doCryptBlock: function (M, offset, subKeys) { + // Get input + this._lBlock = M[offset]; + this._rBlock = M[offset + 1]; + + // Initial permutation + exchangeLR.call(this, 4, 0x0f0f0f0f); + exchangeLR.call(this, 16, 0x0000ffff); + exchangeRL.call(this, 2, 0x33333333); + exchangeRL.call(this, 8, 0x00ff00ff); + exchangeLR.call(this, 1, 0x55555555); + + // Rounds + for (var round = 0; round < 16; round++) { + // Shortcuts + var subKey = subKeys[round]; + var lBlock = this._lBlock; + var rBlock = this._rBlock; + + // Feistel function + var f = 0; + for (var i = 0; i < 8; i++) { + f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0]; + } + this._lBlock = rBlock; + this._rBlock = lBlock ^ f; + } + + // Undo swap from last round + var t = this._lBlock; + this._lBlock = this._rBlock; + this._rBlock = t; + + // Final permutation + exchangeLR.call(this, 1, 0x55555555); + exchangeRL.call(this, 8, 0x00ff00ff); + exchangeRL.call(this, 2, 0x33333333); + exchangeLR.call(this, 16, 0x0000ffff); + exchangeLR.call(this, 4, 0x0f0f0f0f); + + // Set output + M[offset] = this._lBlock; + M[offset + 1] = this._rBlock; + }, + + keySize: 64/32, + + ivSize: 64/32, + + blockSize: 64/32 + }); + + // Swap bits across the left and right words + function exchangeLR(offset, mask) { + var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask; + this._rBlock ^= t; + this._lBlock ^= t << offset; + } + + function exchangeRL(offset, mask) { + var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask; + this._lBlock ^= t; + this._rBlock ^= t << offset; + } + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.DES.encrypt(message, key, cfg); + * var plaintext = CryptoJS.DES.decrypt(ciphertext, key, cfg); + */ + C.DES = BlockCipher._createHelper(DES); + + /** + * Triple-DES block cipher algorithm. + */ + var TripleDES = C_algo.TripleDES = BlockCipher.extend({ + _doReset: function () { + // Shortcuts + var key = this._key; + var keyWords = key.words; + + // Create DES instances + this._des1 = DES.createEncryptor(WordArray.create(keyWords.slice(0, 2))); + this._des2 = DES.createEncryptor(WordArray.create(keyWords.slice(2, 4))); + this._des3 = DES.createEncryptor(WordArray.create(keyWords.slice(4, 6))); + }, + + encryptBlock: function (M, offset) { + this._des1.encryptBlock(M, offset); + this._des2.decryptBlock(M, offset); + this._des3.encryptBlock(M, offset); + }, + + decryptBlock: function (M, offset) { + this._des3.decryptBlock(M, offset); + this._des2.encryptBlock(M, offset); + this._des1.decryptBlock(M, offset); + }, + + keySize: 192/32, + + ivSize: 64/32, + + blockSize: 64/32 + }); + + /** + * Shortcut functions to the cipher's object interface. + * + * @example + * + * var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg); + * var plaintext = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg); + */ + C.TripleDES = BlockCipher._createHelper(TripleDES); +}()); diff --git a/library/cryptojs/components/x64-core-min.js b/library/cryptojs/components/x64-core-min.js new file mode 100644 index 000000000..0566f06fd --- /dev/null +++ b/library/cryptojs/components/x64-core-min.js @@ -0,0 +1,7 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +(function(g){var a=CryptoJS,f=a.lib,e=f.Base,h=f.WordArray,a=a.x64={};a.Word=e.extend({init:function(b,c){this.high=b;this.low=c}});a.WordArray=e.extend({init:function(b,c){b=this.words=b||[];this.sigBytes=c!=g?c:8*b.length},toX32:function(){for(var b=this.words,c=b.length,a=[],d=0;d>> (32 - n)); + // var low = this.low << n; + // } else { + // var high = this.low << (n - 32); + // var low = 0; + // } + + // return X64Word.create(high, low); + // }, + + /** + * Shifts this word n bits to the right. + * + * @param {number} n The number of bits to shift. + * + * @return {X64Word} A new x64-Word object after shifting. + * + * @example + * + * var shifted = x64Word.shiftR(7); + */ + // shiftR: function (n) { + // if (n < 32) { + // var low = (this.low >>> n) | (this.high << (32 - n)); + // var high = this.high >>> n; + // } else { + // var low = this.high >>> (n - 32); + // var high = 0; + // } + + // return X64Word.create(high, low); + // }, + + /** + * Rotates this word n bits to the left. + * + * @param {number} n The number of bits to rotate. + * + * @return {X64Word} A new x64-Word object after rotating. + * + * @example + * + * var rotated = x64Word.rotL(25); + */ + // rotL: function (n) { + // return this.shiftL(n).or(this.shiftR(64 - n)); + // }, + + /** + * Rotates this word n bits to the right. + * + * @param {number} n The number of bits to rotate. + * + * @return {X64Word} A new x64-Word object after rotating. + * + * @example + * + * var rotated = x64Word.rotR(7); + */ + // rotR: function (n) { + // return this.shiftR(n).or(this.shiftL(64 - n)); + // }, + + /** + * Adds this word with the passed word. + * + * @param {X64Word} word The x64-Word to add with this word. + * + * @return {X64Word} A new x64-Word object after adding. + * + * @example + * + * var added = x64Word.add(anotherX64Word); + */ + // add: function (word) { + // var low = (this.low + word.low) | 0; + // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0; + // var high = (this.high + word.high + carry) | 0; + + // return X64Word.create(high, low); + // } + }); + + /** + * An array of 64-bit words. + * + * @property {Array} words The array of CryptoJS.x64.Word objects. + * @property {number} sigBytes The number of significant bytes in this word array. + */ + var X64WordArray = C_x64.WordArray = Base.extend({ + /** + * Initializes a newly created word array. + * + * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects. + * @param {number} sigBytes (Optional) The number of significant bytes in the words. + * + * @example + * + * var wordArray = CryptoJS.x64.WordArray.create(); + * + * var wordArray = CryptoJS.x64.WordArray.create([ + * CryptoJS.x64.Word.create(0x00010203, 0x04050607), + * CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f) + * ]); + * + * var wordArray = CryptoJS.x64.WordArray.create([ + * CryptoJS.x64.Word.create(0x00010203, 0x04050607), + * CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f) + * ], 10); + */ + init: function (words, sigBytes) { + words = this.words = words || []; + + if (sigBytes != undefined) { + this.sigBytes = sigBytes; + } else { + this.sigBytes = words.length * 8; + } + }, + + /** + * Converts this 64-bit word array to a 32-bit word array. + * + * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array. + * + * @example + * + * var x32WordArray = x64WordArray.toX32(); + */ + toX32: function () { + // Shortcuts + var x64Words = this.words; + var x64WordsLength = x64Words.length; + + // Convert + var x32Words = []; + for (var i = 0; i < x64WordsLength; i++) { + var x64Word = x64Words[i]; + x32Words.push(x64Word.high); + x32Words.push(x64Word.low); + } + + return X32WordArray.create(x32Words, this.sigBytes); + }, + + /** + * Creates a copy of this word array. + * + * @return {X64WordArray} The clone. + * + * @example + * + * var clone = x64WordArray.clone(); + */ + clone: function () { + var clone = Base.clone.call(this); + + // Clone "words" array + var words = clone.words = this.words.slice(0); + + // Clone each X64Word object + var wordsLength = words.length; + for (var i = 0; i < wordsLength; i++) { + words[i] = words[i].clone(); + } + + return clone; + } + }); +}()); diff --git a/library/cryptojs/rollups/aes.js b/library/cryptojs/rollups/aes.js new file mode 100644 index 000000000..827503cbd --- /dev/null +++ b/library/cryptojs/rollups/aes.js @@ -0,0 +1,35 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(u,p){var d={},l=d.lib={},s=function(){},t=l.Base={extend:function(a){s.prototype=this;var c=new s;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +r=l.WordArray=t.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=p?c:4*a.length},toString:function(a){return(a||v).stringify(this)},concat:function(a){var c=this.words,e=a.words,j=this.sigBytes;a=a.sigBytes;this.clamp();if(j%4)for(var k=0;k>>2]|=(e[k>>>2]>>>24-8*(k%4)&255)<<24-8*((j+k)%4);else if(65535>>2]=e[k>>>2];else c.push.apply(c,e);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=u.ceil(c/4)},clone:function(){var a=t.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],e=0;e>>2]>>>24-8*(j%4)&255;e.push((k>>>4).toString(16));e.push((k&15).toString(16))}return e.join("")},parse:function(a){for(var c=a.length,e=[],j=0;j>>3]|=parseInt(a.substr(j, +2),16)<<24-4*(j%8);return new r.init(e,c/2)}},b=w.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var e=[],j=0;j>>2]>>>24-8*(j%4)&255));return e.join("")},parse:function(a){for(var c=a.length,e=[],j=0;j>>2]|=(a.charCodeAt(j)&255)<<24-8*(j%4);return new r.init(e,c)}},x=w.Utf8={stringify:function(a){try{return decodeURIComponent(escape(b.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return b.parse(unescape(encodeURIComponent(a)))}}, +q=l.BufferedBlockAlgorithm=t.extend({reset:function(){this._data=new r.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=x.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,e=c.words,j=c.sigBytes,k=this.blockSize,b=j/(4*k),b=a?u.ceil(b):u.max((b|0)-this._minBufferSize,0);a=b*k;j=u.min(4*a,j);if(a){for(var q=0;q>>2]>>>24-8*(r%4)&255)<<16|(l[r+1>>>2]>>>24-8*((r+1)%4)&255)<<8|l[r+2>>>2]>>>24-8*((r+2)%4)&255,v=0;4>v&&r+0.75*v>>6*(3-v)&63));if(l=t.charAt(64))for(;d.length%4;)d.push(l);return d.join("")},parse:function(d){var l=d.length,s=this._map,t=s.charAt(64);t&&(t=d.indexOf(t),-1!=t&&(l=t));for(var t=[],r=0,w=0;w< +l;w++)if(w%4){var v=s.indexOf(d.charAt(w-1))<<2*(w%4),b=s.indexOf(d.charAt(w))>>>6-2*(w%4);t[r>>>2]|=(v|b)<<24-8*(r%4);r++}return p.create(t,r)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); +(function(u){function p(b,n,a,c,e,j,k){b=b+(n&a|~n&c)+e+k;return(b<>>32-j)+n}function d(b,n,a,c,e,j,k){b=b+(n&c|a&~c)+e+k;return(b<>>32-j)+n}function l(b,n,a,c,e,j,k){b=b+(n^a^c)+e+k;return(b<>>32-j)+n}function s(b,n,a,c,e,j,k){b=b+(a^(n|~c))+e+k;return(b<>>32-j)+n}for(var t=CryptoJS,r=t.lib,w=r.WordArray,v=r.Hasher,r=t.algo,b=[],x=0;64>x;x++)b[x]=4294967296*u.abs(u.sin(x+1))|0;r=r.MD5=v.extend({_doReset:function(){this._hash=new w.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(q,n){for(var a=0;16>a;a++){var c=n+a,e=q[c];q[c]=(e<<8|e>>>24)&16711935|(e<<24|e>>>8)&4278255360}var a=this._hash.words,c=q[n+0],e=q[n+1],j=q[n+2],k=q[n+3],z=q[n+4],r=q[n+5],t=q[n+6],w=q[n+7],v=q[n+8],A=q[n+9],B=q[n+10],C=q[n+11],u=q[n+12],D=q[n+13],E=q[n+14],x=q[n+15],f=a[0],m=a[1],g=a[2],h=a[3],f=p(f,m,g,h,c,7,b[0]),h=p(h,f,m,g,e,12,b[1]),g=p(g,h,f,m,j,17,b[2]),m=p(m,g,h,f,k,22,b[3]),f=p(f,m,g,h,z,7,b[4]),h=p(h,f,m,g,r,12,b[5]),g=p(g,h,f,m,t,17,b[6]),m=p(m,g,h,f,w,22,b[7]), +f=p(f,m,g,h,v,7,b[8]),h=p(h,f,m,g,A,12,b[9]),g=p(g,h,f,m,B,17,b[10]),m=p(m,g,h,f,C,22,b[11]),f=p(f,m,g,h,u,7,b[12]),h=p(h,f,m,g,D,12,b[13]),g=p(g,h,f,m,E,17,b[14]),m=p(m,g,h,f,x,22,b[15]),f=d(f,m,g,h,e,5,b[16]),h=d(h,f,m,g,t,9,b[17]),g=d(g,h,f,m,C,14,b[18]),m=d(m,g,h,f,c,20,b[19]),f=d(f,m,g,h,r,5,b[20]),h=d(h,f,m,g,B,9,b[21]),g=d(g,h,f,m,x,14,b[22]),m=d(m,g,h,f,z,20,b[23]),f=d(f,m,g,h,A,5,b[24]),h=d(h,f,m,g,E,9,b[25]),g=d(g,h,f,m,k,14,b[26]),m=d(m,g,h,f,v,20,b[27]),f=d(f,m,g,h,D,5,b[28]),h=d(h,f, +m,g,j,9,b[29]),g=d(g,h,f,m,w,14,b[30]),m=d(m,g,h,f,u,20,b[31]),f=l(f,m,g,h,r,4,b[32]),h=l(h,f,m,g,v,11,b[33]),g=l(g,h,f,m,C,16,b[34]),m=l(m,g,h,f,E,23,b[35]),f=l(f,m,g,h,e,4,b[36]),h=l(h,f,m,g,z,11,b[37]),g=l(g,h,f,m,w,16,b[38]),m=l(m,g,h,f,B,23,b[39]),f=l(f,m,g,h,D,4,b[40]),h=l(h,f,m,g,c,11,b[41]),g=l(g,h,f,m,k,16,b[42]),m=l(m,g,h,f,t,23,b[43]),f=l(f,m,g,h,A,4,b[44]),h=l(h,f,m,g,u,11,b[45]),g=l(g,h,f,m,x,16,b[46]),m=l(m,g,h,f,j,23,b[47]),f=s(f,m,g,h,c,6,b[48]),h=s(h,f,m,g,w,10,b[49]),g=s(g,h,f,m, +E,15,b[50]),m=s(m,g,h,f,r,21,b[51]),f=s(f,m,g,h,u,6,b[52]),h=s(h,f,m,g,k,10,b[53]),g=s(g,h,f,m,B,15,b[54]),m=s(m,g,h,f,e,21,b[55]),f=s(f,m,g,h,v,6,b[56]),h=s(h,f,m,g,x,10,b[57]),g=s(g,h,f,m,t,15,b[58]),m=s(m,g,h,f,D,21,b[59]),f=s(f,m,g,h,z,6,b[60]),h=s(h,f,m,g,C,10,b[61]),g=s(g,h,f,m,j,15,b[62]),m=s(m,g,h,f,A,21,b[63]);a[0]=a[0]+f|0;a[1]=a[1]+m|0;a[2]=a[2]+g|0;a[3]=a[3]+h|0},_doFinalize:function(){var b=this._data,n=b.words,a=8*this._nDataBytes,c=8*b.sigBytes;n[c>>>5]|=128<<24-c%32;var e=u.floor(a/ +4294967296);n[(c+64>>>9<<4)+15]=(e<<8|e>>>24)&16711935|(e<<24|e>>>8)&4278255360;n[(c+64>>>9<<4)+14]=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360;b.sigBytes=4*(n.length+1);this._process();b=this._hash;n=b.words;for(a=0;4>a;a++)c=n[a],n[a]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360;return b},clone:function(){var b=v.clone.call(this);b._hash=this._hash.clone();return b}});t.MD5=v._createHelper(r);t.HmacMD5=v._createHmacHelper(r)})(Math); +(function(){var u=CryptoJS,p=u.lib,d=p.Base,l=p.WordArray,p=u.algo,s=p.EvpKDF=d.extend({cfg:d.extend({keySize:4,hasher:p.MD5,iterations:1}),init:function(d){this.cfg=this.cfg.extend(d)},compute:function(d,r){for(var p=this.cfg,s=p.hasher.create(),b=l.create(),u=b.words,q=p.keySize,p=p.iterations;u.length>>2]&255}};d.BlockCipher=v.extend({cfg:v.cfg.extend({mode:b,padding:q}),reset:function(){v.reset.call(this);var a=this.cfg,b=a.iv,a=a.mode;if(this._xformMode==this._ENC_XFORM_MODE)var c=a.createEncryptor;else c=a.createDecryptor,this._minBufferSize=1;this._mode=c.call(a, +this,b&&b.words)},_doProcessBlock:function(a,b){this._mode.processBlock(a,b)},_doFinalize:function(){var a=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){a.pad(this._data,this.blockSize);var b=this._process(!0)}else b=this._process(!0),a.unpad(b);return b},blockSize:4});var n=d.CipherParams=l.extend({init:function(a){this.mixIn(a)},toString:function(a){return(a||this.formatter).stringify(this)}}),b=(p.format={}).OpenSSL={stringify:function(a){var b=a.ciphertext;a=a.salt;return(a?s.create([1398893684, +1701076831]).concat(a).concat(b):b).toString(r)},parse:function(a){a=r.parse(a);var b=a.words;if(1398893684==b[0]&&1701076831==b[1]){var c=s.create(b.slice(2,4));b.splice(0,4);a.sigBytes-=16}return n.create({ciphertext:a,salt:c})}},a=d.SerializableCipher=l.extend({cfg:l.extend({format:b}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);var l=a.createEncryptor(c,d);b=l.finalize(b);l=l.cfg;return n.create({ciphertext:b,key:c,iv:l.iv,algorithm:a,mode:l.mode,padding:l.padding,blockSize:a.blockSize,formatter:d.format})}, +decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);return a.createDecryptor(c,d).finalize(b.ciphertext)},_parse:function(a,b){return"string"==typeof a?b.parse(a,this):a}}),p=(p.kdf={}).OpenSSL={execute:function(a,b,c,d){d||(d=s.random(8));a=w.create({keySize:b+c}).compute(a,d);c=s.create(a.words.slice(b),4*c);a.sigBytes=4*b;return n.create({key:a,iv:c,salt:d})}},c=d.PasswordBasedCipher=a.extend({cfg:a.cfg.extend({kdf:p}),encrypt:function(b,c,d,l){l=this.cfg.extend(l);d=l.kdf.execute(d, +b.keySize,b.ivSize);l.iv=d.iv;b=a.encrypt.call(this,b,c,d.key,l);b.mixIn(d);return b},decrypt:function(b,c,d,l){l=this.cfg.extend(l);c=this._parse(c,l.format);d=l.kdf.execute(d,b.keySize,b.ivSize,c.salt);l.iv=d.iv;return a.decrypt.call(this,b,c,d.key,l)}})}(); +(function(){for(var u=CryptoJS,p=u.lib.BlockCipher,d=u.algo,l=[],s=[],t=[],r=[],w=[],v=[],b=[],x=[],q=[],n=[],a=[],c=0;256>c;c++)a[c]=128>c?c<<1:c<<1^283;for(var e=0,j=0,c=0;256>c;c++){var k=j^j<<1^j<<2^j<<3^j<<4,k=k>>>8^k&255^99;l[e]=k;s[k]=e;var z=a[e],F=a[z],G=a[F],y=257*a[k]^16843008*k;t[e]=y<<24|y>>>8;r[e]=y<<16|y>>>16;w[e]=y<<8|y>>>24;v[e]=y;y=16843009*G^65537*F^257*z^16843008*e;b[k]=y<<24|y>>>8;x[k]=y<<16|y>>>16;q[k]=y<<8|y>>>24;n[k]=y;e?(e=z^a[a[a[G^z]]],j^=a[a[j]]):e=j=1}var H=[0,1,2,4,8, +16,32,64,128,27,54],d=d.AES=p.extend({_doReset:function(){for(var a=this._key,c=a.words,d=a.sigBytes/4,a=4*((this._nRounds=d+6)+1),e=this._keySchedule=[],j=0;j>>24]<<24|l[k>>>16&255]<<16|l[k>>>8&255]<<8|l[k&255]):(k=k<<8|k>>>24,k=l[k>>>24]<<24|l[k>>>16&255]<<16|l[k>>>8&255]<<8|l[k&255],k^=H[j/d|0]<<24);e[j]=e[j-d]^k}c=this._invKeySchedule=[];for(d=0;dd||4>=j?k:b[l[k>>>24]]^x[l[k>>>16&255]]^q[l[k>>> +8&255]]^n[l[k&255]]},encryptBlock:function(a,b){this._doCryptBlock(a,b,this._keySchedule,t,r,w,v,l)},decryptBlock:function(a,c){var d=a[c+1];a[c+1]=a[c+3];a[c+3]=d;this._doCryptBlock(a,c,this._invKeySchedule,b,x,q,n,s);d=a[c+1];a[c+1]=a[c+3];a[c+3]=d},_doCryptBlock:function(a,b,c,d,e,j,l,f){for(var m=this._nRounds,g=a[b]^c[0],h=a[b+1]^c[1],k=a[b+2]^c[2],n=a[b+3]^c[3],p=4,r=1;r>>24]^e[h>>>16&255]^j[k>>>8&255]^l[n&255]^c[p++],s=d[h>>>24]^e[k>>>16&255]^j[n>>>8&255]^l[g&255]^c[p++],t= +d[k>>>24]^e[n>>>16&255]^j[g>>>8&255]^l[h&255]^c[p++],n=d[n>>>24]^e[g>>>16&255]^j[h>>>8&255]^l[k&255]^c[p++],g=q,h=s,k=t;q=(f[g>>>24]<<24|f[h>>>16&255]<<16|f[k>>>8&255]<<8|f[n&255])^c[p++];s=(f[h>>>24]<<24|f[k>>>16&255]<<16|f[n>>>8&255]<<8|f[g&255])^c[p++];t=(f[k>>>24]<<24|f[n>>>16&255]<<16|f[g>>>8&255]<<8|f[h&255])^c[p++];n=(f[n>>>24]<<24|f[g>>>16&255]<<16|f[h>>>8&255]<<8|f[k&255])^c[p++];a[b]=q;a[b+1]=s;a[b+2]=t;a[b+3]=n},keySize:8});u.AES=p._createHelper(d)})(); diff --git a/library/cryptojs/rollups/hmac-md5.js b/library/cryptojs/rollups/hmac-md5.js new file mode 100644 index 000000000..085eb4a1f --- /dev/null +++ b/library/cryptojs/rollups/hmac-md5.js @@ -0,0 +1,21 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(q,r){var k={},g=k.lib={},p=function(){},t=g.Base={extend:function(b){p.prototype=this;var j=new p;b&&j.mixIn(b);j.hasOwnProperty("init")||(j.init=function(){j.$super.init.apply(this,arguments)});j.init.prototype=j;j.$super=this;return j},create:function(){var b=this.extend();b.init.apply(b,arguments);return b},init:function(){},mixIn:function(b){for(var j in b)b.hasOwnProperty(j)&&(this[j]=b[j]);b.hasOwnProperty("toString")&&(this.toString=b.toString)},clone:function(){return this.init.prototype.extend(this)}}, +n=g.WordArray=t.extend({init:function(b,j){b=this.words=b||[];this.sigBytes=j!=r?j:4*b.length},toString:function(b){return(b||u).stringify(this)},concat:function(b){var j=this.words,a=b.words,l=this.sigBytes;b=b.sigBytes;this.clamp();if(l%4)for(var h=0;h>>2]|=(a[h>>>2]>>>24-8*(h%4)&255)<<24-8*((l+h)%4);else if(65535>>2]=a[h>>>2];else j.push.apply(j,a);this.sigBytes+=b;return this},clamp:function(){var b=this.words,j=this.sigBytes;b[j>>>2]&=4294967295<< +32-8*(j%4);b.length=q.ceil(j/4)},clone:function(){var b=t.clone.call(this);b.words=this.words.slice(0);return b},random:function(b){for(var j=[],a=0;a>>2]>>>24-8*(l%4)&255;h.push((m>>>4).toString(16));h.push((m&15).toString(16))}return h.join("")},parse:function(b){for(var a=b.length,h=[],l=0;l>>3]|=parseInt(b.substr(l, +2),16)<<24-4*(l%8);return new n.init(h,a/2)}},a=v.Latin1={stringify:function(b){var a=b.words;b=b.sigBytes;for(var h=[],l=0;l>>2]>>>24-8*(l%4)&255));return h.join("")},parse:function(b){for(var a=b.length,h=[],l=0;l>>2]|=(b.charCodeAt(l)&255)<<24-8*(l%4);return new n.init(h,a)}},s=v.Utf8={stringify:function(b){try{return decodeURIComponent(escape(a.stringify(b)))}catch(h){throw Error("Malformed UTF-8 data");}},parse:function(b){return a.parse(unescape(encodeURIComponent(b)))}}, +h=g.BufferedBlockAlgorithm=t.extend({reset:function(){this._data=new n.init;this._nDataBytes=0},_append:function(b){"string"==typeof b&&(b=s.parse(b));this._data.concat(b);this._nDataBytes+=b.sigBytes},_process:function(b){var a=this._data,h=a.words,l=a.sigBytes,m=this.blockSize,k=l/(4*m),k=b?q.ceil(k):q.max((k|0)-this._minBufferSize,0);b=k*m;l=q.min(4*b,l);if(b){for(var g=0;g>>32-l)+m}function k(a,m,b,j,g,l,k){a=a+(m&j|b&~j)+g+k;return(a<>>32-l)+m}function g(a,m,b,j,g,l,k){a=a+(m^b^j)+g+k;return(a<>>32-l)+m}function p(a,g,b,j,k,l,p){a=a+(b^(g|~j))+k+p;return(a<>>32-l)+g}for(var t=CryptoJS,n=t.lib,v=n.WordArray,u=n.Hasher,n=t.algo,a=[],s=0;64>s;s++)a[s]=4294967296*q.abs(q.sin(s+1))|0;n=n.MD5=u.extend({_doReset:function(){this._hash=new v.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(h,m){for(var b=0;16>b;b++){var j=m+b,n=h[j];h[j]=(n<<8|n>>>24)&16711935|(n<<24|n>>>8)&4278255360}var b=this._hash.words,j=h[m+0],n=h[m+1],l=h[m+2],q=h[m+3],t=h[m+4],s=h[m+5],u=h[m+6],v=h[m+7],w=h[m+8],x=h[m+9],y=h[m+10],z=h[m+11],A=h[m+12],B=h[m+13],C=h[m+14],D=h[m+15],c=b[0],d=b[1],e=b[2],f=b[3],c=r(c,d,e,f,j,7,a[0]),f=r(f,c,d,e,n,12,a[1]),e=r(e,f,c,d,l,17,a[2]),d=r(d,e,f,c,q,22,a[3]),c=r(c,d,e,f,t,7,a[4]),f=r(f,c,d,e,s,12,a[5]),e=r(e,f,c,d,u,17,a[6]),d=r(d,e,f,c,v,22,a[7]), +c=r(c,d,e,f,w,7,a[8]),f=r(f,c,d,e,x,12,a[9]),e=r(e,f,c,d,y,17,a[10]),d=r(d,e,f,c,z,22,a[11]),c=r(c,d,e,f,A,7,a[12]),f=r(f,c,d,e,B,12,a[13]),e=r(e,f,c,d,C,17,a[14]),d=r(d,e,f,c,D,22,a[15]),c=k(c,d,e,f,n,5,a[16]),f=k(f,c,d,e,u,9,a[17]),e=k(e,f,c,d,z,14,a[18]),d=k(d,e,f,c,j,20,a[19]),c=k(c,d,e,f,s,5,a[20]),f=k(f,c,d,e,y,9,a[21]),e=k(e,f,c,d,D,14,a[22]),d=k(d,e,f,c,t,20,a[23]),c=k(c,d,e,f,x,5,a[24]),f=k(f,c,d,e,C,9,a[25]),e=k(e,f,c,d,q,14,a[26]),d=k(d,e,f,c,w,20,a[27]),c=k(c,d,e,f,B,5,a[28]),f=k(f,c, +d,e,l,9,a[29]),e=k(e,f,c,d,v,14,a[30]),d=k(d,e,f,c,A,20,a[31]),c=g(c,d,e,f,s,4,a[32]),f=g(f,c,d,e,w,11,a[33]),e=g(e,f,c,d,z,16,a[34]),d=g(d,e,f,c,C,23,a[35]),c=g(c,d,e,f,n,4,a[36]),f=g(f,c,d,e,t,11,a[37]),e=g(e,f,c,d,v,16,a[38]),d=g(d,e,f,c,y,23,a[39]),c=g(c,d,e,f,B,4,a[40]),f=g(f,c,d,e,j,11,a[41]),e=g(e,f,c,d,q,16,a[42]),d=g(d,e,f,c,u,23,a[43]),c=g(c,d,e,f,x,4,a[44]),f=g(f,c,d,e,A,11,a[45]),e=g(e,f,c,d,D,16,a[46]),d=g(d,e,f,c,l,23,a[47]),c=p(c,d,e,f,j,6,a[48]),f=p(f,c,d,e,v,10,a[49]),e=p(e,f,c,d, +C,15,a[50]),d=p(d,e,f,c,s,21,a[51]),c=p(c,d,e,f,A,6,a[52]),f=p(f,c,d,e,q,10,a[53]),e=p(e,f,c,d,y,15,a[54]),d=p(d,e,f,c,n,21,a[55]),c=p(c,d,e,f,w,6,a[56]),f=p(f,c,d,e,D,10,a[57]),e=p(e,f,c,d,u,15,a[58]),d=p(d,e,f,c,B,21,a[59]),c=p(c,d,e,f,t,6,a[60]),f=p(f,c,d,e,z,10,a[61]),e=p(e,f,c,d,l,15,a[62]),d=p(d,e,f,c,x,21,a[63]);b[0]=b[0]+c|0;b[1]=b[1]+d|0;b[2]=b[2]+e|0;b[3]=b[3]+f|0},_doFinalize:function(){var a=this._data,g=a.words,b=8*this._nDataBytes,j=8*a.sigBytes;g[j>>>5]|=128<<24-j%32;var k=q.floor(b/ +4294967296);g[(j+64>>>9<<4)+15]=(k<<8|k>>>24)&16711935|(k<<24|k>>>8)&4278255360;g[(j+64>>>9<<4)+14]=(b<<8|b>>>24)&16711935|(b<<24|b>>>8)&4278255360;a.sigBytes=4*(g.length+1);this._process();a=this._hash;g=a.words;for(b=0;4>b;b++)j=g[b],g[b]=(j<<8|j>>>24)&16711935|(j<<24|j>>>8)&4278255360;return a},clone:function(){var a=u.clone.call(this);a._hash=this._hash.clone();return a}});t.MD5=u._createHelper(n);t.HmacMD5=u._createHmacHelper(n)})(Math); +(function(){var q=CryptoJS,r=q.enc.Utf8;q.algo.HMAC=q.lib.Base.extend({init:function(k,g){k=this._hasher=new k.init;"string"==typeof g&&(g=r.parse(g));var p=k.blockSize,q=4*p;g.sigBytes>q&&(g=k.finalize(g));g.clamp();for(var n=this._oKey=g.clone(),v=this._iKey=g.clone(),u=n.words,a=v.words,s=0;s>>2]|=(B[b>>>2]>>>24-8*(b%4)&255)<<24-8*((f+b)%4);else if(65535>>2]=B[b>>>2];else d.push.apply(d,B);this.sigBytes+=a;return this},clamp:function(){var a=this.words,d=this.sigBytes;a[d>>>2]&=4294967295<< +32-8*(d%4);a.length=h.ceil(d/4)},clone:function(){var a=l.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var d=[],b=0;b>>2]>>>24-8*(f%4)&255;b.push((c>>>4).toString(16));b.push((c&15).toString(16))}return b.join("")},parse:function(a){for(var d=a.length,b=[],f=0;f>>3]|=parseInt(a.substr(f, +2),16)<<24-4*(f%8);return new m.init(b,d/2)}},w=v.Latin1={stringify:function(a){var d=a.words;a=a.sigBytes;for(var b=[],f=0;f>>2]>>>24-8*(f%4)&255));return b.join("")},parse:function(a){for(var b=a.length,c=[],f=0;f>>2]|=(a.charCodeAt(f)&255)<<24-8*(f%4);return new m.init(c,b)}},k=v.Utf8={stringify:function(a){try{return decodeURIComponent(escape(w.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return w.parse(unescape(encodeURIComponent(a)))}}, +u=e.BufferedBlockAlgorithm=l.extend({reset:function(){this._data=new m.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=k.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,c=b.words,f=b.sigBytes,e=this.blockSize,k=f/(4*e),k=a?h.ceil(k):h.max((k|0)-this._minBufferSize,0);a=k*e;f=h.min(4*a,f);if(a){for(var u=0;ub;b++){var a=e+b,d=c[a];c[a]=(d<<8|d>>>24)&16711935|(d<<24|d>>>8)&4278255360}var a=this._hash.words,d=x.words,h=w.words,f=A.words,j=l.words,E=m.words,F=v.words,C,n,p,q,y,D,r,s,t,z;D=C=a[0];r=n=a[1];s=p=a[2];t=q=a[3];z=y=a[4];for(var g,b=0;80>b;b+=1)g=C+c[e+f[b]]|0,g=16>b?g+((n^p^q)+d[0]):32>b?g+((n&p|~n&q)+d[1]):48>b? +g+(((n|~p)^q)+d[2]):64>b?g+((n&q|p&~q)+d[3]):g+((n^(p|~q))+d[4]),g|=0,g=g<>>32-E[b],g=g+y|0,C=y,y=q,q=p<<10|p>>>22,p=n,n=g,g=D+c[e+j[b]]|0,g=16>b?g+((r^(s|~t))+h[0]):32>b?g+((r&t|s&~t)+h[1]):48>b?g+(((r|~s)^t)+h[2]):64>b?g+((r&s|~r&t)+h[3]):g+((r^s^t)+h[4]),g|=0,g=g<>>32-F[b],g=g+z|0,D=z,z=t,t=s<<10|s>>>22,s=r,r=g;g=a[1]+p+t|0;a[1]=a[2]+q+z|0;a[2]=a[3]+y+D|0;a[3]=a[4]+C+r|0;a[4]=a[0]+n+s|0;a[0]=g},_doFinalize:function(){var c=this._data,e=c.words,b=8*this._nDataBytes,a=8*c.sigBytes; +e[a>>>5]|=128<<24-a%32;e[(a+64>>>9<<4)+14]=(b<<8|b>>>24)&16711935|(b<<24|b>>>8)&4278255360;c.sigBytes=4*(e.length+1);this._process();c=this._hash;e=c.words;for(b=0;5>b;b++)a=e[b],e[b]=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360;return c},clone:function(){var c=e.clone.call(this);c._hash=this._hash.clone();return c}});h.RIPEMD160=e._createHelper(j);h.HmacRIPEMD160=e._createHmacHelper(j)})(Math); +(function(){var h=CryptoJS,j=h.enc.Utf8;h.algo.HMAC=h.lib.Base.extend({init:function(c,e){c=this._hasher=new c.init;"string"==typeof e&&(e=j.parse(e));var h=c.blockSize,l=4*h;e.sigBytes>l&&(e=c.finalize(e));e.clamp();for(var m=this._oKey=e.clone(),v=this._iKey=e.clone(),x=m.words,w=v.words,k=0;k>>2]|=(q[b>>>2]>>>24-8*(b%4)&255)<<24-8*((f+b)%4);else if(65535>>2]=q[b>>>2];else c.push.apply(c,q);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=g.ceil(c/4)},clone:function(){var a=k.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],b=0;b>>2]>>>24-8*(f%4)&255;b.push((d>>>4).toString(16));b.push((d&15).toString(16))}return b.join("")},parse:function(a){for(var c=a.length,b=[],f=0;f>>3]|=parseInt(a.substr(f, +2),16)<<24-4*(f%8);return new p.init(b,c/2)}},j=b.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var b=[],f=0;f>>2]>>>24-8*(f%4)&255));return b.join("")},parse:function(a){for(var c=a.length,b=[],f=0;f>>2]|=(a.charCodeAt(f)&255)<<24-8*(f%4);return new p.init(b,c)}},h=b.Utf8={stringify:function(a){try{return decodeURIComponent(escape(j.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return j.parse(unescape(encodeURIComponent(a)))}}, +r=d.BufferedBlockAlgorithm=k.extend({reset:function(){this._data=new p.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=h.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,b=c.words,f=c.sigBytes,d=this.blockSize,e=f/(4*d),e=a?g.ceil(e):g.max((e|0)-this._minBufferSize,0);a=e*d;f=g.min(4*a,f);if(a){for(var k=0;ka;a++){if(16>a)m[a]=d[e+a]|0;else{var c=m[a-3]^m[a-8]^m[a-14]^m[a-16];m[a]=c<<1|c>>>31}c=(n<<5|n>>>27)+l+m[a];c=20>a?c+((j&h|~j&g)+1518500249):40>a?c+((j^h^g)+1859775393):60>a?c+((j&h|j&g|h&g)-1894007588):c+((j^h^ +g)-899497514);l=g;g=h;h=j<<30|j>>>2;j=n;n=c}b[0]=b[0]+n|0;b[1]=b[1]+j|0;b[2]=b[2]+h|0;b[3]=b[3]+g|0;b[4]=b[4]+l|0},_doFinalize:function(){var d=this._data,e=d.words,b=8*this._nDataBytes,g=8*d.sigBytes;e[g>>>5]|=128<<24-g%32;e[(g+64>>>9<<4)+14]=Math.floor(b/4294967296);e[(g+64>>>9<<4)+15]=b;d.sigBytes=4*e.length;this._process();return this._hash},clone:function(){var e=d.clone.call(this);e._hash=this._hash.clone();return e}});g.SHA1=d._createHelper(l);g.HmacSHA1=d._createHmacHelper(l)})(); +(function(){var g=CryptoJS,l=g.enc.Utf8;g.algo.HMAC=g.lib.Base.extend({init:function(e,d){e=this._hasher=new e.init;"string"==typeof d&&(d=l.parse(d));var g=e.blockSize,k=4*g;d.sigBytes>k&&(d=e.finalize(d));d.clamp();for(var p=this._oKey=d.clone(),b=this._iKey=d.clone(),n=p.words,j=b.words,h=0;h>>2]|=(f[g>>>2]>>>24-8*(g%4)&255)<<24-8*((b+g)%4);else if(65535>>2]=f[g>>>2];else d.push.apply(d,f);this.sigBytes+=a;return this},clamp:function(){var a=this.words,d=this.sigBytes;a[d>>>2]&=4294967295<< +32-8*(d%4);a.length=j.ceil(d/4)},clone:function(){var a=m.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var d=[],f=0;f>>2]>>>24-8*(b%4)&255;f.push((g>>>4).toString(16));f.push((g&15).toString(16))}return f.join("")},parse:function(a){for(var d=a.length,f=[],b=0;b>>3]|=parseInt(a.substr(b, +2),16)<<24-4*(b%8);return new r.init(f,d/2)}},n=s.Latin1={stringify:function(a){var d=a.words;a=a.sigBytes;for(var f=[],b=0;b>>2]>>>24-8*(b%4)&255));return f.join("")},parse:function(a){for(var d=a.length,f=[],b=0;b>>2]|=(a.charCodeAt(b)&255)<<24-8*(b%4);return new r.init(f,d)}},h=s.Utf8={stringify:function(a){try{return decodeURIComponent(escape(n.stringify(a)))}catch(d){throw Error("Malformed UTF-8 data");}},parse:function(a){return n.parse(unescape(encodeURIComponent(a)))}}, +u=e.BufferedBlockAlgorithm=m.extend({reset:function(){this._data=new r.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=h.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var d=this._data,f=d.words,b=d.sigBytes,g=this.blockSize,c=b/(4*g),c=a?j.ceil(c):j.max((c|0)-this._minBufferSize,0);a=c*g;b=j.min(4*a,b);if(a){for(var e=0;en;){var h;a:{h=l;for(var u=j.sqrt(h),t=2;t<=u;t++)if(!(h%t)){h=!1;break a}h=!0}h&&(8>n&&(m[n]=s(j.pow(l,0.5))),r[n]=s(j.pow(l,1/3)),n++);l++}var a=[],c=c.SHA256=p.extend({_doReset:function(){this._hash=new e.init(m.slice(0))},_doProcessBlock:function(d,f){for(var b=this._hash.words,g=b[0],c=b[1],e=b[2],j=b[3],h=b[4],p=b[5],m=b[6],n=b[7],q=0;64>q;q++){if(16>q)a[q]= +d[f+q]|0;else{var k=a[q-15],l=a[q-2];a[q]=((k<<25|k>>>7)^(k<<14|k>>>18)^k>>>3)+a[q-7]+((l<<15|l>>>17)^(l<<13|l>>>19)^l>>>10)+a[q-16]}k=n+((h<<26|h>>>6)^(h<<21|h>>>11)^(h<<7|h>>>25))+(h&p^~h&m)+r[q]+a[q];l=((g<<30|g>>>2)^(g<<19|g>>>13)^(g<<10|g>>>22))+(g&c^g&e^c&e);n=m;m=p;p=h;h=j+k|0;j=e;e=c;c=g;g=k+l|0}b[0]=b[0]+g|0;b[1]=b[1]+c|0;b[2]=b[2]+e|0;b[3]=b[3]+j|0;b[4]=b[4]+h|0;b[5]=b[5]+p|0;b[6]=b[6]+m|0;b[7]=b[7]+n|0},_doFinalize:function(){var a=this._data,c=a.words,b=8*this._nDataBytes,e=8*a.sigBytes; +c[e>>>5]|=128<<24-e%32;c[(e+64>>>9<<4)+14]=j.floor(b/4294967296);c[(e+64>>>9<<4)+15]=b;a.sigBytes=4*c.length;this._process();return this._hash},clone:function(){var a=p.clone.call(this);a._hash=this._hash.clone();return a}});k.SHA256=p._createHelper(c);k.HmacSHA256=p._createHmacHelper(c)})(Math); +(function(){var j=CryptoJS,k=j.lib.WordArray,c=j.algo,e=c.SHA256,c=c.SHA224=e.extend({_doReset:function(){this._hash=new k.init([3238371032,914150663,812702999,4144912697,4290775857,1750603025,1694076839,3204075428])},_doFinalize:function(){var c=e._doFinalize.call(this);c.sigBytes-=4;return c}});j.SHA224=e._createHelper(c);j.HmacSHA224=e._createHmacHelper(c)})(); +(function(){var j=CryptoJS,k=j.enc.Utf8;j.algo.HMAC=j.lib.Base.extend({init:function(c,e){c=this._hasher=new c.init;"string"==typeof e&&(e=k.parse(e));var j=c.blockSize,m=4*j;e.sigBytes>m&&(e=c.finalize(e));e.clamp();for(var r=this._oKey=e.clone(),s=this._iKey=e.clone(),l=r.words,n=s.words,h=0;h>>2]|=(d[e>>>2]>>>24-8*(e%4)&255)<<24-8*((b+e)%4);else if(65535>>2]=d[e>>>2];else c.push.apply(c,d);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=h.ceil(c/4)},clone:function(){var a=m.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],d=0;d>>2]>>>24-8*(b%4)&255;d.push((e>>>4).toString(16));d.push((e&15).toString(16))}return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b>>3]|=parseInt(a.substr(b, +2),16)<<24-4*(b%8);return new r.init(d,c/2)}},n=l.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b>>2]>>>24-8*(b%4)&255));return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b>>2]|=(a.charCodeAt(b)&255)<<24-8*(b%4);return new r.init(d,c)}},j=l.Utf8={stringify:function(a){try{return decodeURIComponent(escape(n.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return n.parse(unescape(encodeURIComponent(a)))}}, +u=g.BufferedBlockAlgorithm=m.extend({reset:function(){this._data=new r.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=j.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,d=c.words,b=c.sigBytes,e=this.blockSize,f=b/(4*e),f=a?h.ceil(f):h.max((f|0)-this._minBufferSize,0);a=f*e;b=h.min(4*a,b);if(a){for(var g=0;gn;){var j;a:{j=k;for(var u=h.sqrt(j),t=2;t<=u;t++)if(!(j%t)){j=!1;break a}j=!0}j&&(8>n&&(m[n]=l(h.pow(k,0.5))),r[n]=l(h.pow(k,1/3)),n++);k++}var a=[],f=f.SHA256=q.extend({_doReset:function(){this._hash=new g.init(m.slice(0))},_doProcessBlock:function(c,d){for(var b=this._hash.words,e=b[0],f=b[1],g=b[2],j=b[3],h=b[4],m=b[5],n=b[6],q=b[7],p=0;64>p;p++){if(16>p)a[p]= +c[d+p]|0;else{var k=a[p-15],l=a[p-2];a[p]=((k<<25|k>>>7)^(k<<14|k>>>18)^k>>>3)+a[p-7]+((l<<15|l>>>17)^(l<<13|l>>>19)^l>>>10)+a[p-16]}k=q+((h<<26|h>>>6)^(h<<21|h>>>11)^(h<<7|h>>>25))+(h&m^~h&n)+r[p]+a[p];l=((e<<30|e>>>2)^(e<<19|e>>>13)^(e<<10|e>>>22))+(e&f^e&g^f&g);q=n;n=m;m=h;h=j+k|0;j=g;g=f;f=e;e=k+l|0}b[0]=b[0]+e|0;b[1]=b[1]+f|0;b[2]=b[2]+g|0;b[3]=b[3]+j|0;b[4]=b[4]+h|0;b[5]=b[5]+m|0;b[6]=b[6]+n|0;b[7]=b[7]+q|0},_doFinalize:function(){var a=this._data,d=a.words,b=8*this._nDataBytes,e=8*a.sigBytes; +d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=h.floor(b/4294967296);d[(e+64>>>9<<4)+15]=b;a.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var a=q.clone.call(this);a._hash=this._hash.clone();return a}});s.SHA256=q._createHelper(f);s.HmacSHA256=q._createHmacHelper(f)})(Math); +(function(){var h=CryptoJS,s=h.enc.Utf8;h.algo.HMAC=h.lib.Base.extend({init:function(f,g){f=this._hasher=new f.init;"string"==typeof g&&(g=s.parse(g));var h=f.blockSize,m=4*h;g.sigBytes>m&&(g=f.finalize(g));g.clamp();for(var r=this._oKey=g.clone(),l=this._iKey=g.clone(),k=r.words,n=l.words,j=0;j>>2]|=(e[p>>>2]>>>24-8*(p%4)&255)<<24-8*((j+p)%4);else if(65535>>2]=e[p>>>2];else b.push.apply(b,e);this.sigBytes+=a;return this},clamp:function(){var a=this.words,b=this.sigBytes;a[b>>>2]&=4294967295<< +32-8*(b%4);a.length=q.ceil(b/4)},clone:function(){var a=s.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var b=[],e=0;e>>2]>>>24-8*(j%4)&255;e.push((p>>>4).toString(16));e.push((p&15).toString(16))}return e.join("")},parse:function(a){for(var b=a.length,e=[],j=0;j>>3]|=parseInt(a.substr(j, +2),16)<<24-4*(j%8);return new t.init(e,b/2)}},g=w.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var e=[],j=0;j>>2]>>>24-8*(j%4)&255));return e.join("")},parse:function(a){for(var b=a.length,e=[],j=0;j>>2]|=(a.charCodeAt(j)&255)<<24-8*(j%4);return new t.init(e,b)}},n=w.Utf8={stringify:function(a){try{return decodeURIComponent(escape(g.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return g.parse(unescape(encodeURIComponent(a)))}}, +u=d.BufferedBlockAlgorithm=s.extend({reset:function(){this._data=new t.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=n.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,e=b.words,j=b.sigBytes,p=this.blockSize,c=j/(4*p),c=a?q.ceil(c):q.max((c|0)-this._minBufferSize,0);a=c*p;j=q.min(4*a,j);if(a){for(var g=0;gu;u++){t[g+5*n]=(u+1)*(u+2)/2%64;var x=(2*g+3*n)%5,g=n%5,n=x}for(g=0;5>g;g++)for(n=0;5>n;n++)w[g+5*n]=n+5*((2*g+3*n)%5);g=1;for(n=0;24>n;n++){for(var a=x=u=0;7>a;a++){if(g&1){var b=(1<b?x^=1<g;g++)e[g]=s.create();c=c.SHA3=v.extend({cfg:v.cfg.extend({outputLength:512}),_doReset:function(){for(var a=this._state= +[],b=0;25>b;b++)a[b]=new s.init;this.blockSize=(1600-2*this.cfg.outputLength)/32},_doProcessBlock:function(a,b){for(var c=this._state,g=this.blockSize/2,k=0;k>>24)&16711935|(d<<24|d>>>8)&4278255360,l=(l<<8|l>>>24)&16711935|(l<<24|l>>>8)&4278255360,h=c[k];h.high^=l;h.low^=d}for(g=0;24>g;g++){for(k=0;5>k;k++){for(var f=d=0,m=0;5>m;m++)h=c[k+5*m],d^=h.high,f^=h.low;h=e[k];h.high=d;h.low=f}for(k=0;5>k;k++){h=e[(k+4)%5];d=e[(k+1)%5];l=d.high;m=d.low;d=h.high^ +(l<<1|m>>>31);f=h.low^(m<<1|l>>>31);for(m=0;5>m;m++)h=c[k+5*m],h.high^=d,h.low^=f}for(l=1;25>l;l++)h=c[l],k=h.high,h=h.low,m=t[l],32>m?(d=k<>>32-m,f=h<>>32-m):(d=h<>>64-m,f=k<>>64-m),h=e[w[l]],h.high=d,h.low=f;h=e[0];k=c[0];h.high=k.high;h.low=k.low;for(k=0;5>k;k++)for(m=0;5>m;m++)l=k+5*m,h=c[l],d=e[l],l=e[(k+1)%5+5*m],f=e[(k+2)%5+5*m],h.high=d.high^~l.high&f.high,h.low=d.low^~l.low&f.low;h=c[0];k=r[g];h.high^=k.high;h.low^=k.low}},_doFinalize:function(){var a=this._data, +b=a.words,c=8*a.sigBytes,e=32*this.blockSize;b[c>>>5]|=1<<24-c%32;b[(q.ceil((c+1)/e)*e>>>5)-1]|=128;a.sigBytes=4*b.length;this._process();for(var a=this._state,b=this.cfg.outputLength/8,c=b/8,e=[],g=0;g>>24)&16711935|(l<<24|l>>>8)&4278255360,f=(f<<8|f>>>24)&16711935|(f<<24|f>>>8)&4278255360;e.push(f);e.push(l)}return new d.init(e,b)},clone:function(){for(var a=v.clone.call(this),b=a._state=this._state.slice(0),c=0;25>c;c++)b[c]=b[c].clone();return a}}); +f.SHA3=v._createHelper(c);f.HmacSHA3=v._createHmacHelper(c)})(Math); +(function(){var q=CryptoJS,f=q.enc.Utf8;q.algo.HMAC=q.lib.Base.extend({init:function(c,d){c=this._hasher=new c.init;"string"==typeof d&&(d=f.parse(d));var q=c.blockSize,s=4*q;d.sigBytes>s&&(d=c.finalize(d));d.clamp();for(var t=this._oKey=d.clone(),w=this._iKey=d.clone(),r=t.words,g=w.words,n=0;n>>2]|=(c[b>>>2]>>>24-8*(b%4)&255)<<24-8*((e+b)%4);else if(65535>>2]=c[b>>>2];else g.push.apply(g,c);this.sigBytes+=a;return this},clamp:function(){var C=this.words,g=this.sigBytes;C[g>>>2]&=4294967295<< +32-8*(g%4);C.length=a.ceil(g/4)},clone:function(){var a=l.clone.call(this);a.words=this.words.slice(0);return a},random:function(C){for(var g=[],b=0;b>>2]>>>24-8*(e%4)&255;b.push((c>>>4).toString(16));b.push((c&15).toString(16))}return b.join("")},parse:function(a){for(var b=a.length,c=[],e=0;e>>3]|=parseInt(a.substr(e, +2),16)<<24-4*(e%8);return new u.init(c,b/2)}},x=k.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var c=[],e=0;e>>2]>>>24-8*(e%4)&255));return c.join("")},parse:function(a){for(var b=a.length,c=[],e=0;e>>2]|=(a.charCodeAt(e)&255)<<24-8*(e%4);return new u.init(c,b)}},y=k.Utf8={stringify:function(a){try{return decodeURIComponent(escape(x.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return x.parse(unescape(encodeURIComponent(a)))}}, +$=b.BufferedBlockAlgorithm=l.extend({reset:function(){this._data=new u.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=y.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(b){var c=this._data,l=c.words,e=c.sigBytes,d=this.blockSize,f=e/(4*d),f=b?a.ceil(f):a.max((f|0)-this._minBufferSize,0);b=f*d;e=a.min(4*b,e);if(b){for(var k=0;km;m++)k[m]=a();b=b.SHA512=c.extend({_doReset:function(){this._hash=new l.init([new f.init(1779033703,4089235720),new f.init(3144134277,2227873595),new f.init(1013904242,4271175723),new f.init(2773480762,1595750129),new f.init(1359893119,2917565137),new f.init(2600822924,725511199),new f.init(528734635,4215389547),new f.init(1541459225,327033209)])},_doProcessBlock:function(a,b){for(var c=this._hash.words, +d=c[0],f=c[1],g=c[2],l=c[3],e=c[4],m=c[5],L=c[6],c=c[7],Z=d.high,M=d.low,aa=f.high,N=f.low,ba=g.high,O=g.low,ca=l.high,P=l.low,da=e.high,Q=e.low,ea=m.high,R=m.low,fa=L.high,S=L.low,ga=c.high,T=c.low,r=Z,n=M,F=aa,D=N,G=ba,E=O,W=ca,H=P,s=da,p=Q,U=ea,I=R,V=fa,J=S,X=ga,K=T,t=0;80>t;t++){var z=k[t];if(16>t)var q=z.high=a[b+2*t]|0,h=z.low=a[b+2*t+1]|0;else{var q=k[t-15],h=q.high,v=q.low,q=(h>>>1|v<<31)^(h>>>8|v<<24)^h>>>7,v=(v>>>1|h<<31)^(v>>>8|h<<24)^(v>>>7|h<<25),B=k[t-2],h=B.high,j=B.low,B=(h>>>19|j<< +13)^(h<<3|j>>>29)^h>>>6,j=(j>>>19|h<<13)^(j<<3|h>>>29)^(j>>>6|h<<26),h=k[t-7],Y=h.high,A=k[t-16],w=A.high,A=A.low,h=v+h.low,q=q+Y+(h>>>0>>0?1:0),h=h+j,q=q+B+(h>>>0>>0?1:0),h=h+A,q=q+w+(h>>>0>>0?1:0);z.high=q;z.low=h}var Y=s&U^~s&V,A=p&I^~p&J,z=r&F^r&G^F&G,ja=n&D^n&E^D&E,v=(r>>>28|n<<4)^(r<<30|n>>>2)^(r<<25|n>>>7),B=(n>>>28|r<<4)^(n<<30|r>>>2)^(n<<25|r>>>7),j=u[t],ka=j.high,ha=j.low,j=K+((p>>>14|s<<18)^(p>>>18|s<<14)^(p<<23|s>>>9)),w=X+((s>>>14|p<<18)^(s>>>18|p<<14)^(s<<23|p>>>9))+(j>>>0< +K>>>0?1:0),j=j+A,w=w+Y+(j>>>0>>0?1:0),j=j+ha,w=w+ka+(j>>>0>>0?1:0),j=j+h,w=w+q+(j>>>0>>0?1:0),h=B+ja,z=v+z+(h>>>0>>0?1:0),X=V,K=J,V=U,J=I,U=s,I=p,p=H+j|0,s=W+w+(p>>>0>>0?1:0)|0,W=G,H=E,G=F,E=D,F=r,D=n,n=j+h|0,r=w+z+(n>>>0>>0?1:0)|0}M=d.low=M+n;d.high=Z+r+(M>>>0>>0?1:0);N=f.low=N+D;f.high=aa+F+(N>>>0>>0?1:0);O=g.low=O+E;g.high=ba+G+(O>>>0>>0?1:0);P=l.low=P+H;l.high=ca+W+(P>>>0>>0?1:0);Q=e.low=Q+p;e.high=da+s+(Q>>>0

    >>0?1:0);R=m.low=R+I;m.high=ea+U+(R>>>0>>0?1:0); +S=L.low=S+J;L.high=fa+V+(S>>>0>>0?1:0);T=c.low=T+K;c.high=ga+X+(T>>>0>>0?1:0)},_doFinalize:function(){var a=this._data,c=a.words,b=8*this._nDataBytes,d=8*a.sigBytes;c[d>>>5]|=128<<24-d%32;c[(d+128>>>10<<5)+30]=Math.floor(b/4294967296);c[(d+128>>>10<<5)+31]=b;a.sigBytes=4*c.length;this._process();return this._hash.toX32()},clone:function(){var a=c.clone.call(this);a._hash=this._hash.clone();return a},blockSize:32});d.SHA512=c._createHelper(b);d.HmacSHA512=c._createHmacHelper(b)})(); +(function(){var a=CryptoJS,d=a.x64,c=d.Word,b=d.WordArray,d=a.algo,f=d.SHA512,d=d.SHA384=f.extend({_doReset:function(){this._hash=new b.init([new c.init(3418070365,3238371032),new c.init(1654270250,914150663),new c.init(2438529370,812702999),new c.init(355462360,4144912697),new c.init(1731405415,4290775857),new c.init(2394180231,1750603025),new c.init(3675008525,1694076839),new c.init(1203062813,3204075428)])},_doFinalize:function(){var a=f._doFinalize.call(this);a.sigBytes-=16;return a}});a.SHA384= +f._createHelper(d);a.HmacSHA384=f._createHmacHelper(d)})(); +(function(){var a=CryptoJS,d=a.enc.Utf8;a.algo.HMAC=a.lib.Base.extend({init:function(a,b){a=this._hasher=new a.init;"string"==typeof b&&(b=d.parse(b));var f=a.blockSize,l=4*f;b.sigBytes>l&&(b=a.finalize(b));b.clamp();for(var u=this._oKey=b.clone(),k=this._iKey=b.clone(),m=u.words,x=k.words,y=0;y>>2]|=(M[b>>>2]>>>24-8*(b%4)&255)<<24-8*((e+b)%4);else if(65535>>2]=M[b>>>2];else d.push.apply(d,M);this.sigBytes+=a;return this},clamp:function(){var D=this.words,d=this.sigBytes;D[d>>>2]&=4294967295<< +32-8*(d%4);D.length=a.ceil(d/4)},clone:function(){var a=l.clone.call(this);a.words=this.words.slice(0);return a},random:function(D){for(var d=[],b=0;b>>2]>>>24-8*(e%4)&255;b.push((c>>>4).toString(16));b.push((c&15).toString(16))}return b.join("")},parse:function(a){for(var d=a.length,b=[],e=0;e>>3]|=parseInt(a.substr(e, +2),16)<<24-4*(e%8);return new u.init(b,d/2)}},y=k.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var c=[],e=0;e>>2]>>>24-8*(e%4)&255));return c.join("")},parse:function(a){for(var b=a.length,c=[],e=0;e>>2]|=(a.charCodeAt(e)&255)<<24-8*(e%4);return new u.init(c,b)}},z=k.Utf8={stringify:function(a){try{return decodeURIComponent(escape(y.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return y.parse(unescape(encodeURIComponent(a)))}}, +x=b.BufferedBlockAlgorithm=l.extend({reset:function(){this._data=new u.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=z.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(b){var d=this._data,c=d.words,e=d.sigBytes,l=this.blockSize,k=e/(4*l),k=b?a.ceil(k):a.max((k|0)-this._minBufferSize,0);b=k*l;e=a.min(4*b,e);if(b){for(var x=0;xm;m++)k[m]=a();b=b.SHA512=c.extend({_doReset:function(){this._hash=new l.init([new f.init(1779033703,4089235720),new f.init(3144134277,2227873595),new f.init(1013904242,4271175723),new f.init(2773480762,1595750129),new f.init(1359893119,2917565137),new f.init(2600822924,725511199),new f.init(528734635,4215389547),new f.init(1541459225,327033209)])},_doProcessBlock:function(a,b){for(var c=this._hash.words, +f=c[0],j=c[1],d=c[2],l=c[3],e=c[4],m=c[5],N=c[6],c=c[7],aa=f.high,O=f.low,ba=j.high,P=j.low,ca=d.high,Q=d.low,da=l.high,R=l.low,ea=e.high,S=e.low,fa=m.high,T=m.low,ga=N.high,U=N.low,ha=c.high,V=c.low,r=aa,n=O,G=ba,E=P,H=ca,F=Q,Y=da,I=R,s=ea,p=S,W=fa,J=T,X=ga,K=U,Z=ha,L=V,t=0;80>t;t++){var A=k[t];if(16>t)var q=A.high=a[b+2*t]|0,g=A.low=a[b+2*t+1]|0;else{var q=k[t-15],g=q.high,v=q.low,q=(g>>>1|v<<31)^(g>>>8|v<<24)^g>>>7,v=(v>>>1|g<<31)^(v>>>8|g<<24)^(v>>>7|g<<25),C=k[t-2],g=C.high,h=C.low,C=(g>>>19| +h<<13)^(g<<3|h>>>29)^g>>>6,h=(h>>>19|g<<13)^(h<<3|g>>>29)^(h>>>6|g<<26),g=k[t-7],$=g.high,B=k[t-16],w=B.high,B=B.low,g=v+g.low,q=q+$+(g>>>0>>0?1:0),g=g+h,q=q+C+(g>>>0>>0?1:0),g=g+B,q=q+w+(g>>>0>>0?1:0);A.high=q;A.low=g}var $=s&W^~s&X,B=p&J^~p&K,A=r&G^r&H^G&H,ka=n&E^n&F^E&F,v=(r>>>28|n<<4)^(r<<30|n>>>2)^(r<<25|n>>>7),C=(n>>>28|r<<4)^(n<<30|r>>>2)^(n<<25|r>>>7),h=u[t],la=h.high,ia=h.low,h=L+((p>>>14|s<<18)^(p>>>18|s<<14)^(p<<23|s>>>9)),w=Z+((s>>>14|p<<18)^(s>>>18|p<<14)^(s<<23|p>>>9))+(h>>> +0>>0?1:0),h=h+B,w=w+$+(h>>>0>>0?1:0),h=h+ia,w=w+la+(h>>>0>>0?1:0),h=h+g,w=w+q+(h>>>0>>0?1:0),g=C+ka,A=v+A+(g>>>0>>0?1:0),Z=X,L=K,X=W,K=J,W=s,J=p,p=I+h|0,s=Y+w+(p>>>0>>0?1:0)|0,Y=H,I=F,H=G,F=E,G=r,E=n,n=h+g|0,r=w+A+(n>>>0>>0?1:0)|0}O=f.low=O+n;f.high=aa+r+(O>>>0>>0?1:0);P=j.low=P+E;j.high=ba+G+(P>>>0>>0?1:0);Q=d.low=Q+F;d.high=ca+H+(Q>>>0>>0?1:0);R=l.low=R+I;l.high=da+Y+(R>>>0>>0?1:0);S=e.low=S+p;e.high=ea+s+(S>>>0

    >>0?1:0);T=m.low=T+J;m.high=fa+W+(T>>>0>>0?1: +0);U=N.low=U+K;N.high=ga+X+(U>>>0>>0?1:0);V=c.low=V+L;c.high=ha+Z+(V>>>0>>0?1:0)},_doFinalize:function(){var a=this._data,b=a.words,c=8*this._nDataBytes,f=8*a.sigBytes;b[f>>>5]|=128<<24-f%32;b[(f+128>>>10<<5)+30]=Math.floor(c/4294967296);b[(f+128>>>10<<5)+31]=c;a.sigBytes=4*b.length;this._process();return this._hash.toX32()},clone:function(){var a=c.clone.call(this);a._hash=this._hash.clone();return a},blockSize:32});j.SHA512=c._createHelper(b);j.HmacSHA512=c._createHmacHelper(b)})(); +(function(){var a=CryptoJS,j=a.enc.Utf8;a.algo.HMAC=a.lib.Base.extend({init:function(a,b){a=this._hasher=new a.init;"string"==typeof b&&(b=j.parse(b));var f=a.blockSize,l=4*f;b.sigBytes>l&&(b=a.finalize(b));b.clamp();for(var u=this._oKey=b.clone(),k=this._iKey=b.clone(),m=u.words,y=k.words,z=0;z>>2]|=(a[g>>>2]>>>24-8*(g%4)&255)<<24-8*((j+g)%4);else if(65535>>2]=a[g>>>2];else h.push.apply(h,a);this.sigBytes+=b;return this},clamp:function(){var b=this.words,h=this.sigBytes;b[h>>>2]&=4294967295<< +32-8*(h%4);b.length=s.ceil(h/4)},clone:function(){var b=r.clone.call(this);b.words=this.words.slice(0);return b},random:function(b){for(var h=[],a=0;a>>2]>>>24-8*(j%4)&255;g.push((k>>>4).toString(16));g.push((k&15).toString(16))}return g.join("")},parse:function(b){for(var a=b.length,g=[],j=0;j>>3]|=parseInt(b.substr(j, +2),16)<<24-4*(j%8);return new q.init(g,a/2)}},a=v.Latin1={stringify:function(b){var a=b.words;b=b.sigBytes;for(var g=[],j=0;j>>2]>>>24-8*(j%4)&255));return g.join("")},parse:function(b){for(var a=b.length,g=[],j=0;j>>2]|=(b.charCodeAt(j)&255)<<24-8*(j%4);return new q.init(g,a)}},u=v.Utf8={stringify:function(b){try{return decodeURIComponent(escape(a.stringify(b)))}catch(g){throw Error("Malformed UTF-8 data");}},parse:function(b){return a.parse(unescape(encodeURIComponent(b)))}}, +g=l.BufferedBlockAlgorithm=r.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(b){"string"==typeof b&&(b=u.parse(b));this._data.concat(b);this._nDataBytes+=b.sigBytes},_process:function(b){var a=this._data,g=a.words,j=a.sigBytes,k=this.blockSize,m=j/(4*k),m=b?s.ceil(m):s.max((m|0)-this._minBufferSize,0);b=m*k;j=s.min(4*b,j);if(b){for(var l=0;l>>32-j)+k}function m(a,k,b,h,l,j,m){a=a+(k&h|b&~h)+l+m;return(a<>>32-j)+k}function l(a,k,b,h,l,j,m){a=a+(k^b^h)+l+m;return(a<>>32-j)+k}function n(a,k,b,h,l,j,m){a=a+(b^(k|~h))+l+m;return(a<>>32-j)+k}for(var r=CryptoJS,q=r.lib,v=q.WordArray,t=q.Hasher,q=r.algo,a=[],u=0;64>u;u++)a[u]=4294967296*s.abs(s.sin(u+1))|0;q=q.MD5=t.extend({_doReset:function(){this._hash=new v.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(g,k){for(var b=0;16>b;b++){var h=k+b,w=g[h];g[h]=(w<<8|w>>>24)&16711935|(w<<24|w>>>8)&4278255360}var b=this._hash.words,h=g[k+0],w=g[k+1],j=g[k+2],q=g[k+3],r=g[k+4],s=g[k+5],t=g[k+6],u=g[k+7],v=g[k+8],x=g[k+9],y=g[k+10],z=g[k+11],A=g[k+12],B=g[k+13],C=g[k+14],D=g[k+15],c=b[0],d=b[1],e=b[2],f=b[3],c=p(c,d,e,f,h,7,a[0]),f=p(f,c,d,e,w,12,a[1]),e=p(e,f,c,d,j,17,a[2]),d=p(d,e,f,c,q,22,a[3]),c=p(c,d,e,f,r,7,a[4]),f=p(f,c,d,e,s,12,a[5]),e=p(e,f,c,d,t,17,a[6]),d=p(d,e,f,c,u,22,a[7]), +c=p(c,d,e,f,v,7,a[8]),f=p(f,c,d,e,x,12,a[9]),e=p(e,f,c,d,y,17,a[10]),d=p(d,e,f,c,z,22,a[11]),c=p(c,d,e,f,A,7,a[12]),f=p(f,c,d,e,B,12,a[13]),e=p(e,f,c,d,C,17,a[14]),d=p(d,e,f,c,D,22,a[15]),c=m(c,d,e,f,w,5,a[16]),f=m(f,c,d,e,t,9,a[17]),e=m(e,f,c,d,z,14,a[18]),d=m(d,e,f,c,h,20,a[19]),c=m(c,d,e,f,s,5,a[20]),f=m(f,c,d,e,y,9,a[21]),e=m(e,f,c,d,D,14,a[22]),d=m(d,e,f,c,r,20,a[23]),c=m(c,d,e,f,x,5,a[24]),f=m(f,c,d,e,C,9,a[25]),e=m(e,f,c,d,q,14,a[26]),d=m(d,e,f,c,v,20,a[27]),c=m(c,d,e,f,B,5,a[28]),f=m(f,c, +d,e,j,9,a[29]),e=m(e,f,c,d,u,14,a[30]),d=m(d,e,f,c,A,20,a[31]),c=l(c,d,e,f,s,4,a[32]),f=l(f,c,d,e,v,11,a[33]),e=l(e,f,c,d,z,16,a[34]),d=l(d,e,f,c,C,23,a[35]),c=l(c,d,e,f,w,4,a[36]),f=l(f,c,d,e,r,11,a[37]),e=l(e,f,c,d,u,16,a[38]),d=l(d,e,f,c,y,23,a[39]),c=l(c,d,e,f,B,4,a[40]),f=l(f,c,d,e,h,11,a[41]),e=l(e,f,c,d,q,16,a[42]),d=l(d,e,f,c,t,23,a[43]),c=l(c,d,e,f,x,4,a[44]),f=l(f,c,d,e,A,11,a[45]),e=l(e,f,c,d,D,16,a[46]),d=l(d,e,f,c,j,23,a[47]),c=n(c,d,e,f,h,6,a[48]),f=n(f,c,d,e,u,10,a[49]),e=n(e,f,c,d, +C,15,a[50]),d=n(d,e,f,c,s,21,a[51]),c=n(c,d,e,f,A,6,a[52]),f=n(f,c,d,e,q,10,a[53]),e=n(e,f,c,d,y,15,a[54]),d=n(d,e,f,c,w,21,a[55]),c=n(c,d,e,f,v,6,a[56]),f=n(f,c,d,e,D,10,a[57]),e=n(e,f,c,d,t,15,a[58]),d=n(d,e,f,c,B,21,a[59]),c=n(c,d,e,f,r,6,a[60]),f=n(f,c,d,e,z,10,a[61]),e=n(e,f,c,d,j,15,a[62]),d=n(d,e,f,c,x,21,a[63]);b[0]=b[0]+c|0;b[1]=b[1]+d|0;b[2]=b[2]+e|0;b[3]=b[3]+f|0},_doFinalize:function(){var a=this._data,k=a.words,b=8*this._nDataBytes,h=8*a.sigBytes;k[h>>>5]|=128<<24-h%32;var l=s.floor(b/ +4294967296);k[(h+64>>>9<<4)+15]=(l<<8|l>>>24)&16711935|(l<<24|l>>>8)&4278255360;k[(h+64>>>9<<4)+14]=(b<<8|b>>>24)&16711935|(b<<24|b>>>8)&4278255360;a.sigBytes=4*(k.length+1);this._process();a=this._hash;k=a.words;for(b=0;4>b;b++)h=k[b],k[b]=(h<<8|h>>>24)&16711935|(h<<24|h>>>8)&4278255360;return a},clone:function(){var a=t.clone.call(this);a._hash=this._hash.clone();return a}});r.MD5=t._createHelper(q);r.HmacMD5=t._createHmacHelper(q)})(Math); diff --git a/library/cryptojs/rollups/pbkdf2.js b/library/cryptojs/rollups/pbkdf2.js new file mode 100644 index 000000000..fdc7b4fe9 --- /dev/null +++ b/library/cryptojs/rollups/pbkdf2.js @@ -0,0 +1,19 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(g,j){var e={},d=e.lib={},m=function(){},n=d.Base={extend:function(a){m.prototype=this;var c=new m;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +q=d.WordArray=n.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=j?c:4*a.length},toString:function(a){return(a||l).stringify(this)},concat:function(a){var c=this.words,p=a.words,f=this.sigBytes;a=a.sigBytes;this.clamp();if(f%4)for(var b=0;b>>2]|=(p[b>>>2]>>>24-8*(b%4)&255)<<24-8*((f+b)%4);else if(65535>>2]=p[b>>>2];else c.push.apply(c,p);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=g.ceil(c/4)},clone:function(){var a=n.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],b=0;b>>2]>>>24-8*(f%4)&255;b.push((d>>>4).toString(16));b.push((d&15).toString(16))}return b.join("")},parse:function(a){for(var c=a.length,b=[],f=0;f>>3]|=parseInt(a.substr(f, +2),16)<<24-4*(f%8);return new q.init(b,c/2)}},k=b.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var b=[],f=0;f>>2]>>>24-8*(f%4)&255));return b.join("")},parse:function(a){for(var c=a.length,b=[],f=0;f>>2]|=(a.charCodeAt(f)&255)<<24-8*(f%4);return new q.init(b,c)}},h=b.Utf8={stringify:function(a){try{return decodeURIComponent(escape(k.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return k.parse(unescape(encodeURIComponent(a)))}}, +u=d.BufferedBlockAlgorithm=n.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=h.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,d=b.words,f=b.sigBytes,l=this.blockSize,e=f/(4*l),e=a?g.ceil(e):g.max((e|0)-this._minBufferSize,0);a=e*l;f=g.min(4*a,f);if(a){for(var h=0;ha;a++){if(16>a)m[a]=d[e+a]|0;else{var c=m[a-3]^m[a-8]^m[a-14]^m[a-16];m[a]=c<<1|c>>>31}c=(l<<5|l>>>27)+j+m[a];c=20>a?c+((k&h|~k&g)+1518500249):40>a?c+((k^h^g)+1859775393):60>a?c+((k&h|k&g|h&g)-1894007588):c+((k^h^ +g)-899497514);j=g;g=h;h=k<<30|k>>>2;k=l;l=c}b[0]=b[0]+l|0;b[1]=b[1]+k|0;b[2]=b[2]+h|0;b[3]=b[3]+g|0;b[4]=b[4]+j|0},_doFinalize:function(){var d=this._data,e=d.words,b=8*this._nDataBytes,l=8*d.sigBytes;e[l>>>5]|=128<<24-l%32;e[(l+64>>>9<<4)+14]=Math.floor(b/4294967296);e[(l+64>>>9<<4)+15]=b;d.sigBytes=4*e.length;this._process();return this._hash},clone:function(){var e=d.clone.call(this);e._hash=this._hash.clone();return e}});g.SHA1=d._createHelper(j);g.HmacSHA1=d._createHmacHelper(j)})(); +(function(){var g=CryptoJS,j=g.enc.Utf8;g.algo.HMAC=g.lib.Base.extend({init:function(e,d){e=this._hasher=new e.init;"string"==typeof d&&(d=j.parse(d));var g=e.blockSize,n=4*g;d.sigBytes>n&&(d=e.finalize(d));d.clamp();for(var q=this._oKey=d.clone(),b=this._iKey=d.clone(),l=q.words,k=b.words,h=0;h>>2]|=(m[r>>>2]>>>24-8*(r%4)&255)<<24-8*((n+r)%4);else if(65535>>2]=m[r>>>2];else b.push.apply(b,m);this.sigBytes+=a;return this},clamp:function(){var a=this.words,b=this.sigBytes;a[b>>>2]&=4294967295<< +32-8*(b%4);a.length=q.ceil(b/4)},clone:function(){var a=c.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var b=[],m=0;m>>2]>>>24-8*(n%4)&255;m.push((r>>>4).toString(16));m.push((r&15).toString(16))}return m.join("")},parse:function(a){for(var b=a.length,m=[],n=0;n>>3]|=parseInt(a.substr(n, +2),16)<<24-4*(n%8);return new s.init(m,b/2)}},a=b.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var m=[],n=0;n>>2]>>>24-8*(n%4)&255));return m.join("")},parse:function(a){for(var b=a.length,m=[],n=0;n>>2]|=(a.charCodeAt(n)&255)<<24-8*(n%4);return new s.init(m,b)}},t=b.Utf8={stringify:function(b){try{return decodeURIComponent(escape(a.stringify(b)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(b){return a.parse(unescape(encodeURIComponent(b)))}}, +u=l.BufferedBlockAlgorithm=c.extend({reset:function(){this._data=new s.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=t.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,m=b.words,n=b.sigBytes,r=this.blockSize,c=n/(4*r),c=a?q.ceil(c):q.max((c|0)-this._minBufferSize,0);a=c*r;n=q.min(4*a,n);if(a){for(var u=0;u>>2]>>>24-8*(k%4)&255)<<16|(l[k+1>>>2]>>>24-8*((k+1)%4)&255)<<8|l[k+2>>>2]>>>24-8*((k+2)%4)&255,d=0;4>d&&k+0.75*d>>6*(3-d)&63));if(l=c.charAt(64))for(;e.length%4;)e.push(l);return e.join("")},parse:function(e){var l=e.length,p=this._map,c=p.charAt(64);c&&(c=e.indexOf(c),-1!=c&&(l=c));for(var c=[],s=0,b=0;b< +l;b++)if(b%4){var d=p.indexOf(e.charAt(b-1))<<2*(b%4),a=p.indexOf(e.charAt(b))>>>6-2*(b%4);c[s>>>2]|=(d|a)<<24-8*(s%4);s++}return k.create(c,s)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); +(function(q){function k(a,b,c,d,m,n,r){a=a+(b&c|~b&d)+m+r;return(a<>>32-n)+b}function e(a,b,c,d,m,n,r){a=a+(b&d|c&~d)+m+r;return(a<>>32-n)+b}function l(a,b,c,d,m,n,r){a=a+(b^c^d)+m+r;return(a<>>32-n)+b}function p(a,b,c,d,m,n,r){a=a+(c^(b|~d))+m+r;return(a<>>32-n)+b}for(var c=CryptoJS,s=c.lib,b=s.WordArray,d=s.Hasher,s=c.algo,a=[],t=0;64>t;t++)a[t]=4294967296*q.abs(q.sin(t+1))|0;s=s.MD5=d.extend({_doReset:function(){this._hash=new b.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(b,c){for(var d=0;16>d;d++){var t=c+d,m=b[t];b[t]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360}var d=this._hash.words,t=b[c+0],m=b[c+1],n=b[c+2],r=b[c+3],x=b[c+4],s=b[c+5],q=b[c+6],y=b[c+7],z=b[c+8],A=b[c+9],B=b[c+10],C=b[c+11],D=b[c+12],E=b[c+13],F=b[c+14],G=b[c+15],f=d[0],g=d[1],h=d[2],j=d[3],f=k(f,g,h,j,t,7,a[0]),j=k(j,f,g,h,m,12,a[1]),h=k(h,j,f,g,n,17,a[2]),g=k(g,h,j,f,r,22,a[3]),f=k(f,g,h,j,x,7,a[4]),j=k(j,f,g,h,s,12,a[5]),h=k(h,j,f,g,q,17,a[6]),g=k(g,h,j,f,y,22,a[7]), +f=k(f,g,h,j,z,7,a[8]),j=k(j,f,g,h,A,12,a[9]),h=k(h,j,f,g,B,17,a[10]),g=k(g,h,j,f,C,22,a[11]),f=k(f,g,h,j,D,7,a[12]),j=k(j,f,g,h,E,12,a[13]),h=k(h,j,f,g,F,17,a[14]),g=k(g,h,j,f,G,22,a[15]),f=e(f,g,h,j,m,5,a[16]),j=e(j,f,g,h,q,9,a[17]),h=e(h,j,f,g,C,14,a[18]),g=e(g,h,j,f,t,20,a[19]),f=e(f,g,h,j,s,5,a[20]),j=e(j,f,g,h,B,9,a[21]),h=e(h,j,f,g,G,14,a[22]),g=e(g,h,j,f,x,20,a[23]),f=e(f,g,h,j,A,5,a[24]),j=e(j,f,g,h,F,9,a[25]),h=e(h,j,f,g,r,14,a[26]),g=e(g,h,j,f,z,20,a[27]),f=e(f,g,h,j,E,5,a[28]),j=e(j,f, +g,h,n,9,a[29]),h=e(h,j,f,g,y,14,a[30]),g=e(g,h,j,f,D,20,a[31]),f=l(f,g,h,j,s,4,a[32]),j=l(j,f,g,h,z,11,a[33]),h=l(h,j,f,g,C,16,a[34]),g=l(g,h,j,f,F,23,a[35]),f=l(f,g,h,j,m,4,a[36]),j=l(j,f,g,h,x,11,a[37]),h=l(h,j,f,g,y,16,a[38]),g=l(g,h,j,f,B,23,a[39]),f=l(f,g,h,j,E,4,a[40]),j=l(j,f,g,h,t,11,a[41]),h=l(h,j,f,g,r,16,a[42]),g=l(g,h,j,f,q,23,a[43]),f=l(f,g,h,j,A,4,a[44]),j=l(j,f,g,h,D,11,a[45]),h=l(h,j,f,g,G,16,a[46]),g=l(g,h,j,f,n,23,a[47]),f=p(f,g,h,j,t,6,a[48]),j=p(j,f,g,h,y,10,a[49]),h=p(h,j,f,g, +F,15,a[50]),g=p(g,h,j,f,s,21,a[51]),f=p(f,g,h,j,D,6,a[52]),j=p(j,f,g,h,r,10,a[53]),h=p(h,j,f,g,B,15,a[54]),g=p(g,h,j,f,m,21,a[55]),f=p(f,g,h,j,z,6,a[56]),j=p(j,f,g,h,G,10,a[57]),h=p(h,j,f,g,q,15,a[58]),g=p(g,h,j,f,E,21,a[59]),f=p(f,g,h,j,x,6,a[60]),j=p(j,f,g,h,C,10,a[61]),h=p(h,j,f,g,n,15,a[62]),g=p(g,h,j,f,A,21,a[63]);d[0]=d[0]+f|0;d[1]=d[1]+g|0;d[2]=d[2]+h|0;d[3]=d[3]+j|0},_doFinalize:function(){var a=this._data,b=a.words,c=8*this._nDataBytes,d=8*a.sigBytes;b[d>>>5]|=128<<24-d%32;var m=q.floor(c/ +4294967296);b[(d+64>>>9<<4)+15]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360;b[(d+64>>>9<<4)+14]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360;a.sigBytes=4*(b.length+1);this._process();a=this._hash;b=a.words;for(c=0;4>c;c++)d=b[c],b[c]=(d<<8|d>>>24)&16711935|(d<<24|d>>>8)&4278255360;return a},clone:function(){var a=d.clone.call(this);a._hash=this._hash.clone();return a}});c.MD5=d._createHelper(s);c.HmacMD5=d._createHmacHelper(s)})(Math); +(function(){var q=CryptoJS,k=q.lib,e=k.Base,l=k.WordArray,k=q.algo,p=k.EvpKDF=e.extend({cfg:e.extend({keySize:4,hasher:k.MD5,iterations:1}),init:function(c){this.cfg=this.cfg.extend(c)},compute:function(c,e){for(var b=this.cfg,d=b.hasher.create(),a=l.create(),k=a.words,p=b.keySize,b=b.iterations;k.length>>2]&255}};e.BlockCipher=d.extend({cfg:d.cfg.extend({mode:a,padding:u}),reset:function(){d.reset.call(this);var a=this.cfg,b=a.iv,a=a.mode;if(this._xformMode==this._ENC_XFORM_MODE)var c=a.createEncryptor;else c=a.createDecryptor,this._minBufferSize=1;this._mode=c.call(a, +this,b&&b.words)},_doProcessBlock:function(a,b){this._mode.processBlock(a,b)},_doFinalize:function(){var a=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){a.pad(this._data,this.blockSize);var b=this._process(!0)}else b=this._process(!0),a.unpad(b);return b},blockSize:4});var w=e.CipherParams=l.extend({init:function(a){this.mixIn(a)},toString:function(a){return(a||this.formatter).stringify(this)}}),a=(k.format={}).OpenSSL={stringify:function(a){var b=a.ciphertext;a=a.salt;return(a?p.create([1398893684, +1701076831]).concat(a).concat(b):b).toString(s)},parse:function(a){a=s.parse(a);var b=a.words;if(1398893684==b[0]&&1701076831==b[1]){var c=p.create(b.slice(2,4));b.splice(0,4);a.sigBytes-=16}return w.create({ciphertext:a,salt:c})}},v=e.SerializableCipher=l.extend({cfg:l.extend({format:a}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);var e=a.createEncryptor(c,d);b=e.finalize(b);e=e.cfg;return w.create({ciphertext:b,key:c,iv:e.iv,algorithm:a,mode:e.mode,padding:e.padding,blockSize:a.blockSize,formatter:d.format})}, +decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);return a.createDecryptor(c,d).finalize(b.ciphertext)},_parse:function(a,b){return"string"==typeof a?b.parse(a,this):a}}),k=(k.kdf={}).OpenSSL={execute:function(a,c,d,e){e||(e=p.random(8));a=b.create({keySize:c+d}).compute(a,e);d=p.create(a.words.slice(c),4*d);a.sigBytes=4*c;return w.create({key:a,iv:d,salt:e})}},H=e.PasswordBasedCipher=v.extend({cfg:v.cfg.extend({kdf:k}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);c=d.kdf.execute(c, +a.keySize,a.ivSize);d.iv=c.iv;a=v.encrypt.call(this,a,b,c.key,d);a.mixIn(c);return a},decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);c=d.kdf.execute(c,a.keySize,a.ivSize,b.salt);d.iv=c.iv;return v.decrypt.call(this,a,b,c.key,d)}})}(); +(function(){function q(){for(var b=this._X,d=this._C,a=0;8>a;a++)p[a]=d[a];d[0]=d[0]+1295307597+this._b|0;d[1]=d[1]+3545052371+(d[0]>>>0>>0?1:0)|0;d[2]=d[2]+886263092+(d[1]>>>0>>0?1:0)|0;d[3]=d[3]+1295307597+(d[2]>>>0>>0?1:0)|0;d[4]=d[4]+3545052371+(d[3]>>>0>>0?1:0)|0;d[5]=d[5]+886263092+(d[4]>>>0>>0?1:0)|0;d[6]=d[6]+1295307597+(d[5]>>>0>>0?1:0)|0;d[7]=d[7]+3545052371+(d[6]>>>0>>0?1:0)|0;this._b=d[7]>>>0>>0?1:0;for(a=0;8>a;a++){var e=b[a]+d[a],k=e&65535, +l=e>>>16;c[a]=((k*k>>>17)+k*l>>>15)+l*l^((e&4294901760)*e|0)+((e&65535)*e|0)}b[0]=c[0]+(c[7]<<16|c[7]>>>16)+(c[6]<<16|c[6]>>>16)|0;b[1]=c[1]+(c[0]<<8|c[0]>>>24)+c[7]|0;b[2]=c[2]+(c[1]<<16|c[1]>>>16)+(c[0]<<16|c[0]>>>16)|0;b[3]=c[3]+(c[2]<<8|c[2]>>>24)+c[1]|0;b[4]=c[4]+(c[3]<<16|c[3]>>>16)+(c[2]<<16|c[2]>>>16)|0;b[5]=c[5]+(c[4]<<8|c[4]>>>24)+c[3]|0;b[6]=c[6]+(c[5]<<16|c[5]>>>16)+(c[4]<<16|c[4]>>>16)|0;b[7]=c[7]+(c[6]<<8|c[6]>>>24)+c[5]|0}var k=CryptoJS,e=k.lib.StreamCipher,l=[],p=[],c=[],s=k.algo.RabbitLegacy= +e.extend({_doReset:function(){for(var b=this._key.words,c=this.cfg.iv,a=this._X=[b[0],b[3]<<16|b[2]>>>16,b[1],b[0]<<16|b[3]>>>16,b[2],b[1]<<16|b[0]>>>16,b[3],b[2]<<16|b[1]>>>16],b=this._C=[b[2]<<16|b[2]>>>16,b[0]&4294901760|b[1]&65535,b[3]<<16|b[3]>>>16,b[1]&4294901760|b[2]&65535,b[0]<<16|b[0]>>>16,b[2]&4294901760|b[3]&65535,b[1]<<16|b[1]>>>16,b[3]&4294901760|b[0]&65535],e=this._b=0;4>e;e++)q.call(this);for(e=0;8>e;e++)b[e]^=a[e+4&7];if(c){var a=c.words,c=a[0],a=a[1],c=(c<<8|c>>>24)&16711935|(c<< +24|c>>>8)&4278255360,a=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360,e=c>>>16|a&4294901760,k=a<<16|c&65535;b[0]^=c;b[1]^=e;b[2]^=a;b[3]^=k;b[4]^=c;b[5]^=e;b[6]^=a;b[7]^=k;for(e=0;4>e;e++)q.call(this)}},_doProcessBlock:function(b,c){var a=this._X;q.call(this);l[0]=a[0]^a[5]>>>16^a[3]<<16;l[1]=a[2]^a[7]>>>16^a[5]<<16;l[2]=a[4]^a[1]>>>16^a[7]<<16;l[3]=a[6]^a[3]>>>16^a[1]<<16;for(a=0;4>a;a++)l[a]=(l[a]<<8|l[a]>>>24)&16711935|(l[a]<<24|l[a]>>>8)&4278255360,b[c+a]^=l[a]},blockSize:4,ivSize:2});k.RabbitLegacy= +e._createHelper(s)})(); diff --git a/library/cryptojs/rollups/rabbit.js b/library/cryptojs/rollups/rabbit.js new file mode 100644 index 000000000..5ea717ed4 --- /dev/null +++ b/library/cryptojs/rollups/rabbit.js @@ -0,0 +1,36 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(q,k){var e={},l=e.lib={},p=function(){},c=l.Base={extend:function(a){p.prototype=this;var b=new p;a&&b.mixIn(a);b.hasOwnProperty("init")||(b.init=function(){b.$super.init.apply(this,arguments)});b.init.prototype=b;b.$super=this;return b},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var b in a)a.hasOwnProperty(b)&&(this[b]=a[b]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +s=l.WordArray=c.extend({init:function(a,b){a=this.words=a||[];this.sigBytes=b!=k?b:4*a.length},toString:function(a){return(a||d).stringify(this)},concat:function(a){var b=this.words,m=a.words,n=this.sigBytes;a=a.sigBytes;this.clamp();if(n%4)for(var r=0;r>>2]|=(m[r>>>2]>>>24-8*(r%4)&255)<<24-8*((n+r)%4);else if(65535>>2]=m[r>>>2];else b.push.apply(b,m);this.sigBytes+=a;return this},clamp:function(){var a=this.words,b=this.sigBytes;a[b>>>2]&=4294967295<< +32-8*(b%4);a.length=q.ceil(b/4)},clone:function(){var a=c.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var b=[],m=0;m>>2]>>>24-8*(n%4)&255;m.push((r>>>4).toString(16));m.push((r&15).toString(16))}return m.join("")},parse:function(a){for(var b=a.length,m=[],n=0;n>>3]|=parseInt(a.substr(n, +2),16)<<24-4*(n%8);return new s.init(m,b/2)}},a=b.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var m=[],n=0;n>>2]>>>24-8*(n%4)&255));return m.join("")},parse:function(a){for(var b=a.length,m=[],n=0;n>>2]|=(a.charCodeAt(n)&255)<<24-8*(n%4);return new s.init(m,b)}},u=b.Utf8={stringify:function(b){try{return decodeURIComponent(escape(a.stringify(b)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(b){return a.parse(unescape(encodeURIComponent(b)))}}, +t=l.BufferedBlockAlgorithm=c.extend({reset:function(){this._data=new s.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=u.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,m=b.words,n=b.sigBytes,r=this.blockSize,c=n/(4*r),c=a?q.ceil(c):q.max((c|0)-this._minBufferSize,0);a=c*r;n=q.min(4*a,n);if(a){for(var t=0;t>>2]>>>24-8*(k%4)&255)<<16|(l[k+1>>>2]>>>24-8*((k+1)%4)&255)<<8|l[k+2>>>2]>>>24-8*((k+2)%4)&255,d=0;4>d&&k+0.75*d>>6*(3-d)&63));if(l=c.charAt(64))for(;e.length%4;)e.push(l);return e.join("")},parse:function(e){var l=e.length,p=this._map,c=p.charAt(64);c&&(c=e.indexOf(c),-1!=c&&(l=c));for(var c=[],s=0,b=0;b< +l;b++)if(b%4){var d=p.indexOf(e.charAt(b-1))<<2*(b%4),a=p.indexOf(e.charAt(b))>>>6-2*(b%4);c[s>>>2]|=(d|a)<<24-8*(s%4);s++}return k.create(c,s)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); +(function(q){function k(a,b,c,d,m,n,r){a=a+(b&c|~b&d)+m+r;return(a<>>32-n)+b}function e(a,b,c,d,m,n,r){a=a+(b&d|c&~d)+m+r;return(a<>>32-n)+b}function l(a,b,c,d,m,n,r){a=a+(b^c^d)+m+r;return(a<>>32-n)+b}function p(a,b,c,d,m,n,r){a=a+(c^(b|~d))+m+r;return(a<>>32-n)+b}for(var c=CryptoJS,s=c.lib,b=s.WordArray,d=s.Hasher,s=c.algo,a=[],u=0;64>u;u++)a[u]=4294967296*q.abs(q.sin(u+1))|0;s=s.MD5=d.extend({_doReset:function(){this._hash=new b.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(b,c){for(var d=0;16>d;d++){var s=c+d,m=b[s];b[s]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360}var d=this._hash.words,s=b[c+0],m=b[c+1],n=b[c+2],r=b[c+3],x=b[c+4],u=b[c+5],q=b[c+6],y=b[c+7],z=b[c+8],A=b[c+9],B=b[c+10],C=b[c+11],D=b[c+12],E=b[c+13],F=b[c+14],G=b[c+15],f=d[0],g=d[1],h=d[2],j=d[3],f=k(f,g,h,j,s,7,a[0]),j=k(j,f,g,h,m,12,a[1]),h=k(h,j,f,g,n,17,a[2]),g=k(g,h,j,f,r,22,a[3]),f=k(f,g,h,j,x,7,a[4]),j=k(j,f,g,h,u,12,a[5]),h=k(h,j,f,g,q,17,a[6]),g=k(g,h,j,f,y,22,a[7]), +f=k(f,g,h,j,z,7,a[8]),j=k(j,f,g,h,A,12,a[9]),h=k(h,j,f,g,B,17,a[10]),g=k(g,h,j,f,C,22,a[11]),f=k(f,g,h,j,D,7,a[12]),j=k(j,f,g,h,E,12,a[13]),h=k(h,j,f,g,F,17,a[14]),g=k(g,h,j,f,G,22,a[15]),f=e(f,g,h,j,m,5,a[16]),j=e(j,f,g,h,q,9,a[17]),h=e(h,j,f,g,C,14,a[18]),g=e(g,h,j,f,s,20,a[19]),f=e(f,g,h,j,u,5,a[20]),j=e(j,f,g,h,B,9,a[21]),h=e(h,j,f,g,G,14,a[22]),g=e(g,h,j,f,x,20,a[23]),f=e(f,g,h,j,A,5,a[24]),j=e(j,f,g,h,F,9,a[25]),h=e(h,j,f,g,r,14,a[26]),g=e(g,h,j,f,z,20,a[27]),f=e(f,g,h,j,E,5,a[28]),j=e(j,f, +g,h,n,9,a[29]),h=e(h,j,f,g,y,14,a[30]),g=e(g,h,j,f,D,20,a[31]),f=l(f,g,h,j,u,4,a[32]),j=l(j,f,g,h,z,11,a[33]),h=l(h,j,f,g,C,16,a[34]),g=l(g,h,j,f,F,23,a[35]),f=l(f,g,h,j,m,4,a[36]),j=l(j,f,g,h,x,11,a[37]),h=l(h,j,f,g,y,16,a[38]),g=l(g,h,j,f,B,23,a[39]),f=l(f,g,h,j,E,4,a[40]),j=l(j,f,g,h,s,11,a[41]),h=l(h,j,f,g,r,16,a[42]),g=l(g,h,j,f,q,23,a[43]),f=l(f,g,h,j,A,4,a[44]),j=l(j,f,g,h,D,11,a[45]),h=l(h,j,f,g,G,16,a[46]),g=l(g,h,j,f,n,23,a[47]),f=p(f,g,h,j,s,6,a[48]),j=p(j,f,g,h,y,10,a[49]),h=p(h,j,f,g, +F,15,a[50]),g=p(g,h,j,f,u,21,a[51]),f=p(f,g,h,j,D,6,a[52]),j=p(j,f,g,h,r,10,a[53]),h=p(h,j,f,g,B,15,a[54]),g=p(g,h,j,f,m,21,a[55]),f=p(f,g,h,j,z,6,a[56]),j=p(j,f,g,h,G,10,a[57]),h=p(h,j,f,g,q,15,a[58]),g=p(g,h,j,f,E,21,a[59]),f=p(f,g,h,j,x,6,a[60]),j=p(j,f,g,h,C,10,a[61]),h=p(h,j,f,g,n,15,a[62]),g=p(g,h,j,f,A,21,a[63]);d[0]=d[0]+f|0;d[1]=d[1]+g|0;d[2]=d[2]+h|0;d[3]=d[3]+j|0},_doFinalize:function(){var a=this._data,b=a.words,c=8*this._nDataBytes,d=8*a.sigBytes;b[d>>>5]|=128<<24-d%32;var m=q.floor(c/ +4294967296);b[(d+64>>>9<<4)+15]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360;b[(d+64>>>9<<4)+14]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360;a.sigBytes=4*(b.length+1);this._process();a=this._hash;b=a.words;for(c=0;4>c;c++)d=b[c],b[c]=(d<<8|d>>>24)&16711935|(d<<24|d>>>8)&4278255360;return a},clone:function(){var a=d.clone.call(this);a._hash=this._hash.clone();return a}});c.MD5=d._createHelper(s);c.HmacMD5=d._createHmacHelper(s)})(Math); +(function(){var q=CryptoJS,k=q.lib,e=k.Base,l=k.WordArray,k=q.algo,p=k.EvpKDF=e.extend({cfg:e.extend({keySize:4,hasher:k.MD5,iterations:1}),init:function(c){this.cfg=this.cfg.extend(c)},compute:function(c,e){for(var b=this.cfg,d=b.hasher.create(),a=l.create(),k=a.words,p=b.keySize,b=b.iterations;k.length>>2]&255}};e.BlockCipher=d.extend({cfg:d.cfg.extend({mode:a,padding:t}),reset:function(){d.reset.call(this);var a=this.cfg,b=a.iv,a=a.mode;if(this._xformMode==this._ENC_XFORM_MODE)var c=a.createEncryptor;else c=a.createDecryptor,this._minBufferSize=1;this._mode=c.call(a, +this,b&&b.words)},_doProcessBlock:function(a,b){this._mode.processBlock(a,b)},_doFinalize:function(){var a=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){a.pad(this._data,this.blockSize);var b=this._process(!0)}else b=this._process(!0),a.unpad(b);return b},blockSize:4});var w=e.CipherParams=l.extend({init:function(a){this.mixIn(a)},toString:function(a){return(a||this.formatter).stringify(this)}}),a=(k.format={}).OpenSSL={stringify:function(a){var b=a.ciphertext;a=a.salt;return(a?p.create([1398893684, +1701076831]).concat(a).concat(b):b).toString(s)},parse:function(a){a=s.parse(a);var b=a.words;if(1398893684==b[0]&&1701076831==b[1]){var c=p.create(b.slice(2,4));b.splice(0,4);a.sigBytes-=16}return w.create({ciphertext:a,salt:c})}},v=e.SerializableCipher=l.extend({cfg:l.extend({format:a}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);var e=a.createEncryptor(c,d);b=e.finalize(b);e=e.cfg;return w.create({ciphertext:b,key:c,iv:e.iv,algorithm:a,mode:e.mode,padding:e.padding,blockSize:a.blockSize,formatter:d.format})}, +decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);return a.createDecryptor(c,d).finalize(b.ciphertext)},_parse:function(a,b){return"string"==typeof a?b.parse(a,this):a}}),k=(k.kdf={}).OpenSSL={execute:function(a,c,d,e){e||(e=p.random(8));a=b.create({keySize:c+d}).compute(a,e);d=p.create(a.words.slice(c),4*d);a.sigBytes=4*c;return w.create({key:a,iv:d,salt:e})}},H=e.PasswordBasedCipher=v.extend({cfg:v.cfg.extend({kdf:k}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);c=d.kdf.execute(c, +a.keySize,a.ivSize);d.iv=c.iv;a=v.encrypt.call(this,a,b,c.key,d);a.mixIn(c);return a},decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);c=d.kdf.execute(c,a.keySize,a.ivSize,b.salt);d.iv=c.iv;return v.decrypt.call(this,a,b,c.key,d)}})}(); +(function(){function q(){for(var b=this._X,d=this._C,a=0;8>a;a++)p[a]=d[a];d[0]=d[0]+1295307597+this._b|0;d[1]=d[1]+3545052371+(d[0]>>>0>>0?1:0)|0;d[2]=d[2]+886263092+(d[1]>>>0>>0?1:0)|0;d[3]=d[3]+1295307597+(d[2]>>>0>>0?1:0)|0;d[4]=d[4]+3545052371+(d[3]>>>0>>0?1:0)|0;d[5]=d[5]+886263092+(d[4]>>>0>>0?1:0)|0;d[6]=d[6]+1295307597+(d[5]>>>0>>0?1:0)|0;d[7]=d[7]+3545052371+(d[6]>>>0>>0?1:0)|0;this._b=d[7]>>>0>>0?1:0;for(a=0;8>a;a++){var e=b[a]+d[a],k=e&65535, +l=e>>>16;c[a]=((k*k>>>17)+k*l>>>15)+l*l^((e&4294901760)*e|0)+((e&65535)*e|0)}b[0]=c[0]+(c[7]<<16|c[7]>>>16)+(c[6]<<16|c[6]>>>16)|0;b[1]=c[1]+(c[0]<<8|c[0]>>>24)+c[7]|0;b[2]=c[2]+(c[1]<<16|c[1]>>>16)+(c[0]<<16|c[0]>>>16)|0;b[3]=c[3]+(c[2]<<8|c[2]>>>24)+c[1]|0;b[4]=c[4]+(c[3]<<16|c[3]>>>16)+(c[2]<<16|c[2]>>>16)|0;b[5]=c[5]+(c[4]<<8|c[4]>>>24)+c[3]|0;b[6]=c[6]+(c[5]<<16|c[5]>>>16)+(c[4]<<16|c[4]>>>16)|0;b[7]=c[7]+(c[6]<<8|c[6]>>>24)+c[5]|0}var k=CryptoJS,e=k.lib.StreamCipher,l=[],p=[],c=[],s=k.algo.Rabbit= +e.extend({_doReset:function(){for(var b=this._key.words,c=this.cfg.iv,a=0;4>a;a++)b[a]=(b[a]<<8|b[a]>>>24)&16711935|(b[a]<<24|b[a]>>>8)&4278255360;for(var e=this._X=[b[0],b[3]<<16|b[2]>>>16,b[1],b[0]<<16|b[3]>>>16,b[2],b[1]<<16|b[0]>>>16,b[3],b[2]<<16|b[1]>>>16],b=this._C=[b[2]<<16|b[2]>>>16,b[0]&4294901760|b[1]&65535,b[3]<<16|b[3]>>>16,b[1]&4294901760|b[2]&65535,b[0]<<16|b[0]>>>16,b[2]&4294901760|b[3]&65535,b[1]<<16|b[1]>>>16,b[3]&4294901760|b[0]&65535],a=this._b=0;4>a;a++)q.call(this);for(a=0;8> +a;a++)b[a]^=e[a+4&7];if(c){var a=c.words,c=a[0],a=a[1],c=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360,a=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360,e=c>>>16|a&4294901760,k=a<<16|c&65535;b[0]^=c;b[1]^=e;b[2]^=a;b[3]^=k;b[4]^=c;b[5]^=e;b[6]^=a;b[7]^=k;for(a=0;4>a;a++)q.call(this)}},_doProcessBlock:function(b,c){var a=this._X;q.call(this);l[0]=a[0]^a[5]>>>16^a[3]<<16;l[1]=a[2]^a[7]>>>16^a[5]<<16;l[2]=a[4]^a[1]>>>16^a[7]<<16;l[3]=a[6]^a[3]>>>16^a[1]<<16;for(a=0;4>a;a++)l[a]=(l[a]<<8|l[a]>>>24)& +16711935|(l[a]<<24|l[a]>>>8)&4278255360,b[c+a]^=l[a]},blockSize:4,ivSize:2});k.Rabbit=e._createHelper(s)})(); diff --git a/library/cryptojs/rollups/rc4.js b/library/cryptojs/rollups/rc4.js new file mode 100644 index 000000000..aba420f5e --- /dev/null +++ b/library/cryptojs/rollups/rc4.js @@ -0,0 +1,33 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(s,l){var e={},n=e.lib={},p=function(){},b=n.Base={extend:function(c){p.prototype=this;var a=new p;c&&a.mixIn(c);a.hasOwnProperty("init")||(a.init=function(){a.$super.init.apply(this,arguments)});a.init.prototype=a;a.$super=this;return a},create:function(){var c=this.extend();c.init.apply(c,arguments);return c},init:function(){},mixIn:function(c){for(var a in c)c.hasOwnProperty(a)&&(this[a]=c[a]);c.hasOwnProperty("toString")&&(this.toString=c.toString)},clone:function(){return this.init.prototype.extend(this)}}, +d=n.WordArray=b.extend({init:function(c,a){c=this.words=c||[];this.sigBytes=a!=l?a:4*c.length},toString:function(c){return(c||q).stringify(this)},concat:function(c){var a=this.words,m=c.words,f=this.sigBytes;c=c.sigBytes;this.clamp();if(f%4)for(var r=0;r>>2]|=(m[r>>>2]>>>24-8*(r%4)&255)<<24-8*((f+r)%4);else if(65535>>2]=m[r>>>2];else a.push.apply(a,m);this.sigBytes+=c;return this},clamp:function(){var c=this.words,a=this.sigBytes;c[a>>>2]&=4294967295<< +32-8*(a%4);c.length=s.ceil(a/4)},clone:function(){var c=b.clone.call(this);c.words=this.words.slice(0);return c},random:function(c){for(var a=[],m=0;m>>2]>>>24-8*(f%4)&255;m.push((r>>>4).toString(16));m.push((r&15).toString(16))}return m.join("")},parse:function(c){for(var a=c.length,m=[],f=0;f>>3]|=parseInt(c.substr(f, +2),16)<<24-4*(f%8);return new d.init(m,a/2)}},a=t.Latin1={stringify:function(c){var a=c.words;c=c.sigBytes;for(var m=[],f=0;f>>2]>>>24-8*(f%4)&255));return m.join("")},parse:function(c){for(var a=c.length,m=[],f=0;f>>2]|=(c.charCodeAt(f)&255)<<24-8*(f%4);return new d.init(m,a)}},v=t.Utf8={stringify:function(c){try{return decodeURIComponent(escape(a.stringify(c)))}catch(u){throw Error("Malformed UTF-8 data");}},parse:function(c){return a.parse(unescape(encodeURIComponent(c)))}}, +u=n.BufferedBlockAlgorithm=b.extend({reset:function(){this._data=new d.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=v.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var u=this._data,m=u.words,f=u.sigBytes,r=this.blockSize,e=f/(4*r),e=a?s.ceil(e):s.max((e|0)-this._minBufferSize,0);a=e*r;f=s.min(4*a,f);if(a){for(var b=0;b>>2]>>>24-8*(d%4)&255)<<16|(n[d+1>>>2]>>>24-8*((d+1)%4)&255)<<8|n[d+2>>>2]>>>24-8*((d+2)%4)&255,q=0;4>q&&d+0.75*q>>6*(3-q)&63));if(n=b.charAt(64))for(;e.length%4;)e.push(n);return e.join("")},parse:function(e){var n=e.length,p=this._map,b=p.charAt(64);b&&(b=e.indexOf(b),-1!=b&&(n=b));for(var b=[],d=0,t=0;t< +n;t++)if(t%4){var q=p.indexOf(e.charAt(t-1))<<2*(t%4),a=p.indexOf(e.charAt(t))>>>6-2*(t%4);b[d>>>2]|=(q|a)<<24-8*(d%4);d++}return l.create(b,d)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); +(function(s){function l(a,b,c,e,m,f,r){a=a+(b&c|~b&e)+m+r;return(a<>>32-f)+b}function e(a,b,c,e,m,f,r){a=a+(b&e|c&~e)+m+r;return(a<>>32-f)+b}function n(a,b,c,e,m,f,r){a=a+(b^c^e)+m+r;return(a<>>32-f)+b}function p(a,b,c,e,m,f,r){a=a+(c^(b|~e))+m+r;return(a<>>32-f)+b}for(var b=CryptoJS,d=b.lib,t=d.WordArray,q=d.Hasher,d=b.algo,a=[],v=0;64>v;v++)a[v]=4294967296*s.abs(s.sin(v+1))|0;d=d.MD5=q.extend({_doReset:function(){this._hash=new t.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(b,d){for(var c=0;16>c;c++){var q=d+c,m=b[q];b[q]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360}var c=this._hash.words,q=b[d+0],m=b[d+1],f=b[d+2],r=b[d+3],x=b[d+4],t=b[d+5],s=b[d+6],v=b[d+7],y=b[d+8],z=b[d+9],A=b[d+10],B=b[d+11],C=b[d+12],D=b[d+13],E=b[d+14],F=b[d+15],g=c[0],h=c[1],j=c[2],k=c[3],g=l(g,h,j,k,q,7,a[0]),k=l(k,g,h,j,m,12,a[1]),j=l(j,k,g,h,f,17,a[2]),h=l(h,j,k,g,r,22,a[3]),g=l(g,h,j,k,x,7,a[4]),k=l(k,g,h,j,t,12,a[5]),j=l(j,k,g,h,s,17,a[6]),h=l(h,j,k,g,v,22,a[7]), +g=l(g,h,j,k,y,7,a[8]),k=l(k,g,h,j,z,12,a[9]),j=l(j,k,g,h,A,17,a[10]),h=l(h,j,k,g,B,22,a[11]),g=l(g,h,j,k,C,7,a[12]),k=l(k,g,h,j,D,12,a[13]),j=l(j,k,g,h,E,17,a[14]),h=l(h,j,k,g,F,22,a[15]),g=e(g,h,j,k,m,5,a[16]),k=e(k,g,h,j,s,9,a[17]),j=e(j,k,g,h,B,14,a[18]),h=e(h,j,k,g,q,20,a[19]),g=e(g,h,j,k,t,5,a[20]),k=e(k,g,h,j,A,9,a[21]),j=e(j,k,g,h,F,14,a[22]),h=e(h,j,k,g,x,20,a[23]),g=e(g,h,j,k,z,5,a[24]),k=e(k,g,h,j,E,9,a[25]),j=e(j,k,g,h,r,14,a[26]),h=e(h,j,k,g,y,20,a[27]),g=e(g,h,j,k,D,5,a[28]),k=e(k,g, +h,j,f,9,a[29]),j=e(j,k,g,h,v,14,a[30]),h=e(h,j,k,g,C,20,a[31]),g=n(g,h,j,k,t,4,a[32]),k=n(k,g,h,j,y,11,a[33]),j=n(j,k,g,h,B,16,a[34]),h=n(h,j,k,g,E,23,a[35]),g=n(g,h,j,k,m,4,a[36]),k=n(k,g,h,j,x,11,a[37]),j=n(j,k,g,h,v,16,a[38]),h=n(h,j,k,g,A,23,a[39]),g=n(g,h,j,k,D,4,a[40]),k=n(k,g,h,j,q,11,a[41]),j=n(j,k,g,h,r,16,a[42]),h=n(h,j,k,g,s,23,a[43]),g=n(g,h,j,k,z,4,a[44]),k=n(k,g,h,j,C,11,a[45]),j=n(j,k,g,h,F,16,a[46]),h=n(h,j,k,g,f,23,a[47]),g=p(g,h,j,k,q,6,a[48]),k=p(k,g,h,j,v,10,a[49]),j=p(j,k,g,h, +E,15,a[50]),h=p(h,j,k,g,t,21,a[51]),g=p(g,h,j,k,C,6,a[52]),k=p(k,g,h,j,r,10,a[53]),j=p(j,k,g,h,A,15,a[54]),h=p(h,j,k,g,m,21,a[55]),g=p(g,h,j,k,y,6,a[56]),k=p(k,g,h,j,F,10,a[57]),j=p(j,k,g,h,s,15,a[58]),h=p(h,j,k,g,D,21,a[59]),g=p(g,h,j,k,x,6,a[60]),k=p(k,g,h,j,B,10,a[61]),j=p(j,k,g,h,f,15,a[62]),h=p(h,j,k,g,z,21,a[63]);c[0]=c[0]+g|0;c[1]=c[1]+h|0;c[2]=c[2]+j|0;c[3]=c[3]+k|0},_doFinalize:function(){var a=this._data,b=a.words,c=8*this._nDataBytes,d=8*a.sigBytes;b[d>>>5]|=128<<24-d%32;var m=s.floor(c/ +4294967296);b[(d+64>>>9<<4)+15]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360;b[(d+64>>>9<<4)+14]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360;a.sigBytes=4*(b.length+1);this._process();a=this._hash;b=a.words;for(c=0;4>c;c++)d=b[c],b[c]=(d<<8|d>>>24)&16711935|(d<<24|d>>>8)&4278255360;return a},clone:function(){var a=q.clone.call(this);a._hash=this._hash.clone();return a}});b.MD5=q._createHelper(d);b.HmacMD5=q._createHmacHelper(d)})(Math); +(function(){var s=CryptoJS,l=s.lib,e=l.Base,n=l.WordArray,l=s.algo,p=l.EvpKDF=e.extend({cfg:e.extend({keySize:4,hasher:l.MD5,iterations:1}),init:function(b){this.cfg=this.cfg.extend(b)},compute:function(b,d){for(var e=this.cfg,q=e.hasher.create(),a=n.create(),l=a.words,p=e.keySize,e=e.iterations;l.length>>2]&255}};e.BlockCipher=q.extend({cfg:q.cfg.extend({mode:a,padding:u}),reset:function(){q.reset.call(this);var a=this.cfg,b=a.iv,a=a.mode;if(this._xformMode==this._ENC_XFORM_MODE)var c=a.createEncryptor;else c=a.createDecryptor,this._minBufferSize=1;this._mode=c.call(a, +this,b&&b.words)},_doProcessBlock:function(a,b){this._mode.processBlock(a,b)},_doFinalize:function(){var a=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){a.pad(this._data,this.blockSize);var b=this._process(!0)}else b=this._process(!0),a.unpad(b);return b},blockSize:4});var w=e.CipherParams=n.extend({init:function(a){this.mixIn(a)},toString:function(a){return(a||this.formatter).stringify(this)}}),a=(l.format={}).OpenSSL={stringify:function(a){var b=a.ciphertext;a=a.salt;return(a?p.create([1398893684, +1701076831]).concat(a).concat(b):b).toString(d)},parse:function(a){a=d.parse(a);var b=a.words;if(1398893684==b[0]&&1701076831==b[1]){var c=p.create(b.slice(2,4));b.splice(0,4);a.sigBytes-=16}return w.create({ciphertext:a,salt:c})}},c=e.SerializableCipher=n.extend({cfg:n.extend({format:a}),encrypt:function(a,b,c,d){d=this.cfg.extend(d);var e=a.createEncryptor(c,d);b=e.finalize(b);e=e.cfg;return w.create({ciphertext:b,key:c,iv:e.iv,algorithm:a,mode:e.mode,padding:e.padding,blockSize:a.blockSize,formatter:d.format})}, +decrypt:function(a,b,c,d){d=this.cfg.extend(d);b=this._parse(b,d.format);return a.createDecryptor(c,d).finalize(b.ciphertext)},_parse:function(a,b){return"string"==typeof a?b.parse(a,this):a}}),l=(l.kdf={}).OpenSSL={execute:function(a,b,c,d){d||(d=p.random(8));a=t.create({keySize:b+c}).compute(a,d);c=p.create(a.words.slice(b),4*c);a.sigBytes=4*b;return w.create({key:a,iv:c,salt:d})}},G=e.PasswordBasedCipher=c.extend({cfg:c.cfg.extend({kdf:l}),encrypt:function(a,b,d,e){e=this.cfg.extend(e);d=e.kdf.execute(d, +a.keySize,a.ivSize);e.iv=d.iv;a=c.encrypt.call(this,a,b,d.key,e);a.mixIn(d);return a},decrypt:function(a,b,d,e){e=this.cfg.extend(e);b=this._parse(b,e.format);d=e.kdf.execute(d,a.keySize,a.ivSize,b.salt);e.iv=d.iv;return c.decrypt.call(this,a,b,d.key,e)}})}(); +(function(){function s(){for(var b=this._S,d=this._i,e=this._j,q=0,a=0;4>a;a++){var d=(d+1)%256,e=(e+b[d])%256,l=b[d];b[d]=b[e];b[e]=l;q|=b[(b[d]+b[e])%256]<<24-8*a}this._i=d;this._j=e;return q}var l=CryptoJS,e=l.lib.StreamCipher,n=l.algo,p=n.RC4=e.extend({_doReset:function(){for(var b=this._key,d=b.words,b=b.sigBytes,e=this._S=[],l=0;256>l;l++)e[l]=l;for(var a=l=0;256>l;l++){var n=l%b,a=(a+e[l]+(d[n>>>2]>>>24-8*(n%4)&255))%256,n=e[l];e[l]=e[a];e[a]=n}this._i=this._j=0},_doProcessBlock:function(b, +d){b[d]^=s.call(this)},keySize:8,ivSize:0});l.RC4=e._createHelper(p);n=n.RC4Drop=p.extend({cfg:p.cfg.extend({drop:192}),_doReset:function(){p._doReset.call(this);for(var b=this.cfg.drop;0>>2]|=(h[b>>>2]>>>24-8*(b%4)&255)<<24-8*((d+b)%4);else if(65535>>2]=h[b>>>2];else c.push.apply(c,h);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=j.ceil(c/4)},clone:function(){var a=t.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],b=0;b>>2]>>>24-8*(d%4)&255;b.push((g>>>4).toString(16));b.push((g&15).toString(16))}return b.join("")},parse:function(a){for(var c=a.length,b=[],d=0;d>>3]|=parseInt(a.substr(d, +2),16)<<24-4*(d%8);return new u.init(b,c/2)}},A=w.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var b=[],d=0;d>>2]>>>24-8*(d%4)&255));return b.join("")},parse:function(a){for(var b=a.length,h=[],d=0;d>>2]|=(a.charCodeAt(d)&255)<<24-8*(d%4);return new u.init(h,b)}},g=w.Utf8={stringify:function(a){try{return decodeURIComponent(escape(A.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return A.parse(unescape(encodeURIComponent(a)))}}, +v=l.BufferedBlockAlgorithm=t.extend({reset:function(){this._data=new u.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=g.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,h=b.words,d=b.sigBytes,g=this.blockSize,v=d/(4*g),v=a?j.ceil(v):j.max((v|0)-this._minBufferSize,0);a=v*g;d=j.min(4*a,d);if(a){for(var e=0;eb;b++){var a=e+b,c=g[a];g[a]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360}var a=this._hash.words,c=D.words,h=A.words,d=z.words,j=t.words,k=u.words,l=w.words,B,m,n,p,x,C,q,r,s,y;C=B=a[0];q=m=a[1];r=n=a[2];s=p=a[3];y=x=a[4];for(var f,b=0;80>b;b+=1)f=B+g[e+d[b]]|0,f=16>b?f+((m^n^p)+c[0]):32>b?f+((m&n|~m&p)+c[1]):48>b? +f+(((m|~n)^p)+c[2]):64>b?f+((m&p|n&~p)+c[3]):f+((m^(n|~p))+c[4]),f|=0,f=f<>>32-k[b],f=f+x|0,B=x,x=p,p=n<<10|n>>>22,n=m,m=f,f=C+g[e+j[b]]|0,f=16>b?f+((q^(r|~s))+h[0]):32>b?f+((q&s|r&~s)+h[1]):48>b?f+(((q|~r)^s)+h[2]):64>b?f+((q&r|~q&s)+h[3]):f+((q^r^s)+h[4]),f|=0,f=f<>>32-l[b],f=f+y|0,C=y,y=s,s=r<<10|r>>>22,r=q,q=f;f=a[1]+n+s|0;a[1]=a[2]+p+y|0;a[2]=a[3]+x+C|0;a[3]=a[4]+B+q|0;a[4]=a[0]+m+r|0;a[0]=f},_doFinalize:function(){var g=this._data,e=g.words,b=8*this._nDataBytes,a=8*g.sigBytes; +e[a>>>5]|=128<<24-a%32;e[(a+64>>>9<<4)+14]=(b<<8|b>>>24)&16711935|(b<<24|b>>>8)&4278255360;g.sigBytes=4*(e.length+1);this._process();g=this._hash;e=g.words;for(b=0;5>b;b++)a=e[b],e[b]=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360;return g},clone:function(){var e=l.clone.call(this);e._hash=this._hash.clone();return e}});j.RIPEMD160=l._createHelper(k);j.HmacRIPEMD160=l._createHmacHelper(k)})(Math); diff --git a/library/cryptojs/rollups/sha1.js b/library/cryptojs/rollups/sha1.js new file mode 100644 index 000000000..d0d589f71 --- /dev/null +++ b/library/cryptojs/rollups/sha1.js @@ -0,0 +1,15 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(e,m){var p={},j=p.lib={},l=function(){},f=j.Base={extend:function(a){l.prototype=this;var c=new l;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +n=j.WordArray=f.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=m?c:4*a.length},toString:function(a){return(a||h).stringify(this)},concat:function(a){var c=this.words,q=a.words,d=this.sigBytes;a=a.sigBytes;this.clamp();if(d%4)for(var b=0;b>>2]|=(q[b>>>2]>>>24-8*(b%4)&255)<<24-8*((d+b)%4);else if(65535>>2]=q[b>>>2];else c.push.apply(c,q);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=e.ceil(c/4)},clone:function(){var a=f.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],b=0;b>>2]>>>24-8*(d%4)&255;b.push((f>>>4).toString(16));b.push((f&15).toString(16))}return b.join("")},parse:function(a){for(var c=a.length,b=[],d=0;d>>3]|=parseInt(a.substr(d, +2),16)<<24-4*(d%8);return new n.init(b,c/2)}},g=b.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var b=[],d=0;d>>2]>>>24-8*(d%4)&255));return b.join("")},parse:function(a){for(var c=a.length,b=[],d=0;d>>2]|=(a.charCodeAt(d)&255)<<24-8*(d%4);return new n.init(b,c)}},r=b.Utf8={stringify:function(a){try{return decodeURIComponent(escape(g.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return g.parse(unescape(encodeURIComponent(a)))}}, +k=j.BufferedBlockAlgorithm=f.extend({reset:function(){this._data=new n.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=r.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,b=c.words,d=c.sigBytes,f=this.blockSize,h=d/(4*f),h=a?e.ceil(h):e.max((h|0)-this._minBufferSize,0);a=h*f;d=e.min(4*a,d);if(a){for(var g=0;ga;a++){if(16>a)l[a]=f[n+a]|0;else{var c=l[a-3]^l[a-8]^l[a-14]^l[a-16];l[a]=c<<1|c>>>31}c=(h<<5|h>>>27)+j+l[a];c=20>a?c+((g&e|~g&k)+1518500249):40>a?c+((g^e^k)+1859775393):60>a?c+((g&e|g&k|e&k)-1894007588):c+((g^e^ +k)-899497514);j=k;k=e;e=g<<30|g>>>2;g=h;h=c}b[0]=b[0]+h|0;b[1]=b[1]+g|0;b[2]=b[2]+e|0;b[3]=b[3]+k|0;b[4]=b[4]+j|0},_doFinalize:function(){var f=this._data,e=f.words,b=8*this._nDataBytes,h=8*f.sigBytes;e[h>>>5]|=128<<24-h%32;e[(h+64>>>9<<4)+14]=Math.floor(b/4294967296);e[(h+64>>>9<<4)+15]=b;f.sigBytes=4*e.length;this._process();return this._hash},clone:function(){var e=j.clone.call(this);e._hash=this._hash.clone();return e}});e.SHA1=j._createHelper(m);e.HmacSHA1=j._createHmacHelper(m)})(); diff --git a/library/cryptojs/rollups/sha224.js b/library/cryptojs/rollups/sha224.js new file mode 100644 index 000000000..e1653c988 --- /dev/null +++ b/library/cryptojs/rollups/sha224.js @@ -0,0 +1,17 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(g,l){var f={},k=f.lib={},h=function(){},m=k.Base={extend:function(a){h.prototype=this;var c=new h;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +q=k.WordArray=m.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=l?c:4*a.length},toString:function(a){return(a||s).stringify(this)},concat:function(a){var c=this.words,d=a.words,b=this.sigBytes;a=a.sigBytes;this.clamp();if(b%4)for(var e=0;e>>2]|=(d[e>>>2]>>>24-8*(e%4)&255)<<24-8*((b+e)%4);else if(65535>>2]=d[e>>>2];else c.push.apply(c,d);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=g.ceil(c/4)},clone:function(){var a=m.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],d=0;d>>2]>>>24-8*(b%4)&255;d.push((e>>>4).toString(16));d.push((e&15).toString(16))}return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b>>3]|=parseInt(a.substr(b, +2),16)<<24-4*(b%8);return new q.init(d,c/2)}},n=t.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b>>2]>>>24-8*(b%4)&255));return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b>>2]|=(a.charCodeAt(b)&255)<<24-8*(b%4);return new q.init(d,c)}},j=t.Utf8={stringify:function(a){try{return decodeURIComponent(escape(n.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return n.parse(unescape(encodeURIComponent(a)))}}, +w=k.BufferedBlockAlgorithm=m.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=j.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,d=c.words,b=c.sigBytes,e=this.blockSize,f=b/(4*e),f=a?g.ceil(f):g.max((f|0)-this._minBufferSize,0);a=f*e;b=g.min(4*a,b);if(a){for(var u=0;un;){var j;a:{j=s;for(var w=g.sqrt(j),v=2;v<=w;v++)if(!(j%v)){j=!1;break a}j=!0}j&&(8>n&&(m[n]=t(g.pow(s,0.5))),q[n]=t(g.pow(s,1/3)),n++);s++}var a=[],f=f.SHA256=h.extend({_doReset:function(){this._hash=new k.init(m.slice(0))},_doProcessBlock:function(c,d){for(var b=this._hash.words,e=b[0],f=b[1],g=b[2],k=b[3],h=b[4],l=b[5],m=b[6],n=b[7],p=0;64>p;p++){if(16>p)a[p]= +c[d+p]|0;else{var j=a[p-15],r=a[p-2];a[p]=((j<<25|j>>>7)^(j<<14|j>>>18)^j>>>3)+a[p-7]+((r<<15|r>>>17)^(r<<13|r>>>19)^r>>>10)+a[p-16]}j=n+((h<<26|h>>>6)^(h<<21|h>>>11)^(h<<7|h>>>25))+(h&l^~h&m)+q[p]+a[p];r=((e<<30|e>>>2)^(e<<19|e>>>13)^(e<<10|e>>>22))+(e&f^e&g^f&g);n=m;m=l;l=h;h=k+j|0;k=g;g=f;f=e;e=j+r|0}b[0]=b[0]+e|0;b[1]=b[1]+f|0;b[2]=b[2]+g|0;b[3]=b[3]+k|0;b[4]=b[4]+h|0;b[5]=b[5]+l|0;b[6]=b[6]+m|0;b[7]=b[7]+n|0},_doFinalize:function(){var a=this._data,d=a.words,b=8*this._nDataBytes,e=8*a.sigBytes; +d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=g.floor(b/4294967296);d[(e+64>>>9<<4)+15]=b;a.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var a=h.clone.call(this);a._hash=this._hash.clone();return a}});l.SHA256=h._createHelper(f);l.HmacSHA256=h._createHmacHelper(f)})(Math); +(function(){var g=CryptoJS,l=g.lib.WordArray,f=g.algo,k=f.SHA256,f=f.SHA224=k.extend({_doReset:function(){this._hash=new l.init([3238371032,914150663,812702999,4144912697,4290775857,1750603025,1694076839,3204075428])},_doFinalize:function(){var f=k._doFinalize.call(this);f.sigBytes-=4;return f}});g.SHA224=k._createHelper(f);g.HmacSHA224=k._createHmacHelper(f)})(); diff --git a/library/cryptojs/rollups/sha256.js b/library/cryptojs/rollups/sha256.js new file mode 100644 index 000000000..529db30cd --- /dev/null +++ b/library/cryptojs/rollups/sha256.js @@ -0,0 +1,16 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(h,s){var f={},t=f.lib={},g=function(){},j=t.Base={extend:function(a){g.prototype=this;var c=new g;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +q=t.WordArray=j.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=s?c:4*a.length},toString:function(a){return(a||u).stringify(this)},concat:function(a){var c=this.words,d=a.words,b=this.sigBytes;a=a.sigBytes;this.clamp();if(b%4)for(var e=0;e>>2]|=(d[e>>>2]>>>24-8*(e%4)&255)<<24-8*((b+e)%4);else if(65535>>2]=d[e>>>2];else c.push.apply(c,d);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=h.ceil(c/4)},clone:function(){var a=j.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],d=0;d>>2]>>>24-8*(b%4)&255;d.push((e>>>4).toString(16));d.push((e&15).toString(16))}return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b>>3]|=parseInt(a.substr(b, +2),16)<<24-4*(b%8);return new q.init(d,c/2)}},k=v.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b>>2]>>>24-8*(b%4)&255));return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b>>2]|=(a.charCodeAt(b)&255)<<24-8*(b%4);return new q.init(d,c)}},l=v.Utf8={stringify:function(a){try{return decodeURIComponent(escape(k.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return k.parse(unescape(encodeURIComponent(a)))}}, +x=t.BufferedBlockAlgorithm=j.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=l.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,d=c.words,b=c.sigBytes,e=this.blockSize,f=b/(4*e),f=a?h.ceil(f):h.max((f|0)-this._minBufferSize,0);a=f*e;b=h.min(4*a,b);if(a){for(var m=0;mk;){var l;a:{l=u;for(var x=h.sqrt(l),w=2;w<=x;w++)if(!(l%w)){l=!1;break a}l=!0}l&&(8>k&&(j[k]=v(h.pow(u,0.5))),q[k]=v(h.pow(u,1/3)),k++);u++}var a=[],f=f.SHA256=g.extend({_doReset:function(){this._hash=new t.init(j.slice(0))},_doProcessBlock:function(c,d){for(var b=this._hash.words,e=b[0],f=b[1],m=b[2],h=b[3],p=b[4],j=b[5],k=b[6],l=b[7],n=0;64>n;n++){if(16>n)a[n]= +c[d+n]|0;else{var r=a[n-15],g=a[n-2];a[n]=((r<<25|r>>>7)^(r<<14|r>>>18)^r>>>3)+a[n-7]+((g<<15|g>>>17)^(g<<13|g>>>19)^g>>>10)+a[n-16]}r=l+((p<<26|p>>>6)^(p<<21|p>>>11)^(p<<7|p>>>25))+(p&j^~p&k)+q[n]+a[n];g=((e<<30|e>>>2)^(e<<19|e>>>13)^(e<<10|e>>>22))+(e&f^e&m^f&m);l=k;k=j;j=p;p=h+r|0;h=m;m=f;f=e;e=r+g|0}b[0]=b[0]+e|0;b[1]=b[1]+f|0;b[2]=b[2]+m|0;b[3]=b[3]+h|0;b[4]=b[4]+p|0;b[5]=b[5]+j|0;b[6]=b[6]+k|0;b[7]=b[7]+l|0},_doFinalize:function(){var a=this._data,d=a.words,b=8*this._nDataBytes,e=8*a.sigBytes; +d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=h.floor(b/4294967296);d[(e+64>>>9<<4)+15]=b;a.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var a=g.clone.call(this);a._hash=this._hash.clone();return a}});s.SHA256=g._createHelper(f);s.HmacSHA256=g._createHmacHelper(f)})(Math); diff --git a/library/cryptojs/rollups/sha3.js b/library/cryptojs/rollups/sha3.js new file mode 100644 index 000000000..652505c6b --- /dev/null +++ b/library/cryptojs/rollups/sha3.js @@ -0,0 +1,19 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(v,p){var d={},u=d.lib={},r=function(){},f=u.Base={extend:function(a){r.prototype=this;var b=new r;a&&b.mixIn(a);b.hasOwnProperty("init")||(b.init=function(){b.$super.init.apply(this,arguments)});b.init.prototype=b;b.$super=this;return b},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var b in a)a.hasOwnProperty(b)&&(this[b]=a[b]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +s=u.WordArray=f.extend({init:function(a,b){a=this.words=a||[];this.sigBytes=b!=p?b:4*a.length},toString:function(a){return(a||y).stringify(this)},concat:function(a){var b=this.words,c=a.words,j=this.sigBytes;a=a.sigBytes;this.clamp();if(j%4)for(var n=0;n>>2]|=(c[n>>>2]>>>24-8*(n%4)&255)<<24-8*((j+n)%4);else if(65535>>2]=c[n>>>2];else b.push.apply(b,c);this.sigBytes+=a;return this},clamp:function(){var a=this.words,b=this.sigBytes;a[b>>>2]&=4294967295<< +32-8*(b%4);a.length=v.ceil(b/4)},clone:function(){var a=f.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var b=[],c=0;c>>2]>>>24-8*(j%4)&255;c.push((n>>>4).toString(16));c.push((n&15).toString(16))}return c.join("")},parse:function(a){for(var b=a.length,c=[],j=0;j>>3]|=parseInt(a.substr(j, +2),16)<<24-4*(j%8);return new s.init(c,b/2)}},e=x.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var c=[],j=0;j>>2]>>>24-8*(j%4)&255));return c.join("")},parse:function(a){for(var b=a.length,c=[],j=0;j>>2]|=(a.charCodeAt(j)&255)<<24-8*(j%4);return new s.init(c,b)}},q=x.Utf8={stringify:function(a){try{return decodeURIComponent(escape(e.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return e.parse(unescape(encodeURIComponent(a)))}}, +t=u.BufferedBlockAlgorithm=f.extend({reset:function(){this._data=new s.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=q.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var b=this._data,c=b.words,j=b.sigBytes,n=this.blockSize,e=j/(4*n),e=a?v.ceil(e):v.max((e|0)-this._minBufferSize,0);a=e*n;j=v.min(4*a,j);if(a){for(var f=0;ft;t++){s[e+5*q]=(t+1)*(t+2)/2%64;var w=(2*e+3*q)%5,e=q%5,q=w}for(e=0;5>e;e++)for(q=0;5>q;q++)x[e+5*q]=q+5*((2*e+3*q)%5);e=1;for(q=0;24>q;q++){for(var a=w=t=0;7>a;a++){if(e&1){var b=(1<b?w^=1<e;e++)c[e]=f.create();d=d.SHA3=r.extend({cfg:r.cfg.extend({outputLength:512}),_doReset:function(){for(var a=this._state= +[],b=0;25>b;b++)a[b]=new f.init;this.blockSize=(1600-2*this.cfg.outputLength)/32},_doProcessBlock:function(a,b){for(var e=this._state,f=this.blockSize/2,h=0;h>>24)&16711935|(l<<24|l>>>8)&4278255360,m=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360,g=e[h];g.high^=m;g.low^=l}for(f=0;24>f;f++){for(h=0;5>h;h++){for(var d=l=0,k=0;5>k;k++)g=e[h+5*k],l^=g.high,d^=g.low;g=c[h];g.high=l;g.low=d}for(h=0;5>h;h++){g=c[(h+4)%5];l=c[(h+1)%5];m=l.high;k=l.low;l=g.high^ +(m<<1|k>>>31);d=g.low^(k<<1|m>>>31);for(k=0;5>k;k++)g=e[h+5*k],g.high^=l,g.low^=d}for(m=1;25>m;m++)g=e[m],h=g.high,g=g.low,k=s[m],32>k?(l=h<>>32-k,d=g<>>32-k):(l=g<>>64-k,d=h<>>64-k),g=c[x[m]],g.high=l,g.low=d;g=c[0];h=e[0];g.high=h.high;g.low=h.low;for(h=0;5>h;h++)for(k=0;5>k;k++)m=h+5*k,g=e[m],l=c[m],m=c[(h+1)%5+5*k],d=c[(h+2)%5+5*k],g.high=l.high^~m.high&d.high,g.low=l.low^~m.low&d.low;g=e[0];h=y[f];g.high^=h.high;g.low^=h.low}},_doFinalize:function(){var a=this._data, +b=a.words,c=8*a.sigBytes,e=32*this.blockSize;b[c>>>5]|=1<<24-c%32;b[(v.ceil((c+1)/e)*e>>>5)-1]|=128;a.sigBytes=4*b.length;this._process();for(var a=this._state,b=this.cfg.outputLength/8,c=b/8,e=[],h=0;h>>24)&16711935|(f<<24|f>>>8)&4278255360,d=(d<<8|d>>>24)&16711935|(d<<24|d>>>8)&4278255360;e.push(d);e.push(f)}return new u.init(e,b)},clone:function(){for(var a=r.clone.call(this),b=a._state=this._state.slice(0),c=0;25>c;c++)b[c]=b[c].clone();return a}}); +p.SHA3=r._createHelper(d);p.HmacSHA3=r._createHmacHelper(d)})(Math); diff --git a/library/cryptojs/rollups/sha384.js b/library/cryptojs/rollups/sha384.js new file mode 100644 index 000000000..dec5f581c --- /dev/null +++ b/library/cryptojs/rollups/sha384.js @@ -0,0 +1,25 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(a,c){var d={},j=d.lib={},f=function(){},m=j.Base={extend:function(a){f.prototype=this;var b=new f;a&&b.mixIn(a);b.hasOwnProperty("init")||(b.init=function(){b.$super.init.apply(this,arguments)});b.init.prototype=b;b.$super=this;return b},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var b in a)a.hasOwnProperty(b)&&(this[b]=a[b]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +B=j.WordArray=m.extend({init:function(a,b){a=this.words=a||[];this.sigBytes=b!=c?b:4*a.length},toString:function(a){return(a||y).stringify(this)},concat:function(a){var b=this.words,g=a.words,e=this.sigBytes;a=a.sigBytes;this.clamp();if(e%4)for(var k=0;k>>2]|=(g[k>>>2]>>>24-8*(k%4)&255)<<24-8*((e+k)%4);else if(65535>>2]=g[k>>>2];else b.push.apply(b,g);this.sigBytes+=a;return this},clamp:function(){var n=this.words,b=this.sigBytes;n[b>>>2]&=4294967295<< +32-8*(b%4);n.length=a.ceil(b/4)},clone:function(){var a=m.clone.call(this);a.words=this.words.slice(0);return a},random:function(n){for(var b=[],g=0;g>>2]>>>24-8*(e%4)&255;g.push((k>>>4).toString(16));g.push((k&15).toString(16))}return g.join("")},parse:function(a){for(var b=a.length,g=[],e=0;e>>3]|=parseInt(a.substr(e, +2),16)<<24-4*(e%8);return new B.init(g,b/2)}},F=v.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var g=[],e=0;e>>2]>>>24-8*(e%4)&255));return g.join("")},parse:function(a){for(var b=a.length,g=[],e=0;e>>2]|=(a.charCodeAt(e)&255)<<24-8*(e%4);return new B.init(g,b)}},ha=v.Utf8={stringify:function(a){try{return decodeURIComponent(escape(F.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return F.parse(unescape(encodeURIComponent(a)))}}, +Z=j.BufferedBlockAlgorithm=m.extend({reset:function(){this._data=new B.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=ha.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(n){var b=this._data,g=b.words,e=b.sigBytes,k=this.blockSize,m=e/(4*k),m=n?a.ceil(m):a.max((m|0)-this._minBufferSize,0);n=m*k;e=a.min(4*n,e);if(n){for(var c=0;cy;y++)v[y]=a();j=j.SHA512=d.extend({_doReset:function(){this._hash=new m.init([new f.init(1779033703,4089235720),new f.init(3144134277,2227873595),new f.init(1013904242,4271175723),new f.init(2773480762,1595750129),new f.init(1359893119,2917565137),new f.init(2600822924,725511199),new f.init(528734635,4215389547),new f.init(1541459225,327033209)])},_doProcessBlock:function(a,c){for(var d=this._hash.words, +f=d[0],j=d[1],b=d[2],g=d[3],e=d[4],k=d[5],m=d[6],d=d[7],y=f.high,M=f.low,$=j.high,N=j.low,aa=b.high,O=b.low,ba=g.high,P=g.low,ca=e.high,Q=e.low,da=k.high,R=k.low,ea=m.high,S=m.low,fa=d.high,T=d.low,s=y,p=M,G=$,D=N,H=aa,E=O,W=ba,I=P,t=ca,q=Q,U=da,J=R,V=ea,K=S,X=fa,L=T,u=0;80>u;u++){var z=v[u];if(16>u)var r=z.high=a[c+2*u]|0,h=z.low=a[c+2*u+1]|0;else{var r=v[u-15],h=r.high,w=r.low,r=(h>>>1|w<<31)^(h>>>8|w<<24)^h>>>7,w=(w>>>1|h<<31)^(w>>>8|h<<24)^(w>>>7|h<<25),C=v[u-2],h=C.high,l=C.low,C=(h>>>19|l<< +13)^(h<<3|l>>>29)^h>>>6,l=(l>>>19|h<<13)^(l<<3|h>>>29)^(l>>>6|h<<26),h=v[u-7],Y=h.high,A=v[u-16],x=A.high,A=A.low,h=w+h.low,r=r+Y+(h>>>0>>0?1:0),h=h+l,r=r+C+(h>>>0>>0?1:0),h=h+A,r=r+x+(h>>>0>>0?1:0);z.high=r;z.low=h}var Y=t&U^~t&V,A=q&J^~q&K,z=s&G^s&H^G&H,ja=p&D^p&E^D&E,w=(s>>>28|p<<4)^(s<<30|p>>>2)^(s<<25|p>>>7),C=(p>>>28|s<<4)^(p<<30|s>>>2)^(p<<25|s>>>7),l=B[u],ka=l.high,ga=l.low,l=L+((q>>>14|t<<18)^(q>>>18|t<<14)^(q<<23|t>>>9)),x=X+((t>>>14|q<<18)^(t>>>18|q<<14)^(t<<23|q>>>9))+(l>>>0< +L>>>0?1:0),l=l+A,x=x+Y+(l>>>0>>0?1:0),l=l+ga,x=x+ka+(l>>>0>>0?1:0),l=l+h,x=x+r+(l>>>0>>0?1:0),h=C+ja,z=w+z+(h>>>0>>0?1:0),X=V,L=K,V=U,K=J,U=t,J=q,q=I+l|0,t=W+x+(q>>>0>>0?1:0)|0,W=H,I=E,H=G,E=D,G=s,D=p,p=l+h|0,s=x+z+(p>>>0>>0?1:0)|0}M=f.low=M+p;f.high=y+s+(M>>>0

    >>0?1:0);N=j.low=N+D;j.high=$+G+(N>>>0>>0?1:0);O=b.low=O+E;b.high=aa+H+(O>>>0>>0?1:0);P=g.low=P+I;g.high=ba+W+(P>>>0>>0?1:0);Q=e.low=Q+q;e.high=ca+t+(Q>>>0>>0?1:0);R=k.low=R+J;k.high=da+U+(R>>>0>>0?1:0); +S=m.low=S+K;m.high=ea+V+(S>>>0>>0?1:0);T=d.low=T+L;d.high=fa+X+(T>>>0>>0?1:0)},_doFinalize:function(){var a=this._data,c=a.words,d=8*this._nDataBytes,f=8*a.sigBytes;c[f>>>5]|=128<<24-f%32;c[(f+128>>>10<<5)+30]=Math.floor(d/4294967296);c[(f+128>>>10<<5)+31]=d;a.sigBytes=4*c.length;this._process();return this._hash.toX32()},clone:function(){var a=d.clone.call(this);a._hash=this._hash.clone();return a},blockSize:32});c.SHA512=d._createHelper(j);c.HmacSHA512=d._createHmacHelper(j)})(); +(function(){var a=CryptoJS,c=a.x64,d=c.Word,j=c.WordArray,c=a.algo,f=c.SHA512,c=c.SHA384=f.extend({_doReset:function(){this._hash=new j.init([new d.init(3418070365,3238371032),new d.init(1654270250,914150663),new d.init(2438529370,812702999),new d.init(355462360,4144912697),new d.init(1731405415,4290775857),new d.init(2394180231,1750603025),new d.init(3675008525,1694076839),new d.init(1203062813,3204075428)])},_doFinalize:function(){var a=f._doFinalize.call(this);a.sigBytes-=16;return a}});a.SHA384= +f._createHelper(c);a.HmacSHA384=f._createHmacHelper(c)})(); diff --git a/library/cryptojs/rollups/sha512.js b/library/cryptojs/rollups/sha512.js new file mode 100644 index 000000000..ecbffee76 --- /dev/null +++ b/library/cryptojs/rollups/sha512.js @@ -0,0 +1,23 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(a,m){var r={},f=r.lib={},g=function(){},l=f.Base={extend:function(a){g.prototype=this;var b=new g;a&&b.mixIn(a);b.hasOwnProperty("init")||(b.init=function(){b.$super.init.apply(this,arguments)});b.init.prototype=b;b.$super=this;return b},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var b in a)a.hasOwnProperty(b)&&(this[b]=a[b]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +p=f.WordArray=l.extend({init:function(a,b){a=this.words=a||[];this.sigBytes=b!=m?b:4*a.length},toString:function(a){return(a||q).stringify(this)},concat:function(a){var b=this.words,d=a.words,c=this.sigBytes;a=a.sigBytes;this.clamp();if(c%4)for(var j=0;j>>2]|=(d[j>>>2]>>>24-8*(j%4)&255)<<24-8*((c+j)%4);else if(65535>>2]=d[j>>>2];else b.push.apply(b,d);this.sigBytes+=a;return this},clamp:function(){var n=this.words,b=this.sigBytes;n[b>>>2]&=4294967295<< +32-8*(b%4);n.length=a.ceil(b/4)},clone:function(){var a=l.clone.call(this);a.words=this.words.slice(0);return a},random:function(n){for(var b=[],d=0;d>>2]>>>24-8*(c%4)&255;d.push((j>>>4).toString(16));d.push((j&15).toString(16))}return d.join("")},parse:function(a){for(var b=a.length,d=[],c=0;c>>3]|=parseInt(a.substr(c, +2),16)<<24-4*(c%8);return new p.init(d,b/2)}},G=y.Latin1={stringify:function(a){var b=a.words;a=a.sigBytes;for(var d=[],c=0;c>>2]>>>24-8*(c%4)&255));return d.join("")},parse:function(a){for(var b=a.length,d=[],c=0;c>>2]|=(a.charCodeAt(c)&255)<<24-8*(c%4);return new p.init(d,b)}},fa=y.Utf8={stringify:function(a){try{return decodeURIComponent(escape(G.stringify(a)))}catch(b){throw Error("Malformed UTF-8 data");}},parse:function(a){return G.parse(unescape(encodeURIComponent(a)))}}, +h=f.BufferedBlockAlgorithm=l.extend({reset:function(){this._data=new p.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=fa.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(n){var b=this._data,d=b.words,c=b.sigBytes,j=this.blockSize,l=c/(4*j),l=n?a.ceil(l):a.max((l|0)-this._minBufferSize,0);n=l*j;c=a.min(4*n,c);if(n){for(var h=0;hq;q++)y[q]=a();f=f.SHA512=r.extend({_doReset:function(){this._hash=new l.init([new g.init(1779033703,4089235720),new g.init(3144134277,2227873595),new g.init(1013904242,4271175723),new g.init(2773480762,1595750129),new g.init(1359893119,2917565137),new g.init(2600822924,725511199),new g.init(528734635,4215389547),new g.init(1541459225,327033209)])},_doProcessBlock:function(a,f){for(var h=this._hash.words, +g=h[0],n=h[1],b=h[2],d=h[3],c=h[4],j=h[5],l=h[6],h=h[7],q=g.high,m=g.low,r=n.high,N=n.low,Z=b.high,O=b.low,$=d.high,P=d.low,aa=c.high,Q=c.low,ba=j.high,R=j.low,ca=l.high,S=l.low,da=h.high,T=h.low,v=q,s=m,H=r,E=N,I=Z,F=O,W=$,J=P,w=aa,t=Q,U=ba,K=R,V=ca,L=S,X=da,M=T,x=0;80>x;x++){var B=y[x];if(16>x)var u=B.high=a[f+2*x]|0,e=B.low=a[f+2*x+1]|0;else{var u=y[x-15],e=u.high,z=u.low,u=(e>>>1|z<<31)^(e>>>8|z<<24)^e>>>7,z=(z>>>1|e<<31)^(z>>>8|e<<24)^(z>>>7|e<<25),D=y[x-2],e=D.high,k=D.low,D=(e>>>19|k<<13)^ +(e<<3|k>>>29)^e>>>6,k=(k>>>19|e<<13)^(k<<3|e>>>29)^(k>>>6|e<<26),e=y[x-7],Y=e.high,C=y[x-16],A=C.high,C=C.low,e=z+e.low,u=u+Y+(e>>>0>>0?1:0),e=e+k,u=u+D+(e>>>0>>0?1:0),e=e+C,u=u+A+(e>>>0>>0?1:0);B.high=u;B.low=e}var Y=w&U^~w&V,C=t&K^~t&L,B=v&H^v&I^H&I,ha=s&E^s&F^E&F,z=(v>>>28|s<<4)^(v<<30|s>>>2)^(v<<25|s>>>7),D=(s>>>28|v<<4)^(s<<30|v>>>2)^(s<<25|v>>>7),k=p[x],ia=k.high,ea=k.low,k=M+((t>>>14|w<<18)^(t>>>18|w<<14)^(t<<23|w>>>9)),A=X+((w>>>14|t<<18)^(w>>>18|t<<14)^(w<<23|t>>>9))+(k>>>0>> +0?1:0),k=k+C,A=A+Y+(k>>>0>>0?1:0),k=k+ea,A=A+ia+(k>>>0>>0?1:0),k=k+e,A=A+u+(k>>>0>>0?1:0),e=D+ha,B=z+B+(e>>>0>>0?1:0),X=V,M=L,V=U,L=K,U=w,K=t,t=J+k|0,w=W+A+(t>>>0>>0?1:0)|0,W=I,J=F,I=H,F=E,H=v,E=s,s=k+e|0,v=A+B+(s>>>0>>0?1:0)|0}m=g.low=m+s;g.high=q+v+(m>>>0>>0?1:0);N=n.low=N+E;n.high=r+H+(N>>>0>>0?1:0);O=b.low=O+F;b.high=Z+I+(O>>>0>>0?1:0);P=d.low=P+J;d.high=$+W+(P>>>0>>0?1:0);Q=c.low=Q+t;c.high=aa+w+(Q>>>0>>0?1:0);R=j.low=R+K;j.high=ba+U+(R>>>0>>0?1:0);S=l.low= +S+L;l.high=ca+V+(S>>>0>>0?1:0);T=h.low=T+M;h.high=da+X+(T>>>0>>0?1:0)},_doFinalize:function(){var a=this._data,f=a.words,h=8*this._nDataBytes,g=8*a.sigBytes;f[g>>>5]|=128<<24-g%32;f[(g+128>>>10<<5)+30]=Math.floor(h/4294967296);f[(g+128>>>10<<5)+31]=h;a.sigBytes=4*f.length;this._process();return this._hash.toX32()},clone:function(){var a=r.clone.call(this);a._hash=this._hash.clone();return a},blockSize:32});m.SHA512=r._createHelper(f);m.HmacSHA512=r._createHmacHelper(f)})(); diff --git a/library/cryptojs/rollups/tripledes.js b/library/cryptojs/rollups/tripledes.js new file mode 100644 index 000000000..ba24108e7 --- /dev/null +++ b/library/cryptojs/rollups/tripledes.js @@ -0,0 +1,51 @@ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +var CryptoJS=CryptoJS||function(u,l){var d={},n=d.lib={},p=function(){},s=n.Base={extend:function(a){p.prototype=this;var c=new p;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}}, +q=n.WordArray=s.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=l?c:4*a.length},toString:function(a){return(a||v).stringify(this)},concat:function(a){var c=this.words,m=a.words,f=this.sigBytes;a=a.sigBytes;this.clamp();if(f%4)for(var t=0;t>>2]|=(m[t>>>2]>>>24-8*(t%4)&255)<<24-8*((f+t)%4);else if(65535>>2]=m[t>>>2];else c.push.apply(c,m);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<< +32-8*(c%4);a.length=u.ceil(c/4)},clone:function(){var a=s.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],m=0;m>>2]>>>24-8*(f%4)&255;m.push((t>>>4).toString(16));m.push((t&15).toString(16))}return m.join("")},parse:function(a){for(var c=a.length,m=[],f=0;f>>3]|=parseInt(a.substr(f, +2),16)<<24-4*(f%8);return new q.init(m,c/2)}},b=w.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var m=[],f=0;f>>2]>>>24-8*(f%4)&255));return m.join("")},parse:function(a){for(var c=a.length,m=[],f=0;f>>2]|=(a.charCodeAt(f)&255)<<24-8*(f%4);return new q.init(m,c)}},x=w.Utf8={stringify:function(a){try{return decodeURIComponent(escape(b.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return b.parse(unescape(encodeURIComponent(a)))}}, +r=n.BufferedBlockAlgorithm=s.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=x.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,m=c.words,f=c.sigBytes,t=this.blockSize,b=f/(4*t),b=a?u.ceil(b):u.max((b|0)-this._minBufferSize,0);a=b*t;f=u.min(4*a,f);if(a){for(var e=0;e>>2]>>>24-8*(q%4)&255)<<16|(n[q+1>>>2]>>>24-8*((q+1)%4)&255)<<8|n[q+2>>>2]>>>24-8*((q+2)%4)&255,v=0;4>v&&q+0.75*v>>6*(3-v)&63));if(n=s.charAt(64))for(;d.length%4;)d.push(n);return d.join("")},parse:function(d){var n=d.length,p=this._map,s=p.charAt(64);s&&(s=d.indexOf(s),-1!=s&&(n=s));for(var s=[],q=0,w=0;w< +n;w++)if(w%4){var v=p.indexOf(d.charAt(w-1))<<2*(w%4),b=p.indexOf(d.charAt(w))>>>6-2*(w%4);s[q>>>2]|=(v|b)<<24-8*(q%4);q++}return l.create(s,q)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); +(function(u){function l(b,e,a,c,m,f,t){b=b+(e&a|~e&c)+m+t;return(b<>>32-f)+e}function d(b,e,a,c,m,f,t){b=b+(e&c|a&~c)+m+t;return(b<>>32-f)+e}function n(b,e,a,c,m,f,t){b=b+(e^a^c)+m+t;return(b<>>32-f)+e}function p(b,e,a,c,m,f,t){b=b+(a^(e|~c))+m+t;return(b<>>32-f)+e}for(var s=CryptoJS,q=s.lib,w=q.WordArray,v=q.Hasher,q=s.algo,b=[],x=0;64>x;x++)b[x]=4294967296*u.abs(u.sin(x+1))|0;q=q.MD5=v.extend({_doReset:function(){this._hash=new w.init([1732584193,4023233417,2562383102,271733878])}, +_doProcessBlock:function(r,e){for(var a=0;16>a;a++){var c=e+a,m=r[c];r[c]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360}var a=this._hash.words,c=r[e+0],m=r[e+1],f=r[e+2],t=r[e+3],y=r[e+4],q=r[e+5],s=r[e+6],w=r[e+7],v=r[e+8],u=r[e+9],x=r[e+10],z=r[e+11],A=r[e+12],B=r[e+13],C=r[e+14],D=r[e+15],g=a[0],h=a[1],j=a[2],k=a[3],g=l(g,h,j,k,c,7,b[0]),k=l(k,g,h,j,m,12,b[1]),j=l(j,k,g,h,f,17,b[2]),h=l(h,j,k,g,t,22,b[3]),g=l(g,h,j,k,y,7,b[4]),k=l(k,g,h,j,q,12,b[5]),j=l(j,k,g,h,s,17,b[6]),h=l(h,j,k,g,w,22,b[7]), +g=l(g,h,j,k,v,7,b[8]),k=l(k,g,h,j,u,12,b[9]),j=l(j,k,g,h,x,17,b[10]),h=l(h,j,k,g,z,22,b[11]),g=l(g,h,j,k,A,7,b[12]),k=l(k,g,h,j,B,12,b[13]),j=l(j,k,g,h,C,17,b[14]),h=l(h,j,k,g,D,22,b[15]),g=d(g,h,j,k,m,5,b[16]),k=d(k,g,h,j,s,9,b[17]),j=d(j,k,g,h,z,14,b[18]),h=d(h,j,k,g,c,20,b[19]),g=d(g,h,j,k,q,5,b[20]),k=d(k,g,h,j,x,9,b[21]),j=d(j,k,g,h,D,14,b[22]),h=d(h,j,k,g,y,20,b[23]),g=d(g,h,j,k,u,5,b[24]),k=d(k,g,h,j,C,9,b[25]),j=d(j,k,g,h,t,14,b[26]),h=d(h,j,k,g,v,20,b[27]),g=d(g,h,j,k,B,5,b[28]),k=d(k,g, +h,j,f,9,b[29]),j=d(j,k,g,h,w,14,b[30]),h=d(h,j,k,g,A,20,b[31]),g=n(g,h,j,k,q,4,b[32]),k=n(k,g,h,j,v,11,b[33]),j=n(j,k,g,h,z,16,b[34]),h=n(h,j,k,g,C,23,b[35]),g=n(g,h,j,k,m,4,b[36]),k=n(k,g,h,j,y,11,b[37]),j=n(j,k,g,h,w,16,b[38]),h=n(h,j,k,g,x,23,b[39]),g=n(g,h,j,k,B,4,b[40]),k=n(k,g,h,j,c,11,b[41]),j=n(j,k,g,h,t,16,b[42]),h=n(h,j,k,g,s,23,b[43]),g=n(g,h,j,k,u,4,b[44]),k=n(k,g,h,j,A,11,b[45]),j=n(j,k,g,h,D,16,b[46]),h=n(h,j,k,g,f,23,b[47]),g=p(g,h,j,k,c,6,b[48]),k=p(k,g,h,j,w,10,b[49]),j=p(j,k,g,h, +C,15,b[50]),h=p(h,j,k,g,q,21,b[51]),g=p(g,h,j,k,A,6,b[52]),k=p(k,g,h,j,t,10,b[53]),j=p(j,k,g,h,x,15,b[54]),h=p(h,j,k,g,m,21,b[55]),g=p(g,h,j,k,v,6,b[56]),k=p(k,g,h,j,D,10,b[57]),j=p(j,k,g,h,s,15,b[58]),h=p(h,j,k,g,B,21,b[59]),g=p(g,h,j,k,y,6,b[60]),k=p(k,g,h,j,z,10,b[61]),j=p(j,k,g,h,f,15,b[62]),h=p(h,j,k,g,u,21,b[63]);a[0]=a[0]+g|0;a[1]=a[1]+h|0;a[2]=a[2]+j|0;a[3]=a[3]+k|0},_doFinalize:function(){var b=this._data,e=b.words,a=8*this._nDataBytes,c=8*b.sigBytes;e[c>>>5]|=128<<24-c%32;var m=u.floor(a/ +4294967296);e[(c+64>>>9<<4)+15]=(m<<8|m>>>24)&16711935|(m<<24|m>>>8)&4278255360;e[(c+64>>>9<<4)+14]=(a<<8|a>>>24)&16711935|(a<<24|a>>>8)&4278255360;b.sigBytes=4*(e.length+1);this._process();b=this._hash;e=b.words;for(a=0;4>a;a++)c=e[a],e[a]=(c<<8|c>>>24)&16711935|(c<<24|c>>>8)&4278255360;return b},clone:function(){var b=v.clone.call(this);b._hash=this._hash.clone();return b}});s.MD5=v._createHelper(q);s.HmacMD5=v._createHmacHelper(q)})(Math); +(function(){var u=CryptoJS,l=u.lib,d=l.Base,n=l.WordArray,l=u.algo,p=l.EvpKDF=d.extend({cfg:d.extend({keySize:4,hasher:l.MD5,iterations:1}),init:function(d){this.cfg=this.cfg.extend(d)},compute:function(d,l){for(var p=this.cfg,v=p.hasher.create(),b=n.create(),u=b.words,r=p.keySize,p=p.iterations;u.length>>2]&255}};d.BlockCipher=v.extend({cfg:v.cfg.extend({mode:b,padding:r}),reset:function(){v.reset.call(this);var a=this.cfg,c=a.iv,a=a.mode;if(this._xformMode==this._ENC_XFORM_MODE)var b=a.createEncryptor;else b=a.createDecryptor,this._minBufferSize=1;this._mode=b.call(a, +this,c&&c.words)},_doProcessBlock:function(a,c){this._mode.processBlock(a,c)},_doFinalize:function(){var a=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){a.pad(this._data,this.blockSize);var c=this._process(!0)}else c=this._process(!0),a.unpad(c);return c},blockSize:4});var e=d.CipherParams=n.extend({init:function(a){this.mixIn(a)},toString:function(a){return(a||this.formatter).stringify(this)}}),b=(l.format={}).OpenSSL={stringify:function(a){var c=a.ciphertext;a=a.salt;return(a?p.create([1398893684, +1701076831]).concat(a).concat(c):c).toString(q)},parse:function(a){a=q.parse(a);var c=a.words;if(1398893684==c[0]&&1701076831==c[1]){var b=p.create(c.slice(2,4));c.splice(0,4);a.sigBytes-=16}return e.create({ciphertext:a,salt:b})}},a=d.SerializableCipher=n.extend({cfg:n.extend({format:b}),encrypt:function(a,c,b,d){d=this.cfg.extend(d);var l=a.createEncryptor(b,d);c=l.finalize(c);l=l.cfg;return e.create({ciphertext:c,key:b,iv:l.iv,algorithm:a,mode:l.mode,padding:l.padding,blockSize:a.blockSize,formatter:d.format})}, +decrypt:function(a,c,b,e){e=this.cfg.extend(e);c=this._parse(c,e.format);return a.createDecryptor(b,e).finalize(c.ciphertext)},_parse:function(a,c){return"string"==typeof a?c.parse(a,this):a}}),l=(l.kdf={}).OpenSSL={execute:function(a,c,b,d){d||(d=p.random(8));a=w.create({keySize:c+b}).compute(a,d);b=p.create(a.words.slice(c),4*b);a.sigBytes=4*c;return e.create({key:a,iv:b,salt:d})}},c=d.PasswordBasedCipher=a.extend({cfg:a.cfg.extend({kdf:l}),encrypt:function(c,b,e,d){d=this.cfg.extend(d);e=d.kdf.execute(e, +c.keySize,c.ivSize);d.iv=e.iv;c=a.encrypt.call(this,c,b,e.key,d);c.mixIn(e);return c},decrypt:function(c,b,e,d){d=this.cfg.extend(d);b=this._parse(b,d.format);e=d.kdf.execute(e,c.keySize,c.ivSize,b.salt);d.iv=e.iv;return a.decrypt.call(this,c,b,e.key,d)}})}(); +(function(){function u(b,a){var c=(this._lBlock>>>b^this._rBlock)&a;this._rBlock^=c;this._lBlock^=c<>>b^this._lBlock)&a;this._lBlock^=c;this._rBlock^=c<c;c++){var d=q[c]-1;a[c]=b[d>>>5]>>>31-d%32&1}b=this._subKeys=[];for(d=0;16>d;d++){for(var f=b[d]=[],l=v[d],c=0;24>c;c++)f[c/6|0]|=a[(w[c]-1+l)%28]<<31-c%6,f[4+(c/6|0)]|=a[28+(w[c+24]-1+l)%28]<<31-c%6;f[0]=f[0]<<1|f[0]>>>31;for(c=1;7>c;c++)f[c]>>>= +4*(c-1)+3;f[7]=f[7]<<5|f[7]>>>27}a=this._invSubKeys=[];for(c=0;16>c;c++)a[c]=b[15-c]},encryptBlock:function(b,a){this._doCryptBlock(b,a,this._subKeys)},decryptBlock:function(b,a){this._doCryptBlock(b,a,this._invSubKeys)},_doCryptBlock:function(e,a,c){this._lBlock=e[a];this._rBlock=e[a+1];u.call(this,4,252645135);u.call(this,16,65535);l.call(this,2,858993459);l.call(this,8,16711935);u.call(this,1,1431655765);for(var d=0;16>d;d++){for(var f=c[d],n=this._lBlock,p=this._rBlock,q=0,r=0;8>r;r++)q|=b[r][((p^ +f[r])&x[r])>>>0];this._lBlock=p;this._rBlock=n^q}c=this._lBlock;this._lBlock=this._rBlock;this._rBlock=c;u.call(this,1,1431655765);l.call(this,8,16711935);l.call(this,2,858993459);u.call(this,16,65535);u.call(this,4,252645135);e[a]=this._lBlock;e[a+1]=this._rBlock},keySize:2,ivSize:2,blockSize:2});d.DES=n._createHelper(r);s=s.TripleDES=n.extend({_doReset:function(){var b=this._key.words;this._des1=r.createEncryptor(p.create(b.slice(0,2)));this._des2=r.createEncryptor(p.create(b.slice(2,4)));this._des3= +r.createEncryptor(p.create(b.slice(4,6)))},encryptBlock:function(b,a){this._des1.encryptBlock(b,a);this._des2.decryptBlock(b,a);this._des3.encryptBlock(b,a)},decryptBlock:function(b,a){this._des3.decryptBlock(b,a);this._des2.encryptBlock(b,a);this._des1.decryptBlock(b,a)},keySize:6,ivSize:2,blockSize:2});d.TripleDES=n._createHelper(s)})(); -- cgit v1.2.3 From 5538972fec7b1ddc3ce33668f8de3a38d8f73823 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 9 Nov 2013 15:48:59 +0100 Subject: some style work on searchbar autocomplete --- view/theme/redbasic/css/style.css | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a7e8f0717..affb91b39 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2854,10 +2854,37 @@ div.jGrowl div.info { #recip { } + +/*is this needed?*/ .autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } -.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } -.autocomplete .selected { background:#F0F0F0; } -.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; } + +.autocomplete { + position: fixed; + top: 24px; + color: $font_colour; + border: 1px solid $nav_bg_1; + border-top: none; + background: #FFF; + cursor: default; + text-align: left; + max-height: 350px; + overflow: auto; + border-bottom-left-radius:$radiuspx; + border-bottom-right-radius:$radiuspx; + /* IE6 specific: */ + _height: 350px; + _margin: 0; + _overflow-x: hidden; +} +.autocomplete .selected { + background:$bgcolour; +} + +.autocomplete div { + padding:2px 5px; + white-space:nowrap; + overflow:hidden; +} #datebrowse-sidebar select { margin-left: 25px; -- cgit v1.2.3 From b54858d35fb20c9fac798e9e73ce057fd63de747 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 9 Nov 2013 15:54:53 +0100 Subject: oups... something missing... --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index affb91b39..897848711 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2856,7 +2856,7 @@ div.jGrowl div.info { } /*is this needed?*/ -.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } +.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } .autocomplete { position: fixed; @@ -2876,6 +2876,7 @@ div.jGrowl div.info { _margin: 0; _overflow-x: hidden; } + .autocomplete .selected { background:$bgcolour; } -- cgit v1.2.3 From c030330abcbc7584db0d2abfb84acbb10211ee17 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 15:36:14 +0000 Subject: Fix safe search, and also make it an xconfig --- mod/directory.php | 13 ++++++++++--- mod/dirsearch.php | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 13855cff7..9a5b34647 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -28,8 +28,10 @@ function directory_content(&$a) { $safe_mode = 1; - if(local_user()) { - $safe_mode = get_pconfig(local_user(),'directory','safe_mode'); + $observer = get_observer_hash(); + + if($observer) { + $safe_mode = get_xconfig($observer,'directory','safe_mode'); } if($safe_mode === false) $safe_mode = 1; @@ -37,7 +39,10 @@ function directory_content(&$a) { $safe_mode = intval($safe_mode); if(x($_REQUEST,'safe')) - $safe_mode = intval($_REQUEST['safe']); + $safe_mode = (intval($_REQUEST['safe'])); + + + $o = ''; nav_set_selected('directory'); @@ -88,7 +93,9 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); +// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); +logger('query: ' . $query); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 527eb4c50..dcacef651 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -43,9 +43,10 @@ function dirsearch_content(&$a) { $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); // by default use a safe search - $safe = ((x($_REQUEST,'safe')) ? intval($_REQUEST['safe']) : 1 ); - - + $safe = ((x($_REQUEST,'safe'))); // ? intval($_REQUEST['safe']) : 1 ); + if ($safe === false) + $safe = 1; + if(array_key_exists('sync',$_REQUEST)) { if($_REQUEST['sync']) $sync = datetime_convert('UTC','UTC',$_REQUEST['sync']); -- cgit v1.2.3 From 420a80e8f3e65aa0692c93c60759e89a826d9b28 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 15:38:24 +0000 Subject: Kill logging/comment --- mod/directory.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 9a5b34647..18085e83e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -93,9 +93,7 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); -// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); -logger('query: ' . $query); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) -- cgit v1.2.3 From 3fbf78a859cef17244e82d27ea00fdd22041b4a8 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 9 Nov 2013 17:56:19 +0100 Subject: fix directory leaking to ppl which aint got zot in searchbar-autocomplete if block_public is enabled --- mod/acl.php | 6 +++++- mod/directory.php | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mod/acl.php b/mod/acl.php index b886b7e58..0ce179ae0 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -228,6 +228,10 @@ function navbar_complete(&$a) { // logger('navbar_complete'); + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + return login(); + } + $dirmode = intval(get_config('system','directory_mode')); $search = ((x($_REQUEST,'query')) ? htmlentities($_REQUEST['query'],ENT_COMPAT,'UTF-8',false) : ''); if(! $search || mb_strlen($search) < 2) @@ -278,4 +282,4 @@ function navbar_complete(&$a) { } } return array(); -} \ No newline at end of file +} diff --git a/mod/directory.php b/mod/directory.php index 13855cff7..9d2a9d19c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,6 +14,11 @@ function directory_aside(&$a) { require_once('include/contact_widgets.php'); $a->set_widget('find_people',findpeople_widget()); } + + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + return; + } + $a->set_widget('dir_sort_order',dir_sort_links()); } -- cgit v1.2.3 From 1ee9e8caf8be257c341a3acfc0937d4d9926f448 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 9 Nov 2013 18:14:39 +0100 Subject: yes we might need it sometime and we are not supporting IE6 anyway --- view/theme/redbasic/css/style.css | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 897848711..c75672202 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2855,26 +2855,22 @@ div.jGrowl div.info { } -/*is this needed?*/ -.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } +.autocomplete-w1 { + position:fixed; + top:24px; +} .autocomplete { - position: fixed; - top: 24px; color: $font_colour; border: 1px solid $nav_bg_1; border-top: none; background: #FFF; - cursor: default; + cursor: pointer; text-align: left; max-height: 350px; overflow: auto; border-bottom-left-radius:$radiuspx; border-bottom-right-radius:$radiuspx; - /* IE6 specific: */ - _height: 350px; - _margin: 0; - _overflow-x: hidden; } .autocomplete .selected { -- cgit v1.2.3 From b2bb308e24421558f02a6bed2201140486be337b Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 9 Nov 2013 18:32:59 +0100 Subject: oups... should not do that... --- mod/acl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/acl.php b/mod/acl.php index 0ce179ae0..bd19c4bb7 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -229,7 +229,7 @@ function navbar_complete(&$a) { // logger('navbar_complete'); if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - return login(); + return; } $dirmode = intval(get_config('system','directory_mode')); -- cgit v1.2.3 From 6f2163a08ec6b48a113e768c8fc0a94f8dd0bde1 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 18:13:08 +0000 Subject: Add a safesearch toggle --- mod/toggle_safesearch.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 mod/toggle_safesearch.php diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php new file mode 100644 index 000000000..1294520c6 --- /dev/null +++ b/mod/toggle_safesearch.php @@ -0,0 +1,22 @@ + Date: Sat, 9 Nov 2013 18:43:40 +0000 Subject: Bring safe search to the UI --- include/dir_fns.php | 18 ++++++++++++++++++ mod/directory.php | 5 ++++- view/tpl/safesearch.tpl | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 view/tpl/safesearch.tpl diff --git a/include/dir_fns.php b/include/dir_fns.php index e234ae0fa..319be25c4 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -20,7 +20,25 @@ function dir_sort_links() { return $o; } +function dir_safe_mode(&$a) { + $observer = get_observer_hash(); + +// if ($observer) + $safe_mode = get_xconfig($observer,'directory','safe_mode'); + if($safe_mode == 0) + $toggle = t('Enable Safe Search'); + else + $toggle = t('Disable Safe Search'); + $o = replace_macros(get_markup_template('safesearch.tpl'), array( + '$toggle' => $toggle, + )); + + return $o; +} +if($safe_mode == 1) + set_xconfig($observer,'directory','safe_mode', '0'); + function sync_directories($dirmode) { if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL) diff --git a/mod/directory.php b/mod/directory.php index 18085e83e..61a40f8d4 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,8 +14,9 @@ function directory_aside(&$a) { require_once('include/contact_widgets.php'); $a->set_widget('find_people',findpeople_widget()); } + $a->set_widget('safe_search',dir_safe_mode()); $a->set_widget('dir_sort_order',dir_sort_links()); - + } @@ -93,7 +94,9 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); +// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); +logger('query: ' . $query); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl new file mode 100644 index 000000000..92c3db2a5 --- /dev/null +++ b/view/tpl/safesearch.tpl @@ -0,0 +1,2 @@ +

    Safe Mode

    +{{$toggle}} -- cgit v1.2.3 From 8569fda732238fe8f1fd845e0b273cc325033df0 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 18:45:52 +0000 Subject: Clean up --- include/dir_fns.php | 2 +- mod/directory.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 319be25c4..cd812ddc7 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -23,7 +23,7 @@ function dir_sort_links() { function dir_safe_mode(&$a) { $observer = get_observer_hash(); -// if ($observer) + if ($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); if($safe_mode == 0) $toggle = t('Enable Safe Search'); diff --git a/mod/directory.php b/mod/directory.php index 61a40f8d4..657ecd8f9 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -94,9 +94,8 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); -// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); -logger('query: ' . $query); + if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) -- cgit v1.2.3 From bbe16eba346274daae7532158e997b7becde5cc2 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 18:49:50 +0000 Subject: Stray line --- include/dir_fns.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index cd812ddc7..0d0507059 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -36,9 +36,6 @@ function dir_safe_mode(&$a) { return $o; } -if($safe_mode == 1) - set_xconfig($observer,'directory','safe_mode', '0'); - function sync_directories($dirmode) { if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL) -- cgit v1.2.3 From 97a109eed4e034d587b0d64d0f70f6b8a9380217 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 9 Nov 2013 12:15:34 -0800 Subject: doc update --- doc/html/apw_2php_2style_8php.html | 2 +- doc/html/bbcode_8php.html | 28 +- doc/html/bbcode_8php.js | 3 +- doc/html/boot_8php.html | 53 +- doc/html/boot_8php.js | 1 + doc/html/crypto_8php.html | 4 +- doc/html/datetime_8php.html | 4 +- doc/html/dba__driver_8php.html | 4 +- doc/html/default_8php.html | 6 +- doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html | 6 +- doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.js | 3 +- doc/html/dir_817f6d302394b98e59575acdb59998bc.html | 2 +- doc/html/dir_817f6d302394b98e59575acdb59998bc.js | 2 +- doc/html/extract_8php.html | 4 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 17 +- doc/html/globals.html | 20 +- doc/html/globals_0x61.html | 5 +- doc/html/globals_0x62.html | 5 +- doc/html/globals_0x65.html | 3 +- doc/html/globals_0x69.html | 2 +- doc/html/globals_0x72.html | 2 +- doc/html/globals_0x73.html | 5 +- doc/html/globals_func_0x61.html | 5 +- doc/html/globals_func_0x62.html | 5 +- doc/html/globals_func_0x72.html | 2 +- doc/html/globals_func_0x73.html | 2 +- doc/html/globals_vars.html | 20 +- doc/html/globals_vars_0x65.html | 1 + doc/html/globals_vars_0x69.html | 2 +- doc/html/globals_vars_0x73.html | 3 + doc/html/include_2attach_8php.html | 50 +- doc/html/include_2attach_8php.js | 1 + doc/html/include_2config_8php.html | 2 +- doc/html/include_2message_8php.html | 14 +- doc/html/include_2message_8php.js | 2 +- doc/html/item_8php.html | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/md_README.html | 2 +- doc/html/minimalisticdarkness_8php.html | 12 +- doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 46 +- doc/html/navtreeindex1.js | 28 +- doc/html/navtreeindex2.js | 6 +- doc/html/navtreeindex3.js | 12 +- doc/html/navtreeindex4.js | 26 +- doc/html/navtreeindex5.js | 34 +- doc/html/navtreeindex6.js | 54 +- doc/html/navtreeindex7.js | 19 +- doc/html/passion_8php.html | 112 ++ doc/html/passionwide_8php.html | 112 ++ doc/html/permissions_8php.html | 2 +- doc/html/plugin_8php.html | 2 +- doc/html/redbasic_2php_2style_8php.html | 116 +- doc/html/redbasic_2php_2style_8php.js | 7 + doc/html/search/all_24.js | 6 + doc/html/search/all_61.js | 5 +- doc/html/search/all_62.js | 3 +- doc/html/search/all_64.js | 3 +- doc/html/search/all_65.js | 2 +- doc/html/search/all_69.js | 2 +- doc/html/search/all_70.js | 2 + doc/html/search/all_72.js | 2 +- doc/html/search/all_73.js | 5 +- doc/html/search/files_64.js | 3 +- doc/html/search/files_70.js | 4 +- doc/html/search/functions_61.js | 3 +- doc/html/search/functions_62.js | 3 +- doc/html/search/functions_72.js | 2 +- doc/html/search/functions_73.js | 2 +- doc/html/search/variables_24.js | 6 + doc/html/search/variables_65.js | 2 +- doc/html/search/variables_69.js | 2 +- doc/html/search/variables_73.js | 3 +- doc/html/security_8php.html | 2 +- doc/html/text_8php.html | 6 +- doc/html/typo_8php.html | 6 +- doc/html/view_2theme_2apw_2php_2config_8php.html | 42 +- doc/html/view_2theme_2apw_2php_2config_8php.js | 2 +- .../view_2theme_2redbasic_2php_2config_8php.html | 68 +- .../view_2theme_2redbasic_2php_2config_8php.js | 2 +- util/messages.po | 1298 +++++++++++--------- version.inc | 2 +- 84 files changed, 1496 insertions(+), 894 deletions(-) create mode 100644 doc/html/passion_8php.html create mode 100644 doc/html/passionwide_8php.html diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index a1f83a2c2..4d05fd68d 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -128,7 +128,7 @@ Variables
    -

    Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), follow_widget(), get_all_perms(), get_pconfig(), get_theme_uid(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_tagcloud(), and zot_feed().

    +

    Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), follow_widget(), get_all_perms(), get_pconfig(), get_theme_uid(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_tagcloud(), and zot_feed().

    diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index 94efd04c2..daff36f2e 100644 --- a/doc/html/bbcode_8php.html +++ b/doc/html/bbcode_8php.html @@ -118,9 +118,11 @@ Functions    bb_unspacefy_and_trim ($st)   -if(!function_exists('bb_extract_images'))
    -if(!function_exists('bb_replace_images')) bb_ShareAttributes ($match) -  +if(!function_exists('bb_extract_images'))
    +if(!function_exists('bb_replace_images')) bb_parse_crypt ($match) +  + bb_ShareAttributes ($match) +   bb_ShareAttributesSimple ($match)    rpost_callback ($match) @@ -129,12 +131,28 @@ Functions  

    Function Documentation

    - +
    - + + + + + + +
    if (!function_exists('bb_extract_images')) if (!function_exists('bb_replace_images')) bb_ShareAttributes if (!function_exists('bb_extract_images')) if (!function_exists('bb_replace_images')) bb_parse_crypt ( $match)
    +
    + +
    +
    + +
    +
    + + + diff --git a/doc/html/bbcode_8php.js b/doc/html/bbcode_8php.js index 26c034447..a2d64b997 100644 --- a/doc/html/bbcode_8php.js +++ b/doc/html/bbcode_8php.js @@ -1,6 +1,7 @@ var bbcode_8php = [ - [ "bb_ShareAttributes", "bbcode_8php.html#a52c45273fbb7ce5ec27094f7936856e1", null ], + [ "bb_parse_crypt", "bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f", null ], + [ "bb_ShareAttributes", "bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a", null ], [ "bb_ShareAttributesSimple", "bbcode_8php.html#a2be26414a367118143cc89e2d58e7377", null ], [ "bb_spacefy", "bbcode_8php.html#a8911e027907820df3db03b4f76724b50", null ], [ "bb_unspacefy_and_trim", "bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d", null ], diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index aa2ba9bd5..f76154384 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -224,7 +224,7 @@ Variables - + @@ -250,6 +250,8 @@ Variables + + @@ -862,7 +864,7 @@ Variables
    bb_ShareAttributes (   $match)
     
    const ZOT_REVISION 1
     
    const DB_UPDATE_VERSION 1080
    const DB_UPDATE_VERSION 1081
     
    const EOL '<br />' . "\r\n"
     
     
    const LANGUAGE_DETECT_MIN_CONFIDENCE 0.01
     
    const STORAGE_DEFAULT_PERMISSIONS 0770
     
    const MAX_IMAGE_LENGTH -1
     
    const DEFAULT_DB_ENGINE 'MyISAM'
    -

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

    +

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

    @@ -960,7 +962,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), 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(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_block(), comanche_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), rpost_callback(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), syncdirs(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), widget_tagcloud(), z_fetch_url(), and zot_finger().

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), 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(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_block(), comanche_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), rpost_callback(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), syncdirs(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), widget_tagcloud(), z_fetch_url(), and zot_finger().

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

    Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_store(), comanche_menu(), common_content(), common_friends_visitor_widget(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), get_public_feed(), item_permissions_sql(), mitem_content(), new_contact(), permissions_sql(), photo_init(), photos_post(), prepare_body(), profile_sidebar(), search_content(), stream_perms_xchans(), suggest_content(), tagger_content(), thing_init(), viewconnections_content(), vote_content(), vote_post(), wall_attach_post(), and z_readdir().

    +

    Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), comanche_menu(), common_content(), common_friends_visitor_widget(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), get_public_feed(), item_permissions_sql(), mitem_content(), new_contact(), notice(), permissions_sql(), photo_init(), photos_post(), prepare_body(), profile_sidebar(), search_content(), stream_perms_xchans(), suggest_content(), tagger_content(), thing_init(), viewconnections_content(), vote_content(), vote_post(), wall_attach_post(), and z_readdir().

    @@ -1152,7 +1154,7 @@ Variables
    -

    Referenced by connections_init(), message_content(), network_init(), page_init(), and profile_sidebar().

    +

    Referenced by connections_init(), message_content(), network_init(), page_init(), photos_init(), and profile_sidebar().

    @@ -1256,7 +1258,7 @@ Variables
    -

    Referenced by acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), lastpost_init(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_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(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_profile(), z_input_filter(), zid_init(), and zping_content().

    +

    Referenced by acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connect_content(), connect_post(), connections_aside(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), lastpost_init(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_aside(), message_content(), message_post(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_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(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_profile(), z_input_filter(), zid_init(), and zping_content().

    @@ -1290,7 +1292,7 @@ Variables
    -

    Referenced by admin_content(), api_content(), channel_content(), follow_content(), lastpost_content(), login_content(), network_content(), notify_content(), oexchange_content(), profile_content(), regmod_content(), and rpost_content().

    +

    Referenced by admin_content(), api_content(), channel_content(), connections_content(), follow_content(), lastpost_content(), login_content(), message_content(), network_content(), notify_content(), oexchange_content(), profile_content(), regmod_content(), and rpost_content().

    @@ -1330,7 +1332,7 @@ Variables

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

    $cmd and string args are surrounded with ""

    -

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

    +

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

    @@ -1615,7 +1617,7 @@ Variables
    -

    Referenced by allowed_public_recips(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_css_if_exists(), format_filer(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), 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(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    +

    Referenced by allowed_public_recips(), bb_parse_crypt(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_css_if_exists(), format_filer(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), 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(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    @@ -1653,7 +1655,7 @@ Variables
    Returns
    string

    'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else

    -

    Referenced by bb_ShareAttributes(), conversation(), get_plink(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

    +

    Referenced by bb_ShareAttributes(), conversation(), get_plink(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

    @@ -2304,7 +2306,7 @@ Variables
    -

    Referenced by RedInode\delete(), and z_readdir().

    +

    Referenced by attach_mkdir(), RedInode\delete(), and z_readdir().

    @@ -2410,7 +2412,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1080const DB_UPDATE_VERSION 1081
    @@ -2456,7 +2458,7 @@ Variables
    -

    Referenced by directory_run(), dirsearch_content(), import_site(), import_xchan(), sync_directories(), update_suggestions(), and zfinger_init().

    +

    Referenced by directory_run(), dirsearch_content(), import_site(), import_xchan(), sync_directories(), update_modtime(), update_suggestions(), and zfinger_init().

    @@ -2721,7 +2723,7 @@ Variables
    -

    Referenced by consume_feed(), delete_item_lowlevel(), encode_item(), expire_run(), get_item_elements(), item_expire(), item_store(), like_content(), notifier_run(), photos_post(), and process_delivery().

    +

    Referenced by consume_feed(), delete_item_lowlevel(), encode_item(), expire_run(), get_item_elements(), item_expire(), item_store(), like_content(), notifier_run(), photos_post(), poller_run(), and process_delivery().

    @@ -2819,7 +2821,7 @@ Variables
    -

    Referenced by editpost_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), and unobscure().

    +

    Referenced by editpost_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), tag_deliver(), and unobscure().

    @@ -3081,7 +3083,7 @@ Variables
    -

    Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), network_content(), new_contact(), notifier_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), lrdd(), mail_store(), message_post(), mini_group_select(), network_content(), new_contact(), notifier_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -3164,7 +3166,7 @@ Variables
    -

    Referenced by encode_mail(), get_mail_elements(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), and send_message().

    +

    Referenced by encode_mail(), get_mail_elements(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), and send_message().

    @@ -4451,6 +4453,21 @@ Variables

    Referenced by fix_contact_ssl_policy().

    + + + +
    +
    + + + + +
    const STORAGE_DEFAULT_PERMISSIONS 0770
    +
    +

    Default permissions for file-based storage (webDAV, etc.) These files will be owned by the webserver who will need write access to the "storage" folder. Ideally you should make this 700, however some hosted platforms may not let you change ownership of this directory so we're defaulting to both owner-write and group-write privilege. This should work for most cases without modification. Over-ride this in your .htconfig.php if you need something either more or less restrictive.

    + +

    Referenced by attach_mkdir().

    +
    @@ -4723,6 +4740,8 @@ Variables
    +

    Referenced by channel_remove().

    +
    diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 45d529df7..bbb5596e5 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -251,6 +251,7 @@ var boot_8php = [ "SSL_POLICY_FULL", "boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc", null ], [ "SSL_POLICY_NONE", "boot_8php.html#af86c651547aa8f9e549ee40a09455549", null ], [ "SSL_POLICY_SELFSIGN", "boot_8php.html#adca48aee78465ae3064ca4432c0d87b5", null ], + [ "STORAGE_DEFAULT_PERMISSIONS", "boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6", null ], [ "TERM_CATEGORY", "boot_8php.html#af33d1b2e98a1e21af672005525d46dfe", null ], [ "TERM_FILE", "boot_8php.html#afb97615e985a013799839b68b99018d7", null ], [ "TERM_HASHTAG", "boot_8php.html#a2750985ec445617d7e82ae3098c91e3f", null ], diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index bd01438b6..450cd42bd 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -224,7 +224,7 @@ Functions
    -

    Referenced by get_item_elements(), get_mail_elements(), item_post(), item_store(), item_store_update(), post_post(), send_message(), zfinger_init(), zot_build_packet(), and zot_fetch().

    +

    Referenced by get_item_elements(), get_mail_elements(), item_post(), item_store(), item_store_update(), post_post(), send_message(), zfinger_init(), zot_build_packet(), and zot_fetch().

    @@ -252,7 +252,7 @@ Functions
    -

    Referenced by editpost_content(), encode_item(), encode_mail(), message_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), unobscure(), zot_import(), and zot_refresh().

    +

    Referenced by editpost_content(), encode_item(), encode_mail(), message_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().

    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 2f049fea8..214433337 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(), build_sync_packet(), cal(), channel_content(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), like_content(), logger(), magic_init(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), 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_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), like_content(), logger(), magic_init(), mail_store(), message_content(), message_post(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    @@ -474,7 +474,7 @@ Functions
    -

    Referenced by admin_page_users(), advanced_profile(), bb_ShareAttributes(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

    +

    Referenced by admin_page_users(), advanced_profile(), bb_ShareAttributes(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 18a4a494a..3b1a23cf2 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

    Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedInode\setName(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedInode\setName(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    @@ -320,7 +320,7 @@ Functions

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

    -

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), RedInode\delete(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), dir_tagadelic(), directory_content(), directory_run(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), follow_widget(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), intro_content(), intro_post(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedInode\setName(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), RedInode\delete(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), dir_tagadelic(), directory_content(), directory_run(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), follow_widget(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), intro_content(), intro_post(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedInode\setName(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/default_8php.html b/doc/html/default_8php.html index a8abec733..dbec1176a 100644 --- a/doc/html/default_8php.html +++ b/doc/html/default_8php.html @@ -4,7 +4,7 @@ -The Red Project: view/php/default.php File Reference +The Red Matrix: view/php/default.php File Reference @@ -28,9 +28,9 @@ - + diff --git a/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html b/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html index ba350f1a7..0a33e4c45 100644 --- a/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html +++ b/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html @@ -110,14 +110,16 @@ Files - - + + + + diff --git a/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.js b/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.js index 7733db5fb..c0f751065 100644 --- a/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.js +++ b/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.js @@ -3,10 +3,11 @@ var dir_05f4fba29266e8fd7869afcd6cefb5cb = [ "darkness.php", "darkness_8php.html", null ], [ "darknessleftaside.php", "darknessleftaside_8php.html", null ], [ "darknessrightaside.php", "darknessrightaside_8php.html", null ], - [ "default.php", "theme_2apw_2schema_2default_8php.html", null ], [ "greenthumbnails.php", "greenthumbnails_8php.html", null ], [ "minimalisticdarkness.php", "minimalisticdarkness_8php.html", "minimalisticdarkness_8php" ], [ "olddefault.php", "olddefault_8php.html", null ], + [ "passion.php", "passion_8php.html", null ], + [ "passionwide.php", "passionwide_8php.html", null ], [ "pine.php", "pine_8php.html", null ], [ "redbasic.php", "redbasic_8php.html", null ], [ "widedarkness.php", "widedarkness_8php.html", null ] diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html index 05cf3e5c7..5c55343df 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html @@ -104,7 +104,7 @@ $(document).ready(function(){initNavTree('dir_817f6d302394b98e59575acdb59998bc.h
    -
    The Red Project +
    The Red Matrix
     
    file  darknessrightaside.php
     
    file  default.php
     
    file  greenthumbnails.php
     
    file  minimalisticdarkness.php
     
    file  olddefault.php
     
    file  passion.php
     
    file  passionwide.php
     
    file  pine.php
     
    file  redbasic.php
    - + diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js index a98d00c4e..f42b8d444 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js @@ -1,6 +1,6 @@ var dir_817f6d302394b98e59575acdb59998bc = [ - [ "default.php", "php_2default_8php.html", "php_2default_8php" ], + [ "default.php", "default_8php.html", "default_8php" ], [ "full.php", "full_8php.html", "full_8php" ], [ "minimal.php", "minimal_8php.html", null ], [ "mod_import.php", "mod__import_8php.html", "mod__import_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 66c753266..20e95c86d 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables

    Files

    file  default.php
    file  default.php
     
    file  full.php
     
    -

    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(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), 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_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), 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(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), photo_driver\save(), 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(), theme_attachments(), thing_init(), 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_mkdir(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), 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_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), 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(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_post(), remove_community_tag(), photo_driver\save(), 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(), theme_attachments(), theme_content(), thing_init(), 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().

    @@ -146,7 +146,7 @@ Variables
    -

    Referenced by admin_page_plugins(), admin_page_site(), admin_page_themes(), apw_form(), fbrowser_content(), filestorage_content(), and redbasic_form().

    +

    Referenced by admin_page_plugins(), admin_page_site(), admin_page_themes(), apw_form(), fbrowser_content(), filestorage_content(), and redbasic_form().

    diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 7b29e67ea..47d0a971d 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions
    -

    Referenced by apw_form(), categories_widget(), channel_aside(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), lastpost_aside(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), rpost_content(), saved_searches(), search_saved_searches(), settings_aside(), sources_content(), sources_post(), and thing_content().

    +

    Referenced by apw_form(), categories_widget(), channel_aside(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), lastpost_aside(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), rpost_content(), saved_searches(), search_saved_searches(), settings_aside(), sources_content(), sources_post(), and thing_content().

    diff --git a/doc/html/files.html b/doc/html/files.html index 792b70334..7517a691b 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -331,7 +331,7 @@ $(document).ready(function(){initNavTree('files.html','');}); |\*updatetpl.py o+view |o+php -||o*default.php +||o*default.php ||o*full.php ||o*minimal.php ||o*mod_import.php @@ -348,13 +348,14 @@ $(document).ready(function(){initNavTree('files.html','');}); | | o*darkness.php | | o*darknessleftaside.php | | o*darknessrightaside.php -| | o*default.php -| | o*greenthumbnails.php -| | o*minimalisticdarkness.php -| | o*olddefault.php -| | o*pine.php -| | o*redbasic.php -| | \*widedarkness.php +| | o*greenthumbnails.php +| | o*minimalisticdarkness.php +| | o*olddefault.php +| | o*passion.php +| | o*passionwide.php +| | o*pine.php +| | o*redbasic.php +| | \*widedarkness.php | \+redbasic |  o+php |  |o*config.php diff --git a/doc/html/globals.html b/doc/html/globals.html index 1e5140097..20413222c 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -159,6 +159,9 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $background_image : style.php
    • +
  • $banner_colour +: style.php +
  • $bgcolour : style.php
    • @@ -221,6 +224,12 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $nav_colour : style.php
    • +
  • $nav_min_opacity +: style.php +
    • +
  • $nav_percent_min_opacity +: style.php +
  • $needed : docblox_errorchecker.php
    • @@ -266,11 +275,20 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $shadow : style.php
    • +
  • $sloppy_photos +: style.php +
  • $str : typohelper.php
    • +
  • $toolicon_activecolour +: style.php +
    • +
  • $toolicon_colour +: style.php +
  • $uid -: style.php +: style.php
  • $width : minimalisticdarkness.php diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 3967f89a6..0e079c6b2 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -553,7 +553,7 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');}); : apps.php
  • apw_form() -: config.php +: config.php
  • apw_init() : theme.php @@ -603,6 +603,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • attach_list_files() : attach.php
    • +
  • attach_mkdir() +: attach.php +
  • attach_store() : attach.php
    • diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html index a28bb4987..e49d6d9eb 100644 --- a/doc/html/globals_0x62.html +++ b/doc/html/globals_0x62.html @@ -153,8 +153,11 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
  • bb2diaspora() : bb2diaspora.php
    • +
  • bb_parse_crypt() +: bbcode.php +
  • bb_ShareAttributes() -: bbcode.php +: bbcode.php
  • bb_ShareAttributesSimple() : bbcode.php diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index 0610a3871..dc540eaf9 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -157,7 +157,8 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');}); : editwebpage.php
  • else -: auth.php +: style.php +, auth.php , fpostit.php , tpldebug.php
    • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 1ff7886ec..a0f507d21 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -159,7 +159,7 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • if : style.php , php2po.php -, default.php +, default.php , full.php
  • import_author_xchan() diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 822fcb6ae..fdd45bb5d 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -175,7 +175,7 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');}); : items.php
  • redbasic_form() -: config.php +: config.php
  • redbasic_init() : theme.php diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index 35782a7b4..ac6b57d31 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -175,7 +175,7 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');}); : datetime.php
  • send_message() -: message.php +: message.php
  • send_reg_approval_email() : account.php @@ -294,6 +294,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • status_editor() : conversation.php
    • +
  • STORAGE_DEFAULT_PERMISSIONS +: boot.php +
  • store_item_tag() : taxonomy.php
    • diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index e1f060856..1fa26b2b8 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -417,7 +417,7 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); : apps.php
  • apw_form() -: config.php +: config.php
  • apw_init() : theme.php @@ -458,6 +458,9 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
  • attach_list_files() : attach.php
    • +
  • attach_mkdir() +: attach.php +
  • attach_store() : attach.php
    • diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html index 84a41e9bc..0736bb974 100644 --- a/doc/html/globals_func_0x62.html +++ b/doc/html/globals_func_0x62.html @@ -152,8 +152,11 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
  • bb2diaspora() : bb2diaspora.php
    • +
  • bb_parse_crypt() +: bbcode.php +
  • bb_ShareAttributes() -: bbcode.php +: bbcode.php
  • bb_ShareAttributesSimple() : bbcode.php diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index bab0b23ea..63b4cd48f 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -162,7 +162,7 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');}); : items.php
  • redbasic_form() -: config.php +: config.php
  • redbasic_init() : theme.php diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index dee9cb30d..ccec53426 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -174,7 +174,7 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); : datetime.php
  • send_message() -: message.php +: message.php
  • send_reg_approval_email() : account.php diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html index 83a545353..e3baf490a 100644 --- a/doc/html/globals_vars.html +++ b/doc/html/globals_vars.html @@ -154,6 +154,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $background_image : style.php
    • +
  • $banner_colour +: style.php +
  • $bgcolour : style.php
    • @@ -216,6 +219,12 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $nav_colour : style.php
    • +
  • $nav_min_opacity +: style.php +
    • +
  • $nav_percent_min_opacity +: style.php +
  • $needed : docblox_errorchecker.php
    • @@ -261,11 +270,20 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $shadow : style.php
    • +
  • $sloppy_photos +: style.php +
  • $str : typohelper.php
    • +
  • $toolicon_activecolour +: style.php +
    • +
  • $toolicon_colour +: style.php +
  • $uid -: style.php +: style.php
  • $width : minimalisticdarkness.php diff --git a/doc/html/globals_vars_0x65.html b/doc/html/globals_vars_0x65.html index db1069edc..4539792cb 100644 --- a/doc/html/globals_vars_0x65.html +++ b/doc/html/globals_vars_0x65.html @@ -142,6 +142,7 @@ $(document).ready(function(){initNavTree('globals_vars_0x65.html','');});
  • else : auth.php , fpostit.php +, style.php , tpldebug.php
  • EOL diff --git a/doc/html/globals_vars_0x69.html b/doc/html/globals_vars_0x69.html index ecc822698..fdaac05a0 100644 --- a/doc/html/globals_vars_0x69.html +++ b/doc/html/globals_vars_0x69.html @@ -141,7 +141,7 @@ $(document).ready(function(){initNavTree('globals_vars_0x69.html','');});

    - i -

    • if : php2po.php -, default.php +, default.php , style.php , full.php
      • diff --git a/doc/html/globals_vars_0x73.html b/doc/html/globals_vars_0x73.html index 6815e793e..4bdfffd91 100644 --- a/doc/html/globals_vars_0x73.html +++ b/doc/html/globals_vars_0x73.html @@ -148,6 +148,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x73.html','');});
    • SSL_POLICY_SELFSIGN : boot.php
      • +
    • STORAGE_DEFAULT_PERMISSIONS +: boot.php +
    diff --git a/doc/html/include_2attach_8php.html b/doc/html/include_2attach_8php.html index 31955e83b..338bbb45d 100644 --- a/doc/html/include_2attach_8php.html +++ b/doc/html/include_2attach_8php.html @@ -126,6 +126,8 @@ Functions    z_readdir ($channel_id, $observer_hash, $pathname, $parent_hash= '')   + attach_mkdir ($channel, $observer_hash, $arr=null) + 

    Function Documentation

    @@ -180,7 +182,7 @@ Functions
    -

    Referenced by item_post(), and send_message().

    +

    Referenced by item_post(), and send_message().

    @@ -288,6 +290,50 @@ Functions
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    attach_mkdir ( $channel,
     $observer_hash,
     $arr = null 
    )
    +
    +

    attach_mkdir($channel,$observer_hash,$arr);

    +

    Create directory

    +
    Parameters
    + + + + +
    $channelchannel array of owner
    $observer_hashhash of current observer
    $arrparameter array to fulfil request
    +
    +
    +

    Required: $arr['filename'] $arr['folder'] // hash of parent directory, empty string for root directory

    +

    Optional: $arr['hash'] // precumputed hash for this node $arr['allow_cid'] $arr['allow_gid'] $arr['deny_cid'] $arr['deny_gid']

    +
    @@ -326,7 +372,7 @@ Functions
    -

    Referenced by fix_attached_file_permissions(), send_message(), and wall_attach_post().

    +

    Referenced by fix_attached_file_permissions(), send_message(), and wall_attach_post().

    diff --git a/doc/html/include_2attach_8php.js b/doc/html/include_2attach_8php.js index 750e2d059..af10aa06f 100644 --- a/doc/html/include_2attach_8php.js +++ b/doc/html/include_2attach_8php.js @@ -4,6 +4,7 @@ var include_2attach_8php = [ "attach_by_hash_nodata", "include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932", null ], [ "attach_count_files", "include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3", null ], [ "attach_list_files", "include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d", null ], + [ "attach_mkdir", "include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc", null ], [ "attach_store", "include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f", null ], [ "z_mime_content_type", "include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a", null ], [ "z_readdir", "include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909", null ] diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 7d3aec9af..45c126cd4 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
    -

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), cloud_init(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), unobscure(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    +

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), cloud_init(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), tag_deliver(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    diff --git a/doc/html/include_2message_8php.html b/doc/html/include_2message_8php.html index 9fcd5d528..69d06c33e 100644 --- a/doc/html/include_2message_8php.html +++ b/doc/html/include_2message_8php.html @@ -112,8 +112,8 @@ $(document).ready(function(){initNavTree('include_2message_8php.html','');}); - - + + @@ -264,7 +264,7 @@ Functions - +

    Functions

     send_message ($uid=0, $recipient='', $body='', $subject='', $replyto='')
     
     send_message ($uid=0, $recipient='', $body='', $subject='', $replyto='', $expires= '')
     
     private_messages_list ($uid, $mailbox= '', $start=0, $numitems=0)
     
     private_messages_fetch_message ($channel_id, $messageitem_id, $updateseen=false)
    @@ -296,7 +296,13 @@ Functions - + + + + + + + diff --git a/doc/html/include_2message_8php.js b/doc/html/include_2message_8php.js index ac91159ba..01478930f 100644 --- a/doc/html/include_2message_8php.js +++ b/doc/html/include_2message_8php.js @@ -4,5 +4,5 @@ var include_2message_8php = [ "private_messages_fetch_conversation", "include_2message_8php.html#a5f8de9847e203329e317ac38dc646898", null ], [ "private_messages_fetch_message", "include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091", null ], [ "private_messages_list", "include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e", null ], - [ "send_message", "include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd", null ] + [ "send_message", "include_2message_8php.html#a751ffd6635022b2190f56154ee745752", null ] ]; \ No newline at end of file diff --git a/doc/html/item_8php.html b/doc/html/item_8php.html index 48f42f777..34bd42f97 100644 --- a/doc/html/item_8php.html +++ b/doc/html/item_8php.html @@ -366,7 +366,7 @@ Functions

    This is the POST destination for most all locally posted text stuff. This function handles status, wall-to-wall status, local comments, and remote coments that are posted on this site (as opposed to being delivered in a feed). Also processed here are posts and comments coming through the statusnet/twitter API. All of these become an "item" which is our basic unit of information. Posts that originate externally or do not fall into the above posting categories go through item_store() instead of this function.

    Is this a reply to something?

    fix naked links by passing through a callback to see if this is a red site (already known to us) which will get a zrl, otherwise link with url

    -

    When a photo was uploaded into the message using the (profile wall) ajax uploader, The permissions are initially set to disallow anybody but the owner from seeing it. This is because the permissions may not yet have been set for the post. If it's private, the photo permissions should be set appropriately. But we didn't know the final permissions on the post until now. So now we'll look for links of uploaded messages that are in the post and set them to the same permissions as the post itself.

    +

    When a photo was uploaded into the message using the (profile wall) ajax uploader, The permissions are initially set to disallow anybody but the owner from seeing it. This is because the permissions may not yet have been set for the post. If it's private, the photo permissions should be set appropriately. But we didn't know the final permissions on the post until now. So now we'll look for links of uploaded photos and attachments that are in the post and set them to the same permissions as the post itself.

    Fold multi-line [code] sequences

    Look for any tags and linkify them

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index e78cb185e..7554583ae 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -700,7 +700,7 @@ Functions
     $replyto = '' $replyto = '',
     $expires = '' 
    -

    Referenced by api_statuses_destroy(), contact_remove(), delete_imported_item(), drop_items(), item_content(), item_expire(), photos_post(), and remove_all_xchan_resources().

    +

    Referenced by api_statuses_destroy(), contact_remove(), delete_imported_item(), drop_items(), item_content(), item_expire(), photos_post(), poller_run(), and remove_all_xchan_resources().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 008efa277..ec7de1492 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/md_README.html b/doc/html/md_README.html index 40c6a0ce9..37ea462a7 100644 --- a/doc/html/md_README.html +++ b/doc/html/md_README.html @@ -101,7 +101,7 @@ $(document).ready(function(){initNavTree('md_README.html','');});
    apw
    -

    A Photographic Wapentake theme for the Red Matrix.

    +

    A Polymorphic Wapentake theme for the Red Matrix.

    Image
    diff --git a/doc/html/minimalisticdarkness_8php.html b/doc/html/minimalisticdarkness_8php.html index a61414119..38cf4809d 100644 --- a/doc/html/minimalisticdarkness_8php.html +++ b/doc/html/minimalisticdarkness_8php.html @@ -136,7 +136,7 @@ Variables
    -

    Referenced by admin_content(), apw_form(), and theme_content().

    +

    Referenced by admin_content(), apw_form(), and theme_content().

    @@ -150,7 +150,7 @@ Variables
    -

    Referenced by apw_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -164,7 +164,7 @@ Variables
    -

    Referenced by apw_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -178,7 +178,7 @@ Variables
    -

    Referenced by apw_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -192,7 +192,7 @@ Variables
    -

    Referenced by apw_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -206,7 +206,7 @@ Variables
    -

    Referenced by apw_form(), fix_private_photos(), oembed_iframe(), photo_upload(), photos_post(), and theme_content().

    +

    Referenced by apw_form(), fix_private_photos(), oembed_iframe(), photo_upload(), photos_post(), and theme_content().

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index c60cc34a9..9e0a9ac2a 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,13 +36,13 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce", -"classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f", -"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353", -"globals_0x74.html", -"interfaceITemplateEngine.html", -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6", -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f" +"boot_8php.html#a8da836617174eed9fc2ac8054125354b", +"classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6", +"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53", +"globals_0x70.html", +"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab", +"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214", +"text_8php.html#a1633412120f52bdce5f43e0a127d9293" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 984d88c4d..a7675931a 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -88,13 +88,14 @@ var NAVTREEINDEX0 = "bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba":[5,0,0,9,1], "bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc":[5,0,0,9,4], "bbcode_8php.html":[5,0,0,10], -"bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,4], -"bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,3], -"bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,1], -"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,5], -"bbcode_8php.html#a52c45273fbb7ce5ec27094f7936856e1":[5,0,0,10,0], -"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,6], -"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,2], +"bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,5], +"bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,4], +"bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a":[5,0,0,10,1], +"bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,2], +"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,6], +"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,7], +"bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f":[5,0,0,10,0], +"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,3], "blocks_8php.html":[5,0,1,7], "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0], "boot_8php.html":[5,0,4], @@ -110,9 +111,9 @@ var NAVTREEINDEX0 = "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,209], "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,75], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,174], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,264], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,260], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,263], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,265], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,261], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,264], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,26], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,67], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], @@ -125,9 +126,9 @@ var NAVTREEINDEX0 = "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,149], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,173], "boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,143], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,271], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,272], "boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,242], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,272], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,273], "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,177], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,84], "boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,221], @@ -140,7 +141,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,25], "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,108], "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,100], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,253], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,254], "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,196], "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,91], "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,135], @@ -156,11 +157,11 @@ var NAVTREEINDEX0 = "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,51], "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,125], "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,162], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,275], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,276], "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,181], "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,115], "boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,120], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,274], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,275], "boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,217], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,68], @@ -174,7 +175,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,167], "boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,157], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,79], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,261], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,262], "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,37], "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,20], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,179], @@ -191,7 +192,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,40], "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,195], "boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,229], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,273], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,274], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,24], "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,69], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,185], @@ -202,7 +203,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,208], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,22], "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,83], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,257], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,258], "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,171], "boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,145], "boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,48], @@ -222,7 +223,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,138], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,80], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,265], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,266], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,82], "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,95], @@ -242,12 +243,11 @@ var NAVTREEINDEX0 = "boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,118], "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,65], "boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,130], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,256], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,255], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,257], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,256], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,184], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,17], "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,106], "boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,231], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,133], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,127] +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,133] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index e5b82b63e..74b43a219 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,12 +1,13 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,127], "boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,238], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,34], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,152], "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,131], "boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,129], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,267], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,268], "boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,243], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,19], "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,198], @@ -15,8 +16,8 @@ var NAVTREEINDEX1 = "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], "boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,224], "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,199], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,270], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,258], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,271], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,259], "boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,223], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,187], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,29], @@ -52,7 +53,7 @@ var NAVTREEINDEX1 = "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,45], "boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,239], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,262], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,263], "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,72], "boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,119], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,104], @@ -63,7 +64,7 @@ var NAVTREEINDEX1 = "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,102], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,42], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,64], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,268], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,269], "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,124], "boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,126], "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,197], @@ -71,7 +72,7 @@ var NAVTREEINDEX1 = "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8], "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,172], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,269], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,270], "boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,225], "boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,204], "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,71], @@ -91,23 +92,24 @@ var NAVTREEINDEX1 = "boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,250], "boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,46], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,27], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,254], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,255], "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,18], "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,180], "boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,158], "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,188], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,266], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,267], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,30], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,259], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,260], "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,58], "boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,222], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,251], "boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,164], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,107], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,175], "boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,189], "boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,141], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,33], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,251], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,252], "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,182], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,66], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,59], @@ -117,7 +119,7 @@ var NAVTREEINDEX1 = "boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,249], "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,194], "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,176], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,252], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,253], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,55], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,88], "boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,150], @@ -247,7 +249,5 @@ var NAVTREEINDEX1 = "classConversation.html#ae81221251307e315f566a11f921ce0a9":[4,0,8,19], "classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae":[4,0,8,16], "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0], -"classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a":[4,0,8,13], -"classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6":[4,0,8,12], -"classFKOAuth1.html":[4,0,13] +"classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a":[4,0,8,13] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 3e4245870..a0b749ba3 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,7 @@ var NAVTREEINDEX2 = { +"classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6":[4,0,8,12], +"classFKOAuth1.html":[4,0,13], "classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f":[4,0,13,1], "classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6":[4,0,13,0], "classFKOAuthDataStore.html":[4,0,14], @@ -247,7 +249,5 @@ var NAVTREEINDEX2 = "contact__selectors_8php.html":[5,0,0,18], "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,18,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,18,0], -"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,18,3], -"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,18,2], -"contact__widgets_8php.html":[5,0,0,19] +"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,18,3] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 4b25fc21d..f26fead64 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,7 @@ var NAVTREEINDEX3 = { +"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,18,2], +"contact__widgets_8php.html":[5,0,0,19], "contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,19,0], "contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,19,2], "contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,19,1], @@ -76,6 +78,8 @@ var NAVTREEINDEX3 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], "dba__mysql_8php.html":[5,0,0,0,1], "dba__mysqli_8php.html":[5,0,0,0,2], +"default_8php.html":[5,0,3,0,0], +"default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], "delegate_8php.html":[5,0,1,18], "delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,18,0], "deliver_8php.html":[5,0,0,25], @@ -207,8 +211,8 @@ var NAVTREEINDEX3 = "functions_0x73.html":[4,3,0,17], "functions_0x74.html":[4,3,0,18], "functions_0x76.html":[4,3,0,19], -"functions_func.html":[4,3,1], "functions_func.html":[4,3,1,0], +"functions_func.html":[4,3,1], "functions_func_0x61.html":[4,3,1,1], "functions_func_0x62.html":[4,3,1,2], "functions_func_0x63.html":[4,3,1,3], @@ -245,9 +249,5 @@ var NAVTREEINDEX3 = "globals_0x6c.html":[5,1,0,13], "globals_0x6d.html":[5,1,0,14], "globals_0x6e.html":[5,1,0,15], -"globals_0x6f.html":[5,1,0,16], -"globals_0x70.html":[5,1,0,17], -"globals_0x71.html":[5,1,0,18], -"globals_0x72.html":[5,1,0,19], -"globals_0x73.html":[5,1,0,20] +"globals_0x6f.html":[5,1,0,16] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index c95752f74..714c78d71 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,13 +1,17 @@ var NAVTREEINDEX4 = { +"globals_0x70.html":[5,1,0,17], +"globals_0x71.html":[5,1,0,18], +"globals_0x72.html":[5,1,0,19], +"globals_0x73.html":[5,1,0,20], "globals_0x74.html":[5,1,0,21], "globals_0x75.html":[5,1,0,22], "globals_0x76.html":[5,1,0,23], "globals_0x77.html":[5,1,0,24], "globals_0x78.html":[5,1,0,25], "globals_0x7a.html":[5,1,0,26], -"globals_func.html":[5,1,1,0], "globals_func.html":[5,1,1], +"globals_func.html":[5,1,1,0], "globals_func_0x61.html":[5,1,1,1], "globals_func_0x62.html":[5,1,1,2], "globals_func_0x63.html":[5,1,1,3], @@ -33,8 +37,8 @@ var NAVTREEINDEX4 = "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], @@ -58,7 +62,7 @@ var NAVTREEINDEX4 = "globals_vars_0x7a.html":[5,1,2,21], "gprobe_8php.html":[5,0,0,34], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,34,0], -"greenthumbnails_8php.html":[5,0,3,1,0,1,4], +"greenthumbnails_8php.html":[5,0,3,1,0,1,3], "hcard_8php.html":[5,0,1,35], "hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,35,0], "hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,35,1], @@ -146,11 +150,12 @@ var NAVTREEINDEX4 = "include_2attach_8php.html":[5,0,0,6], "include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36":[5,0,0,6,0], "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#a6fdd92775f31c07d2863e16e0026018a":[5,0,0,6,6], +"include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f":[5,0,0,6,5], "include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3":[5,0,0,6,2], +"include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc":[5,0,0,6,4], "include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[5,0,0,6,1], -"include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,6], +"include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,7], "include_2chanman_8php.html":[5,0,0,12], "include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[5,0,0,12,0], "include_2config_8php.html":[5,0,0,16], @@ -200,7 +205,7 @@ var NAVTREEINDEX4 = "include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,44,2], "include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,44,1], "include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,44,3], -"include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd":[5,0,0,44,4], +"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[5,0,0,44,4], "include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,44,0], "include_2network_8php.html":[5,0,0,46], "include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4":[5,0,0,46,0], @@ -244,10 +249,5 @@ var NAVTREEINDEX4 = "include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,55,0], "include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,55,2], "include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,55,1], -"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,55,7], -"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,55,3], -"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,55,6], -"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,55,5], -"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,55,4], -"index.html":[] +"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,55,7] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index f5db33c9f..488b10227 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,10 @@ var NAVTREEINDEX5 = { +"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,55,3], +"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,55,6], +"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,55,5], +"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,55,4], +"index.html":[], "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], @@ -108,13 +113,13 @@ var NAVTREEINDEX5 = "md_config.html":[0], "md_fresh.html":[1], "minimal_8php.html":[5,0,3,0,2], -"minimalisticdarkness_8php.html":[5,0,3,1,0,1,5], -"minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f":[5,0,3,1,0,1,5,4], -"minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead":[5,0,3,1,0,1,5,3], -"minimalisticdarkness_8php.html#a5795120b4b324bc4ca83f1e6fdce7d57":[5,0,3,1,0,1,5,5], -"minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,1,0,1,5,0], -"minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,1,0,1,5,2], -"minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,1,0,1,5,1], +"minimalisticdarkness_8php.html":[5,0,3,1,0,1,4], +"minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f":[5,0,3,1,0,1,4,4], +"minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead":[5,0,3,1,0,1,4,3], +"minimalisticdarkness_8php.html#a5795120b4b324bc4ca83f1e6fdce7d57":[5,0,3,1,0,1,4,5], +"minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,1,0,1,4,0], +"minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,1,0,1,4,2], +"minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,1,0,1,4,1], "mitem_8php.html":[5,0,1,54], "mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,54,2], "mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,54,0], @@ -173,8 +178,8 @@ var NAVTREEINDEX5 = "namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], -"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacefriendica-to-smarty-tpl.html":[3,0,2], +"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacemembers.html":[3,1,0], "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], @@ -204,7 +209,7 @@ var NAVTREEINDEX5 = "oexchange_8php.html":[5,0,1,63], "oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,63,0], "oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,63,1], -"olddefault_8php.html":[5,0,3,1,0,1,6], +"olddefault_8php.html":[5,0,3,1,0,1,5], "onedirsync_8php.html":[5,0,0,51], "onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,51,0], "onepoll_8php.html":[5,0,0,52], @@ -223,6 +228,8 @@ var NAVTREEINDEX5 = "parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,66,3], "parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,66,1], "parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,66,0], +"passion_8php.html":[5,0,3,1,0,1,6], +"passionwide_8php.html":[5,0,3,1,0,1,7], "permissions_8php.html":[5,0,0,54], "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,54,2], "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,54,0], @@ -242,12 +249,5 @@ var NAVTREEINDEX5 = "php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[5,0,2,5,7], "php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[5,0,2,5,5], "php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[5,0,2,5,6], -"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,5,3], -"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,5,0], -"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,5,1], -"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,5,4], -"php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[5,0,2,5,2], -"php_2default_8php.html":[5,0,3,0,0], -"php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], -"php_8php.html":[5,0,1,69] +"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,5,3] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index b24764355..30b306caa 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,7 +1,12 @@ var NAVTREEINDEX6 = { +"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,5,0], +"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,5,1], +"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,5,4], +"php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[5,0,2,5,2], +"php_8php.html":[5,0,1,69], "php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,0], -"pine_8php.html":[5,0,3,1,0,1,7], +"pine_8php.html":[5,0,3,1,0,1,8], "ping_8php.html":[5,0,1,70], "ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,70,0], "plugin_8php.html":[5,0,0,56], @@ -82,22 +87,29 @@ var NAVTREEINDEX6 = "randprof_8php.html":[5,0,1,82], "randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,82,0], "redbasic_2php_2style_8php.html":[5,0,3,1,1,0,1], -"redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,1,1,0,1,1], -"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,1,0,1,11], -"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,1,1,0,1,5], -"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,1,1,0,1,4], +"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,1,1,0,1,9], +"redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,1,1,0,1,2], +"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,1,0,1,17], +"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,1,1,0,1,6], +"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,1,1,0,1,5], "redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,1,1,0,1,0], -"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,1,0,1,7], -"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,1,0,1,2], -"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,1,0,1,8], -"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,1,0,1,12], -"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,1,0,1,6], -"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,1,0,1,10], -"redbasic_2php_2style_8php.html#acf4b43e21b9103e003def2b42ffeda99":[5,0,3,1,1,0,1,9], -"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,1,0,1,3], +"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,1,1,0,1,16], +"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,1,0,1,10], +"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,1,0,1,3], +"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,1,1,0,1,14], +"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,1,0,1,11], +"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,1,0,1,19], +"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,1,0,1,7], +"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,1,0,1,13], +"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,1,1,0,1,18], +"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,1,1,0,1,8], +"redbasic_2php_2style_8php.html#acf4b43e21b9103e003def2b42ffeda99":[5,0,3,1,1,0,1,12], +"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,1,1,0,1,15], +"redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0":[5,0,3,1,1,0,1,1], +"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,1,0,1,4], "redbasic_2php_2theme_8php.html":[5,0,3,1,1,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,1,0,2,0], -"redbasic_8php.html":[5,0,3,1,0,1,8], +"redbasic_8php.html":[5,0,3,1,0,1,9], "reddav_8php.html":[5,0,0,63], "redir_8php.html":[5,0,1,83], "redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,83,0], @@ -237,17 +249,5 @@ var NAVTREEINDEX6 = "text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,70,5], "text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,70,77], "text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,70,32], -"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,70,35], -"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,70,49], -"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,70,52], -"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,70,46], -"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,70,47], -"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,70,42], -"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,70,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,70,85], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,70,74], -"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,70,48], -"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,70,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,70,87], -"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,70,23] +"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,70,35] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index eb14ce2e3..1f8dff6f9 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,17 @@ var NAVTREEINDEX7 = { +"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,70,49], +"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,70,52], +"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,70,46], +"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,70,47], +"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,70,42], +"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,70,4], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,70,85], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,70,74], +"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,70,48], +"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,70,10], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,70,87], +"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,70,23], "text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,70,82], "text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,70,80], "text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,70,30], @@ -66,7 +78,6 @@ var NAVTREEINDEX7 = "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,70,12], "text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,70,58], "text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,70,53], -"theme_2apw_2schema_2default_8php.html":[5,0,3,1,0,1,3], "theme__init_8php.html":[5,0,3,0,6], "thing_8php.html":[5,0,1,104], "thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,104,0], @@ -106,11 +117,11 @@ var NAVTREEINDEX7 = "updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[5,0,2,10,0], "updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[5,0,2,10,4], "view_2theme_2apw_2php_2config_8php.html":[5,0,3,1,0,0,0], -"view_2theme_2apw_2php_2config_8php.html#a24da7d946bdb1f17856da129a86dc6cb":[5,0,3,1,0,0,0,0], +"view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec":[5,0,3,1,0,0,0,0], "view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,0,0,0,1], "view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,0,0,0,2], "view_2theme_2redbasic_2php_2config_8php.html":[5,0,3,1,1,0,0], -"view_2theme_2redbasic_2php_2config_8php.html#a619f3215434e6e1de416edb55b4dc341":[5,0,3,1,1,0,0,0], +"view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[5,0,3,1,1,0,0,0], "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], "view_8php.html":[5,0,1,112], @@ -135,7 +146,7 @@ var NAVTREEINDEX7 = "webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,119,0], "wfinger_8php.html":[5,0,1,120], "wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,120,0], -"widedarkness_8php.html":[5,0,3,1,0,1,9], +"widedarkness_8php.html":[5,0,3,1,0,1,10], "widgets_8php.html":[5,0,0,71], "widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,71,1], "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,71,0], diff --git a/doc/html/passion_8php.html b/doc/html/passion_8php.html new file mode 100644 index 000000000..212555895 --- /dev/null +++ b/doc/html/passion_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/apw/schema/passion.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    passion.php File Reference
    +
    +
    +
    +
    + diff --git a/doc/html/passionwide_8php.html b/doc/html/passionwide_8php.html new file mode 100644 index 000000000..05820ffdd --- /dev/null +++ b/doc/html/passionwide_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/apw/schema/passionwide.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    passionwide.php File Reference
    +
    +
    +
    +
    + diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 733645f51..668f4d376 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -248,7 +248,7 @@ Functions
    -

    Referenced by Conversation\add_thread(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedInode\delete(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), RedInode\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), z_readdir(), and zot_feed().

    +

    Referenced by Conversation\add_thread(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedInode\delete(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), RedInode\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), z_readdir(), and zot_feed().

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 5c078f686..455833078 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -282,7 +282,7 @@ Functions
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), rpost_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), rpost_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 097672358..5d0467111 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -118,12 +118,18 @@ Variables    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour")   + $banner_colour = get_pconfig($uid,'redbasic','banner_colour') +   $schema = get_pconfig($uid,'redbasic','schema')    $bgcolour = get_pconfig($uid, "redbasic", "background_colour")    $background_image = get_pconfig($uid, "redbasic", "background_image")   + $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour') +  + $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour') +   $item_colour = get_pconfig($uid, "redbasic", "item_colour")    $item_opacity = get_pconfig($uid, "redbasic", "item_opacity") @@ -138,6 +144,14 @@ Variables    $section_width =get_pconfig($uid,"redbasic","section_width")   + $nav_min_opacity =get_pconfig($uid,'redbasic','nav_min_opacity') +  + $sloppy_photos =get_pconfig($uid,'redbasic','sloppy_photos') +  +if($nav_min_opacity===false||$nav_min_opacity=== '') else +  + $nav_percent_min_opacity = (int) 100 * $nav_min_opacity + 

    Variable Documentation

    @@ -150,7 +164,17 @@ Variables
    -

    Referenced by redbasic_form(), and theme_content().

    +
    + + +
    +
    + + + + +
    $banner_colour = get_pconfig($uid,'redbasic','banner_colour')
    +
    @@ -164,7 +188,7 @@ Variables
    -

    Referenced by apw_form(), redbasic_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -178,7 +202,7 @@ Variables
    -

    Referenced by apw_form(), redbasic_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -192,7 +216,7 @@ Variables
    -

    Referenced by apw_form(), redbasic_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -206,7 +230,7 @@ Variables
    -

    Referenced by apw_form(), redbasic_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -220,8 +244,6 @@ Variables
    -

    Referenced by redbasic_form(), and theme_content().

    -
    @@ -234,7 +256,29 @@ Variables
    -

    Referenced by redbasic_form(), and theme_content().

    +
    + + +
    +
    + + + + +
    $nav_min_opacity =get_pconfig($uid,'redbasic','nav_min_opacity')
    +
    + +
    +
    + +
    +
    + + + + +
    $nav_percent_min_opacity = (int) 100 * $nav_min_opacity
    +
    @@ -248,7 +292,7 @@ Variables
    -

    Referenced by redbasic_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -262,7 +306,7 @@ Variables
    -

    Referenced by apw_form(), redbasic_form(), and theme_content().

    +

    Referenced by apw_form(), and theme_content().

    @@ -276,8 +320,6 @@ Variables
    -

    Referenced by redbasic_form(), and theme_content().

    -
    @@ -290,7 +332,41 @@ Variables
    -

    Referenced by redbasic_form(), and theme_content().

    +
    + + +
    +
    + + + + +
    $sloppy_photos =get_pconfig($uid,'redbasic','sloppy_photos')
    +
    + +
    +
    + +
    +
    + + + + +
    $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour')
    +
    + +
    +
    + +
    +
    + + + + +
    $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour')
    +
    @@ -304,6 +380,20 @@ Variables
    +
    + + +
    +
    + + + + +
    if ($nav_min_opacity===false||$nav_min_opacity=== '') else
    +
    +Initial value:
    {
    +
    $nav_float_min_opacity = (float) $nav_min_opacity
    +
    diff --git a/doc/html/redbasic_2php_2style_8php.js b/doc/html/redbasic_2php_2style_8php.js index cb3d22e88..9d389fe14 100644 --- a/doc/html/redbasic_2php_2style_8php.js +++ b/doc/html/redbasic_2php_2style_8php.js @@ -1,16 +1,23 @@ var redbasic_2php_2style_8php = [ [ "$background_image", "redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c", null ], + [ "$banner_colour", "redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0", null ], [ "$bgcolour", "redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574", null ], [ "$font_colour", "redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b", null ], [ "$font_size", "redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc", null ], [ "$item_colour", "redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16", null ], [ "$item_opacity", "redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8", null ], [ "$nav_colour", "redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649", null ], + [ "$nav_min_opacity", "redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1", null ], + [ "$nav_percent_min_opacity", "redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c", null ], [ "$radius", "redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351", null ], [ "$schema", "redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee", null ], [ "$section_width", "redbasic_2php_2style_8php.html#acf4b43e21b9103e003def2b42ffeda99", null ], [ "$shadow", "redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a", null ], + [ "$sloppy_photos", "redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad", null ], + [ "$toolicon_activecolour", "redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3", null ], + [ "$toolicon_colour", "redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb", null ], [ "$uid", "redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a", null ], + [ "else", "redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459", null ], [ "if", "redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a", null ] ]; \ No newline at end of file diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 376f2402a..14a0de2b1 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -12,6 +12,7 @@ var searchData= ['_24attach',['$attach',['../classRedInode.html#a7b317eb1230930154107ed51e54193f5',1,'RedInode']]], ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory']]], ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]], + ['_24banner_5fcolour',['$banner_colour',['../redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0',1,'style.php']]], ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], ['_24bgcolour',['$bgcolour',['../redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574',1,'style.php']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], @@ -77,6 +78,8 @@ var searchData= ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]], ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]], + ['_24nav_5fmin_5fopacity',['$nav_min_opacity',['../redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1',1,'style.php']]], + ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]], ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]], ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]], ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]], @@ -117,6 +120,7 @@ var searchData= ['_24session_5fexists',['$session_exists',['../session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb',1,'session.php']]], ['_24session_5fexpire',['$session_expire',['../session_8php.html#af0100a2642a5268594bbd5742a03d885',1,'session.php']]], ['_24shadow',['$shadow',['../redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a',1,'style.php']]], + ['_24sloppy_5fphotos',['$sloppy_photos',['../redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad',1,'style.php']]], ['_24sourcename',['$sourcename',['../classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11',1,'App']]], ['_24stack',['$stack',['../classTemplate.html#a6f0efc256688c36110180b501067ff11',1,'Template']]], ['_24str',['$str',['../typohelper_8php.html#a7542d95618011800c61773127fa625cf',1,'typohelper.php']]], @@ -130,6 +134,8 @@ var searchData= ['_24threaded',['$threaded',['../classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2',1,'Item']]], ['_24threads',['$threads',['../classConversation.html#a41f4a549e6a99f98935c4742addd22c8',1,'Conversation']]], ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App']]], + ['_24toolicon_5factivecolour',['$toolicon_activecolour',['../redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3',1,'style.php']]], + ['_24toolicon_5fcolour',['$toolicon_colour',['../redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb',1,'style.php']]], ['_24toplevel',['$toplevel',['../classItem.html#a5cfa6cf964f433a917a81cab079ff9d8',1,'Item']]], ['_24type',['$type',['../classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03',1,'photo_driver']]], ['_24types',['$types',['../classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03',1,'photo_driver']]], diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index c6cc82269..db26f737d 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -150,7 +150,7 @@ var searchData= ['appdirpath',['appdirpath',['../boot_8php.html#a75a90b0eadd0df510f7e63210733634d',1,'boot.php']]], ['apps_2ephp',['apps.php',['../apps_8php.html',1,'']]], ['apps_5fcontent',['apps_content',['../apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c',1,'apps.php']]], - ['apw_5fform',['apw_form',['../view_2theme_2apw_2php_2config_8php.html#a24da7d946bdb1f17856da129a86dc6cb',1,'config.php']]], + ['apw_5fform',['apw_form',['../view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec',1,'config.php']]], ['apw_5finit',['apw_init',['../apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89',1,'theme.php']]], ['argc',['argc',['../boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7',1,'boot.php']]], ['argv',['argv',['../boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006',1,'boot.php']]], @@ -160,8 +160,8 @@ var searchData= ['atom_5fauthor',['atom_author',['../items_8php.html#a016dd86c827d08db89061ea81d15c6cb',1,'items.php']]], ['atom_5fentry',['atom_entry',['../items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6',1,'items.php']]], ['atom_5ftime',['ATOM_TIME',['../boot_8php.html#ad34c1547020a305915bcc39707744690',1,'boot.php']]], - ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], + ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], ['attach_5fby_5fhash',['attach_by_hash',['../include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36',1,'attach.php']]], ['attach_5fby_5fhash_5fnodata',['attach_by_hash_nodata',['../include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932',1,'attach.php']]], ['attach_5fcount_5ffiles',['attach_count_files',['../include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3',1,'attach.php']]], @@ -169,6 +169,7 @@ var searchData= ['attach_5fflag_5fos',['ATTACH_FLAG_OS',['../boot_8php.html#a781916f83fcc8ff1035649afa45f0292',1,'boot.php']]], ['attach_5finit',['attach_init',['../mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1',1,'attach.php']]], ['attach_5flist_5ffiles',['attach_list_files',['../include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d',1,'attach.php']]], + ['attach_5fmkdir',['attach_mkdir',['../include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc',1,'attach.php']]], ['attach_5fstore',['attach_store',['../include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f',1,'attach.php']]], ['attribute_5fcontains',['attribute_contains',['../text_8php.html#a95fd2f8f23a1948414a03ebc963bac57',1,'text.php']]], ['auth_2ephp',['auth.php',['../auth_8php.html',1,'']]], diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js index acdb7f4e1..7f994ee27 100644 --- a/doc/html/search/all_62.js +++ b/doc/html/search/all_62.js @@ -6,7 +6,8 @@ var searchData= ['baseobject_2ephp',['BaseObject.php',['../BaseObject_8php.html',1,'']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]], - ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a52c45273fbb7ce5ec27094f7936856e1',1,'bbcode.php']]], + ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]], + ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a',1,'bbcode.php']]], ['bb_5fshareattributessimple',['bb_ShareAttributesSimple',['../bbcode_8php.html#a2be26414a367118143cc89e2d58e7377',1,'bbcode.php']]], ['bb_5fspacefy',['bb_spacefy',['../bbcode_8php.html#a8911e027907820df3db03b4f76724b50',1,'bbcode.php']]], ['bb_5ftag_5fpreg_5freplace',['bb_tag_preg_replace',['../bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba',1,'bb2diaspora.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index a8b3e471e..0478967bd 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -25,8 +25,7 @@ var searchData= ['dbg',['dbg',['../classdba__driver.html#adcc1f8955120fec0708bce39202d0422',1,'dba_driver\dbg()'],['../dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb',1,'dbg(): dba_driver.php']]], ['dbq',['dbq',['../dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee',1,'dba_driver.php']]], ['decode_5ftags',['decode_tags',['../items_8php.html#a56b2a4abcadfac71175cd50555528cc3',1,'items.php']]], - ['default_2ephp',['default.php',['../php_2default_8php.html',1,'']]], - ['default_2ephp',['default.php',['../theme_2apw_2schema_2default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../default_8php.html',1,'']]], ['default_5fdb_5fengine',['DEFAULT_DB_ENGINE',['../boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d',1,'boot.php']]], ['del_5fconfig',['del_config',['../include_2config_8php.html#a549910227348003efc3c05c9105c42da',1,'config.php']]], ['del_5fpconfig',['del_pconfig',['../include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941',1,'config.php']]], diff --git a/doc/html/search/all_65.js b/doc/html/search/all_65.js index 87866e483..475bb7505 100644 --- a/doc/html/search/all_65.js +++ b/doc/html/search/all_65.js @@ -8,7 +8,7 @@ var searchData= ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]], ['editwebpage_2ephp',['editwebpage.php',['../editwebpage_8php.html',1,'']]], ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]], - ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php']]], + ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php'],['../redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459',1,'else(): style.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], ['encode_5fitem',['encode_item',['../items_8php.html#a82955cc578f0fa600acec84475026194',1,'items.php']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index bcc5b7f9b..8e07b9665 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -5,7 +5,7 @@ var searchData= ['identity_5fbasic_5fimport',['identity_basic_import',['../identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485',1,'identity.php']]], ['identity_5fcheck_5fservice_5fclass',['identity_check_service_class',['../identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633',1,'identity.php']]], ['ids_5fto_5fquerystr',['ids_to_querystr',['../text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a',1,'text.php']]], - ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]], + ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]], ['imagestring',['imageString',['../classphoto__driver.html#abc9f73ad90923772d52b9fcc4eb117dd',1,'photo_driver\imageString()'],['../classphoto__gd.html#a0795fc029be382557ae3f6e285f40e00',1,'photo_gd\imageString()'],['../classphoto__imagick.html#a70adbef31128c0ac8cbc5dcf34cdb019',1,'photo_imagick\imageString()']]], ['import_2ephp',['import.php',['../import_8php.html',1,'']]], ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 4f026488c..632f60bdd 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -20,6 +20,8 @@ var searchData= ['parse_5fxml_5fstring',['parse_xml_string',['../include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6',1,'network.php']]], ['parsed',['parsed',['../classFriendicaSmarty.html#a6a4d4281d6fa9be1d37a97b188ffe8c9',1,'FriendicaSmarty']]], ['parseurl_5fgetsiteinfo',['parseurl_getsiteinfo',['../parse__url_8php.html#a25635549f2c22955d72465f4d2e58993',1,'parse_url.php']]], + ['passion_2ephp',['passion.php',['../passion_8php.html',1,'']]], + ['passionwide_2ephp',['passionwide.php',['../passionwide_8php.html',1,'']]], ['path',['path',['../namespacefriendica-to-smarty-tpl.html#a68d15934660cd1f4301ce251b1646f09',1,'friendica-to-smarty-tpl.path()'],['../namespaceupdatetpl.html#ae694f5e1f25f8a92a945eb90c432dfe6',1,'updatetpl.path()']]], ['pdl_5fselector',['pdl_selector',['../comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e',1,'comanche.php']]], ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 6c5199a79..67dee5054 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -14,7 +14,7 @@ var searchData= ['red_5fversion',['RED_VERSION',['../boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3',1,'boot.php']]], ['red_5fzrl_5fcallback',['red_zrl_callback',['../items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b',1,'items.php']]], ['redbasic_2ephp',['redbasic.php',['../redbasic_8php.html',1,'']]], - ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a619f3215434e6e1de416edb55b4dc341',1,'config.php']]], + ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793',1,'config.php']]], ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]], ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]], ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index fe610e392..c0f8c30ad 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -19,7 +19,7 @@ var searchData= ['security_2ephp',['security.php',['../security_8php.html',1,'']]], ['select_5ftimezone',['select_timezone',['../datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f',1,'datetime.php']]], ['send',['send',['../classenotify.html#afbc088860f534c6c05788b48cfc262c6',1,'enotify']]], - ['send_5fmessage',['send_message',['../include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd',1,'message.php']]], + ['send_5fmessage',['send_message',['../include_2message_8php.html#a751ffd6635022b2190f56154ee745752',1,'message.php']]], ['send_5freg_5fapproval_5femail',['send_reg_approval_email',['../account_8php.html#a014de2d5d5c9785de5bf547a485822fa',1,'account.php']]], ['send_5fstatus_5fnotifications',['send_status_notifications',['../items_8php.html#aab9e0c58247427126de0699c729c3b6c',1,'items.php']]], ['send_5fverification_5femail',['send_verification_email',['../account_8php.html#aa9c29c497c17d8f9344dce8631ad8761',1,'account.php']]], @@ -93,6 +93,7 @@ var searchData= ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]], ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]], ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], + ['storage_5fdefault_5fpermissions',['STORAGE_DEFAULT_PERMISSIONS',['../boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6',1,'boot.php']]], ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]], ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]], ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]], @@ -100,8 +101,8 @@ var searchData= ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]], ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], - ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], diff --git a/doc/html/search/files_64.js b/doc/html/search/files_64.js index 4145691dc..f2ac54231 100644 --- a/doc/html/search/files_64.js +++ b/doc/html/search/files_64.js @@ -9,8 +9,7 @@ var searchData= ['dba_5fdriver_2ephp',['dba_driver.php',['../dba__driver_8php.html',1,'']]], ['dba_5fmysql_2ephp',['dba_mysql.php',['../dba__mysql_8php.html',1,'']]], ['dba_5fmysqli_2ephp',['dba_mysqli.php',['../dba__mysqli_8php.html',1,'']]], - ['default_2ephp',['default.php',['../theme_2apw_2schema_2default_8php.html',1,'']]], - ['default_2ephp',['default.php',['../php_2default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../default_8php.html',1,'']]], ['delegate_2ephp',['delegate.php',['../delegate_8php.html',1,'']]], ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]], ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]], diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js index 11e90bec0..660b1f132 100644 --- a/doc/html/search/files_70.js +++ b/doc/html/search/files_70.js @@ -3,13 +3,15 @@ var searchData= ['page_2ephp',['page.php',['../page_8php.html',1,'']]], ['page_5fwidgets_2ephp',['page_widgets.php',['../page__widgets_8php.html',1,'']]], ['parse_5furl_2ephp',['parse_url.php',['../parse__url_8php.html',1,'']]], + ['passion_2ephp',['passion.php',['../passion_8php.html',1,'']]], + ['passionwide_2ephp',['passionwide.php',['../passionwide_8php.html',1,'']]], ['permissions_2ephp',['permissions.php',['../permissions_8php.html',1,'']]], ['photo_2ephp',['photo.php',['../photo_8php.html',1,'']]], ['photo_5fdriver_2ephp',['photo_driver.php',['../photo__driver_8php.html',1,'']]], ['photo_5fgd_2ephp',['photo_gd.php',['../photo__gd_8php.html',1,'']]], ['photo_5fimagick_2ephp',['photo_imagick.php',['../photo__imagick_8php.html',1,'']]], - ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]], ['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]], + ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]], ['php_2ephp',['php.php',['../php_8php.html',1,'']]], ['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]], ['pine_2ephp',['pine.php',['../pine_8php.html',1,'']]], diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index 5777796e6..de5178fed 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -94,7 +94,7 @@ var searchData= ['api_5fusers_5fshow',['api_users_show',['../include_2api_8php.html#abe8e929e93f7ab134b1cb1fb30f19a76',1,'api.php']]], ['appdirpath',['appdirpath',['../boot_8php.html#a75a90b0eadd0df510f7e63210733634d',1,'boot.php']]], ['apps_5fcontent',['apps_content',['../apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c',1,'apps.php']]], - ['apw_5fform',['apw_form',['../view_2theme_2apw_2php_2config_8php.html#a24da7d946bdb1f17856da129a86dc6cb',1,'config.php']]], + ['apw_5fform',['apw_form',['../view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec',1,'config.php']]], ['apw_5finit',['apw_init',['../apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89',1,'theme.php']]], ['argc',['argc',['../boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7',1,'boot.php']]], ['argv',['argv',['../boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006',1,'boot.php']]], @@ -108,6 +108,7 @@ var searchData= ['attach_5fcount_5ffiles',['attach_count_files',['../include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3',1,'attach.php']]], ['attach_5finit',['attach_init',['../mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1',1,'attach.php']]], ['attach_5flist_5ffiles',['attach_list_files',['../include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d',1,'attach.php']]], + ['attach_5fmkdir',['attach_mkdir',['../include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc',1,'attach.php']]], ['attach_5fstore',['attach_store',['../include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f',1,'attach.php']]], ['attribute_5fcontains',['attribute_contains',['../text_8php.html#a95fd2f8f23a1948414a03ebc963bac57',1,'text.php']]], ['authenticate_5fsuccess',['authenticate_success',['../security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733',1,'security.php']]], diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js index ee238c6ee..4a02db2e4 100644 --- a/doc/html/search/functions_62.js +++ b/doc/html/search/functions_62.js @@ -3,7 +3,8 @@ var searchData= ['base64url_5fdecode',['base64url_decode',['../text_8php.html#a13286f8a95d2de6b102966ecc270c8d6',1,'text.php']]], ['base64url_5fencode',['base64url_encode',['../text_8php.html#a070384ec000fd65043fce11d5392d241',1,'text.php']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], - ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a52c45273fbb7ce5ec27094f7936856e1',1,'bbcode.php']]], + ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]], + ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a',1,'bbcode.php']]], ['bb_5fshareattributessimple',['bb_ShareAttributesSimple',['../bbcode_8php.html#a2be26414a367118143cc89e2d58e7377',1,'bbcode.php']]], ['bb_5fspacefy',['bb_spacefy',['../bbcode_8php.html#a8911e027907820df3db03b4f76724b50',1,'bbcode.php']]], ['bb_5ftag_5fpreg_5freplace',['bb_tag_preg_replace',['../bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba',1,'bb2diaspora.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index 3ed8064bd..5df1d71d2 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -6,7 +6,7 @@ var searchData= ['rconnect_5furl',['rconnect_url',['../Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91',1,'Contact.php']]], ['rebuild_5ftheme_5ftable',['rebuild_theme_table',['../admin_8php.html#ae46311a3fefc21abc838a26e91789de6',1,'admin.php']]], ['red_5fzrl_5fcallback',['red_zrl_callback',['../items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b',1,'items.php']]], - ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a619f3215434e6e1de416edb55b4dc341',1,'config.php']]], + ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793',1,'config.php']]], ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]], ['redir_5finit',['redir_init',['../redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5',1,'redir.php']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 7c271fa19..3bb2b7427 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -16,7 +16,7 @@ var searchData= ['search_5fsaved_5fsearches',['search_saved_searches',['../search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6',1,'search.php']]], ['select_5ftimezone',['select_timezone',['../datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f',1,'datetime.php']]], ['send',['send',['../classenotify.html#afbc088860f534c6c05788b48cfc262c6',1,'enotify']]], - ['send_5fmessage',['send_message',['../include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd',1,'message.php']]], + ['send_5fmessage',['send_message',['../include_2message_8php.html#a751ffd6635022b2190f56154ee745752',1,'message.php']]], ['send_5freg_5fapproval_5femail',['send_reg_approval_email',['../account_8php.html#a014de2d5d5c9785de5bf547a485822fa',1,'account.php']]], ['send_5fstatus_5fnotifications',['send_status_notifications',['../items_8php.html#aab9e0c58247427126de0699c729c3b6c',1,'items.php']]], ['send_5fverification_5femail',['send_verification_email',['../account_8php.html#aa9c29c497c17d8f9344dce8631ad8761',1,'account.php']]], diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 376f2402a..14a0de2b1 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -12,6 +12,7 @@ var searchData= ['_24attach',['$attach',['../classRedInode.html#a7b317eb1230930154107ed51e54193f5',1,'RedInode']]], ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory']]], ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]], + ['_24banner_5fcolour',['$banner_colour',['../redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0',1,'style.php']]], ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], ['_24bgcolour',['$bgcolour',['../redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574',1,'style.php']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], @@ -77,6 +78,8 @@ var searchData= ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]], ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]], + ['_24nav_5fmin_5fopacity',['$nav_min_opacity',['../redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1',1,'style.php']]], + ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]], ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]], ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]], ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]], @@ -117,6 +120,7 @@ var searchData= ['_24session_5fexists',['$session_exists',['../session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb',1,'session.php']]], ['_24session_5fexpire',['$session_expire',['../session_8php.html#af0100a2642a5268594bbd5742a03d885',1,'session.php']]], ['_24shadow',['$shadow',['../redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a',1,'style.php']]], + ['_24sloppy_5fphotos',['$sloppy_photos',['../redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad',1,'style.php']]], ['_24sourcename',['$sourcename',['../classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11',1,'App']]], ['_24stack',['$stack',['../classTemplate.html#a6f0efc256688c36110180b501067ff11',1,'Template']]], ['_24str',['$str',['../typohelper_8php.html#a7542d95618011800c61773127fa625cf',1,'typohelper.php']]], @@ -130,6 +134,8 @@ var searchData= ['_24threaded',['$threaded',['../classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2',1,'Item']]], ['_24threads',['$threads',['../classConversation.html#a41f4a549e6a99f98935c4742addd22c8',1,'Conversation']]], ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App']]], + ['_24toolicon_5factivecolour',['$toolicon_activecolour',['../redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3',1,'style.php']]], + ['_24toolicon_5fcolour',['$toolicon_colour',['../redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb',1,'style.php']]], ['_24toplevel',['$toplevel',['../classItem.html#a5cfa6cf964f433a917a81cab079ff9d8',1,'Item']]], ['_24type',['$type',['../classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03',1,'photo_driver']]], ['_24types',['$types',['../classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03',1,'photo_driver']]], diff --git a/doc/html/search/variables_65.js b/doc/html/search/variables_65.js index 260cd72bd..78718ea57 100644 --- a/doc/html/search/variables_65.js +++ b/doc/html/search/variables_65.js @@ -1,6 +1,6 @@ var searchData= [ - ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php']]], + ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php'],['../redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459',1,'else(): style.php']]], ['eol',['EOL',['../boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b',1,'boot.php']]], ['eot',['EOT',['../typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805',1,'typohelper.php']]], ['excludepaths',['excludepaths',['../namespaceupdatetpl.html#a988d937ed5d5c2b592b763036af5cf94',1,'updatetpl']]], diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js index c71968467..e46f2ce95 100644 --- a/doc/html/search/variables_69.js +++ b/doc/html/search/variables_69.js @@ -1,6 +1,6 @@ var searchData= [ - ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]], + ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]], ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]], ['item_5fbuildblock',['ITEM_BUILDBLOCK',['../boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf',1,'boot.php']]], ['item_5fdelayed_5fpublish',['ITEM_DELAYED_PUBLISH',['../boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20',1,'boot.php']]], diff --git a/doc/html/search/variables_73.js b/doc/html/search/variables_73.js index 380434573..961bce010 100644 --- a/doc/html/search/variables_73.js +++ b/doc/html/search/variables_73.js @@ -2,5 +2,6 @@ var searchData= [ ['ssl_5fpolicy_5ffull',['SSL_POLICY_FULL',['../boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc',1,'boot.php']]], ['ssl_5fpolicy_5fnone',['SSL_POLICY_NONE',['../boot_8php.html#af86c651547aa8f9e549ee40a09455549',1,'boot.php']]], - ['ssl_5fpolicy_5fselfsign',['SSL_POLICY_SELFSIGN',['../boot_8php.html#adca48aee78465ae3064ca4432c0d87b5',1,'boot.php']]] + ['ssl_5fpolicy_5fselfsign',['SSL_POLICY_SELFSIGN',['../boot_8php.html#adca48aee78465ae3064ca4432c0d87b5',1,'boot.php']]], + ['storage_5fdefault_5fpermissions',['STORAGE_DEFAULT_PERMISSIONS',['../boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6',1,'boot.php']]] ]; diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 3d3255bc9..c5f6580bb 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -399,7 +399,7 @@ Functions

    Profile owner - everything is visible

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

    -

    Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), and z_readdir().

    +

    Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), and z_readdir().

    diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index b33a4b2f7..c1675ffb8 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1287,7 +1287,7 @@ Variables
    -

    Referenced by account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), 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(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), localize_item(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), magic_init(), mail_store(), menu_edit(), message_content(), message_post(), mini_group_select(), mood_init(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onedirsync_run(), onepoll_run(), page_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), public_recips(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), redir_init(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), authenticate_success(), avatar_img(), base64url_decode(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), localize_item(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), magic_init(), mail_store(), menu_edit(), message_post(), mini_group_select(), mood_init(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onedirsync_run(), onepoll_run(), page_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), public_recips(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), redir_init(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -1707,7 +1707,7 @@ Variables
    -

    Referenced by aes_encapsulate(), attach_store(), build_sync_packet(), create_account(), create_identity(), dfrn_deliver(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), redir_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

    +

    Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), build_sync_packet(), create_account(), create_identity(), dfrn_deliver(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), redir_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

    @@ -1772,7 +1772,7 @@ Variables
    Returns
    string substituted string
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), rpost_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), design_tools(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), follow_widget(), format_categories(), format_filer(), 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(), lastpost_content(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), 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(), rpost_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), writepages_widget(), and xrd_init().

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index fca3fe98c..169430c6c 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -120,7 +120,7 @@ Variables    $dirs = glob('addon/*')   -else $phpath = 'php' +else $phpath = 'php'  

    Variable Documentation

    @@ -134,7 +134,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blocks_content(), build_sync_packet(), 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(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), contact_block(), contact_select(), conversation(), 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(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), fix_private_photos(), follow_init(), follow_widget(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), 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_photo_menu(), item_post(), items_fetch(), lang_selector(), lastpost_aside(), lastpost_content(), lastpost_init(), layouts_content(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), menu_content(), message_aside(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), 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(), onedirsync_run(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), 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(), redir_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), 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_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), 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(), thing_init(), 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(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_profile(), widget_tagcloud(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    +

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blocks_content(), build_sync_packet(), 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(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), contact_block(), contact_select(), conversation(), 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(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), fix_private_photos(), follow_init(), follow_widget(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), 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_photo_menu(), item_post(), items_fetch(), lang_selector(), lastpost_aside(), lastpost_content(), lastpost_init(), layouts_content(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), menu_content(), message_aside(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), 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(), onedirsync_run(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), 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(), redir_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), 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_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), 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(), thing_init(), 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(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_profile(), widget_tagcloud(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    @@ -167,7 +167,7 @@ Variables
    - +
    else $phpath = 'php'else $phpath = 'php'
    diff --git a/doc/html/view_2theme_2apw_2php_2config_8php.html b/doc/html/view_2theme_2apw_2php_2config_8php.html index 2ad35da6e..fdc825a6e 100644 --- a/doc/html/view_2theme_2apw_2php_2config_8php.html +++ b/doc/html/view_2theme_2apw_2php_2config_8php.html @@ -116,11 +116,11 @@ Functions    theme_post (&$a)   - apw_form (&$a, $schema, $font_size, $font, $iconpath, $line_height, $background, $bgcolour, $item_colour, $link_colour, $width, $minwidth, $gcrwidth, $font_colour, $symmetry, $aside, $scaling, $opacity, $nav, $itemfloat, $sectionleft, $sectionright, $sectionwidth, $asideleft, $asideright) -  + apw_form (&$a, $schema, $font_size, $font, $iconpath, $bigshadow, $smallshadow, $shadowcolour, $radius, $line_height, $background, $bgcolour, $sectionbackground, $sectioncolour, $item_colour, $link_colour, $width, $minwidth, $gcrwidth, $font_colour, $symmetry, $aside, $scaling, $opacity, $nav, $itemfloat, $sectionleft, $sectionright, $sectionwidth, $asideleft, $asideright) + 

    Function Documentation

    - +
    @@ -154,6 +154,30 @@ Functions + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,6 +196,18 @@ Functions + + + + + + + + + + + + diff --git a/doc/html/view_2theme_2apw_2php_2config_8php.js b/doc/html/view_2theme_2apw_2php_2config_8php.js index 35c12d7fe..c696ce526 100644 --- a/doc/html/view_2theme_2apw_2php_2config_8php.js +++ b/doc/html/view_2theme_2apw_2php_2config_8php.js @@ -1,6 +1,6 @@ var view_2theme_2apw_2php_2config_8php = [ - [ "apw_form", "view_2theme_2apw_2php_2config_8php.html#a24da7d946bdb1f17856da129a86dc6cb", null ], + [ "apw_form", "view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec", null ], [ "theme_content", "view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d", null ], [ "theme_post", "view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6", null ] ]; \ No newline at end of file diff --git a/doc/html/view_2theme_2redbasic_2php_2config_8php.html b/doc/html/view_2theme_2redbasic_2php_2config_8php.html index ea296ca39..fa5473c94 100644 --- a/doc/html/view_2theme_2redbasic_2php_2config_8php.html +++ b/doc/html/view_2theme_2redbasic_2php_2config_8php.html @@ -116,11 +116,11 @@ Functions - - + +
      $iconpath,
     $bigshadow,
     $smallshadow,
     $shadowcolour,
     $radius,
      $bgcolour,
     $sectionbackground,
     $sectioncolour,
     
     theme_post (&$a)
     
     redbasic_form (&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, $font_size, $font_colour, $radius, $shadow, $section_width)
     
     redbasic_form (&$a, $arr)
     

    Function Documentation

    - +
    @@ -134,67 +134,7 @@ Functions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/doc/html/view_2theme_2redbasic_2php_2config_8php.js b/doc/html/view_2theme_2redbasic_2php_2config_8php.js index 14cb1c79c..3a5955982 100644 --- a/doc/html/view_2theme_2redbasic_2php_2config_8php.js +++ b/doc/html/view_2theme_2redbasic_2php_2config_8php.js @@ -1,6 +1,6 @@ var view_2theme_2redbasic_2php_2config_8php = [ - [ "redbasic_form", "view_2theme_2redbasic_2php_2config_8php.html#a619f3215434e6e1de416edb55b4dc341", null ], + [ "redbasic_form", "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793", null ], [ "theme_content", "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d", null ], [ "theme_post", "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6", null ] ]; \ No newline at end of file diff --git a/util/messages.po b/util/messages.po index f4ab00317..1d0feea59 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-11-01.484\n" +"Project-Id-Version: 2013-11-08.491\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-01 00:02-0700\n" +"POT-Creation-Date: 2013-11-08 00:03-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,78 +70,78 @@ msgstr "" msgid "%s Administrator" msgstr "" -#: ../../include/enotify.php:75 +#: ../../include/enotify.php:76 #, php-format msgid "%s " msgstr "" -#: ../../include/enotify.php:79 +#: ../../include/enotify.php:80 #, php-format msgid "[Red:Notify] New mail received at %s" msgstr "" -#: ../../include/enotify.php:81 +#: ../../include/enotify.php:82 #, php-format msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: ../../include/enotify.php:82 +#: ../../include/enotify.php:83 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: ../../include/enotify.php:82 +#: ../../include/enotify.php:83 msgid "a private message" msgstr "" -#: ../../include/enotify.php:83 +#: ../../include/enotify.php:84 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../include/enotify.php:134 +#: ../../include/enotify.php:135 #, php-format msgid "%1$s commented on [zrl=%2$s]a %3$s[/zrl]" msgstr "" -#: ../../include/enotify.php:141 +#: ../../include/enotify.php:142 #, php-format msgid "%1$s commented on [zrl=%2$s]%3$s's %4$s[/zrl]" msgstr "" -#: ../../include/enotify.php:149 +#: ../../include/enotify.php:150 #, php-format msgid "%1$s commented on [zrl=%2$s]your %3$s[/zrl]" msgstr "" -#: ../../include/enotify.php:159 +#: ../../include/enotify.php:160 #, php-format msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../include/enotify.php:160 +#: ../../include/enotify.php:161 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:163 ../../include/enotify.php:180 +#: ../../include/enotify.php:164 ../../include/enotify.php:181 #: ../../include/enotify.php:206 ../../include/enotify.php:224 #: ../../include/enotify.php:237 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../include/enotify.php:170 +#: ../../include/enotify.php:171 #, php-format msgid "[Red:Notify] %s posted to your profile wall" msgstr "" -#: ../../include/enotify.php:172 +#: ../../include/enotify.php:173 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../include/enotify.php:174 +#: ../../include/enotify.php:175 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" @@ -247,16 +247,16 @@ msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:98 ../../mod/settings.php:710 ../../mod/menu.php:55 +#: ../../mod/webpages.php:98 ../../mod/settings.php:712 ../../mod/menu.php:55 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 #: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 -#: ../../mod/editpost.php:96 ../../mod/editblock.php:114 +#: ../../mod/editpost.php:97 ../../mod/editblock.php:114 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:107 ../../include/conversation.php:631 -#: ../../mod/settings.php:711 ../../mod/admin.php:677 ../../mod/group.php:182 -#: ../../mod/photos.php:1129 ../../mod/connections.php:351 +#: ../../mod/settings.php:713 ../../mod/admin.php:677 ../../mod/group.php:182 +#: ../../mod/photos.php:1129 ../../mod/connections.php:354 #: ../../mod/filestorage.php:82 msgid "Delete" msgstr "" @@ -349,10 +349,10 @@ msgid "last edited: %s" msgstr "" #: ../../include/ItemObject.php:246 ../../include/conversation.php:705 -#: ../../include/conversation.php:1110 ../../mod/photos.php:1061 -#: ../../mod/message.php:321 ../../mod/message.php:498 +#: ../../include/conversation.php:1111 ../../mod/photos.php:1061 +#: ../../mod/message.php:326 ../../mod/message.php:505 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 -#: ../../mod/editpost.php:105 ../../mod/editblock.php:123 +#: ../../mod/editpost.php:106 ../../mod/editblock.php:123 msgid "Please wait" msgstr "" @@ -379,22 +379,22 @@ msgid "Comment" msgstr "" #: ../../include/ItemObject.php:530 ../../mod/events.php:458 -#: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:283 -#: ../../mod/setup.php:326 ../../mod/settings.php:648 -#: ../../mod/settings.php:760 ../../mod/settings.php:788 -#: ../../mod/settings.php:812 ../../mod/settings.php:883 -#: ../../mod/settings.php:1051 ../../mod/connect.php:96 +#: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:302 +#: ../../mod/setup.php:345 ../../mod/settings.php:650 +#: ../../mod/settings.php:762 ../../mod/settings.php:790 +#: ../../mod/settings.php:814 ../../mod/settings.php:885 +#: ../../mod/settings.php:1053 ../../mod/connect.php:96 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418 #: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009 #: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:685 #: ../../mod/photos.php:779 ../../mod/photos.php:1040 #: ../../mod/photos.php:1080 ../../mod/photos.php:1166 -#: ../../mod/message.php:322 ../../mod/message.php:497 -#: ../../mod/connections.php:429 ../../mod/profiles.php:529 +#: ../../mod/message.php:327 ../../mod/message.php:504 +#: ../../mod/connections.php:432 ../../mod/profiles.php:529 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 -#: ../../view/theme/redbasic/php/config.php:66 -#: ../../view/theme/apw/php/config.php:158 +#: ../../view/theme/redbasic/php/config.php:79 +#: ../../view/theme/apw/php/config.php:231 msgid "Submit" msgstr "" @@ -430,16 +430,16 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:539 ../../include/conversation.php:1077 +#: ../../include/ItemObject.php:539 ../../include/conversation.php:1078 #: ../../mod/webpages.php:102 ../../mod/photos.php:1081 #: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150 -#: ../../mod/editpost.php:125 ../../mod/editblock.php:144 +#: ../../mod/editpost.php:126 ../../mod/editblock.php:144 msgid "Preview" msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:185 -#: ../../boot.php:1721 +#: ../../boot.php:1742 msgid "Connect" msgstr "" @@ -451,33 +451,33 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:492 ../../include/conversation.php:933 +#: ../../include/Contact.php:510 ../../include/conversation.php:933 msgid "Poke" msgstr "" -#: ../../include/Contact.php:493 ../../include/conversation.php:927 +#: ../../include/Contact.php:511 ../../include/conversation.php:927 msgid "View Status" msgstr "" -#: ../../include/Contact.php:494 ../../include/nav.php:75 -#: ../../include/conversation.php:928 ../../mod/connections.php:304 -#: ../../mod/connections.php:418 +#: ../../include/Contact.php:512 ../../include/nav.php:75 +#: ../../include/conversation.php:928 ../../mod/connections.php:307 +#: ../../mod/connections.php:421 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:495 ../../include/conversation.php:929 +#: ../../include/Contact.php:513 ../../include/conversation.php:929 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:496 +#: ../../include/Contact.php:514 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:497 ../../include/conversation.php:931 +#: ../../include/Contact.php:515 ../../include/conversation.php:931 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:498 ../../include/conversation.php:932 +#: ../../include/Contact.php:516 ../../include/conversation.php:932 msgid "Send PM" msgstr "" @@ -542,7 +542,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:673 -#: ../../mod/admin.php:682 ../../boot.php:1449 +#: ../../mod/admin.php:682 ../../boot.php:1464 msgid "Email" msgstr "" @@ -677,7 +677,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:160 ../../boot.php:1771 +#: ../../mod/events.php:450 ../../mod/directory.php:160 ../../boot.php:1792 msgid "Location:" msgstr "" @@ -685,6 +685,14 @@ msgstr "" msgid "General Features" msgstr "" +#: ../../include/features.php:23 +msgid "Content Expiration" +msgstr "" + +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "" + #: ../../include/features.php:24 msgid "Multiple Profiles" msgstr "" @@ -755,7 +763,7 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:38 ../../mod/settings.php:118 +#: ../../include/features.php:38 ../../mod/settings.php:120 #: ../../mod/sources.php:67 msgid "Channel Sources" msgstr "" @@ -1021,11 +1029,11 @@ msgstr "" msgid "[no subject]" msgstr "" -#: ../../include/message.php:38 +#: ../../include/message.php:42 msgid "Unable to determine sender." msgstr "" -#: ../../include/message.php:138 +#: ../../include/message.php:143 msgid "Stored post could not be verified." msgstr "" @@ -1045,12 +1053,12 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1059 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1061 msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:162 -#: ../../boot.php:1773 +#: ../../boot.php:1794 msgid "Gender:" msgstr "" @@ -1071,7 +1079,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:164 -#: ../../boot.php:1774 +#: ../../boot.php:1795 msgid "Status:" msgstr "" @@ -1085,7 +1093,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:166 -#: ../../boot.php:1775 +#: ../../boot.php:1796 msgid "Homepage:" msgstr "" @@ -1329,167 +1337,167 @@ msgstr "" msgid "surprised" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Monday" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Tuesday" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Wednesday" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Thursday" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Friday" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Saturday" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:970 msgid "Sunday" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "January" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "February" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "March" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "April" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "May" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "June" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "July" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "August" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "September" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "October" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "November" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:974 msgid "December" msgstr "" -#: ../../include/text.php:1050 ../../mod/message.php:433 +#: ../../include/text.php:1052 ../../mod/message.php:442 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1051 ../../mod/message.php:434 +#: ../../include/text.php:1053 ../../mod/message.php:443 msgid "bytes" msgstr "" -#: ../../include/text.php:1086 +#: ../../include/text.php:1088 msgid "remove category" msgstr "" -#: ../../include/text.php:1108 +#: ../../include/text.php:1110 msgid "remove from file" msgstr "" -#: ../../include/text.php:1162 ../../include/text.php:1174 +#: ../../include/text.php:1164 ../../include/text.php:1176 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1350 ../../mod/events.php:326 +#: ../../include/text.php:1352 ../../mod/events.php:326 msgid "link to source" msgstr "" -#: ../../include/text.php:1369 +#: ../../include/text.php:1371 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1372 ../../include/text.php:1437 +#: ../../include/text.php:1374 ../../include/text.php:1439 msgid "default" msgstr "" -#: ../../include/text.php:1408 +#: ../../include/text.php:1410 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1449 +#: ../../include/text.php:1451 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1601 ../../include/conversation.php:117 +#: ../../include/text.php:1603 ../../include/conversation.php:117 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/text.php:1604 ../../include/conversation.php:120 +#: ../../include/text.php:1606 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1607 ../../include/conversation.php:145 +#: ../../include/text.php:1609 ../../include/conversation.php:145 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/text.php:1609 ../../include/conversation.php:147 +#: ../../include/text.php:1611 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1614 +#: ../../include/text.php:1616 msgid "activity" msgstr "" -#: ../../include/text.php:1876 +#: ../../include/text.php:1878 msgid "Design" msgstr "" -#: ../../include/text.php:1878 +#: ../../include/text.php:1880 msgid "Blocks" msgstr "" -#: ../../include/text.php:1879 +#: ../../include/text.php:1881 msgid "Menus" msgstr "" -#: ../../include/text.php:1880 +#: ../../include/text.php:1882 msgid "Layouts" msgstr "" -#: ../../include/text.php:1881 +#: ../../include/text.php:1883 msgid "Pages" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1127 +#: ../../include/identity.php:14 ../../mod/item.php:1125 msgid "Unable to obtain identity information from database" msgstr "" @@ -1519,32 +1527,40 @@ msgid "Default Profile" msgstr "" #: ../../include/identity.php:239 ../../include/profile_selectors.php:42 -#: ../../mod/network.php:387 ../../mod/connections.php:384 +#: ../../mod/network.php:387 ../../mod/connections.php:387 msgid "Friends" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:462 -#: ../../include/bbcode.php:465 +#: ../../include/bbcode.php:94 ../../include/bbcode.php:499 +#: ../../include/bbcode.php:502 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:141 +#: ../../include/bbcode.php:131 ../../include/bbcode.php:506 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:131 +msgid "Algorithm: " +msgstr "" + +#: ../../include/bbcode.php:131 +msgid "Key hint: " +msgstr "" + +#: ../../include/bbcode.php:178 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:143 +#: ../../include/bbcode.php:180 msgid "post" msgstr "" -#: ../../include/bbcode.php:422 ../../include/bbcode.php:442 +#: ../../include/bbcode.php:459 ../../include/bbcode.php:479 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:469 ../../include/bbcode.php:470 -msgid "Encrypted content" -msgstr "" - #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -1566,27 +1582,27 @@ 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:3553 -#: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 -#: ../../mod/invite.php:102 ../../mod/allfriends.php:10 -#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 -#: ../../mod/lastpost.php:93 ../../mod/page.php:30 ../../mod/setup.php:181 -#: ../../mod/settings.php:625 ../../mod/viewconnections.php:33 -#: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 -#: ../../mod/sources.php:48 ../../mod/mitem.php:92 ../../mod/group.php:15 -#: ../../mod/photos.php:74 ../../mod/photos.php:654 ../../mod/viewsrc.php:12 -#: ../../mod/menu.php:40 ../../mod/message.php:204 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:42 ../../mod/network.php:7 ../../mod/intro.php:50 -#: ../../mod/connections.php:174 ../../mod/profiles.php:163 -#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 -#: ../../mod/new_channel.php:97 ../../mod/filestorage.php:26 -#: ../../mod/manage.php:6 ../../mod/crepair.php:115 -#: ../../mod/editlayout.php:48 ../../mod/nogroup.php:25 -#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 -#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64 -#: ../../mod/notifications.php:66 ../../mod/blocks.php:29 -#: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128 -#: ../../mod/channel.php:123 ../../mod/fsuggest.php:78 +#: ../../include/attach.php:464 ../../include/attach.php:539 +#: ../../include/items.php:3572 ../../mod/common.php:43 +#: ../../mod/events.php:134 ../../mod/invite.php:13 ../../mod/invite.php:102 +#: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30 +#: ../../mod/setup.php:200 ../../mod/settings.php:627 +#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 +#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 +#: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654 +#: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208 +#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:7 +#: ../../mod/intro.php:50 ../../mod/connections.php:177 +#: ../../mod/profiles.php:163 ../../mod/profiles.php:476 +#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 +#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 +#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48 +#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 +#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42 +#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 +#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 #: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 @@ -1610,7 +1626,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../boot.php:2222 +#: ../../include/photos.php:288 ../../boot.php:2243 msgid "Photo Albums" msgstr "" @@ -1885,7 +1901,27 @@ msgstr "" msgid "Path not available." msgstr "" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1446 +#: ../../include/attach.php:544 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:562 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:584 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:628 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:632 +msgid "database storage failed." +msgstr "" + +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1461 msgid "Logout" msgstr "" @@ -1913,7 +1949,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2219 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2240 msgid "Photos" msgstr "" @@ -1921,7 +1957,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:84 ../../boot.php:1447 +#: ../../include/nav.php:84 ../../boot.php:1462 msgid "Login" msgstr "" @@ -1942,7 +1978,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:124 ../../mod/register.php:187 ../../boot.php:1423 +#: ../../include/nav.php:124 ../../mod/register.php:187 ../../boot.php:1438 msgid "Register" msgstr "" @@ -2014,7 +2050,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:157 ../../mod/connections.php:562 +#: ../../include/nav.php:157 ../../mod/connections.php:565 msgid "New Connections" msgstr "" @@ -2062,11 +2098,11 @@ msgstr "" msgid "Outbox" msgstr "" -#: ../../include/nav.php:170 ../../mod/message.php:21 +#: ../../include/nav.php:170 ../../mod/message.php:24 msgid "New Message" msgstr "" -#: ../../include/nav.php:173 ../../mod/events.php:348 ../../boot.php:2230 +#: ../../include/nav.php:173 ../../mod/events.php:348 ../../boot.php:2251 msgid "Events" msgstr "" @@ -2090,7 +2126,7 @@ msgstr "" msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:179 ../../mod/settings.php:129 +#: ../../include/nav.php:179 ../../mod/settings.php:131 #: ../../mod/admin.php:769 ../../mod/admin.php:974 msgid "Settings" msgstr "" @@ -2099,7 +2135,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:181 ../../mod/connections.php:668 +#: ../../include/nav.php:181 ../../mod/connections.php:671 msgid "Connections" msgstr "" @@ -2244,7 +2280,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:674 +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:677 #: ../../mod/directory.php:208 ../../mod/directory.php:213 msgid "Find" msgstr "" @@ -2436,8 +2472,8 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:43 -#: ../../view/theme/apw/php/config.php:119 +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:56 +#: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "" @@ -2554,8 +2590,8 @@ msgstr "" msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1062 ../../mod/message.php:271 -#: ../../mod/message.php:398 +#: ../../include/conversation.php:1062 ../../mod/message.php:275 +#: ../../mod/message.php:406 msgid "Please enter a link URL:" msgstr "" @@ -2579,117 +2615,129 @@ msgstr "" msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1087 ../../mod/photos.php:1060 +#: ../../include/conversation.php:1068 ../../mod/message.php:276 +#: ../../mod/message.php:407 ../../mod/editpost.php:52 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../include/conversation.php:1088 ../../mod/photos.php:1060 msgid "Share" msgstr "" -#: ../../include/conversation.php:1089 +#: ../../include/conversation.php:1090 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1091 ../../mod/message.php:318 -#: ../../mod/message.php:494 ../../mod/editlayout.php:101 -#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 +#: ../../include/conversation.php:1092 ../../mod/message.php:323 +#: ../../mod/message.php:501 ../../mod/editlayout.php:101 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98 #: ../../mod/editblock.php:115 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1092 +#: ../../include/conversation.php:1093 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1093 ../../mod/message.php:319 -#: ../../mod/message.php:495 ../../mod/editlayout.php:102 -#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:98 +#: ../../include/conversation.php:1094 ../../mod/message.php:324 +#: ../../mod/message.php:502 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99 #: ../../mod/editblock.php:116 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1094 +#: ../../include/conversation.php:1095 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1095 ../../mod/message.php:320 -#: ../../mod/message.php:496 ../../mod/editlayout.php:103 -#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:99 +#: ../../include/conversation.php:1096 ../../mod/message.php:325 +#: ../../mod/message.php:503 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100 #: ../../mod/editblock.php:117 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1096 +#: ../../include/conversation.php:1097 msgid "web link" msgstr "" -#: ../../include/conversation.php:1097 +#: ../../include/conversation.php:1098 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1098 +#: ../../include/conversation.php:1099 msgid "video link" msgstr "" -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1100 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1100 +#: ../../include/conversation.php:1101 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1101 ../../mod/editlayout.php:107 -#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:103 +#: ../../include/conversation.php:1102 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 #: ../../mod/editblock.php:121 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1102 +#: ../../include/conversation.php:1103 msgid "set location" msgstr "" -#: ../../include/conversation.php:1103 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 +#: ../../include/conversation.php:1104 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 #: ../../mod/editblock.php:122 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1104 +#: ../../include/conversation.php:1105 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1106 ../../mod/editlayout.php:121 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 +#: ../../include/conversation.php:1107 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118 #: ../../mod/editblock.php:136 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1109 ../../mod/editlayout.php:123 -#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:119 +#: ../../include/conversation.php:1110 ../../mod/editlayout.php:123 +#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120 #: ../../mod/editblock.php:138 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1111 ../../mod/editlayout.php:110 -#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:106 +#: ../../include/conversation.php:1112 ../../mod/editlayout.php:110 +#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107 #: ../../mod/editblock.php:124 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1112 +#: ../../include/conversation.php:1113 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1120 ../../mod/editlayout.php:118 -#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:114 +#: ../../include/conversation.php:1121 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115 #: ../../mod/editblock.php:133 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1122 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:120 +#: ../../include/conversation.php:1123 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121 #: ../../mod/editblock.php:139 msgid "Example: bob@example.com, mary@example.com" msgstr "" +#: ../../include/conversation.php:1136 ../../mod/message.php:330 +#: ../../mod/message.php:508 ../../mod/editlayout.php:134 +#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132 +#: ../../mod/editblock.php:149 +msgid "Set expiration date" +msgstr "" + #: ../../include/security.php:49 msgid "Welcome " msgstr "" @@ -2713,25 +2761,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3502 ../../mod/page.php:66 ../../mod/admin.php:150 +#: ../../include/items.php:3521 ../../mod/page.php:66 ../../mod/admin.php:150 #: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3674 +#: ../../include/items.php:3693 msgid "Archives" msgstr "" -#: ../../include/items.php:3835 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3854 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3851 ../../mod/network.php:469 +#: ../../include/items.php:3870 ../../mod/network.php:469 msgid "Group is empty" msgstr "" -#: ../../include/items.php:3867 +#: ../../include/items.php:3886 msgid "Connection not found." msgstr "" @@ -2767,7 +2815,7 @@ msgstr "" msgid "Previous" msgstr "" -#: ../../mod/events.php:351 ../../mod/setup.php:237 +#: ../../mod/events.php:351 ../../mod/setup.php:256 msgid "Next" msgstr "" @@ -2898,15 +2946,16 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:315 -#: ../../mod/message.php:490 +#: ../../mod/invite.php:141 ../../mod/message.php:320 +#: ../../mod/message.php:497 msgid "Your message:" msgstr "" #: ../../mod/invite.php:142 msgid "" "You are cordially invited to join me and some other close friends on the Red " -"Matrix - a revolutionary new decentralised social and information tool." +"Matrix - a revolutionary new decentralised communication and information " +"tool." msgstr "" #: ../../mod/invite.php:144 @@ -2919,7 +2968,8 @@ msgstr "" #: ../../mod/invite.php:150 msgid "" -"Once you have registered, please connect with my Red Matrix channel address:" +"Once you have registered (on ANY Red Matrix site - they are all inter-" +"connected), please connect with my Red Matrix channel address:" msgstr "" #: ../../mod/invite.php:152 @@ -2940,7 +2990,7 @@ msgstr "" #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1620 +#: ../../boot.php:1641 msgid "Requested profile is not available." msgstr "" @@ -2967,17 +3017,17 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:1006 -#: ../../mod/settings.php:1011 ../../mod/settings.php:1034 -#: ../../mod/settings.php:1036 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1038 ../../mod/profiles.php:506 +#: ../../mod/api.php:105 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 +#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 +#: ../../mod/settings.php:1040 ../../mod/profiles.php:506 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:1006 -#: ../../mod/settings.php:1011 ../../mod/settings.php:1034 -#: ../../mod/settings.php:1036 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1038 ../../mod/profiles.php:507 +#: ../../mod/api.php:106 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 +#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 +#: ../../mod/settings.php:1040 ../../mod/profiles.php:507 msgid "No" msgstr "" @@ -3006,336 +3056,336 @@ msgstr "" msgid "Item not available." msgstr "" -#: ../../mod/setup.php:142 +#: ../../mod/setup.php:161 msgid "Red Matrix Server - Setup" msgstr "" -#: ../../mod/setup.php:148 +#: ../../mod/setup.php:167 msgid "Could not connect to database." msgstr "" -#: ../../mod/setup.php:152 +#: ../../mod/setup.php:171 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: ../../mod/setup.php:157 +#: ../../mod/setup.php:176 msgid "Could not create table." msgstr "" -#: ../../mod/setup.php:163 +#: ../../mod/setup.php:182 msgid "Your site database has been installed." msgstr "" -#: ../../mod/setup.php:168 +#: ../../mod/setup.php:187 msgid "" "You may need to import the file \"install/database.sql\" manually using " "phpmyadmin or mysql." msgstr "" -#: ../../mod/setup.php:169 ../../mod/setup.php:236 ../../mod/setup.php:565 +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../mod/setup.php:233 +#: ../../mod/setup.php:252 msgid "System check" msgstr "" -#: ../../mod/setup.php:238 +#: ../../mod/setup.php:257 msgid "Check again" msgstr "" -#: ../../mod/setup.php:260 +#: ../../mod/setup.php:279 msgid "Database connection" msgstr "" -#: ../../mod/setup.php:261 +#: ../../mod/setup.php:280 msgid "" "In order to install Red Matrix we need to know how to connect to your " "database." msgstr "" -#: ../../mod/setup.php:262 +#: ../../mod/setup.php:281 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../mod/setup.php:263 +#: ../../mod/setup.php:282 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../mod/setup.php:267 +#: ../../mod/setup.php:286 msgid "Database Server Name" msgstr "" -#: ../../mod/setup.php:267 +#: ../../mod/setup.php:286 msgid "Default is localhost" msgstr "" -#: ../../mod/setup.php:268 +#: ../../mod/setup.php:287 msgid "Database Port" msgstr "" -#: ../../mod/setup.php:268 +#: ../../mod/setup.php:287 msgid "Communication port number - use 0 for default" msgstr "" -#: ../../mod/setup.php:269 +#: ../../mod/setup.php:288 msgid "Database Login Name" msgstr "" -#: ../../mod/setup.php:270 +#: ../../mod/setup.php:289 msgid "Database Login Password" msgstr "" -#: ../../mod/setup.php:271 +#: ../../mod/setup.php:290 msgid "Database Name" msgstr "" -#: ../../mod/setup.php:273 ../../mod/setup.php:315 +#: ../../mod/setup.php:292 ../../mod/setup.php:334 msgid "Site administrator email address" msgstr "" -#: ../../mod/setup.php:273 ../../mod/setup.php:315 +#: ../../mod/setup.php:292 ../../mod/setup.php:334 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../mod/setup.php:274 ../../mod/setup.php:317 +#: ../../mod/setup.php:293 ../../mod/setup.php:336 msgid "Website URL" msgstr "" -#: ../../mod/setup.php:274 ../../mod/setup.php:317 +#: ../../mod/setup.php:293 ../../mod/setup.php:336 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/setup.php:277 ../../mod/setup.php:320 +#: ../../mod/setup.php:296 ../../mod/setup.php:339 msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/setup.php:304 +#: ../../mod/setup.php:323 msgid "Site settings" msgstr "" -#: ../../mod/setup.php:360 +#: ../../mod/setup.php:379 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/setup.php:361 +#: ../../mod/setup.php:380 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:365 +#: ../../mod/setup.php:384 msgid "PHP executable path" msgstr "" -#: ../../mod/setup.php:365 +#: ../../mod/setup.php:384 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../mod/setup.php:370 +#: ../../mod/setup.php:389 msgid "Command line PHP" msgstr "" -#: ../../mod/setup.php:379 +#: ../../mod/setup.php:398 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/setup.php:380 +#: ../../mod/setup.php:399 msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/setup.php:382 +#: ../../mod/setup.php:401 msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/setup.php:403 +#: ../../mod/setup.php:422 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../mod/setup.php:404 +#: ../../mod/setup.php:423 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../mod/setup.php:406 +#: ../../mod/setup.php:425 msgid "Generate encryption keys" msgstr "" -#: ../../mod/setup.php:413 +#: ../../mod/setup.php:432 msgid "libCurl PHP module" msgstr "" -#: ../../mod/setup.php:414 +#: ../../mod/setup.php:433 msgid "GD graphics PHP module" msgstr "" -#: ../../mod/setup.php:415 +#: ../../mod/setup.php:434 msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/setup.php:416 +#: ../../mod/setup.php:435 msgid "mysqli PHP module" msgstr "" -#: ../../mod/setup.php:417 +#: ../../mod/setup.php:436 msgid "mb_string PHP module" msgstr "" -#: ../../mod/setup.php:418 +#: ../../mod/setup.php:437 msgid "mcrypt PHP module" msgstr "" -#: ../../mod/setup.php:423 ../../mod/setup.php:425 +#: ../../mod/setup.php:442 ../../mod/setup.php:444 msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/setup.php:423 +#: ../../mod/setup.php:442 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/setup.php:429 ../../mod/setup.php:432 +#: ../../mod/setup.php:448 ../../mod/setup.php:451 msgid "proc_open" msgstr "" -#: ../../mod/setup.php:429 +#: ../../mod/setup.php:448 msgid "" "Error: proc_open is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../mod/setup.php:437 +#: ../../mod/setup.php:456 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:441 +#: ../../mod/setup.php:460 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/setup.php:445 +#: ../../mod/setup.php:464 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:449 +#: ../../mod/setup.php:468 msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:453 +#: ../../mod/setup.php:472 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:457 +#: ../../mod/setup.php:476 msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:473 +#: ../../mod/setup.php:492 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:474 +#: ../../mod/setup.php:493 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:475 +#: ../../mod/setup.php:494 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:476 +#: ../../mod/setup.php:495 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:479 +#: ../../mod/setup.php:498 msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/setup.php:489 +#: ../../mod/setup.php:508 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:490 +#: ../../mod/setup.php:509 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:491 +#: ../../mod/setup.php:510 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:492 +#: ../../mod/setup.php:511 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:495 +#: ../../mod/setup.php:514 msgid "view/tpl/smarty3 is writable" msgstr "" -#: ../../mod/setup.php:509 +#: ../../mod/setup.php:528 msgid "SSL certificate validation" msgstr "" -#: ../../mod/setup.php:509 +#: ../../mod/setup.php:528 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../mod/setup.php:516 +#: ../../mod/setup.php:535 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../mod/setup.php:518 +#: ../../mod/setup.php:537 msgid "Url rewrite is working" msgstr "" -#: ../../mod/setup.php:528 +#: ../../mod/setup.php:547 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:552 +#: ../../mod/setup.php:571 msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/setup.php:563 +#: ../../mod/setup.php:582 msgid "

    What next

    " msgstr "" -#: ../../mod/setup.php:564 +#: ../../mod/setup.php:583 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -3364,456 +3414,456 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/settings.php:51 +#: ../../mod/settings.php:53 msgid "Account settings" msgstr "" -#: ../../mod/settings.php:57 +#: ../../mod/settings.php:59 msgid "Channel settings" msgstr "" -#: ../../mod/settings.php:63 +#: ../../mod/settings.php:65 msgid "Additional features" msgstr "" -#: ../../mod/settings.php:69 +#: ../../mod/settings.php:71 msgid "Feature settings" msgstr "" -#: ../../mod/settings.php:75 +#: ../../mod/settings.php:77 msgid "Display settings" msgstr "" -#: ../../mod/settings.php:81 +#: ../../mod/settings.php:83 msgid "Connected apps" msgstr "" -#: ../../mod/settings.php:87 +#: ../../mod/settings.php:89 msgid "Export channel" msgstr "" -#: ../../mod/settings.php:99 +#: ../../mod/settings.php:101 msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../mod/settings.php:109 +#: ../../mod/settings.php:111 msgid "Premium Channel Settings" msgstr "" -#: ../../mod/settings.php:169 +#: ../../mod/settings.php:171 msgid "Name is required" msgstr "" -#: ../../mod/settings.php:173 +#: ../../mod/settings.php:175 msgid "Key and Secret are required" msgstr "" -#: ../../mod/settings.php:177 ../../mod/settings.php:674 +#: ../../mod/settings.php:179 ../../mod/settings.php:676 msgid "Update" msgstr "" -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:292 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:294 +#: ../../mod/settings.php:296 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:307 +#: ../../mod/settings.php:309 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:309 +#: ../../mod/settings.php:311 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:323 +#: ../../mod/settings.php:325 msgid "Not valid email." msgstr "" -#: ../../mod/settings.php:326 +#: ../../mod/settings.php:328 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/settings.php:335 +#: ../../mod/settings.php:337 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:576 +#: ../../mod/settings.php:578 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:647 ../../mod/settings.php:673 -#: ../../mod/settings.php:709 +#: ../../mod/settings.php:649 ../../mod/settings.php:675 +#: ../../mod/settings.php:711 msgid "Add application" msgstr "" -#: ../../mod/settings.php:649 ../../mod/settings.php:675 +#: ../../mod/settings.php:651 ../../mod/settings.php:677 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 msgid "Cancel" msgstr "" -#: ../../mod/settings.php:650 ../../mod/settings.php:676 +#: ../../mod/settings.php:652 ../../mod/settings.php:678 #: ../../mod/admin.php:673 ../../mod/crepair.php:148 msgid "Name" msgstr "" -#: ../../mod/settings.php:650 +#: ../../mod/settings.php:652 msgid "Name of application" msgstr "" -#: ../../mod/settings.php:651 ../../mod/settings.php:677 +#: ../../mod/settings.php:653 ../../mod/settings.php:679 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:651 ../../mod/settings.php:652 +#: ../../mod/settings.php:653 ../../mod/settings.php:654 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:678 +#: ../../mod/settings.php:654 ../../mod/settings.php:680 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/settings.php:655 ../../mod/settings.php:681 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:653 +#: ../../mod/settings.php:655 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 +#: ../../mod/settings.php:656 ../../mod/settings.php:682 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:654 +#: ../../mod/settings.php:656 msgid "Optional" msgstr "" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:667 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:708 +#: ../../mod/settings.php:710 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:712 +#: ../../mod/settings.php:714 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:713 +#: ../../mod/settings.php:715 msgid "No name" msgstr "" -#: ../../mod/settings.php:714 +#: ../../mod/settings.php:716 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:725 +#: ../../mod/settings.php:727 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:733 +#: ../../mod/settings.php:735 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:756 +#: ../../mod/settings.php:758 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:757 +#: ../../mod/settings.php:759 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:760 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:761 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:761 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:761 ../../mod/settings.php:1060 +#: ../../mod/settings.php:763 ../../mod/settings.php:1062 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:764 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:765 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:779 +#: ../../mod/settings.php:781 msgid "Off" msgstr "" -#: ../../mod/settings.php:779 +#: ../../mod/settings.php:781 msgid "On" msgstr "" -#: ../../mod/settings.php:786 +#: ../../mod/settings.php:788 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:813 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:841 ../../mod/admin.php:369 +#: ../../mod/settings.php:843 ../../mod/admin.php:369 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:881 +#: ../../mod/settings.php:883 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:887 +#: ../../mod/settings.php:889 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:888 +#: ../../mod/settings.php:890 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:891 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:891 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:892 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:892 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:893 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:929 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:930 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:931 msgid "Anybody in your address book" msgstr "" -#: ../../mod/settings.php:930 +#: ../../mod/settings.php:932 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:933 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:934 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1008 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:1011 +#: ../../mod/settings.php:1013 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:1015 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:1017 ../../mod/profile_photo.php:298 msgid "or" msgstr "" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1022 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1033 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1033 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1034 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1035 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1036 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1038 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:1038 +#: ../../mod/settings.php:1040 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1051 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1058 +#: ../../mod/settings.php:1060 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1063 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1064 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1065 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1067 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1067 msgid "This channel publishes adult content." msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1069 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1071 msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1070 +#: ../../mod/settings.php:1072 msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/settings.php:1071 +#: ../../mod/settings.php:1073 msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/settings.php:1072 +#: ../../mod/settings.php:1074 msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/settings.php:1073 +#: ../../mod/settings.php:1075 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1076 +#: ../../mod/settings.php:1078 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1076 +#: ../../mod/settings.php:1078 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1077 +#: ../../mod/settings.php:1079 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1080 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1091 +#: ../../mod/settings.php:1093 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1091 +#: ../../mod/settings.php:1093 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1094 +#: ../../mod/settings.php:1096 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1095 +#: ../../mod/settings.php:1097 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1096 +#: ../../mod/settings.php:1098 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1097 +#: ../../mod/settings.php:1099 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1098 +#: ../../mod/settings.php:1100 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1099 +#: ../../mod/settings.php:1101 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1100 +#: ../../mod/settings.php:1102 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1101 +#: ../../mod/settings.php:1103 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1102 +#: ../../mod/settings.php:1104 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1103 +#: ../../mod/settings.php:1105 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1104 +#: ../../mod/settings.php:1106 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1105 +#: ../../mod/settings.php:1107 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1106 +#: ../../mod/settings.php:1108 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1107 +#: ../../mod/settings.php:1109 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1110 +#: ../../mod/settings.php:1112 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1111 +#: ../../mod/settings.php:1113 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -4411,12 +4461,12 @@ msgid "Deny" msgstr "" #: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:325 ../../mod/connections.php:467 +#: ../../mod/connections.php:328 ../../mod/connections.php:470 msgid "Block" msgstr "" -#: ../../mod/admin.php:679 ../../mod/connections.php:325 -#: ../../mod/connections.php:467 +#: ../../mod/admin.php:679 ../../mod/connections.php:328 +#: ../../mod/connections.php:470 msgid "Unblock" msgstr "" @@ -4819,11 +4869,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1838 ../../boot.php:1918 +#: ../../mod/ping.php:230 ../../boot.php:1859 ../../boot.php:1939 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1884 ../../boot.php:1959 +#: ../../mod/ping.php:252 ../../boot.php:1905 ../../boot.php:1980 msgid "[today]" msgstr "" @@ -4860,7 +4910,7 @@ msgid "Drop" msgstr "" #: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:529 +#: ../../mod/connections.php:532 msgid "New" msgstr "" @@ -4921,93 +4971,93 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: ../../mod/message.php:16 +#: ../../mod/message.php:19 msgid "Check Mail" msgstr "" -#: ../../mod/message.php:52 +#: ../../mod/message.php:56 msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/message.php:60 +#: ../../mod/message.php:64 msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/message.php:67 +#: ../../mod/message.php:71 msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/message.php:93 +#: ../../mod/message.php:97 msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/message.php:213 ../../mod/notifications.php:101 +#: ../../mod/message.php:217 ../../mod/notifications.php:101 msgid "Messages" msgstr "" -#: ../../mod/message.php:224 +#: ../../mod/message.php:228 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:231 +#: ../../mod/message.php:235 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:248 +#: ../../mod/message.php:252 msgid "Message recalled." msgstr "" -#: ../../mod/message.php:305 +#: ../../mod/message.php:310 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:306 ../../mod/message.php:485 +#: ../../mod/message.php:311 ../../mod/message.php:492 msgid "To:" msgstr "" -#: ../../mod/message.php:311 ../../mod/message.php:487 +#: ../../mod/message.php:316 ../../mod/message.php:494 msgid "Subject:" msgstr "" -#: ../../mod/message.php:340 +#: ../../mod/message.php:348 msgid "No messages." msgstr "" -#: ../../mod/message.php:356 ../../mod/message.php:452 +#: ../../mod/message.php:364 ../../mod/message.php:461 msgid "Delete message" msgstr "" -#: ../../mod/message.php:358 +#: ../../mod/message.php:366 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:377 +#: ../../mod/message.php:385 msgid "Message not found." msgstr "" -#: ../../mod/message.php:453 +#: ../../mod/message.php:462 msgid "Recall message" msgstr "" -#: ../../mod/message.php:455 +#: ../../mod/message.php:464 msgid "Message has been recalled." msgstr "" -#: ../../mod/message.php:474 +#: ../../mod/message.php:481 msgid "Private Conversation" msgstr "" -#: ../../mod/message.php:478 +#: ../../mod/message.php:485 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:480 +#: ../../mod/message.php:487 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:484 +#: ../../mod/message.php:491 msgid "Send Reply" msgstr "" @@ -5103,11 +5153,11 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../mod/network.php:385 ../../mod/connections.php:381 +#: ../../mod/network.php:385 ../../mod/connections.php:384 msgid "Me" msgstr "" -#: ../../mod/network.php:386 ../../mod/connections.php:383 +#: ../../mod/network.php:386 ../../mod/connections.php:386 msgid "Best Friends" msgstr "" @@ -5115,11 +5165,11 @@ msgstr "" msgid "Co-workers" msgstr "" -#: ../../mod/network.php:389 ../../mod/connections.php:385 +#: ../../mod/network.php:389 ../../mod/connections.php:388 msgid "Former Friends" msgstr "" -#: ../../mod/network.php:390 ../../mod/connections.php:386 +#: ../../mod/network.php:390 ../../mod/connections.php:389 msgid "Acquaintances" msgstr "" @@ -5144,13 +5194,13 @@ msgid "Invalid connection." msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:332 ../../mod/connections.php:468 +#: ../../mod/connections.php:335 ../../mod/connections.php:471 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" msgstr "" -#: ../../mod/intro.php:29 ../../mod/connections.php:119 +#: ../../mod/intro.php:29 ../../mod/connections.php:122 msgid "Connection updated." msgstr "" @@ -5170,7 +5220,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:473 +#: ../../mod/intro.php:95 ../../mod/connections.php:476 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -5190,385 +5240,385 @@ msgstr "" msgid "Discard" msgstr "" -#: ../../mod/connections.php:64 +#: ../../mod/connections.php:67 msgid "Could not access contact record." msgstr "" -#: ../../mod/connections.php:78 +#: ../../mod/connections.php:81 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:121 +#: ../../mod/connections.php:124 msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:196 +#: ../../mod/connections.php:199 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:210 +#: ../../mod/connections.php:213 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:217 +#: ../../mod/connections.php:220 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connections.php:218 +#: ../../mod/connections.php:221 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connections.php:222 ../../mod/connections.php:234 -#: ../../mod/connections.php:246 ../../mod/connections.php:258 -#: ../../mod/connections.php:273 +#: ../../mod/connections.php:225 ../../mod/connections.php:237 +#: ../../mod/connections.php:249 ../../mod/connections.php:261 +#: ../../mod/connections.php:276 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connections.php:229 +#: ../../mod/connections.php:232 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connections.php:230 +#: ../../mod/connections.php:233 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connections.php:241 +#: ../../mod/connections.php:244 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connections.php:242 +#: ../../mod/connections.php:245 msgid "Channel has been archived" msgstr "" -#: ../../mod/connections.php:253 +#: ../../mod/connections.php:256 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connections.php:254 +#: ../../mod/connections.php:257 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connections.php:268 +#: ../../mod/connections.php:271 msgid "Channel has been approved" msgstr "" -#: ../../mod/connections.php:269 +#: ../../mod/connections.php:272 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connections.php:287 +#: ../../mod/connections.php:290 msgid "Contact has been removed." msgstr "" -#: ../../mod/connections.php:307 +#: ../../mod/connections.php:310 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connections.php:311 +#: ../../mod/connections.php:314 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connections.php:314 +#: ../../mod/connections.php:317 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:318 +#: ../../mod/connections.php:321 msgid "Recent Activity" msgstr "" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:324 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connections.php:328 +#: ../../mod/connections.php:331 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:332 ../../mod/connections.php:468 +#: ../../mod/connections.php:335 ../../mod/connections.php:471 msgid "Unignore" msgstr "" -#: ../../mod/connections.php:335 +#: ../../mod/connections.php:338 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:341 msgid "Unarchive" msgstr "" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:341 msgid "Archive" msgstr "" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:344 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:347 msgid "Unhide" msgstr "" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:347 msgid "Hide" msgstr "" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:350 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connections.php:354 +#: ../../mod/connections.php:357 msgid "Delete this connection" msgstr "" -#: ../../mod/connections.php:387 +#: ../../mod/connections.php:390 msgid "Unknown" msgstr "" -#: ../../mod/connections.php:397 ../../mod/connections.php:426 +#: ../../mod/connections.php:400 ../../mod/connections.php:429 msgid "Approve this connection" msgstr "" -#: ../../mod/connections.php:397 +#: ../../mod/connections.php:400 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:413 +#: ../../mod/connections.php:416 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connections.php:413 +#: ../../mod/connections.php:416 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:417 +#: ../../mod/connections.php:420 msgid "" "When receiving a channel introduction, any permissions provided here will be " "applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." msgstr "" -#: ../../mod/connections.php:419 +#: ../../mod/connections.php:422 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:425 +#: ../../mod/connections.php:428 msgid "inherited" msgstr "" -#: ../../mod/connections.php:427 +#: ../../mod/connections.php:430 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:431 msgid "" "This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:430 +#: ../../mod/connections.php:433 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:431 +#: ../../mod/connections.php:434 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:432 +#: ../../mod/connections.php:435 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:436 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:438 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:439 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:441 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:442 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:440 +#: ../../mod/connections.php:443 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:444 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:445 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:446 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:447 msgid "" "Some permissions may be inherited from your privacy " "settings, which have higher priority. Changing those on this page will " "have no effect." msgstr "" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:448 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:449 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:450 +#: ../../mod/connections.php:453 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:451 +#: ../../mod/connections.php:454 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:452 +#: ../../mod/connections.php:455 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:456 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:457 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:459 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:459 +#: ../../mod/connections.php:462 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:461 +#: ../../mod/connections.php:464 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:463 +#: ../../mod/connections.php:466 msgid "Update now" msgstr "" -#: ../../mod/connections.php:469 +#: ../../mod/connections.php:472 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:470 +#: ../../mod/connections.php:473 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:471 +#: ../../mod/connections.php:474 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:472 +#: ../../mod/connections.php:475 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:473 +#: ../../mod/connections.php:476 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/connections.php:509 ../../mod/connections.php:581 +#: ../../mod/connections.php:512 ../../mod/connections.php:584 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:514 ../../mod/connections.php:588 +#: ../../mod/connections.php:517 ../../mod/connections.php:591 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:519 ../../mod/connections.php:602 +#: ../../mod/connections.php:522 ../../mod/connections.php:605 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:524 ../../mod/connections.php:595 +#: ../../mod/connections.php:527 ../../mod/connections.php:598 msgid "Archived" msgstr "" -#: ../../mod/connections.php:535 +#: ../../mod/connections.php:538 msgid "All" msgstr "" -#: ../../mod/connections.php:556 +#: ../../mod/connections.php:559 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:559 +#: ../../mod/connections.php:562 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:565 +#: ../../mod/connections.php:568 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:568 +#: ../../mod/connections.php:571 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:571 +#: ../../mod/connections.php:574 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:574 +#: ../../mod/connections.php:577 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:577 +#: ../../mod/connections.php:580 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:584 +#: ../../mod/connections.php:587 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:591 +#: ../../mod/connections.php:594 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:598 +#: ../../mod/connections.php:601 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:605 +#: ../../mod/connections.php:608 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:647 +#: ../../mod/connections.php:650 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:648 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:651 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:672 +#: ../../mod/connections.php:675 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:673 +#: ../../mod/connections.php:676 msgid "Finding: " msgstr "" @@ -5828,23 +5878,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1735 +#: ../../mod/profiles.php:624 ../../boot.php:1756 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1742 +#: ../../mod/profiles.php:625 ../../boot.php:1763 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1756 +#: ../../mod/profiles.php:636 ../../boot.php:1777 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1759 +#: ../../mod/profiles.php:639 ../../boot.php:1780 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1760 +#: ../../mod/profiles.php:640 ../../boot.php:1781 msgid "Edit visibility" msgstr "" @@ -5925,7 +5975,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1457 +#: ../../mod/lostpass.php:85 ../../boot.php:1472 msgid "Password Reset" msgstr "" @@ -6187,21 +6237,21 @@ msgid "Edit Layout" msgstr "" #: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123 -#: ../../mod/editpost.php:100 ../../mod/editblock.php:118 +#: ../../mod/editpost.php:101 ../../mod/editblock.php:118 msgid "Insert YouTube video" msgstr "" #: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 -#: ../../mod/editpost.php:101 ../../mod/editblock.php:119 +#: ../../mod/editpost.php:102 ../../mod/editblock.php:119 msgid "Insert Vorbis [.ogg] video" msgstr "" #: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 -#: ../../mod/editpost.php:102 ../../mod/editblock.php:120 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:120 msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editlayout.php:137 +#: ../../mod/editlayout.php:140 msgid "Delete Layout" msgstr "" @@ -6289,7 +6339,7 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../mod/editwebpage.php:158 +#: ../../mod/editwebpage.php:162 msgid "Delete Webpage" msgstr "" @@ -6467,7 +6517,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1053 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1051 msgid "Wall Photos" msgstr "" @@ -6508,7 +6558,7 @@ msgstr "" msgid "Edit Block" msgstr "" -#: ../../mod/editblock.php:153 +#: ../../mod/editblock.php:156 msgid "Delete Block" msgstr "" @@ -6540,20 +6590,20 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:365 +#: ../../mod/item.php:363 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:768 +#: ../../mod/item.php:766 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1132 +#: ../../mod/item.php:1130 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1138 +#: ../../mod/item.php:1136 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6758,257 +6808,329 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" +#: ../../view/theme/redbasic/php/config.php:68 +msgid "Scheme Default" +msgstr "" + #: ../../view/theme/redbasic/php/config.php:69 -#: ../../view/theme/apw/php/config.php:161 -msgid "Theme settings" +msgid "red" msgstr "" #: ../../view/theme/redbasic/php/config.php:70 -#: ../../view/theme/apw/php/config.php:162 -msgid "Set scheme" +msgid "black" msgstr "" #: ../../view/theme/redbasic/php/config.php:71 +msgid "silver" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:82 +#: ../../view/theme/apw/php/config.php:234 +msgid "Theme settings" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:83 +#: ../../view/theme/apw/php/config.php:235 +msgid "Set scheme" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:84 msgid "Navigation bar colour" msgstr "" -#: ../../view/theme/redbasic/php/config.php:72 +#: ../../view/theme/redbasic/php/config.php:85 +msgid "Set font-colour for banner" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:86 msgid "Set the background colour" msgstr "" -#: ../../view/theme/redbasic/php/config.php:73 +#: ../../view/theme/redbasic/php/config.php:87 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:74 +#: ../../view/theme/redbasic/php/config.php:88 msgid "Set the background colour of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:75 +#: ../../view/theme/redbasic/php/config.php:89 msgid "Set the opacity of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:76 -#: ../../view/theme/apw/php/config.php:163 +#: ../../view/theme/redbasic/php/config.php:90 +msgid "Set the basic colour for item icons" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:91 +msgid "Set the hover colour for item icons" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:92 +#: ../../view/theme/apw/php/config.php:236 msgid "Set font-size for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:77 +#: ../../view/theme/redbasic/php/config.php:93 msgid "Set font-colour for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:78 +#: ../../view/theme/redbasic/php/config.php:94 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:79 +#: ../../view/theme/redbasic/php/config.php:95 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:80 +#: ../../view/theme/redbasic/php/config.php:96 msgid "Set width of main section" msgstr "" -#: ../../view/theme/apw/php/config.php:130 -#: ../../view/theme/apw/php/config.php:143 +#: ../../view/theme/redbasic/php/config.php:97 +msgid "Set minimum opacity of nav bar - to hide it" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Sloppy photo albums" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Are you a clean desk or a messy desk person?" +msgstr "" + +#: ../../view/theme/apw/php/config.php:193 +#: ../../view/theme/apw/php/config.php:211 msgid "Schema Default" msgstr "" -#: ../../view/theme/apw/php/config.php:131 +#: ../../view/theme/apw/php/config.php:194 msgid "Sans-Serif" msgstr "" -#: ../../view/theme/apw/php/config.php:132 +#: ../../view/theme/apw/php/config.php:195 msgid "Monospace" msgstr "" -#: ../../view/theme/apw/php/config.php:164 +#: ../../view/theme/apw/php/config.php:237 msgid "Set font face" msgstr "" -#: ../../view/theme/apw/php/config.php:165 +#: ../../view/theme/apw/php/config.php:238 msgid "Set iconset" msgstr "" -#: ../../view/theme/apw/php/config.php:166 +#: ../../view/theme/apw/php/config.php:239 +msgid "Set big shadow size, default 15px 15px 15px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:240 +msgid "Set small shadow size, default 5px 5px 5px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:241 +msgid "Set shadow colour, default #000" +msgstr "" + +#: ../../view/theme/apw/php/config.php:242 +msgid "Set radius size, default 5px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:243 msgid "Set line-height for posts and comments" msgstr "" -#: ../../view/theme/apw/php/config.php:167 +#: ../../view/theme/apw/php/config.php:244 msgid "Set background image" msgstr "" -#: ../../view/theme/apw/php/config.php:168 +#: ../../view/theme/apw/php/config.php:245 msgid "Set background colour" msgstr "" -#: ../../view/theme/apw/php/config.php:169 +#: ../../view/theme/apw/php/config.php:246 +msgid "Set section background image" +msgstr "" + +#: ../../view/theme/apw/php/config.php:247 +msgid "Set section background colour" +msgstr "" + +#: ../../view/theme/apw/php/config.php:248 msgid "Set colour of items - use hex" msgstr "" -#: ../../view/theme/apw/php/config.php:170 +#: ../../view/theme/apw/php/config.php:249 msgid "Set colour of links - use hex" msgstr "" -#: ../../view/theme/apw/php/config.php:171 +#: ../../view/theme/apw/php/config.php:250 msgid "Set max-width for items. Default 400px" msgstr "" -#: ../../view/theme/apw/php/config.php:172 +#: ../../view/theme/apw/php/config.php:251 msgid "Set min-width for items. Default 240px" msgstr "" -#: ../../view/theme/apw/php/config.php:173 +#: ../../view/theme/apw/php/config.php:252 msgid "Set the generic content wrapper width. Default 48%" msgstr "" -#: ../../view/theme/apw/php/config.php:174 +#: ../../view/theme/apw/php/config.php:253 msgid "Set colour of fonts - use hex" msgstr "" -#: ../../view/theme/apw/php/config.php:175 +#: ../../view/theme/apw/php/config.php:254 msgid "Set background-size element" msgstr "" -#: ../../view/theme/apw/php/config.php:176 +#: ../../view/theme/apw/php/config.php:255 msgid "Item opacity" msgstr "" -#: ../../view/theme/apw/php/config.php:177 +#: ../../view/theme/apw/php/config.php:256 msgid "Display post previews only" msgstr "" -#: ../../view/theme/apw/php/config.php:178 +#: ../../view/theme/apw/php/config.php:257 msgid "Display side bar on channel page" msgstr "" -#: ../../view/theme/apw/php/config.php:179 +#: ../../view/theme/apw/php/config.php:258 msgid "Colour of the navigation bar" msgstr "" -#: ../../view/theme/apw/php/config.php:180 +#: ../../view/theme/apw/php/config.php:259 msgid "Item float" msgstr "" -#: ../../view/theme/apw/php/config.php:181 +#: ../../view/theme/apw/php/config.php:260 msgid "Left offset of the section element" msgstr "" -#: ../../view/theme/apw/php/config.php:182 +#: ../../view/theme/apw/php/config.php:261 msgid "Right offset of the section element" msgstr "" -#: ../../view/theme/apw/php/config.php:183 +#: ../../view/theme/apw/php/config.php:262 msgid "Section width" msgstr "" -#: ../../view/theme/apw/php/config.php:184 +#: ../../view/theme/apw/php/config.php:263 msgid "Left offset of the aside" msgstr "" -#: ../../view/theme/apw/php/config.php:185 +#: ../../view/theme/apw/php/config.php:264 msgid "Right offset of the aside element" msgstr "" -#: ../../boot.php:1262 +#: ../../boot.php:1277 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1265 +#: ../../boot.php:1280 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1422 +#: ../../boot.php:1437 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1450 +#: ../../boot.php:1465 msgid "Password" msgstr "" -#: ../../boot.php:1451 +#: ../../boot.php:1466 msgid "Remember me" msgstr "" -#: ../../boot.php:1456 +#: ../../boot.php:1471 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1575 +#: ../../boot.php:1536 +msgid "permission denied" +msgstr "" + +#: ../../boot.php:1537 +msgid "Got Zot?" +msgstr "" + +#: ../../boot.php:1596 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1587 +#: ../../boot.php:1608 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1741 +#: ../../boot.php:1762 msgid "Profiles" msgstr "" -#: ../../boot.php:1741 +#: ../../boot.php:1762 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1745 +#: ../../boot.php:1766 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1839 ../../boot.php:1919 +#: ../../boot.php:1860 ../../boot.php:1940 msgid "F d" msgstr "" -#: ../../boot.php:1896 +#: ../../boot.php:1917 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1897 +#: ../../boot.php:1918 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1952 +#: ../../boot.php:1973 msgid "[No description]" msgstr "" -#: ../../boot.php:1970 +#: ../../boot.php:1991 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1971 +#: ../../boot.php:1992 msgid "Events this week:" msgstr "" -#: ../../boot.php:2205 +#: ../../boot.php:2226 msgid "Channel" msgstr "" -#: ../../boot.php:2208 +#: ../../boot.php:2229 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2212 +#: ../../boot.php:2233 msgid "About" msgstr "" -#: ../../boot.php:2215 +#: ../../boot.php:2236 msgid "Profile Details" msgstr "" -#: ../../boot.php:2233 +#: ../../boot.php:2254 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2238 +#: ../../boot.php:2259 msgid "Webpages" msgstr "" -#: ../../boot.php:2241 +#: ../../boot.php:2262 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2523 +#: ../../boot.php:2544 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 259a60c9a..bce4e9a9d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-07.490 +2013-11-09.492 -- cgit v1.2.3 From a6f37739c2af958c126eebb7bca1347679808765 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 14:15:57 -0800 Subject: too much privacy on get_plink() which is left over from Friendica days --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 985262fe8..fc70e3509 100755 --- a/include/text.php +++ b/include/text.php @@ -1346,7 +1346,7 @@ function get_plink($item,$mode) { else $key = 'llink'; - if (x($item,$key) && ($item['item_private'] != 1)) { + if(x($item,$key)) { return array( 'href' => zid($item[$key]), 'title' => t('link to source'), -- cgit v1.2.3 From 29e142acb3edd8884ff83dc8211ddc0b5248e603 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 15:25:13 -0800 Subject: rev update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index bce4e9a9d..ee9cd8d7a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-09.492 +2013-11-10.493 -- cgit v1.2.3 From 0d28608db7a3f8e0b0a4efa62d9a4aff9db7d760 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 16:39:21 -0800 Subject: add base64 converters which aren't universal across browsers --- js/crypto.js | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 js/crypto.js diff --git a/js/crypto.js b/js/crypto.js new file mode 100644 index 000000000..4f1570f7e --- /dev/null +++ b/js/crypto.js @@ -0,0 +1,109 @@ + +function base64_encode (data) { + // http://kevin.vanzonneveld.net + // + original by: Tyler Akins (http://rumkin.com) + // + improved by: Bayron Guevara + // + improved by: Thunder.m + // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) + // + bugfixed by: Pellentesque Malesuada + // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) + // + improved by: Rafa? Kukawski (http://kukawski.pl) + // * example 1: base64_encode('Kevin van Zonneveld'); + // * returns 1: 'S2V2aW4gdmFuIFpvbm5ldmVsZA==' + // mozilla has this native + // - but breaks in 2.0.0.12! + //if (typeof this.window['btoa'] === 'function') { + // return btoa(data); + //} + var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + var o1, o2, o3, h1, h2, h3, h4, bits, i = 0, + ac = 0, + enc = "", + tmp_arr = []; + + if (!data) { + return data; + } + + do { // pack three octets into four hexets + o1 = data.charCodeAt(i++); + o2 = data.charCodeAt(i++); + o3 = data.charCodeAt(i++); + + bits = o1 << 16 | o2 << 8 | o3; + + h1 = bits >> 18 & 0x3f; + h2 = bits >> 12 & 0x3f; + h3 = bits >> 6 & 0x3f; + h4 = bits & 0x3f; + + // use hexets to index into b64, and append result to encoded string + tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4); + } while (i < data.length); + + enc = tmp_arr.join(''); + + var r = data.length % 3; + + return (r ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3); + +} + + +function base64_decode (data) { + // http://kevin.vanzonneveld.net + // + original by: Tyler Akins (http://rumkin.com) + // + improved by: Thunder.m + // + input by: Aman Gupta + // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) + // + bugfixed by: Onno Marsman + // + bugfixed by: Pellentesque Malesuada + // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) + // + input by: Brett Zamir (http://brett-zamir.me) + // + bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) + // * example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA=='); + // * returns 1: 'Kevin van Zonneveld' + // mozilla has this native + // - but breaks in 2.0.0.12! + //if (typeof this.window['atob'] === 'function') { + // return atob(data); + //} + var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + var o1, o2, o3, h1, h2, h3, h4, bits, i = 0, + ac = 0, + dec = "", + tmp_arr = []; + + if (!data) { + return data; + } + + data += ''; + + do { // unpack four hexets into three octets using index points in b64 + h1 = b64.indexOf(data.charAt(i++)); + h2 = b64.indexOf(data.charAt(i++)); + h3 = b64.indexOf(data.charAt(i++)); + h4 = b64.indexOf(data.charAt(i++)); + + bits = h1 << 18 | h2 << 12 | h3 << 6 | h4; + + o1 = bits >> 16 & 0xff; + o2 = bits >> 8 & 0xff; + o3 = bits & 0xff; + + if (h3 == 64) { + tmp_arr[ac++] = String.fromCharCode(o1); + } else if (h4 == 64) { + tmp_arr[ac++] = String.fromCharCode(o1, o2); + } else { + tmp_arr[ac++] = String.fromCharCode(o1, o2, o3); + } + } while (i < data.length); + + dec = tmp_arr.join(''); + + return dec; +} + + -- cgit v1.2.3 From effb1a0534aae40a1b2a0e396de09d1b0d06bb44 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 18:57:24 -0800 Subject: provide zid in js so we can use it from client --- boot.php | 3 ++- view/tpl/head.tpl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 96b73eaaa..c3a10f300 100755 --- a/boot.php +++ b/boot.php @@ -990,7 +990,8 @@ class App { '$icon' => head_get_icon(), '$head_css' => head_get_css(), '$head_js' => head_get_js(), - '$js_strings' => js_strings() + '$js_strings' => js_strings(), + '$zid' => get_my_address(), )) . $this->page['htmlhead']; } diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 4211eeab3..eb4c6c2ad 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -23,6 +23,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; + var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; -- cgit v1.2.3 From c8008039d8a357be0125371830a48838aaa4916e Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 11 Nov 2013 03:09:45 +0000 Subject: When toggling safesearch, go back to the directory page, rather than the z_root by default. --- mod/toggle_safesearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php index 1294520c6..9d4e9a109 100644 --- a/mod/toggle_safesearch.php +++ b/mod/toggle_safesearch.php @@ -15,7 +15,7 @@ if($safe_mode == 1) if(isset($_GET['address'])) $address = $_GET['address']; else - $address = z_root(); + $address = z_root() . '/directory'; goaway($address); } -- cgit v1.2.3 From 3a10e698c9932df64c6e4fa9e0785efaf4357362 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 19:58:08 -0800 Subject: Didn't finish it. Gotta' pee. --- include/bbcode.php | 11 ++------ js/crypto.js | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ view/php/theme_init.php | 2 ++ 3 files changed, 76 insertions(+), 9 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 14d0ce14a..de71eb4e3 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -121,14 +121,7 @@ function bb_parse_crypt($match) { if ($matches[1] != "") $hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - // Next we really should link to a JS routine based on the algorithm which prompts for a key - // something like zdecrypt_{algorithm}, which will be a no-op if the decryption algorithm is not present - // We can either pass the text or pass a message ID and let the decryption module call /viewsrc or something - // to get the text. The text might be large so the message ID might be preferable. But if we pass the - // text directly we won't have to do a network fetch; and can potentially display the results in a popup. - - - $Text = '
    ' . t('Encrypted content') . '
    ' . t('Algorithm: ') . $algorithm . '
    ' . t('Key hint: ') . $hint . '
    '; + $Text = '
    ' . t('Encrypted content') . '
    '; return $Text; @@ -503,7 +496,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { } if (strpos($Text,'[/crypt]') !== false) { - $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
    ' . t('Encrypted content') . '
    ', $Text); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
    ' . t('Encrypted content') . '
    ', $Text); $Text = preg_replace_callback("/\[crypt (.*?)\](.*?)\[\/crypt\]/ism", 'bb_parse_crypt', $Text); } // Try to Oembed diff --git a/js/crypto.js b/js/crypto.js index 4f1570f7e..022613128 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -1,4 +1,76 @@ + +function str_rot13 (str) { + // http://kevin.vanzonneveld.net + // + original by: Jonas Raoni Soares Silva (http://www.jsfromhell.com) + // + improved by: Ates Goral (http://magnetiq.com) + // + bugfixed by: Onno Marsman + // + improved by: Rafa? Kukawski (http://blog.kukawski.pl) + // * example 1: str_rot13('Kevin van Zonneveld'); + // * returns 1: 'Xriva ina Mbaariryq' + // * example 2: str_rot13('Xriva ina Mbaariryq'); + // * returns 2: 'Kevin van Zonneveld' + // * example 3: str_rot13(33); + // * returns 3: '33' + return (str + '').replace(/[a-z]/gi, function (s) { + return String.fromCharCode(s.charCodeAt(0) + (s.toLowerCase() < 'n' ? 13 : -13)); + }); +} + + +function red_encrypt(alg, elem,text) { + var enc_text = ''; + var newdiv = ''; + + if(! alg) + alg = 'rot13'; + + if((alg == 'rot13') || (alg == 'triple-rot13')) + newdiv = "[crypt alg='rot13']" + str_rot13(text) + '[/crypt]'; + else if(alg == 'aes256') { + var enc_key = prompt('key'); + var enc_hint = prompt('hint'); + + enc_text = base64_encode(CryptoJS.AES.encrypt(text,key)); + + newdiv = "[crypt alg='aes256' hint=' + hint + ']" + enc_text + '[/crypt]'; + } + + alert(newdiv); + + + textarea = document.getElementById(elem); + if (document.selection) { + textarea.focus(); + selected = document.selection.createRange(); + selected.text = newdiv; + } else if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + textarea.value = textarea.value.substring(0, start) + newdiv + textarea.value.substring(end, textarea.value.length); + } +} + +function red_decrypt(alg,hint,text) { + + var enc_text = ''; + + if(alg == 'rot13' || alg == 'triple-rot13') + enc_text = str_rot13(text); + + if(alg == 'aes256') { + var enc_key = prompt(hint); + enc_text = CryptoJS.AES.decrypt(base64_decode(text),enc_key); + } + + alert(enc_text); + +} + + + + + function base64_encode (data) { // http://kevin.vanzonneveld.net // + original by: Tyler Akins (http://rumkin.com) diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 8b75bc940..0cb5d4d68 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -25,9 +25,11 @@ head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); +head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('js/acl.js'); head_add_js('js/webtoolkit.base64.js'); head_add_js('js/main.js'); +head_add_js('js/crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); -- cgit v1.2.3 From c39200429046cdde16edbcb6e28c5cf3c7434d4a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 20:34:10 -0800 Subject: some more doco for how to finish it. --- js/crypto.js | 9 +++++++++ view/tpl/jot.tpl | 3 +++ 2 files changed, 12 insertions(+) diff --git a/js/crypto.js b/js/crypto.js index 022613128..4b7baa155 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -18,6 +18,15 @@ function str_rot13 (str) { } +// We probably just want the element where the text is and find it ourself. e.g. if +// there is highlighted text use it, otherwise use the entire text. +// So the third element may be useless. Fix also in view/tpl/jot.tpl before +// adding to all the editor templates and enabling the feature + +// Should probably do some input sanitising and dealing with bbcode, hiding key text, and displaying +// results in a lightbox and/or popup form are left as an exercise for the reader. + + function red_encrypt(alg, elem,text) { var enc_text = ''; var newdiv = ''; diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index f7dd12758..c04880cf7 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -54,6 +54,9 @@
    +
    -- cgit v1.2.3 From 888d7e05bf2fac41b52ab6b4094d6547174506c3 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 11 Nov 2013 06:13:17 +0000 Subject: More safe search - since the default is one, toggle only works after an initial xconfig is set - the first one will turn safe search on (ie, do nothing from a users point of view). Fix that. --- include/dir_fns.php | 2 +- mod/toggle_safesearch.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 0d0507059..7af98bec3 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -25,7 +25,7 @@ function dir_safe_mode(&$a) { if ($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); - if($safe_mode == 0) + if($safe_mode === '0') $toggle = t('Enable Safe Search'); else $toggle = t('Disable Safe Search'); diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php index 9d4e9a109..5fb18f694 100644 --- a/mod/toggle_safesearch.php +++ b/mod/toggle_safesearch.php @@ -6,10 +6,11 @@ $observer = get_observer_hash(); if($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); - -if($safe_mode == 0) +if ($safe_mode == '') + set_xconfig($observer,'directory','safe_mode', '0'); +elseif($safe_mode == '0') set_xconfig($observer,'directory','safe_mode', '1'); -if($safe_mode == 1) +elseif($safe_mode == '1') set_xconfig($observer,'directory','safe_mode', '0'); if(isset($_GET['address'])) -- cgit v1.2.3 From ca4103debef7ecf36d93842750667e70c2a1e42a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 23:19:44 -0800 Subject: e2ee --- include/conversation.php | 2 ++ include/features.php | 1 + js/crypto.js | 40 ++++++++++++++++++++++----------------- view/php/theme_init.php | 1 + view/theme/redbasic/css/style.css | 5 +++++ view/tpl/jot.tpl | 6 +++--- 6 files changed, 35 insertions(+), 20 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index fc0ae98e6..88156ae63 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1134,6 +1134,8 @@ function status_editor($a,$x,$popup=false) { '$defexpire' => '', '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'), '$expires' => t('Set expiration date'), + '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), + '$encrypt' => t('Encrypt text'), )); diff --git a/include/features.php b/include/features.php index bf3323b56..7146122b7 100644 --- a/include/features.php +++ b/include/features.php @@ -36,6 +36,7 @@ function get_features() { array('richtext', t('Richtext Editor'), t('Enable richtext editor')), array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds')), + array('content_encrypt', t('Encrypt Content'), t('Allow encryption of content end-to-end with a shared secret key')), ), // Network Tools diff --git a/js/crypto.js b/js/crypto.js index 4b7baa155..bed1525cd 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -31,33 +31,39 @@ function red_encrypt(alg, elem,text) { var enc_text = ''; var newdiv = ''; - if(! alg) + var text = $(elem).val(); + + var enc_key = prompt('key'); + + if(! enc_key) alg = 'rot13'; if((alg == 'rot13') || (alg == 'triple-rot13')) newdiv = "[crypt alg='rot13']" + str_rot13(text) + '[/crypt]'; else if(alg == 'aes256') { - var enc_key = prompt('key'); var enc_hint = prompt('hint'); - enc_text = base64_encode(CryptoJS.AES.encrypt(text,key)); + enc_text = CryptoJS.AES.encrypt(text,enc_key); + + encrypted = enc_text.toString(); - newdiv = "[crypt alg='aes256' hint=' + hint + ']" + enc_text + '[/crypt]'; + newdiv = "[crypt alg='aes256' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; } alert(newdiv); - - textarea = document.getElementById(elem); - if (document.selection) { - textarea.focus(); - selected = document.selection.createRange(); - selected.text = newdiv; - } else if (textarea.selectionStart || textarea.selectionStart == "0") { - var start = textarea.selectionStart; - var end = textarea.selectionEnd; - textarea.value = textarea.value.substring(0, start) + newdiv + textarea.value.substring(end, textarea.value.length); - } + $(elem).val(newdiv); + +// textarea = document.getElementById(elem); +// if (document.selection) { +// textarea.focus(); +// selected = document.selection.createRange(); +// selected.text = newdiv; +// } else if (textarea.selectionStart || textarea.selectionStart == "0") { +// var start = textarea.selectionStart; +// var end = textarea.selectionEnd; +// textarea.value = textarea.value.substring(0, start) + newdiv + textarea.value.substring(end, textarea.value.length); +// } } function red_decrypt(alg,hint,text) { @@ -69,10 +75,10 @@ function red_decrypt(alg,hint,text) { if(alg == 'aes256') { var enc_key = prompt(hint); - enc_text = CryptoJS.AES.decrypt(base64_decode(text),enc_key); + enc_text = CryptoJS.AES.decrypt(text,enc_key); } - alert(enc_text); + alert(enc_text.toString(CryptoJS.enc.Utf8)); } diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0cb5d4d68..ab28180f2 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -25,6 +25,7 @@ head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); +head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('js/acl.js'); head_add_js('js/webtoolkit.base64.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c75672202..9190e8a95 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -321,6 +321,7 @@ footer { #profile-link, #profile-title, #profile-expires, +#profile-encrypt, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -1142,6 +1143,10 @@ footer { float: left; margin-left: 15px; } +#profile-encrypt-wrapper { + float: left; + margin-left: 15px; +} #jot-preview-link { float: left; margin-left: 45px; diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c04880cf7..0618e7491 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -54,9 +54,9 @@
    - +
    + +
    -- cgit v1.2.3 From 435e2dae0e9204afd7288c14748e88f680276969 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 00:21:00 -0800 Subject: display encrypted text inline --- include/bbcode.php | 7 +++++-- js/crypto.js | 18 ++++++++++++++++-- version.inc | 2 +- view/tpl/jot-header.tpl | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index de71eb4e3..271cace73 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -121,7 +121,9 @@ function bb_parse_crypt($match) { if ($matches[1] != "") $hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - $Text = '
    ' . t('Encrypted content') . '
    '; + $x = random_string(); + + $Text = '
    ' . t('Encrypted content') . '

    '; return $Text; @@ -496,7 +498,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { } if (strpos($Text,'[/crypt]') !== false) { - $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
    ' . t('Encrypted content') . '
    ', $Text); + $x = random_string(); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
    ' . t('Encrypted content') . '
    ', $Text); $Text = preg_replace_callback("/\[crypt (.*?)\](.*?)\[\/crypt\]/ism", 'bb_parse_crypt', $Text); } // Try to Oembed diff --git a/js/crypto.js b/js/crypto.js index bed1525cd..6970229ce 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -33,14 +33,23 @@ function red_encrypt(alg, elem,text) { var text = $(elem).val(); + // key and hint need to be localised + var enc_key = prompt('key'); + // If you don't provide a key you get rot13, which doesn't need a key + // but consequently isn't secure. + if(! enc_key) alg = 'rot13'; if((alg == 'rot13') || (alg == 'triple-rot13')) newdiv = "[crypt alg='rot13']" + str_rot13(text) + '[/crypt]'; else if(alg == 'aes256') { + + // This is the prompt we're going to use when the receiver tries to open it. + // Maybe "Grandma's maiden name" or "our secret place" or something. + var enc_hint = prompt('hint'); enc_text = CryptoJS.AES.encrypt(text,enc_key); @@ -66,7 +75,7 @@ function red_encrypt(alg, elem,text) { // } } -function red_decrypt(alg,hint,text) { +function red_decrypt(alg,hint,text,elem) { var enc_text = ''; @@ -78,8 +87,13 @@ function red_decrypt(alg,hint,text) { enc_text = CryptoJS.AES.decrypt(text,enc_key); } - alert(enc_text.toString(CryptoJS.enc.Utf8)); + // Not sure whether to drop this back in the conversation display. + // It probably needs a lightbox or popup window because any conversation + // updates could + // wipe out the text and make you re-enter the key if it was in the + // conversation. For now we do that so you can read it. + $(elem).html(b2h(enc_text.toString(CryptoJS.enc.Utf8))); } diff --git a/version.inc b/version.inc index ee9cd8d7a..e352254ae 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-10.493 +2013-11-11.494 diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 05928bc32..4457a6d52 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -361,6 +361,42 @@ function enableOnUser(){ }; + function b2h(s) { + var y = s; + function rep(re, str) { + y = y.replace(re,str); + }; + + rep(/\n/gi,"
    "); + rep(/\[b\]/gi,""); + rep(/\[\/b\]/gi,""); + rep(/\[i\]/gi,""); + rep(/\[\/i\]/gi,""); + rep(/\[u\]/gi,""); + rep(/\[\/u\]/gi,""); + rep(/\[hr\]/gi,"
    "); + rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); + rep(/\[url\](.*?)\[\/url\]/gi,"$1"); + rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); + rep(/\[img\](.*?)\[\/img\]/gi,""); + + rep(/\[list\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=1\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=i\](.*?)\[\/list\]/gi,'
      $1
    '); + rep(/\[list=I\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=a\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=A\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[li\](.*?)\[\/li\]/gi, '
  • $1
    • '); + rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); + rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); + rep(/\[code\](.*?)\[\/code\]/gi,"$1"); + rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
    $1
    "); + + return y; + }; + + {{$geotag}} -- cgit v1.2.3 From dc1cb583a0a7ad4dd6a6a086d862c695a9cf0331 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 00:22:51 -0800 Subject: remove debugging stuff --- js/crypto.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/crypto.js b/js/crypto.js index 6970229ce..702ebd0e1 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -59,7 +59,9 @@ function red_encrypt(alg, elem,text) { newdiv = "[crypt alg='aes256' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; } - alert(newdiv); + enc_key = ''; + +// alert(newdiv); $(elem).val(newdiv); @@ -87,6 +89,8 @@ function red_decrypt(alg,hint,text,elem) { enc_text = CryptoJS.AES.decrypt(text,enc_key); } + enc_key = ''; + // Not sure whether to drop this back in the conversation display. // It probably needs a lightbox or popup window because any conversation // updates could -- cgit v1.2.3 From 260d5231a47292599cb8aa03a7186e7c5e86dac1 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 00:29:25 -0800 Subject: change wording on feature to "even more encryption" because otherwise it sounds like we don't have any at all - and we certainly do. --- include/features.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/features.php b/include/features.php index 7146122b7..e0c6c63bc 100644 --- a/include/features.php +++ b/include/features.php @@ -36,7 +36,7 @@ function get_features() { array('richtext', t('Richtext Editor'), t('Enable richtext editor')), array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds')), - array('content_encrypt', t('Encrypt Content'), t('Allow encryption of content end-to-end with a shared secret key')), + array('content_encrypt', t('Even More Encryption'), t('Allow encryption of content end-to-end with a shared secret key')), ), // Network Tools -- cgit v1.2.3 From b233166d20842bfa92450bfbd3c5d0be9e3c0f4a Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 00:35:33 -0800 Subject: fix editpost which showed an encrypt button but no other buttons --- mod/editpost.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/editpost.php b/mod/editpost.php index 81eef2782..b01afe9b3 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -130,6 +130,8 @@ function editpost_content(&$a) { '$defexpire' => $itm[0]['expires'], '$feature_expire' => 'none', '$expires' => t('Set expiration date'), + '$feature_encrypt' => 'none', + '$encrypt' => t('Encrypt text'), )); return $o; -- cgit v1.2.3 From b5bc04799c9f2fec82bbd0e9823a384118ea14c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 01:18:09 -0800 Subject: turn safemode into a proper widget --- include/dir_fns.php | 1 + view/tpl/safesearch.tpl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 7af98bec3..fef58428f 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -30,6 +30,7 @@ function dir_safe_mode(&$a) { else $toggle = t('Disable Safe Search'); $o = replace_macros(get_markup_template('safesearch.tpl'), array( + '$safemode' => t('Safe Mode'), '$toggle' => $toggle, )); diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl index 92c3db2a5..e0b2ab538 100644 --- a/view/tpl/safesearch.tpl +++ b/view/tpl/safesearch.tpl @@ -1,2 +1,4 @@ -

    Safe Mode

    +
    +

    {{$safemode}}

    {{$toggle}} +
    -- cgit v1.2.3 From f8a34c737d312ca3102ccacb737b59ff712b4612 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 11 Nov 2013 16:50:43 +0100 Subject: change spacing to fit other widgets --- view/tpl/peoplefind.tpl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index c3cbb064b..aef341d41 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,16 +1,14 @@

    {{$findpeople}}

    -
    {{$desc}}
    + {{$desc}}
    - + + - {{if $similar}} - - {{/if}} - - - {{if $inv}} - - {{/if}} +
    + {{if $similar}}{{$similar}}
    {{/if}} + {{$suggest}}
    + {{$random}}
    + {{if $inv}}{{$inv}}{{/if}}
    -- cgit v1.2.3 From c06dd4b589885f2577210543345c15da9ed23c4e Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 11 Nov 2013 18:44:23 +0100 Subject: looks more structured this way --- include/oembed.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/oembed.php b/include/oembed.php index 04a40f6ee..5da842170 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -123,6 +123,7 @@ function oembed_format_object($j){ if ( $j->type!='rich' || !strpos($j->html,$embedurl) ){ $embedlink = (isset($j->title))?$j->title:$embedurl; $ret .= "$embedlink"; + $ret .= "
    "; if (isset($j->author_name)) $ret.=" by ".$j->author_name; if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; } else { -- cgit v1.2.3 From e095e15f476cb9a94c9953137875572cad345ce8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 14:10:11 -0800 Subject: because some of the "hints" floating around are pretty pathetic and ambiguous and require a few tries. --- js/crypto.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/js/crypto.js b/js/crypto.js index 702ebd0e1..9e8a43f55 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -97,7 +97,17 @@ function red_decrypt(alg,hint,text,elem) { // wipe out the text and make you re-enter the key if it was in the // conversation. For now we do that so you can read it. - $(elem).html(b2h(enc_text.toString(CryptoJS.enc.Utf8))); + var enc_result = enc_text.toString(CryptoJS.enc.Utf8); + delete enc_text; + + // incorrect decryptions *usually* but don't always have zero length + // If the person typo'd let them try again without reloading the page + // otherwise they'll have no "padlock" to click to try again. + + if(enc_result.length) { + $(elem).html(b2h(enc_result)); + enc_result = ''; + } } -- cgit v1.2.3 From 4a3191cd1909dbfde861a113ba121e94b577a4cd Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 15:20:30 -0800 Subject: localise js ui strings for e2ee --- include/js_strings.php | 16 +++++++++------- js/crypto.js | 6 +++--- view/tpl/js_strings.tpl | 16 +++++++++------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/include/js_strings.php b/include/js_strings.php index 2e4f70774..afa8f075a 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -2,13 +2,15 @@ function js_strings() { return replace_macros(get_markup_template('js_strings.tpl'), array( - '$delitem' => t('Delete this item?'), - '$comment' => t('Comment'), - '$showmore' => t('show more'), - '$showfewer' => t('show fewer'), - '$pwshort' => t("Password too short"), - '$pwnomatch' => t("Passwords do not match"), - '$everybody' => t('everybody'), + '$delitem' => t('Delete this item?'), + '$comment' => t('Comment'), + '$showmore' => t('show more'), + '$showfewer' => t('show fewer'), + '$pwshort' => t("Password too short"), + '$pwnomatch' => t("Passwords do not match"), + '$everybody' => t('everybody'), + '$passphrase' => t('Secret Passphrase'), + '$passhint' => t('Passphrase hint'), '$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'), '$t02' => ((t('timeago.suffixAgo') != 'timeago.suffixAgo') ? t('timeago.suffixAgo') : 'null'), diff --git a/js/crypto.js b/js/crypto.js index 9e8a43f55..e9ab6961b 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -35,7 +35,7 @@ function red_encrypt(alg, elem,text) { // key and hint need to be localised - var enc_key = prompt('key'); + var enc_key = prompt(aStr['passphrase']); // If you don't provide a key you get rot13, which doesn't need a key // but consequently isn't secure. @@ -50,7 +50,7 @@ function red_encrypt(alg, elem,text) { // This is the prompt we're going to use when the receiver tries to open it. // Maybe "Grandma's maiden name" or "our secret place" or something. - var enc_hint = prompt('hint'); + var enc_hint = prompt(aStr['passhint']); enc_text = CryptoJS.AES.encrypt(text,enc_key); @@ -85,7 +85,7 @@ function red_decrypt(alg,hint,text,elem) { enc_text = str_rot13(text); if(alg == 'aes256') { - var enc_key = prompt(hint); + var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); enc_text = CryptoJS.AES.decrypt(text,enc_key); } diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index b61c69b90..144ecb17c 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -2,13 +2,15 @@ var aStr = { - 'delitem' : '{{$delitem}}', - 'comment' : '{{$comment}}', - 'showmore' : '{{$showmore}}', - 'showfewer' : '{{$showfewer}}', - 'pwshort' : '{{$pwshort}}', - 'pwnomatch' : '{{$pwnomatch}}', - 'everybody' : '{{$everybody}}', + 'delitem' : '{{$delitem}}', + 'comment' : '{{$comment}}', + 'showmore' : '{{$showmore}}', + 'showfewer' : '{{$showfewer}}', + 'pwshort' : '{{$pwshort}}', + 'pwnomatch' : '{{$pwnomatch}}', + 'everybody' : '{{$everybody}}', + 'passphrase' : '{{$passphrase}}', + 'passhint' : '{{$passhint}}', 't01' : {{$t01}}, 't02' : {{$t02}}, -- cgit v1.2.3 From d9013f43110a6474a8e52b72492bc490d50b7972 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 16:47:49 -0800 Subject: provide real barebones XSS protection on e2ee contents and implement a few bbcode tags we're likely to see a lot of. Still need to write a js zid() function to properly implement zrl and zmg but at least they will be linked now. --- view/tpl/jot-header.tpl | 67 +++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 4457a6d52..eb7c5abdb 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -367,31 +367,48 @@ function enableOnUser(){ y = y.replace(re,str); }; - rep(/\n/gi,"
    "); - rep(/\[b\]/gi,""); - rep(/\[\/b\]/gi,""); - rep(/\[i\]/gi,""); - rep(/\[\/i\]/gi,""); - rep(/\[u\]/gi,""); - rep(/\[\/u\]/gi,""); - rep(/\[hr\]/gi,"
    "); - rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); - rep(/\[url\](.*?)\[\/url\]/gi,"$1"); - rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); - rep(/\[img\](.*?)\[\/img\]/gi,""); - - rep(/\[list\](.*?)\[\/list\]/gi, '
      $1
    '); - rep(/\[list=\](.*?)\[\/list\]/gi, '
      $1
    '); - rep(/\[list=1\](.*?)\[\/list\]/gi, '
      $1
    '); - rep(/\[list=i\](.*?)\[\/list\]/gi,'
      $1
    '); - rep(/\[list=I\](.*?)\[\/list\]/gi, '
      $1
    '); - rep(/\[list=a\](.*?)\[\/list\]/gi, '
      $1
    '); - rep(/\[list=A\](.*?)\[\/list\]/gi, '
      $1
    '); - rep(/\[li\](.*?)\[\/li\]/gi, '
  • $1
    • '); - rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); - rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); - rep(/\[code\](.*?)\[\/code\]/gi,"$1"); - rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
    $1
    "); + rep(/\&/gi,"&"); + rep(/\/gi,">"); + rep(/\"/gi,"""); + + rep(/\n/gi,"
    "); + rep(/\[b\]/gi,""); + rep(/\[\/b\]/gi,""); + rep(/\[i\]/gi,""); + rep(/\[\/i\]/gi,""); + rep(/\[u\]/gi,""); + rep(/\[\/u\]/gi,""); + rep(/\[hr\]/gi,"
    "); + rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); + rep(/\[url\](.*?)\[\/url\]/gi,"$1"); + rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); + rep(/\[img\](.*?)\[\/img\]/gi,""); + + // FIXME - add zid + rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"$2"); + rep(/\[zrl\](.*?)\[\/zrl\]/gi,"$1"); + rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,""); + rep(/\[zmg\](.*?)\[\/zmg\]/gi,""); + + rep(/\[list\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=1\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=i\](.*?)\[\/list\]/gi,'
      $1
    '); + rep(/\[list=I\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=a\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[list=A\](.*?)\[\/list\]/gi, '
      $1
    '); + rep(/\[li\](.*?)\[\/li\]/gi, '
  • $1
    • '); + rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); + rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); + rep(/\[code\](.*?)\[\/code\]/gi,"$1"); + rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
    $1
    "); + + + + rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); + + rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">'); return y; }; -- cgit v1.2.3 From 54438be7c2c402e4a897a2534f0f465dea5f068b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 17:50:36 -0800 Subject: make e2ee work on tinymce --- js/crypto.js | 16 +++++++++++++++- view/tpl/jot-header.tpl | 7 ++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/js/crypto.js b/js/crypto.js index e9ab6961b..50282d18f 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -31,6 +31,9 @@ function red_encrypt(alg, elem,text) { var enc_text = ''; var newdiv = ''; + if(typeof tinyMCE !== "undefined") + tinyMCE.triggerSave(false,true); + var text = $(elem).val(); // key and hint need to be localised @@ -63,7 +66,18 @@ function red_encrypt(alg, elem,text) { // alert(newdiv); - $(elem).val(newdiv); + // This might be a comment box on a page with a tinymce editor + // so check if there is a tinymce editor but also check the display + // property of our source element - because a tinymce instance + // will have display "none". If a normal textarea such as in a comment + // box has display "none" you wouldn't be able to type in it. + + if($(elem).css('display') == 'none' && typeof tinyMCE !== "undefined") { + tinyMCE.activeEditor.setContent(newdiv); + } + else { + $(elem).val(newdiv); + } // textarea = document.getElementById(elem); // if (document.selection) { diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index eb7c5abdb..ce29443f7 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -299,12 +299,13 @@ function enableOnUser(){ function addeditortext(data) { - if(plaintext == 'none') { + if(typeof tinyMCE !== "undefined") { + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + else { var currentText = $("#profile-jot-text").val(); $("#profile-jot-text").val(currentText + data); } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); } function h2b(s) { -- cgit v1.2.3 From 58e0d58489472e78fc824b7654c59aa45b1c08ca Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 18:31:34 -0800 Subject: add rabbit and tripledes ciphers - probably need a pconfig to set the default --- js/crypto.js | 47 ++++++++++++++++++++++++++++++++++++++++------- view/php/theme_init.php | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/js/crypto.js b/js/crypto.js index 50282d18f..a7b278537 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -48,18 +48,43 @@ function red_encrypt(alg, elem,text) { if((alg == 'rot13') || (alg == 'triple-rot13')) newdiv = "[crypt alg='rot13']" + str_rot13(text) + '[/crypt]'; - else if(alg == 'aes256') { - // This is the prompt we're going to use when the receiver tries to open it. - // Maybe "Grandma's maiden name" or "our secret place" or something. + if(alg == 'aes256') { + + // This is the prompt we're going to use when the receiver tries to open it. + // Maybe "Grandma's maiden name" or "our secret place" or something. + + var enc_hint = prompt(aStr['passhint']); + + enc_text = CryptoJS.AES.encrypt(text,enc_key); + + encrypted = enc_text.toString(); + + newdiv = "[crypt alg='aes256' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; + } + if(alg == 'rabbit') { + + // This is the prompt we're going to use when the receiver tries to open it. + // Maybe "Grandma's maiden name" or "our secret place" or something. - var enc_hint = prompt(aStr['passhint']); + var enc_hint = prompt(aStr['passhint']); - enc_text = CryptoJS.AES.encrypt(text,enc_key); + enc_text = CryptoJS.Rabbit.encrypt(text,enc_key); + encrypted = enc_text.toString(); - encrypted = enc_text.toString(); + newdiv = "[crypt alg='rabbit' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; + } + if(alg == '3des') { + + // This is the prompt we're going to use when the receiver tries to open it. + // Maybe "Grandma's maiden name" or "our secret place" or something. + + var enc_hint = prompt(aStr['passhint']); + + enc_text = CryptoJS.TripleDES.encrypt(text,enc_key); + encrypted = enc_text.toString(); - newdiv = "[crypt alg='aes256' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; + newdiv = "[crypt alg='3des' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; } enc_key = ''; @@ -102,6 +127,14 @@ function red_decrypt(alg,hint,text,elem) { var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); enc_text = CryptoJS.AES.decrypt(text,enc_key); } + if(alg == 'rabbit') { + var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); + enc_text = CryptoJS.Rabbit.decrypt(text,enc_key); + } + if(alg == '3des') { + var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); + enc_text = CryptoJS.TripleDES.decrypt(text,enc_key); + } enc_key = ''; diff --git a/view/php/theme_init.php b/view/php/theme_init.php index ab28180f2..0867c989d 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -27,6 +27,8 @@ head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); +head_add_js('library/cryptojs/rollups/rabbit.js'); +head_add_js('library/cryptojs/rollups/tripledes.js'); head_add_js('js/acl.js'); head_add_js('js/webtoolkit.base64.js'); head_add_js('js/main.js'); -- cgit v1.2.3 From a7c53d470b9be467fc047130383095a569ba74e8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 18:42:49 -0800 Subject: ability to use other ciphers --- include/conversation.php | 5 +++++ view/tpl/jot.tpl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 88156ae63..59ca24d41 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1079,6 +1079,10 @@ function status_editor($a,$x,$popup=false) { if(x($x,'nopreview')) $preview = ''; + $cipher = get_pconfig($x['profile_uid'],'system','default_cipher'); + if(! $cipher) + $cipher = 'aes256'; + call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); @@ -1136,6 +1140,7 @@ function status_editor($a,$x,$popup=false) { '$expires' => t('Set expiration date'), '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), '$encrypt' => t('Encrypt text'), + '$cipher' => $cipher, )); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 0618e7491..924f7d9bc 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -55,7 +55,7 @@
    - +
    -- cgit v1.2.3 From cdcc68a168f352d88520a62101b9fd9ef8f6ea2c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 19:45:40 -0800 Subject: having a real problem with $section_width - which is preventing fluid layouts. I don't see an easy way a fixed width can work - either as percentage or a pixel width. I think the right way to do this is probably to set a right-margin - which will let the width float within the constraints of the viewport but should achieve the same result. --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9190e8a95..7a3dbceba 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -129,8 +129,10 @@ nav { } +/* section {width: $section_width; } +*/ nav:hover { background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); -- cgit v1.2.3 From 34ee8de82176d3dca4a340388dcac6a3e5a91b9f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 20:20:31 -0800 Subject: basic linking of audio/video tags in encrypted bbcode --- view/tpl/jot-header.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ce29443f7..c3e020619 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -405,7 +405,8 @@ function enableOnUser(){ rep(/\[code\](.*?)\[\/code\]/gi,"$1"); rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
    $1
    "); - + rep(/\[video\](.*?)\[\/video\]/gi,"$1"); + rep(/\[audio\](.*?)\[\/audio\]/gi,"$1"); rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); -- cgit v1.2.3 From 7cb4c2f8ad813336aafdec05e40f3a8eb1808d00 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 12 Nov 2013 01:34:09 -0800 Subject: cap width of conversations at 1024px --- version.inc | 2 +- view/theme/redbasic/css/style.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/version.inc b/version.inc index e352254ae..c8184c2cf 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-11.494 +2013-11-12.495 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7a3dbceba..ee3534a11 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1024,6 +1024,7 @@ footer { .thread-wrapper.toplevel_item { width: 92%; + max-width: 1024px; } .wall-item-body { -- cgit v1.2.3
     $schema,
     $nav_colour,
     $bgcolour,
     $background_image,
     $item_colour,
     $item_opacity,
     $font_size,
     $font_colour,
     $radius,
     $shadow,
     $section_width $arr