diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-30 13:57:54 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 09:14:41 +0100 |
| commit | df6fc6cc70ceb06e0b9d8a7ff9ce4cbf2f74e710 (patch) | |
| tree | 37679559a66256e7d3457d5a93d2534d2e34aa44 /apps/files_sharing | |
| parent | 7c8a84e7ac31a0f4c1d59ad1c13ca0c5cce65d8e (diff) | |
| download | nextcloud-server-df6fc6cc70ceb06e0b9d8a7ff9ce4cbf2f74e710.tar.gz nextcloud-server-df6fc6cc70ceb06e0b9d8a7ff9ce4cbf2f74e710.zip | |
Add the user's cloud id to the vCard
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/helper.php | 16 | ||||
| -rw-r--r-- | apps/files_sharing/settings-personal.php | 4 |
2 files changed, 1 insertions, 19 deletions
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index a804737c490..391b491e1ff 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -310,20 +310,4 @@ class Helper { \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder); } - /** - * remove protocol from URL - * - * @param string $url - * @return string - */ - public static function removeProtocolFromUrl($url) { - if (strpos($url, 'https://') === 0) { - return substr($url, strlen('https://')); - } else if (strpos($url, 'http://') === 0) { - return substr($url, strlen('http://')); - } - - return $url; - } - } diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php index deaa7b92ac7..85fad9c3eaf 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/files_sharing/settings-personal.php @@ -32,9 +32,7 @@ if (count($matches) > 0 && $matches[1] <= 9) { $isIE8 = true; } -$uid = \OC::$server->getUserSession()->getUser()->getUID(); -$server = \OC::$server->getURLGenerator()->getAbsoluteURL('/'); -$cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/'); +$cloudID = \OC::$server->getUserSession()->getUser()->getCloudId(); $url = 'https://owncloud.org/federation#' . $cloudID; $ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg'); |