Merge remote-tracking branch 'upstream/master'

18 files changed, 31 insertions, 15 deletions

diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js
index 9e544859d..380730a10 100644
--- a/doc/html/search/all_61.js
+++ b/doc/html/search/all_61.js
@@ -3,6 +3,7 @@ var searchData=
   ['abook_5fconnections',['abook_connections',['../Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e',1,'Contact.php']]],
   ['abook_5fflag_5farchived',['ABOOK_FLAG_ARCHIVED',['../boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5',1,'boot.php']]],
   ['abook_5fflag_5fblocked',['ABOOK_FLAG_BLOCKED',['../boot_8php.html#a52b599cd13e152ebc80d7e4413683195',1,'boot.php']]],
+  ['abook_5fflag_5ffeed',['ABOOK_FLAG_FEED',['../boot_8php.html#ae0d9527117cd87dcba11986047ae336e',1,'boot.php']]],
   ['abook_5fflag_5fhidden',['ABOOK_FLAG_HIDDEN',['../boot_8php.html#a34c756469ebed32e2fc987bcde62d382',1,'boot.php']]],
   ['abook_5fflag_5fignored',['ABOOK_FLAG_IGNORED',['../boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6',1,'boot.php']]],
   ['abook_5fflag_5fpending',['ABOOK_FLAG_PENDING',['../boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155',1,'boot.php']]],
diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index c74251929..959791f4b 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -6,6 +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,'']]],
+  ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47',1,'bb2diaspora.php']]],
+  ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]],
   ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]],
   ['bb_5fparse_5fapp',['bb_parse_app',['../bbcode_8php.html#abb02f1044ff1c635d12af690d0f2cfa2',1,'bbcode.php']]],
   ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]],
@@ -35,8 +37,8 @@ var searchData=
   ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]],
   ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]],
   ['bookmark_5fadd',['bookmark_add',['../include_2bookmarks_8php.html#aef1cb2968c41c759f2d106e1088ca323',1,'bookmarks.php']]],
-  ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]],
   ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]],
+  ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]],
   ['bookmarks_5fcontent',['bookmarks_content',['../mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a',1,'bookmarks.php']]],
   ['bookmarks_5finit',['bookmarks_init',['../mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3',1,'bookmarks.php']]],
   ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]],
diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js
index 5d1a3a072..4b480a8d1 100644
--- a/doc/html/search/all_63.js
+++ b/doc/html/search/all_63.js
@@ -58,6 +58,7 @@ var searchData=
   ['check_5fphp',['check_php',['../setup_8php.html#a14d208682a88632290c895d20da6e7d6',1,'setup.php']]],
   ['check_5fsmarty3',['check_smarty3',['../setup_8php.html#afd8b0b3ade1507c45325caf377bf459d',1,'setup.php']]],
   ['check_5fstore',['check_store',['../setup_8php.html#ab4b71369a25021d59247c917e98d8246',1,'setup.php']]],
+  ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.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']]],
diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js
index 512283299..1271af9ed 100644
--- a/doc/html/search/all_64.js
+++ b/doc/html/search/all_64.js
@@ -61,6 +61,7 @@ var searchData=
   ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]],
   ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]],
   ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]],
+  ['diaspora_5fmention_5fcallback',['diaspora_mention_callback',['../bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b',1,'bb2diaspora.php']]],
   ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]],
   ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]],
   ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]],
@@ -107,6 +108,7 @@ var searchData=
   ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]],
   ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]],
   ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]],
+  ['discover_5fby_5furl',['discover_by_url',['../include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48',1,'network.php']]],
   ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]],
   ['display_2ephp',['display.php',['../display_8php.html',1,'']]],
   ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]],
diff --git a/doc/html/search/all_65.js b/doc/html/search/all_65.js
index d8149217e..10bddfec9 100644
--- a/doc/html/search/all_65.js
+++ b/doc/html/search/all_65.js
@@ -8,7 +8,6 @@ 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']]],
-  ['element_5finstall',['element_install',['../include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b',1,'apps.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']]],
diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js
index f498619dc..3e2bbcd59 100644
--- a/doc/html/search/all_66.js
+++ b/doc/html/search/all_66.js
@@ -26,6 +26,7 @@ var searchData=
   ['filestorage_2ephp',['filestorage.php',['../filestorage_8php.html',1,'']]],
   ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]],
   ['filestorage_5fpost',['filestorage_post',['../filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd',1,'filestorage.php']]],
+  ['filter_5finsecure',['filter_insecure',['../items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a',1,'items.php']]],
   ['find_5fdiaspora_5fperson_5fby_5fhandle',['find_diaspora_person_by_handle',['../diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b',1,'diaspora.php']]],
   ['find_5ffilename_5fby_5fhash',['find_filename_by_hash',['../include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86',1,'attach.php']]],
   ['find_5ffolder_5fhash_5fby_5fattach_5fhash',['find_folder_hash_by_attach_hash',['../include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997',1,'attach.php']]],
@@ -47,8 +48,8 @@ var searchData=
   ['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]],
   ['flip',['flip',['../classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832',1,'photo_driver\flip()'],['../classphoto__gd.html#a44cedef376044018702d9355ddc813ce',1,'photo_gd\flip()'],['../classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393',1,'photo_imagick\flip()']]],
   ['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]],
-  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
   ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
+  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
   ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]],
   ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]],
   ['foreach',['foreach',['../typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5',1,'typo.php']]],
diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js
index 706be9447..e97771040 100644
--- a/doc/html/search/all_69.js
+++ b/doc/html/search/all_69.js
@@ -8,6 +8,7 @@ var searchData=
   ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): default.php'],['../full_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): full.php'],['../redable_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): redable.php'],['../apw_2php_2style_8php.html#a2f71e817b8fac88ce7f0ec5c0fb88b8d',1,'if(): style.php'],['../theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): default.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_5fdiaspora',['import_author_diaspora',['../items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc',1,'items.php']]],
   ['import_5fauthor_5frss',['import_author_rss',['../items_8php.html#a6bee35961f2e32905f20367a9309d627',1,'items.php']]],
   ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]],
   ['import_5fauthor_5fzot',['import_author_zot',['../zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d',1,'zot.php']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 266b0bff9..806257116 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -25,8 +25,8 @@ var searchData=
   ['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']]],
-  ['service_5fclass_5fallows',['service_class_allows',['../plugin_8php.html#a030cec6793b909c439c0336ba39b1571',1,'plugin.php']]],
-  ['service_5fclass_5ffetch',['service_class_fetch',['../plugin_8php.html#a905b54e10704b283ac64680a8abc0971',1,'plugin.php']]],
+  ['service_5fclass_5fallows',['service_class_allows',['../account_8php.html#a030cec6793b909c439c0336ba39b1571',1,'account.php']]],
+  ['service_5fclass_5ffetch',['service_class_fetch',['../account_8php.html#a905b54e10704b283ac64680a8abc0971',1,'account.php']]],
   ['session_2ephp',['session.php',['../session_8php.html',1,'']]],
   ['set',['set',['../classCache.html#ae622b82adc1c2fb1f3e2cc4fd9688fce',1,'Cache']]],
   ['set_5faccount',['set_account',['../classApp.html#aeb1fe1c8ad9aa639909bd183ce578536',1,'App']]],
@@ -108,6 +108,7 @@ var searchData=
   ['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_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#af0a887050dc8d0f51c89890cdaf3145f',1,'items.php']]],
   ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
   ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]],
   ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]],
@@ -116,9 +117,9 @@ var searchData=
   ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
   ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',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',['../mytheme_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_75.js b/doc/html/search/all_75.js
index 7d8bb61fd..a052a0a78 100644
--- a/doc/html/search/all_75.js
+++ b/doc/html/search/all_75.js
@@ -33,9 +33,9 @@ var searchData=
   ['update_5fsuggestions',['update_suggestions',['../socgraph_8php.html#a790690bb1a1d02483fe31632a160144d',1,'socgraph.php']]],
   ['updatetpl',['updatetpl',['../namespaceupdatetpl.html',1,'']]],
   ['updatetpl_2epy',['updatetpl.py',['../updatetpl_8py.html',1,'']]],
-  ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'plugin.php']]],
-  ['upgrade_5flink',['upgrade_link',['../plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'plugin.php']]],
-  ['upgrade_5fmessage',['upgrade_message',['../plugin_8php.html#a901657dd078e070516cf97285e0bada7',1,'plugin.php']]],
+  ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../account_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'account.php']]],
+  ['upgrade_5flink',['upgrade_link',['../account_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'account.php']]],
+  ['upgrade_5fmessage',['upgrade_message',['../account_8php.html#a901657dd078e070516cf97285e0bada7',1,'account.php']]],
   ['user_5fallow',['user_allow',['../account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1',1,'account.php']]],
   ['user_5fapprove',['user_approve',['../account_8php.html#ad07be417ac7eda939768804106ddea3d',1,'account.php']]],
   ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]],
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 378c8486a..50e587929 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -3,6 +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']]],
+  ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47',1,'bb2diaspora.php']]],
+  ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]],
   ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]],
   ['bb_5fparse_5fapp',['bb_parse_app',['../bbcode_8php.html#abb02f1044ff1c635d12af690d0f2cfa2',1,'bbcode.php']]],
   ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]],
diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js
index d11551d2d..ea32c91b1 100644
--- a/doc/html/search/functions_63.js
+++ b/doc/html/search/functions_63.js
@@ -49,6 +49,7 @@ var searchData=
   ['check_5fphp',['check_php',['../setup_8php.html#a14d208682a88632290c895d20da6e7d6',1,'setup.php']]],
   ['check_5fsmarty3',['check_smarty3',['../setup_8php.html#afd8b0b3ade1507c45325caf377bf459d',1,'setup.php']]],
   ['check_5fstore',['check_store',['../setup_8php.html#ab4b71369a25021d59247c917e98d8246',1,'setup.php']]],
+  ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.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']]],
diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js
index 7c43a67b3..5f9bb71b5 100644
--- a/doc/html/search/functions_64.js
+++ b/doc/html/search/functions_64.js
@@ -40,6 +40,7 @@ var searchData=
   ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]],
   ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]],
   ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]],
+  ['diaspora_5fmention_5fcallback',['diaspora_mention_callback',['../bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b',1,'bb2diaspora.php']]],
   ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]],
   ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]],
   ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]],
@@ -75,6 +76,7 @@ var searchData=
   ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]],
   ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]],
   ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]],
+  ['discover_5fby_5furl',['discover_by_url',['../include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48',1,'network.php']]],
   ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]],
   ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]],
   ['dlogger',['dlogger',['../text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c',1,'text.php']]],
diff --git a/doc/html/search/functions_65.js b/doc/html/search/functions_65.js
index 213d3e89b..8424dbba4 100644
--- a/doc/html/search/functions_65.js
+++ b/doc/html/search/functions_65.js
@@ -4,7 +4,6 @@ var searchData=
   ['editlayout_5fcontent',['editlayout_content',['../editlayout_8php.html#aa877e4157a26b099de904164181dd386',1,'editlayout.php']]],
   ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]],
   ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]],
-  ['element_5finstall',['element_install',['../include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b',1,'apps.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/functions_66.js b/doc/html/search/functions_66.js
index d86e4c5d3..4e63189e8 100644
--- a/doc/html/search/functions_66.js
+++ b/doc/html/search/functions_66.js
@@ -17,6 +17,7 @@ var searchData=
   ['filerm_5fcontent',['filerm_content',['../filerm_8php.html#ae2eb28d2054fa2c37e38689882172208',1,'filerm.php']]],
   ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]],
   ['filestorage_5fpost',['filestorage_post',['../filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd',1,'filestorage.php']]],
+  ['filter_5finsecure',['filter_insecure',['../items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a',1,'items.php']]],
   ['find_5fdiaspora_5fperson_5fby_5fhandle',['find_diaspora_person_by_handle',['../diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b',1,'diaspora.php']]],
   ['find_5ffilename_5fby_5fhash',['find_filename_by_hash',['../include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86',1,'attach.php']]],
   ['find_5ffolder_5fhash_5fby_5fattach_5fhash',['find_folder_hash_by_attach_hash',['../include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997',1,'attach.php']]],
diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js
index 2b7e3939c..8a7f609a5 100644
--- a/doc/html/search/functions_69.js
+++ b/doc/html/search/functions_69.js
@@ -5,6 +5,7 @@ var searchData=
   ['identity_5fselector',['identity_selector',['../identity_8php.html#a2ab5172eabd375869060c9ad68323f5c',1,'identity.php']]],
   ['ids_5fto_5fquerystr',['ids_to_querystr',['../text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a',1,'text.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_5fauthor_5fdiaspora',['import_author_diaspora',['../items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc',1,'items.php']]],
   ['import_5fauthor_5frss',['import_author_rss',['../items_8php.html#a6bee35961f2e32905f20367a9309d627',1,'items.php']]],
   ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]],
   ['import_5fauthor_5fzot',['import_author_zot',['../zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d',1,'zot.php']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index f771c9bdb..60abef114 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -22,8 +22,8 @@ var searchData=
   ['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']]],
-  ['service_5fclass_5fallows',['service_class_allows',['../plugin_8php.html#a030cec6793b909c439c0336ba39b1571',1,'plugin.php']]],
-  ['service_5fclass_5ffetch',['service_class_fetch',['../plugin_8php.html#a905b54e10704b283ac64680a8abc0971',1,'plugin.php']]],
+  ['service_5fclass_5fallows',['service_class_allows',['../account_8php.html#a030cec6793b909c439c0336ba39b1571',1,'account.php']]],
+  ['service_5fclass_5ffetch',['service_class_fetch',['../account_8php.html#a905b54e10704b283ac64680a8abc0971',1,'account.php']]],
   ['set',['set',['../classCache.html#ae622b82adc1c2fb1f3e2cc4fd9688fce',1,'Cache']]],
   ['set_5faccount',['set_account',['../classApp.html#aeb1fe1c8ad9aa639909bd183ce578536',1,'App']]],
   ['set_5fapp',['set_app',['../classBaseObject.html#a0a9acda12d751692834cf6999f889223',1,'BaseObject']]],
@@ -88,6 +88,7 @@ var searchData=
   ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]],
   ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]],
   ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
+  ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#af0a887050dc8d0f51c89890cdaf3145f',1,'items.php']]],
   ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
   ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]],
   ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]],
diff --git a/doc/html/search/functions_75.js b/doc/html/search/functions_75.js
index 09258d0df..9c23d4d2e 100644
--- a/doc/html/search/functions_75.js
+++ b/doc/html/search/functions_75.js
@@ -21,9 +21,9 @@ var searchData=
   ['update_5fremote_5fid',['update_remote_id',['../items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6',1,'items.php']]],
   ['update_5fsearch_5fcontent',['update_search_content',['../update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52',1,'update_search.php']]],
   ['update_5fsuggestions',['update_suggestions',['../socgraph_8php.html#a790690bb1a1d02483fe31632a160144d',1,'socgraph.php']]],
-  ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'plugin.php']]],
-  ['upgrade_5flink',['upgrade_link',['../plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'plugin.php']]],
-  ['upgrade_5fmessage',['upgrade_message',['../plugin_8php.html#a901657dd078e070516cf97285e0bada7',1,'plugin.php']]],
+  ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../account_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'account.php']]],
+  ['upgrade_5flink',['upgrade_link',['../account_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'account.php']]],
+  ['upgrade_5fmessage',['upgrade_message',['../account_8php.html#a901657dd078e070516cf97285e0bada7',1,'account.php']]],
   ['user_5fallow',['user_allow',['../account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1',1,'account.php']]],
   ['user_5fapprove',['user_approve',['../account_8php.html#ad07be417ac7eda939768804106ddea3d',1,'account.php']]],
   ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]],
diff --git a/doc/html/search/variables_61.js b/doc/html/search/variables_61.js
index 7a5098d4c..5dd81d424 100644
--- a/doc/html/search/variables_61.js
+++ b/doc/html/search/variables_61.js
@@ -2,6 +2,7 @@ var searchData=
 [
   ['abook_5fflag_5farchived',['ABOOK_FLAG_ARCHIVED',['../boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5',1,'boot.php']]],
   ['abook_5fflag_5fblocked',['ABOOK_FLAG_BLOCKED',['../boot_8php.html#a52b599cd13e152ebc80d7e4413683195',1,'boot.php']]],
+  ['abook_5fflag_5ffeed',['ABOOK_FLAG_FEED',['../boot_8php.html#ae0d9527117cd87dcba11986047ae336e',1,'boot.php']]],
   ['abook_5fflag_5fhidden',['ABOOK_FLAG_HIDDEN',['../boot_8php.html#a34c756469ebed32e2fc987bcde62d382',1,'boot.php']]],
   ['abook_5fflag_5fignored',['ABOOK_FLAG_IGNORED',['../boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6',1,'boot.php']]],
   ['abook_5fflag_5fpending',['ABOOK_FLAG_PENDING',['../boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155',1,'boot.php']]],