diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 16:17:58 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 16:17:58 +0100 |
| commit | df5872ec50a68de5d99bd6b5cf17ceb94f2ef833 (patch) | |
| tree | eedcfa1459f9cf6ef67bec10787883875ed1fc3f /apps/files_sharing | |
| parent | c35a450cb1c0df0f77dea4c69182a381543b679a (diff) | |
| parent | 28ceab2f616d45a53dcc00c2cff53d5524bf0e9e (diff) | |
| download | nextcloud-server-df5872ec50a68de5d99bd6b5cf17ceb94f2ef833.tar.gz nextcloud-server-df5872ec50a68de5d99bd6b5cf17ceb94f2ef833.zip | |
Merge pull request #20719 from owncloud/adding-system-addressbook-of-users
Adding system addressbook for users of this instance - a occ command …
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'); |