diff options
| -rw-r--r-- | .tag | 1 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 4 | ||||
| -rw-r--r-- | lib/private/httphelper.php | 3 | ||||
| -rw-r--r-- | lib/private/urlgenerator.php | 8 | ||||
| -rw-r--r-- | settings/personal.php | 6 | ||||
| -rw-r--r-- | settings/templates/personal.php | 8 |
7 files changed, 24 insertions, 10 deletions
@@ -0,0 +1 @@ +$Format:%H$ diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index aeebc2d6439..96229fd370a 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -13,8 +13,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c1a75447210..c799205b7cf 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -14,8 +14,8 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/lib/private/httphelper.php b/lib/private/httphelper.php index 1f3482b3514..08c35e4ae08 100644 --- a/lib/private/httphelper.php +++ b/lib/private/httphelper.php @@ -214,7 +214,8 @@ class HTTPHelper { curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POST, count($fields)); - curl_setopt($ch, CURLOPT_POSTFIELDS, $fieldsString); + curl_setopt($ch, CURLOPT_POSTFIELDS, (string)$fieldsString); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); if (is_readable($certBundle)) { curl_setopt($ch, CURLOPT_CAINFO, $certBundle); } diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index d263d25aeef..0bf8ce22998 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -32,8 +32,7 @@ class URLGenerator implements IURLGenerator { /** * Creates an url using a defined route * @param string $route - * @param array $parameters - * @internal param array $args with param=>value, will be appended to the returned url + * @param array $parameters args with param=>value, will be appended to the returned url * @return string the url * * Returns a url to the given route. @@ -45,9 +44,8 @@ class URLGenerator implements IURLGenerator { /** * Creates an absolute url using a defined route - * @param string $route - * @param array $parameters - * @internal param array $args with param=>value, will be appended to the returned url + * @param string $routeName + * @param array $arguments args with param=>value, will be appended to the returned url * @return string the url * * Returns an absolute url to the given route. diff --git a/settings/personal.php b/settings/personal.php index f181c9cb2c1..7239df365f5 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -100,6 +100,12 @@ $tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true)); $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); $tmpl->assign('certs', $certificateManager->listCertificates()); +// Get array of group ids for this user +$groups = \OC::$server->getGroupManager()->getUserIdGroups(OC_User::getUser()); +$groups2 = array_map(function($group) { return $group->getGID(); }, $groups); +sort($groups2); +$tmpl->assign('groups', $groups2); + // add hardcoded forms from the template $l = OC_L10N::get('settings'); $formsAndMore = array(); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 3bd5971f44e..02e61287937 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -136,6 +136,14 @@ if($_['passwordChangeSupported']) { } ?> +<div id="groups" class="section"> + <h2><?php p($l->t('Groups')); ?></h2> + <p><?php p($l->t('You are member of the following groups:')); ?></p> + <p> + <?php p(implode(', ', $_['groups'])); ?> + </p> +</div> + <?php if ($_['enableAvatars']): ?> <form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>"> <h2><?php p($l->t('Profile picture')); ?></h2> |