diff options
| -rw-r--r-- | core/js/config.php | 2 | ||||
| -rw-r--r-- | lib/private/connector/sabre/filesplugin.php | 2 | ||||
| -rw-r--r-- | lib/private/files/storage/dav.php | 1 | ||||
| -rw-r--r-- | lib/public/util.php | 5 | ||||
| -rw-r--r-- | settings/ajax/grouplist.php | 4 | ||||
| -rw-r--r-- | settings/ajax/userlist.php | 7 |
6 files changed, 12 insertions, 9 deletions
diff --git a/core/js/config.php b/core/js/config.php index 2f423111bda..0ab74d2949e 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -70,7 +70,7 @@ $array = array( "firstDay" => json_encode($l->l('firstday', 'firstday')) , "oc_config" => json_encode( array( - 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), + 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), ini_get('session.gc_maxlifetime')), 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true), 'version' => implode('.', OC_Util::getVersion()), 'versionstring' => OC_Util::getVersionString(), diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php index 871fac88e68..5f83aa0fb55 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -37,7 +37,7 @@ class OC_Connector_Sabre_FilesPlugin extends \Sabre\DAV\ServerPlugin $server->xmlNamespaces[self::NS_OWNCLOUD] = 'oc'; $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}id'; - $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}perm'; + $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}permissions'; $this->server = $server; $this->server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties')); diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 726688fe444..02c3ebd0202 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -281,6 +281,7 @@ class DAV extends \OC\Files\Storage\Common { curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path)); curl_setopt($curl, CURLOPT_PUT, true); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); if ($this->secure === true) { curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2); diff --git a/lib/public/util.php b/lib/public/util.php index 8f4691eeade..ff8c743c0df 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -128,10 +128,11 @@ class Util { /** * get l10n object * @param string $application + * @param string|null $language * @return \OC_L10N */ - public static function getL10N( $application ) { - return \OC_L10N::get( $application ); + public static function getL10N($application, $language = null) { + return \OC_L10N::get($application, $language); } /** diff --git a/settings/ajax/grouplist.php b/settings/ajax/grouplist.php index 52df98c4e5e..93bb510773d 100644 --- a/settings/ajax/grouplist.php +++ b/settings/ajax/grouplist.php @@ -38,9 +38,7 @@ $adminGroups = array(); $groupManager = \OC_Group::getManager(); $isAdmin = OC_User::isAdminUser(OC_User::getUser()); -//we pass isAdmin as true, because OC_SubAdmin has no search feature, -//groups will be filtered out later -$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), true, $groupManager); +$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager); $groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT); list($adminGroups, $groups) = $groupsInfo->get($groupPattern, $pattern); diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index 2bf40686b87..a99c221beb8 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -76,10 +76,13 @@ if (OC_User::isAdminUser(OC_User::getUser())) { $batch = OC_Group::usersInGroups($groups, $pattern, $limit, $offset); foreach ($batch as $uid) { $user = $userManager->get($uid); + + // Only add the groups, this user is a subadmin of + $userGroups = array_intersect(OC_Group::getUserGroups($uid), OC_SubAdmin::getSubAdminsGroups(OC_User::getUser())); $users[] = array( - 'name' => $user, + 'name' => $uid, 'displayname' => $user->getDisplayName(), - 'groups' => join(', ', OC_Group::getUserGroups($uid)), + 'groups' => join(', ', $userGroups), 'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'), 'storageLocation' => $user->getHome(), 'lastLogin' => $user->getLastLogin(), |