Merge branch 'master' into tres

Conflicts:
	include/zot.php

18 files changed, 35 insertions, 13 deletions

diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index c4d2bcad1..9588db74d 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -9,13 +9,15 @@ var searchData=
   ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#ab27761069ea1275f0fc4c543099c5519',1,'bb2diaspora.php']]],
   ['bb2diaspora_5fitemwallwall',['bb2diaspora_itemwallwall',['../bb2diaspora_8php.html#aab32042f8bd63552d3fadeeae9eab083',1,'bb2diaspora.php']]],
   ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]],
+  ['bb_5fextract_5fimages',['bb_extract_images',['../bbcode_8php.html#a583bf904481db2623ead8cbd28f16d32',1,'bbcode.php']]],
   ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]],
   ['bb_5fmap_5fcoords',['bb_map_coords',['../bbcode_8php.html#a02d5f2434e7bb5cf683e52a9b4787f24',1,'bbcode.php']]],
   ['bb_5fmap_5flocation',['bb_map_location',['../bbcode_8php.html#a7cb403fd1c36d7376c2f3932a1ceb54d',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']]],
+  ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#aaaae933e2563558db886b820075c93c8',1,'bbcode.php']]],
   ['bb_5fparse_5felement',['bb_parse_element',['../bbcode_8php.html#aa73fb62e7be1fa5fce4ad5f3d4487fc9',1,'bbcode.php']]],
   ['bb_5fqr',['bb_qr',['../bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c',1,'bbcode.php']]],
+  ['bb_5freplace_5fimages',['bb_replace_images',['../bbcode_8php.html#a35f52b106a3d522f1c0783e78223f402',1,'bbcode.php']]],
   ['bb_5fsanitize_5fstyle',['bb_sanitize_style',['../bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e',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']]],
diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js
index 10e9b143c..2ffabed36 100644
--- a/doc/html/search/all_66.js
+++ b/doc/html/search/all_66.js
@@ -12,7 +12,7 @@ var searchData=
   ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]],
   ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]],
   ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
-  ['file_5factivity',['file_activity',['../include_2attach_8php.html#a3502fd6e55160e0ccdeab88c02723b9f',1,'attach.php']]],
+  ['file_5factivity',['file_activity',['../include_2attach_8php.html#aa23ba65e5bb732be71fdd27ccff7d46e',1,'attach.php']]],
   ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
   ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
   ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index a10fe0d2b..8010a12e7 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -47,6 +47,7 @@ var searchData=
   ['get_5ffeature_5fdefault',['get_feature_default',['../features_8php.html#ab9a273de13a12a1c561b380cabaea090',1,'features.php']]],
   ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]],
   ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]],
+  ['get_5ffile_5factivity_5fobject',['get_file_activity_object',['../include_2attach_8php.html#aa784c064ae323710f4ef68771a4a38db',1,'attach.php']]],
   ['get_5ffirst_5fdim',['get_first_dim',['../datetime_8php.html#aba971b67f17fecf050813f1eba72367f',1,'datetime.php']]],
   ['get_5fform_5fsecurity_5ftoken',['get_form_security_token',['../security_8php.html#acd06ef411116115c2f0a92633700db8a',1,'security.php']]],
   ['get_5fformatsmap',['get_FormatsMap',['../classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4',1,'photo_imagick']]],
@@ -126,7 +127,7 @@ var searchData=
   ['getetag',['getETag',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a9f14682acf3ccb70df5af5dd0687c689',1,'RedMatrix::RedDAV::RedFile']]],
   ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]],
   ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]],
-  ['geticonfromtype',['getIconFromType',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a810af4506cb3247e0ea7b0c4accbbc7a',1,'RedMatrix::RedDAV::RedBrowser']]],
+  ['geticonfromtype',['getIconFromType',['../text_8php.html#a5ee0715f7fa144b1307a3ff10222c609',1,'text.php']]],
   ['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',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5',1,'RedMatrix\RedDAV\RedDirectory\getLastModified()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25',1,'RedMatrix\RedDAV\RedFile\getLastModified()']]],
   ['getname',['getName',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df',1,'RedMatrix\RedDAV\RedDirectory\getName()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d',1,'RedMatrix\RedDAV\RedFile\getName()']]],
diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js
index 2533e2f2e..6ae5ac795 100644
--- a/doc/html/search/all_6c.js
+++ b/doc/html/search/all_6c.js
@@ -33,8 +33,9 @@ var searchData=
   ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
   ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
   ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#aee4b619839cf4b64220f34edf5c67b52',1,'config.php']]],
+  ['local_5fchannel',['local_channel',['../boot_8php.html#ae2811a843962fb9bf5e34fc8f64eaadb',1,'boot.php']]],
   ['local_5fdir_5fupdate',['local_dir_update',['../dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e',1,'dir_fns.php']]],
-  ['local_5fuser',['local_channel',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
+  ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
   ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
   ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]],
   ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index 2a142c1b9..4116d10f2 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -113,6 +113,7 @@ var searchData=
   ['png_5fquality',['PNG_QUALITY',['../boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce',1,'boot.php']]],
   ['po2php_2ephp',['po2php.php',['../po2php_8php.html',1,'']]],
   ['po2php_5frun',['po2php_run',['../po2php_8php.html#a3b75e36f913198299e99559b175cd8b4',1,'po2php.php']]],
+  ['poco',['poco',['../socgraph_8php.html#a2225cdc3651a0bea089b16cbfb6ddaf1',1,'socgraph.php']]],
   ['poco_2ephp',['poco.php',['../poco_8php.html',1,'']]],
   ['poco_5finit',['poco_init',['../poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498',1,'poco.php']]],
   ['poco_5fload',['poco_load',['../socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6',1,'socgraph.php']]],
@@ -137,6 +138,8 @@ var searchData=
   ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]],
   ['post_5fvar',['post_var',['../pubsubhubbub_8php.html#a2006060ce09105d08716154c06aecfcd',1,'pubsubhubbub.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
+  ['prate_2ephp',['prate.php',['../prate_8php.html',1,'']]],
+  ['prate_5fpost',['prate_post',['../prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd',1,'prate.php']]],
   ['preg_5fcallback_5fhelp_5finclude',['preg_callback_help_include',['../help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4',1,'help.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
   ['prep_2ephp',['prep.php',['../prep_8php.html',1,'']]],
@@ -153,8 +156,8 @@ var searchData=
   ['private_5fmessages_5ffetch_5fconversation',['private_messages_fetch_conversation',['../include_2message_8php.html#a5f8de9847e203329e317ac38dc646898',1,'message.php']]],
   ['private_5fmessages_5ffetch_5fmessage',['private_messages_fetch_message',['../include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091',1,'message.php']]],
   ['private_5fmessages_5flist',['private_messages_list',['../include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e',1,'message.php']]],
-  ['probe_2ephp',['probe.php',['../mod_2probe_8php.html',1,'']]],
   ['probe_2ephp',['probe.php',['../include_2probe_8php.html',1,'']]],
+  ['probe_2ephp',['probe.php',['../mod_2probe_8php.html',1,'']]],
   ['probe_5factivity_5fstream',['probe_activity_stream',['../include_2probe_8php.html#a2daa857942aceca01f956016dbbd139c',1,'probe.php']]],
   ['probe_5fcontent',['probe_content',['../mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99',1,'probe.php']]],
   ['probe_5fdfrn',['probe_dfrn',['../include_2probe_8php.html#a9b5eca1e01e52b3e65d64db0c92181e0',1,'probe.php']]],
@@ -170,6 +173,7 @@ var searchData=
   ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]],
   ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]],
   ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]],
+  ['process_5frating_5fdelivery',['process_rating_delivery',['../zot_8php.html#ab718f7ab0df9c4153037d1a3f2613181',1,'zot.php']]],
   ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]],
   ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]],
   ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]],
diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js
index 59b25a93b..2f08eb9c4 100644
--- a/doc/html/search/all_72.js
+++ b/doc/html/search/all_72.js
@@ -80,8 +80,9 @@ var searchData=
   ['relative_5fdate',['relative_date',['../datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82',1,'datetime.php']]],
   ['reload_5fplugins',['reload_plugins',['../plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025',1,'plugin.php']]],
   ['reltoabs',['reltoabs',['../text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2',1,'text.php']]],
+  ['remote_5fchannel',['remote_channel',['../boot_8php.html#ad9f1a90205081844e1e9c4b2ffd95458',1,'boot.php']]],
   ['remote_5fonline_5fstatus',['remote_online_status',['../identity_8php.html#a47d6f53216f23a3484061793bef29854',1,'identity.php']]],
-  ['remote_5fuser',['remote_channel',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
+  ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
   ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]],
   ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]],
   ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]],
diff --git a/doc/html/search/all_75.js b/doc/html/search/all_75.js
index 3162bb574..ff860fb76 100644
--- a/doc/html/search/all_75.js
+++ b/doc/html/search/all_75.js
@@ -48,7 +48,7 @@ var searchData=
   ['user_5fapprove',['user_approve',['../account_8php.html#ad07be417ac7eda939768804106ddea3d',1,'account.php']]],
   ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]],
   ['user_5fremove',['user_remove',['../Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15',1,'Contact.php']]],
-  ['userreadablesize',['userReadableSize',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a242ce69a2fe5a5fdf9c2b8d3954accfd',1,'RedMatrix::RedDAV::RedBrowser']]],
+  ['userreadablesize',['userReadableSize',['../text_8php.html#afb1ae3e1f6985d4b78dd1d00473e39fb',1,'text.php']]],
   ['utc_5fnow',['UTC_NOW',['../classdba__driver.html#aa3325d982d4ee5d1114fd7e02a4356e8',1,'dba_driver\UTC_NOW()'],['../classdba__postgres.html#ace80a204e34b20b9907650399cce02a3',1,'dba_postgres\UTC_NOW()']]],
   ['utcnow',['utcnow',['../classdba__driver.html#ad700712879719bee23752b8f424d97d0',1,'dba_driver']]],
   ['util',['util',['../namespaceutil.html',1,'']]]
diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js
index 11483478c..ed3ff2a2d 100644
--- a/doc/html/search/all_78.js
+++ b/doc/html/search/all_78.js
@@ -18,6 +18,8 @@ var searchData=
   ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]],
   ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]],
   ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]],
+  ['xpoco_2ephp',['xpoco.php',['../xpoco_8php.html',1,'']]],
+  ['xpoco_5finit',['xpoco_init',['../xpoco_8php.html#a715e5b14ad5bd4a6f9c12ddfdcac07c2',1,'xpoco.php']]],
   ['xrd_2ephp',['xrd.php',['../xrd_8php.html',1,'']]],
   ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]],
   ['xref_2ephp',['xref.php',['../xref_8php.html',1,'']]],
diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js
index 24bb3555c..2cbb96014 100644
--- a/doc/html/search/files_70.js
+++ b/doc/html/search/files_70.js
@@ -25,6 +25,7 @@ var searchData=
   ['poll_2ephp',['poll.php',['../poll_8php.html',1,'']]],
   ['poller_2ephp',['poller.php',['../poller_8php.html',1,'']]],
   ['post_2ephp',['post.php',['../post_8php.html',1,'']]],
+  ['prate_2ephp',['prate.php',['../prate_8php.html',1,'']]],
   ['prep_2ephp',['prep.php',['../prep_8php.html',1,'']]],
   ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]],
   ['probe_2ephp',['probe.php',['../include_2probe_8php.html',1,'']]],
diff --git a/doc/html/search/files_78.js b/doc/html/search/files_78.js
index e725086d3..0f6e4df5e 100644
--- a/doc/html/search/files_78.js
+++ b/doc/html/search/files_78.js
@@ -1,6 +1,7 @@
 var searchData=
 [
   ['xchan_2ephp',['xchan.php',['../xchan_8php.html',1,'']]],
+  ['xpoco_2ephp',['xpoco.php',['../xpoco_8php.html',1,'']]],
   ['xrd_2ephp',['xrd.php',['../xrd_8php.html',1,'']]],
   ['xref_2ephp',['xref.php',['../xref_8php.html',1,'']]]
 ];
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 47ba65793..517deceae 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -6,13 +6,15 @@ var searchData=
   ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#ab27761069ea1275f0fc4c543099c5519',1,'bb2diaspora.php']]],
   ['bb2diaspora_5fitemwallwall',['bb2diaspora_itemwallwall',['../bb2diaspora_8php.html#aab32042f8bd63552d3fadeeae9eab083',1,'bb2diaspora.php']]],
   ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]],
+  ['bb_5fextract_5fimages',['bb_extract_images',['../bbcode_8php.html#a583bf904481db2623ead8cbd28f16d32',1,'bbcode.php']]],
   ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]],
   ['bb_5fmap_5fcoords',['bb_map_coords',['../bbcode_8php.html#a02d5f2434e7bb5cf683e52a9b4787f24',1,'bbcode.php']]],
   ['bb_5fmap_5flocation',['bb_map_location',['../bbcode_8php.html#a7cb403fd1c36d7376c2f3932a1ceb54d',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']]],
+  ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#aaaae933e2563558db886b820075c93c8',1,'bbcode.php']]],
   ['bb_5fparse_5felement',['bb_parse_element',['../bbcode_8php.html#aa73fb62e7be1fa5fce4ad5f3d4487fc9',1,'bbcode.php']]],
   ['bb_5fqr',['bb_qr',['../bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c',1,'bbcode.php']]],
+  ['bb_5freplace_5fimages',['bb_replace_images',['../bbcode_8php.html#a35f52b106a3d522f1c0783e78223f402',1,'bbcode.php']]],
   ['bb_5fsanitize_5fstyle',['bb_sanitize_style',['../bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e',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']]],
diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js
index 05b883038..7f785b62f 100644
--- a/doc/html/search/functions_66.js
+++ b/doc/html/search/functions_66.js
@@ -8,7 +8,7 @@ var searchData=
   ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]],
   ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]],
   ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
-  ['file_5factivity',['file_activity',['../include_2attach_8php.html#a3502fd6e55160e0ccdeab88c02723b9f',1,'attach.php']]],
+  ['file_5factivity',['file_activity',['../include_2attach_8php.html#aa23ba65e5bb732be71fdd27ccff7d46e',1,'attach.php']]],
   ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
   ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
   ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index ea840791e..638f42409 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -47,6 +47,7 @@ var searchData=
   ['get_5ffeature_5fdefault',['get_feature_default',['../features_8php.html#ab9a273de13a12a1c561b380cabaea090',1,'features.php']]],
   ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]],
   ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]],
+  ['get_5ffile_5factivity_5fobject',['get_file_activity_object',['../include_2attach_8php.html#aa784c064ae323710f4ef68771a4a38db',1,'attach.php']]],
   ['get_5ffirst_5fdim',['get_first_dim',['../datetime_8php.html#aba971b67f17fecf050813f1eba72367f',1,'datetime.php']]],
   ['get_5fform_5fsecurity_5ftoken',['get_form_security_token',['../security_8php.html#acd06ef411116115c2f0a92633700db8a',1,'security.php']]],
   ['get_5fformatsmap',['get_FormatsMap',['../classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4',1,'photo_imagick']]],
@@ -126,7 +127,7 @@ var searchData=
   ['getetag',['getETag',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a9f14682acf3ccb70df5af5dd0687c689',1,'RedMatrix::RedDAV::RedFile']]],
   ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]],
   ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]],
-  ['geticonfromtype',['getIconFromType',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a810af4506cb3247e0ea7b0c4accbbc7a',1,'RedMatrix::RedDAV::RedBrowser']]],
+  ['geticonfromtype',['getIconFromType',['../text_8php.html#a5ee0715f7fa144b1307a3ff10222c609',1,'text.php']]],
   ['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',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5',1,'RedMatrix\RedDAV\RedDirectory\getLastModified()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25',1,'RedMatrix\RedDAV\RedFile\getLastModified()']]],
   ['getname',['getName',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df',1,'RedMatrix\RedDAV\RedDirectory\getName()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d',1,'RedMatrix\RedDAV\RedFile\getName()']]],
diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js
index 7ce236bc0..6d9b2c37f 100644
--- a/doc/html/search/functions_6c.js
+++ b/doc/html/search/functions_6c.js
@@ -26,8 +26,9 @@ var searchData=
   ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
   ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
   ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#aee4b619839cf4b64220f34edf5c67b52',1,'config.php']]],
+  ['local_5fchannel',['local_channel',['../boot_8php.html#ae2811a843962fb9bf5e34fc8f64eaadb',1,'boot.php']]],
   ['local_5fdir_5fupdate',['local_dir_update',['../dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e',1,'dir_fns.php']]],
-  ['local_5fuser',['local_channel',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
+  ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
   ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
   ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
   ['locs_5fcontent',['locs_content',['../locs_8php.html#a6c900f53970c0d0e738d2fe06d27ca44',1,'locs.php']]],
diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js
index 546078b8d..d44f6dda9 100644
--- a/doc/html/search/functions_70.js
+++ b/doc/html/search/functions_70.js
@@ -44,6 +44,7 @@ var searchData=
   ['pkcs8to1',['pkcs8to1',['../crypto_8php.html#a7427a18417341aa35e2207bfa205e432',1,'crypto.php']]],
   ['plugin_5fis_5finstalled',['plugin_is_installed',['../plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9',1,'plugin.php']]],
   ['po2php_5frun',['po2php_run',['../po2php_8php.html#a3b75e36f913198299e99559b175cd8b4',1,'po2php.php']]],
+  ['poco',['poco',['../socgraph_8php.html#a2225cdc3651a0bea089b16cbfb6ddaf1',1,'socgraph.php']]],
   ['poco_5finit',['poco_init',['../poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498',1,'poco.php']]],
   ['poco_5fload',['poco_load',['../socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6',1,'socgraph.php']]],
   ['poke_5fcontent',['poke_content',['../poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993',1,'poke.php']]],
@@ -59,6 +60,7 @@ var searchData=
   ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]],
   ['post_5fvar',['post_var',['../pubsubhubbub_8php.html#a2006060ce09105d08716154c06aecfcd',1,'pubsubhubbub.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
+  ['prate_5fpost',['prate_post',['../prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd',1,'prate.php']]],
   ['preg_5fcallback_5fhelp_5finclude',['preg_callback_help_include',['../help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4',1,'help.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
   ['prep_5fcontent',['prep_content',['../prep_8php.html#a9a410206b7f229a4c3f6bdb2eb42690a',1,'prep.php']]],
@@ -88,6 +90,7 @@ var searchData=
   ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]],
   ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]],
   ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]],
+  ['process_5frating_5fdelivery',['process_rating_delivery',['../zot_8php.html#ab718f7ab0df9c4153037d1a3f2613181',1,'zot.php']]],
   ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]],
   ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]],
   ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'identity.php']]],
diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js
index cdf380215..853dd12ae 100644
--- a/doc/html/search/functions_72.js
+++ b/doc/html/search/functions_72.js
@@ -43,8 +43,9 @@ var searchData=
   ['relative_5fdate',['relative_date',['../datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82',1,'datetime.php']]],
   ['reload_5fplugins',['reload_plugins',['../plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025',1,'plugin.php']]],
   ['reltoabs',['reltoabs',['../text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2',1,'text.php']]],
+  ['remote_5fchannel',['remote_channel',['../boot_8php.html#ad9f1a90205081844e1e9c4b2ffd95458',1,'boot.php']]],
   ['remote_5fonline_5fstatus',['remote_online_status',['../identity_8php.html#a47d6f53216f23a3484061793bef29854',1,'identity.php']]],
-  ['remote_5fuser',['remote_channel',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
+  ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
   ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]],
   ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]],
   ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]],
diff --git a/doc/html/search/functions_75.js b/doc/html/search/functions_75.js
index e05062fb2..ac285d2f7 100644
--- a/doc/html/search/functions_75.js
+++ b/doc/html/search/functions_75.js
@@ -35,6 +35,6 @@ var searchData=
   ['user_5fapprove',['user_approve',['../account_8php.html#ad07be417ac7eda939768804106ddea3d',1,'account.php']]],
   ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]],
   ['user_5fremove',['user_remove',['../Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15',1,'Contact.php']]],
-  ['userreadablesize',['userReadableSize',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a242ce69a2fe5a5fdf9c2b8d3954accfd',1,'RedMatrix::RedDAV::RedBrowser']]],
+  ['userreadablesize',['userReadableSize',['../text_8php.html#afb1ae3e1f6985d4b78dd1d00473e39fb',1,'text.php']]],
   ['utcnow',['utcnow',['../classdba__driver.html#ad700712879719bee23752b8f424d97d0',1,'dba_driver']]]
 ];
diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js
index 80f9b5f99..4b41fd661 100644
--- a/doc/html/search/functions_78.js
+++ b/doc/html/search/functions_78.js
@@ -9,6 +9,7 @@ var searchData=
   ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]],
   ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]],
   ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]],
+  ['xpoco_5finit',['xpoco_init',['../xpoco_8php.html#a715e5b14ad5bd4a6f9c12ddfdcac07c2',1,'xpoco.php']]],
   ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]],
   ['xref_5finit',['xref_init',['../xref_8php.html#a9bee399213b8de8226b0d60834307473',1,'xref.php']]]
 ];