Merge pull request #13728 from owncloud/federated_cloud
rename 'server-to-server sharing' to 'federated cloud'
This commit is contained in:
commit
5c8e5e223d
|
@ -34,7 +34,7 @@ class Server2Server {
|
|||
public function createShare($params) {
|
||||
|
||||
if (!$this->isS2SEnabled(true)) {
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
|
||||
}
|
||||
|
||||
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
|
||||
|
@ -94,7 +94,7 @@ class Server2Server {
|
|||
public function acceptShare($params) {
|
||||
|
||||
if (!$this->isS2SEnabled()) {
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
|
||||
}
|
||||
|
||||
$id = $params['id'];
|
||||
|
@ -121,7 +121,7 @@ class Server2Server {
|
|||
public function declineShare($params) {
|
||||
|
||||
if (!$this->isS2SEnabled()) {
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
|
||||
}
|
||||
|
||||
$id = $params['id'];
|
||||
|
@ -152,7 +152,7 @@ class Server2Server {
|
|||
public function unshare($params) {
|
||||
|
||||
if (!$this->isS2SEnabled()) {
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
|
||||
return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
|
||||
}
|
||||
|
||||
$id = $params['id'];
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
?>
|
||||
<div class="section" id="fileSharingSettings" >
|
||||
|
||||
<h2><?php p($l->t('Server-to-Server Sharing'));?></h2>
|
||||
<h2><?php p($l->t('Federated Cloud Sharing'));?></h2>
|
||||
|
||||
<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled"
|
||||
value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
|
||||
|
|
Loading…
Reference in New Issue