Revert "Revert "merge""

This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.

21 files changed, 30 insertions, 44 deletions

diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index 01317772b..5436f11a4 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -21,5 +21,5 @@ var searchData=
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
   ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
-  ['build_5fsync_5fpacket',['build_sync_packet',['../include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'settings.php']]]
+  ['build_5fsync_5fpacket',['build_sync_packet',['../zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'zot.php']]]
 ];
diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js
index 086b4367e..346f7b051 100644
--- a/doc/html/search/all_63.js
+++ b/doc/html/search/all_63.js
@@ -16,6 +16,7 @@ var searchData=
   ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]],
   ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]],
   ['channel_5fremove',['channel_remove',['../Contact_8php.html#ad46ff6764f12b6d3ab45c49b797f98aa',1,'Contact.php']]],
+  ['channel_5ftotal',['channel_total',['../identity_8php.html#a77d2237f1846964634b1c99089c27c7d',1,'identity.php']]],
   ['channelx_5fby_5fhash',['channelx_by_hash',['../Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258',1,'Contact.php']]],
   ['channelx_5fby_5fn',['channelx_by_n',['../Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc',1,'Contact.php']]],
   ['channelx_5fby_5fnick',['channelx_by_nick',['../Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e',1,'Contact.php']]],
diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js
index 949dc529e..6dc2004fd 100644
--- a/doc/html/search/all_64.js
+++ b/doc/html/search/all_64.js
@@ -36,8 +36,6 @@ var searchData=
   ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]],
   ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]],
   ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]],
-  ['dertopem',['DerToPem',['../crypto_8php.html#a630e1574554f34e7c38511585d9e71a2',1,'crypto.php']]],
-  ['dertorsa',['DerToRsa',['../crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839',1,'crypto.php']]],
   ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]],
   ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]],
   ['dfrn_5fdeliver',['dfrn_deliver',['../items_8php.html#a8395d189a36abfa0dfff81a2b0e70669',1,'items.php']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index 6a85186ff..7222dd01f 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -75,7 +75,7 @@ var searchData=
   ['get_5ftemplate_5fldelim',['get_template_ldelim',['../classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a',1,'App']]],
   ['get_5ftemplate_5frdelim',['get_template_rdelim',['../classApp.html#aab23c59172310fd30f2d60dc039d3eea',1,'App']]],
   ['get_5fterms_5foftype',['get_terms_oftype',['../taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'taxonomy.php']]],
-  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
+  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
   ['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]],
   ['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]],
   ['get_5ftheme_5fuid',['get_theme_uid',['../boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'boot.php']]],
diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js
index 8c9bc0406..bee3f5e56 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#a2a9b3d213aeeef28c4393ba8f7b408a4',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd',1,'if(): style.php'],['../theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea',1,'if(): style.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'],['../redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd',1,'if(): style.php'],['../theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea',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']]],
@@ -15,6 +15,7 @@ var searchData=
   ['import_5fdirectory_5fprofile',['import_directory_profile',['../zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32',1,'zot.php']]],
   ['import_5fpost',['import_post',['../import_8php.html#af17fef0410518f7eac205d0ea416eaa2',1,'import.php']]],
   ['import_5fprofile_5fphoto',['import_profile_photo',['../photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca',1,'photo_driver.php']]],
+  ['import_5fsite',['import_site',['../zot_8php.html#a2657e141d62d5f67ad3c87651b585299',1,'zot.php']]],
   ['import_5fxchan',['import_xchan',['../zot_8php.html#ab0227978011d8601494a7651fa26acf0',1,'zot.php']]],
   ['info',['info',['../boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498',1,'boot.php']]],
   ['install',['install',['../classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746',1,'dba_driver']]],
@@ -54,6 +55,7 @@ var searchData=
   ['item_5fnocomment',['ITEM_NOCOMMENT',['../boot_8php.html#a949116d9a295b214293006c060ca4848',1,'boot.php']]],
   ['item_5fnotshown',['ITEM_NOTSHOWN',['../boot_8php.html#a8663f32171568489dbb2a01dd00371f8',1,'boot.php']]],
   ['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]],
+  ['item_5fobscured',['ITEM_OBSCURED',['../boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d',1,'boot.php']]],
   ['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]],
   ['item_5fpermissions_5fsql',['item_permissions_sql',['../security_8php.html#a9355488460ab11d6058656ff919e5cf9',1,'security.php']]],
   ['item_5fphoto_5fmenu',['item_photo_menu',['../conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3',1,'conversation.php']]],
diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js
index 747d87f21..6f2314df0 100644
--- a/doc/html/search/all_6d.js
+++ b/doc/html/search/all_6d.js
@@ -6,6 +6,7 @@ var searchData=
   ['magiclink_5furl',['magiclink_url',['../text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6',1,'text.php']]],
   ['mail_5fdeleted',['MAIL_DELETED',['../boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8',1,'boot.php']]],
   ['mail_5fisreply',['MAIL_ISREPLY',['../boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2',1,'boot.php']]],
+  ['mail_5fobscured',['MAIL_OBSCURED',['../boot_8php.html#a44ae1542a805ffd7f826fb511db07374',1,'boot.php']]],
   ['mail_5frecalled',['MAIL_RECALLED',['../boot_8php.html#ae4861de36017fe399c1839f778bad9f5',1,'boot.php']]],
   ['mail_5freplied',['MAIL_REPLIED',['../boot_8php.html#aa3679df31c8dad1b71816b0322d5baff',1,'boot.php']]],
   ['mail_5fseen',['MAIL_SEEN',['../boot_8php.html#a1fbb93cf030f07391f22cc2948744869',1,'boot.php']]],
@@ -25,8 +26,6 @@ var searchData=
   ['message_5faside',['message_aside',['../mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7',1,'message.php']]],
   ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]],
   ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]],
-  ['metopem',['metopem',['../crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85',1,'crypto.php']]],
-  ['metorsa',['metorsa',['../crypto_8php.html#a573f02517abe4ac9241268263063b2a0',1,'crypto.php']]],
   ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]],
   ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f',1,'group.php']]],
   ['minimal_2ephp',['minimal.php',['../minimal_8php.html',1,'']]],
diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index e70c5ff30..d362b680b 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -17,8 +17,6 @@ var searchData=
   ['parsed',['parsed',['../classFriendicaSmarty.html#a6a4d4281d6fa9be1d37a97b188ffe8c9',1,'FriendicaSmarty']]],
   ['parseurl_5fgetsiteinfo',['parseurl_getsiteinfo',['../parse__url_8php.html#a25635549f2c22955d72465f4d2e58993',1,'parse_url.php']]],
   ['path',['path',['../namespacefriendica-to-smarty-tpl.html#a68d15934660cd1f4301ce251b1646f09',1,'friendica-to-smarty-tpl.path()'],['../namespaceupdatetpl.html#ae694f5e1f25f8a92a945eb90c432dfe6',1,'updatetpl.path()']]],
-  ['pemtome',['pemtome',['../crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c',1,'crypto.php']]],
-  ['pemtorsa',['pemtorsa',['../crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8',1,'crypto.php']]],
   ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]],
   ['permissions_2ephp',['permissions.php',['../permissions_8php.html',1,'']]],
   ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]],
@@ -77,10 +75,8 @@ var searchData=
   ['php_5ftpl',['php_tpl',['../namespacefriendica-to-smarty-tpl.html#a5dfc21ab8282dda8e3a7dff43cd0e283',1,'friendica-to-smarty-tpl']]],
   ['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]],
   ['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]],
-  ['pkcs1_5fencode',['pkcs1_encode',['../crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5',1,'crypto.php']]],
-  ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#a3398666e184faf8e516c8e5d91de86eb',1,'crypto.php']]],
+  ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec',1,'crypto.php']]],
   ['pkcs5_5funpad',['pkcs5_unpad',['../crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85',1,'crypto.php']]],
-  ['pkcs8_5fencode',['pkcs8_encode',['../crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2',1,'crypto.php']]],
   ['plugin_2ephp',['plugin.php',['../plugin_8php.html',1,'']]],
   ['png_5fquality',['PNG_QUALITY',['../boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce',1,'boot.php']]],
   ['po2php_2ephp',['po2php.php',['../po2php_8php.html',1,'']]],
@@ -103,7 +99,7 @@ var searchData=
   ['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
-  ['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]],
+  ['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]],
   ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]],
   ['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]],
   ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]],
@@ -117,6 +113,7 @@ var searchData=
   ['probe_2ephp',['probe.php',['../probe_8php.html',1,'']]],
   ['probe_5fcontent',['probe_content',['../probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99',1,'probe.php']]],
   ['proc_5frun',['proc_run',['../boot_8php.html#ab346a2ece14993861f3e4206befa94f0',1,'boot.php']]],
+  ['process_5fchannel_5fsync_5fdelivery',['process_channel_sync_delivery',['../zot_8php.html#ac301c67864917c35922257950ae0f95c',1,'zot.php']]],
   ['process_5fdelivery',['process_delivery',['../zot_8php.html#a37ec13b18057634eadb071f05297f5e1',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']]],
@@ -150,7 +147,6 @@ var searchData=
   ['protodriver_2ephp',['ProtoDriver.php',['../ProtoDriver_8php.html',1,'']]],
   ['public_5fpermissions_5fsql',['public_permissions_sql',['../security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01',1,'security.php']]],
   ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]],
-  ['pubrsatome',['pubrsatome',['../crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287',1,'crypto.php']]],
   ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]],
   ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]]
 ];
diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js
index 98625eb53..b6f0d62cc 100644
--- a/doc/html/search/all_72.js
+++ b/doc/html/search/all_72.js
@@ -61,7 +61,6 @@ var searchData=
   ['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()']]],
   ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]],
   ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]],
-  ['rsatopem',['rsatopem',['../crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26',1,'crypto.php']]],
   ['rsd_5fxml_2ephp',['rsd_xml.php',['../rsd__xml_8php.html',1,'']]],
   ['rsd_5fxml_5fcontent',['rsd_xml_content',['../rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82',1,'rsd_xml.php']]],
   ['runs',['runs',['../docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec',1,'docblox_errorchecker.php']]]
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 4639ecfb2..77c05a3f4 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -1,6 +1,5 @@
 var searchData=
 [
-  ['salmon_5fkey',['salmon_key',['../crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5',1,'crypto.php']]],
   ['sanitise_5facl',['sanitise_acl',['../text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c',1,'text.php']]],
   ['saved_5fsearches',['saved_searches',['../mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad',1,'network.php']]],
   ['saveimage',['saveImage',['../classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3',1,'photo_driver']]],
@@ -52,11 +51,10 @@ 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()']]],
-  ['settings_2ephp',['settings.php',['../include_2settings_8php.html',1,'']]],
-  ['settings_2ephp',['settings.php',['../mod_2settings_8php.html',1,'']]],
-  ['settings_5faside',['settings_aside',['../mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
-  ['settings_5finit',['settings_init',['../mod_2settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]],
-  ['settings_5fpost',['settings_post',['../mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
+  ['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']]],
+  ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
   ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
   ['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]],
   ['setup_5finit',['setup_init',['../setup_8php.html#a267555abd17290e659b4bf44b885e4e0',1,'setup.php']]],
@@ -92,8 +90,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',['../redstrap_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/files_73.js b/doc/html/search/files_73.js
index 2be1083e1..637791c44 100644
--- a/doc/html/search/files_73.js
+++ b/doc/html/search/files_73.js
@@ -4,16 +4,15 @@ var searchData=
   ['search_5fac_2ephp',['search_ac.php',['../search__ac_8php.html',1,'']]],
   ['security_2ephp',['security.php',['../security_8php.html',1,'']]],
   ['session_2ephp',['session.php',['../session_8php.html',1,'']]],
-  ['settings_2ephp',['settings.php',['../include_2settings_8php.html',1,'']]],
-  ['settings_2ephp',['settings.php',['../mod_2settings_8php.html',1,'']]],
+  ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]],
   ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
   ['share_2ephp',['share.php',['../share_8php.html',1,'']]],
   ['siteinfo_2ephp',['siteinfo.php',['../siteinfo_8php.html',1,'']]],
   ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
   ['socgraph_2ephp',['socgraph.php',['../socgraph_8php.html',1,'']]],
   ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
   ['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
+  ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
   ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]],
   ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]],
   ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]]
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 2d082bf9c..9b6ac0476 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -16,5 +16,5 @@ var searchData=
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
   ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
-  ['build_5fsync_5fpacket',['build_sync_packet',['../include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'settings.php']]]
+  ['build_5fsync_5fpacket',['build_sync_packet',['../zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'zot.php']]]
 ];
diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js
index 43c48a5c0..00f4a80d7 100644
--- a/doc/html/search/functions_63.js
+++ b/doc/html/search/functions_63.js
@@ -13,6 +13,7 @@ var searchData=
   ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]],
   ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]],
   ['channel_5fremove',['channel_remove',['../Contact_8php.html#ad46ff6764f12b6d3ab45c49b797f98aa',1,'Contact.php']]],
+  ['channel_5ftotal',['channel_total',['../identity_8php.html#a77d2237f1846964634b1c99089c27c7d',1,'identity.php']]],
   ['channelx_5fby_5fhash',['channelx_by_hash',['../Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258',1,'Contact.php']]],
   ['channelx_5fby_5fn',['channelx_by_n',['../Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc',1,'Contact.php']]],
   ['channelx_5fby_5fnick',['channelx_by_nick',['../Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e',1,'Contact.php']]],
diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js
index f7e68ceb1..b2517d52c 100644
--- a/doc/html/search/functions_64.js
+++ b/doc/html/search/functions_64.js
@@ -22,8 +22,6 @@ var searchData=
   ['deliver',['deliver',['../classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b',1,'ProtoDriver\deliver()'],['../classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f',1,'ZotDriver\deliver()']]],
   ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]],
   ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]],
-  ['dertopem',['DerToPem',['../crypto_8php.html#a630e1574554f34e7c38511585d9e71a2',1,'crypto.php']]],
-  ['dertorsa',['DerToRsa',['../crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839',1,'crypto.php']]],
   ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]],
   ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]],
   ['dfrn_5fdeliver',['dfrn_deliver',['../items_8php.html#a8395d189a36abfa0dfff81a2b0e70669',1,'items.php']]],
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 94728ff17..51db5875f 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -75,7 +75,7 @@ var searchData=
   ['get_5ftemplate_5fldelim',['get_template_ldelim',['../classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a',1,'App']]],
   ['get_5ftemplate_5frdelim',['get_template_rdelim',['../classApp.html#aab23c59172310fd30f2d60dc039d3eea',1,'App']]],
   ['get_5fterms_5foftype',['get_terms_oftype',['../taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'taxonomy.php']]],
-  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
+  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
   ['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]],
   ['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]],
   ['get_5ftheme_5fuid',['get_theme_uid',['../boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'boot.php']]],
diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js
index 709f042f0..d4c48a47b 100644
--- a/doc/html/search/functions_69.js
+++ b/doc/html/search/functions_69.js
@@ -12,6 +12,7 @@ var searchData=
   ['import_5fdirectory_5fprofile',['import_directory_profile',['../zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32',1,'zot.php']]],
   ['import_5fpost',['import_post',['../import_8php.html#af17fef0410518f7eac205d0ea416eaa2',1,'import.php']]],
   ['import_5fprofile_5fphoto',['import_profile_photo',['../photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca',1,'photo_driver.php']]],
+  ['import_5fsite',['import_site',['../zot_8php.html#a2657e141d62d5f67ad3c87651b585299',1,'zot.php']]],
   ['import_5fxchan',['import_xchan',['../zot_8php.html#ab0227978011d8601494a7651fa26acf0',1,'zot.php']]],
   ['info',['info',['../boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498',1,'boot.php']]],
   ['install',['install',['../classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746',1,'dba_driver']]],
diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js
index 298a991a4..cd02081da 100644
--- a/doc/html/search/functions_6d.js
+++ b/doc/html/search/functions_6d.js
@@ -13,8 +13,6 @@ var searchData=
   ['message_5faside',['message_aside',['../mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7',1,'message.php']]],
   ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]],
   ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]],
-  ['metopem',['metopem',['../crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85',1,'crypto.php']]],
-  ['metorsa',['metorsa',['../crypto_8php.html#a573f02517abe4ac9241268263063b2a0',1,'crypto.php']]],
   ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]],
   ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f',1,'group.php']]],
   ['mood_5fcontent',['mood_content',['../mood_8php.html#a721b9b6703b3234a005641c92d409b8f',1,'mood.php']]],
diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js
index 67d8fad8b..f37bb2de9 100644
--- a/doc/html/search/functions_70.js
+++ b/doc/html/search/functions_70.js
@@ -7,8 +7,6 @@ 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']]],
-  ['pemtome',['pemtome',['../crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c',1,'crypto.php']]],
-  ['pemtorsa',['pemtorsa',['../crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8',1,'crypto.php']]],
   ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]],
   ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]],
   ['perms2str',['perms2str',['../text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee',1,'text.php']]],
@@ -28,10 +26,8 @@ var searchData=
   ['photos_5fpost',['photos_post',['../mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080',1,'photos.php']]],
   ['php_5finit',['php_init',['../php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6',1,'php.php']]],
   ['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]],
-  ['pkcs1_5fencode',['pkcs1_encode',['../crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5',1,'crypto.php']]],
-  ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#a3398666e184faf8e516c8e5d91de86eb',1,'crypto.php']]],
+  ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec',1,'crypto.php']]],
   ['pkcs5_5funpad',['pkcs5_unpad',['../crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85',1,'crypto.php']]],
-  ['pkcs8_5fencode',['pkcs8_encode',['../crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2',1,'crypto.php']]],
   ['po2php_5frun',['po2php_run',['../po2php_8php.html#a3b75e36f913198299e99559b175cd8b4',1,'po2php.php']]],
   ['poco_5finit',['poco_init',['../poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498',1,'poco.php']]],
   ['poco_5fload',['poco_load',['../socgraph_8php.html#aad9ee2421fd1ca405b241e8ed72d9aca',1,'socgraph.php']]],
@@ -47,7 +43,7 @@ var searchData=
   ['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
-  ['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]],
+  ['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]],
   ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]],
   ['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]],
   ['pretheme_5finit',['pretheme_init',['../pretheme_8php.html#af5660943ee99db5fd75182316522eafe',1,'pretheme.php']]],
@@ -59,6 +55,7 @@ var searchData=
   ['private_5fmessages_5flist',['private_messages_list',['../include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e',1,'message.php']]],
   ['probe_5fcontent',['probe_content',['../probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99',1,'probe.php']]],
   ['proc_5frun',['proc_run',['../boot_8php.html#ab346a2ece14993861f3e4206befa94f0',1,'boot.php']]],
+  ['process_5fchannel_5fsync_5fdelivery',['process_channel_sync_delivery',['../zot_8php.html#ac301c67864917c35922257950ae0f95c',1,'zot.php']]],
   ['process_5fdelivery',['process_delivery',['../zot_8php.html#a37ec13b18057634eadb071f05297f5e1',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']]],
@@ -84,7 +81,6 @@ var searchData=
   ['protect_5fsprintf',['protect_sprintf',['../text_8php.html#a4e7698aca48982512594b274543c3b9b',1,'text.php']]],
   ['public_5fpermissions_5fsql',['public_permissions_sql',['../security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01',1,'security.php']]],
   ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]],
-  ['pubrsatome',['pubrsatome',['../crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287',1,'crypto.php']]],
   ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]],
   ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]]
 ];
diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js
index 266daa2ae..167c34050 100644
--- a/doc/html/search/functions_72.js
+++ b/doc/html/search/functions_72.js
@@ -44,7 +44,6 @@ var searchData=
   ['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()']]],
   ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]],
   ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]],
-  ['rsatopem',['rsatopem',['../crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26',1,'crypto.php']]],
   ['rsd_5fxml_5fcontent',['rsd_xml_content',['../rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82',1,'rsd_xml.php']]],
   ['runs',['runs',['../docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec',1,'docblox_errorchecker.php']]]
 ];
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index b3568bd75..2d6052b46 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -1,6 +1,5 @@
 var searchData=
 [
-  ['salmon_5fkey',['salmon_key',['../crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5',1,'crypto.php']]],
   ['sanitise_5facl',['sanitise_acl',['../text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c',1,'text.php']]],
   ['saved_5fsearches',['saved_searches',['../mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad',1,'network.php']]],
   ['saveimage',['saveImage',['../classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3',1,'photo_driver']]],
@@ -48,9 +47,9 @@ 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()']]],
-  ['settings_5faside',['settings_aside',['../mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
-  ['settings_5finit',['settings_init',['../mod_2settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]],
-  ['settings_5fpost',['settings_post',['../mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
+  ['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']]],
   ['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]],
   ['setup_5finit',['setup_init',['../setup_8php.html#a267555abd17290e659b4bf44b885e4e0',1,'setup.php']]],
   ['setup_5fpost',['setup_post',['../setup_8php.html#a13cf286774149a0a7bd8adb8179cec75',1,'setup.php']]],
diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js
index c8dd6d072..382d21761 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#a2a9b3d213aeeef28c4393ba8f7b408a4',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd',1,'if(): style.php'],['../theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea',1,'if(): style.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'],['../redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd',1,'if(): style.php'],['../theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea',1,'if(): style.php']]],
   ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]],
   ['item_5fdelayed_5fpublish',['ITEM_DELAYED_PUBLISH',['../boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20',1,'boot.php']]],
   ['item_5fdeleted',['ITEM_DELETED',['../boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49',1,'boot.php']]],
@@ -10,6 +10,7 @@ var searchData=
   ['item_5fnocomment',['ITEM_NOCOMMENT',['../boot_8php.html#a949116d9a295b214293006c060ca4848',1,'boot.php']]],
   ['item_5fnotshown',['ITEM_NOTSHOWN',['../boot_8php.html#a8663f32171568489dbb2a01dd00371f8',1,'boot.php']]],
   ['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]],
+  ['item_5fobscured',['ITEM_OBSCURED',['../boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d',1,'boot.php']]],
   ['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]],
   ['item_5frelay',['ITEM_RELAY',['../boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221',1,'boot.php']]],
   ['item_5fspam',['ITEM_SPAM',['../boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb',1,'boot.php']]],
diff --git a/doc/html/search/variables_6d.js b/doc/html/search/variables_6d.js
index c4431a676..45bb59275 100644
--- a/doc/html/search/variables_6d.js
+++ b/doc/html/search/variables_6d.js
@@ -2,6 +2,7 @@ var searchData=
 [
   ['mail_5fdeleted',['MAIL_DELETED',['../boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8',1,'boot.php']]],
   ['mail_5fisreply',['MAIL_ISREPLY',['../boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2',1,'boot.php']]],
+  ['mail_5fobscured',['MAIL_OBSCURED',['../boot_8php.html#a44ae1542a805ffd7f826fb511db07374',1,'boot.php']]],
   ['mail_5frecalled',['MAIL_RECALLED',['../boot_8php.html#ae4861de36017fe399c1839f778bad9f5',1,'boot.php']]],
   ['mail_5freplied',['MAIL_REPLIED',['../boot_8php.html#aa3679df31c8dad1b71816b0322d5baff',1,'boot.php']]],
   ['mail_5fseen',['MAIL_SEEN',['../boot_8php.html#a1fbb93cf030f07391f22cc2948744869',1,'boot.php']]],