diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-06-18 13:00:50 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-06-18 13:00:50 +0200 |
| commit | f9093466bf2230edde9a4e8156101dc9558968c5 (patch) | |
| tree | 92df0e38f470831e3558b910472d7e61459d79cb | |
| parent | b43bfaf132b8457768785a5ef5165a1227273140 (diff) | |
| download | nextcloud-server-f9093466bf2230edde9a4e8156101dc9558968c5.tar.gz nextcloud-server-f9093466bf2230edde9a4e8156101dc9558968c5.zip | |
add id to url
| -rw-r--r-- | apps/files_sharing/settings-personal.php | 6 | ||||
| -rw-r--r-- | apps/files_sharing/templates/settings-personal.php | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php index 704ee8103db..fdf641e1d2c 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/files_sharing/settings-personal.php @@ -27,13 +27,13 @@ $l = \OC::$server->getL10N('files_sharing'); $uid = \OC::$server->getUserSession()->getUser()->getUID(); $server = \OC::$server->getURLGenerator()->getAbsoluteURL('/'); $cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/'); -$url = 'https://owncloud.org/federation'; +$url = 'https://owncloud.org/federation#' . $cloudID; $ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg'); $tmpl = new OCP\Template('files_sharing', 'settings-personal'); $tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled()); -$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID %s see %s', [$cloudID, $url])); -$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID %s', [$cloudID])); +$tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$url])); +$tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID', [$cloudID])); $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath); $tmpl->assign('reference', $url); $tmpl->assign('cloudId', $cloudID); diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php index bc10da5583b..ee761ff5897 100644 --- a/apps/files_sharing/templates/settings-personal.php +++ b/apps/files_sharing/templates/settings-personal.php @@ -21,14 +21,14 @@ style('files_sharing', '3rdparty/gs-share/style'); <p> <?php p($l->t('Share it:')); ?> <div class="gs-share"> - <button data-url="<?php p($_['reference']); ?>" + <button data-url="<?php p(urlencode($_['reference'])); ?>" data-title='<?php p(urlencode($_['message_without_URL'])); ?>' class='js-gs-share social-gnu'> GNU Social </button> </div> <button class="social-diaspora pop-up" - data-url='http://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p($_['reference']); ?>'> + data-url='http://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p(urlencode($_['reference'])); ?>'> Diaspora </button> <button class="social-twitter pop-up" @@ -36,11 +36,11 @@ style('files_sharing', '3rdparty/gs-share/style'); Twitter </button> <button class="social-facebook pop-up" - data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p($_['reference']); ?>'> + data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'> Facebook </button> <button class="social-googleplus pop-up" - data-url='https://plus.google.com/share?url=<?php p($_['reference']); ?>'/> + data-url='https://plus.google.com/share?url=<?php p(urlencode($_['reference'])); ?>'/> Google+ </button> </p> |