Merge pull request #10669 from annando/no-rino

Remove all traces of "rino"

src/Module/Admin/Site.php

@@ -199,7 +199,6 @@ class Site extends BaseAdmin
 		$temppath               = (!empty($_POST['temppath'])               ? Strings::escapeTags(trim($_POST['temppath']))   : '');
 		$singleuser             = (!empty($_POST['singleuser'])             ? Strings::escapeTags(trim($_POST['singleuser'])) : '');
 		$only_tag_search        = !empty($_POST['only_tag_search']);
-		$rino                   = (!empty($_POST['rino'])                   ? intval($_POST['rino'])                          : 0);
 		$check_new_version_url  = (!empty($_POST['check_new_version_url'])  ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none');
 
 		$worker_queues    = (!empty($_POST['worker_queues'])                ? intval($_POST['worker_queues'])                 : 10);
@@ -379,8 +378,6 @@ class Site extends BaseAdmin
 		DI::config()->set('system', 'relay_deny_tags'  , $relay_deny_tags);
 		DI::config()->set('system', 'relay_user_tags'  , $relay_user_tags);
 
-		DI::config()->set('system', 'rino_encrypt'     , $rino);
-
 		DI::baseUrl()->redirect('admin/site' . $active_panel);
 	}
 
@@ -602,8 +599,6 @@ class Site extends BaseAdmin
 
 			'$relocate_url'           => ['relocate_url', DI::l10n()->t('New base url'), DI::baseUrl()->get(), DI::l10n()->t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')],
 
-			'$rino'                   => ['rino', DI::l10n()->t('RINO Encryption'), intval(DI::config()->get('system', 'rino_encrypt')), DI::l10n()->t('Encryption layer between nodes.'), [0 => DI::l10n()->t('Disabled'), 1 => DI::l10n()->t('Enabled')]],
-
 			'$worker_queues'          => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)],
 			'$worker_fastlane'        => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')],
 

static/settings.config.php

@@ -180,12 +180,6 @@ return [
 		// If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
 		'relay_user_tags' => true,
 
-		// rino_encrypt (Integer)
-		// Server-to-server private message encryption (RINO).
-		// Encryption will only be provided if this setting is set to a non zero value on both servers.
-		// Set to 0 to disable, 2 to enable, 1 is deprecated but won't need mcrypt.
-		'rino_encrypt' => 2,
-
 		// temppath (String)
 		// Custom temporary file directory
 		'temppath' => '',

view/templates/admin/site.tpl

@@ -86,7 +86,6 @@
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$advanced}}</h2>
-		{{include file="field_select.tpl" field=$rino}}
 		{{include file="field_checkbox.tpl" field=$verifyssl}}
 		{{include file="field_input.tpl" field=$proxy}}
 		{{include file="field_input.tpl" field=$proxyuser}}

view/theme/frio/templates/admin/site.tpl

@@ -185,7 +185,6 @@
 				</div>
 				<div id="admin-settings-advanced-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-advanced">
 					<div class="panel-body">
-						{{include file="field_select.tpl" field=$rino}}
 						{{include file="field_checkbox.tpl" field=$verifyssl}}
 						{{include file="field_input.tpl" field=$proxy}}
 						{{include file="field_input.tpl" field=$proxyuser}}