diff options
| -rw-r--r-- | CONTRIBUTING.md | 1 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 6 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 13 | ||||
| -rw-r--r-- | lib/private/api.php | 3 | ||||
| -rwxr-xr-x | lib/private/util.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 20 |
6 files changed, 31 insertions, 14 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2360a082a25..70bd85fabf0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,6 +20,7 @@ If you have questions about how to install or use ownCloud, please direct these - [Bookmarks](https://github.com/owncloud/bookmarks/issues) - [Calendar](https://github.com/owncloud/calendar/issues) - [Contacts](https://github.com/owncloud/contacts/issues) + - [Documents](https://github.com/owncloud/documents/issues) - [Mail](https://github.com/owncloud/mail/issues) - [Media/Music](https://github.com/owncloud/media/issues) - [News](https://github.com/owncloud/news/issues) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 95c0723f254..8c56f1cb364 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -465,7 +465,11 @@ $(document).ready(function() { crumb.text(text); } - $(document).click(function() { + $(document).click(function(ev) { + // do not close when clicking in the dropdown + if ($(ev.target).closest('#new').length){ + return; + } $('#new>ul').hide(); $('#new').removeClass('active'); if ($('#new .error').length > 0) { diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index c33a06bbdc3..02dfa16a224 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -593,18 +593,19 @@ var FileList={ var fileSize = '<td class="filesize">'+humanFileSize(totalSize)+'</td>'; } - $('#fileList').append('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>'); + var $summary = $('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>'); + $('#fileList').append($summary); - var $dirInfo = $('.summary .dirinfo'); - var $fileInfo = $('.summary .fileinfo'); - var $connector = $('.summary .connector'); + var $dirInfo = $summary.find('.dirinfo'); + var $fileInfo = $summary.find('.fileinfo'); + var $connector = $summary.find('.connector'); // Show only what's necessary, e.g.: no files: don't show "0 files" - if ($dirInfo.html().charAt(0) === "0") { + if (totalDirs === 0) { $dirInfo.hide(); $connector.hide(); } - if ($fileInfo.html().charAt(0) === "0") { + if (totalFiles === 0) { $fileInfo.hide(); $connector.hide(); } diff --git a/lib/private/api.php b/lib/private/api.php index 26091657b31..7e69a6a77d2 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -250,7 +250,8 @@ class OC_API { // reuse existing login $loggedIn = OC_User::isLoggedIn(); - if ($loggedIn === true) { + $ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false; + if ($loggedIn === true && $ocsApiRequest) { return OC_User::getUser(); } diff --git a/lib/private/util.php b/lib/private/util.php index f63884c0f32..176eb4bc369 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -579,6 +579,7 @@ class OC_Util { * @return void */ public static function checkAdminUser() { + OC_Util::checkLoggedIn(); if( !OC_User::isAdminUser(OC_User::getUser())) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' )); exit(); @@ -611,6 +612,7 @@ class OC_Util { * @return array $groups where the current user is subadmin */ public static function checkSubAdminUser() { + OC_Util::checkLoggedIn(); if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' )); exit(); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a5724bf3b17..5413b700936 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -4,6 +4,13 @@ * See the COPYING-README file. */ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); +$levelLabels = array( + $l->t( 'Everything (fatal issues, errors, warnings, info, debug)' ), + $l->t( 'Info, warnings, errors and fatal issues' ), + $l->t( 'Warnings, errors and fatal issues' ), + $l->t( 'Errors and fatal issues' ), + $l->t( 'Fatal issues only' ), +); ?> <?php @@ -210,12 +217,13 @@ if (!$_['internetconnectionworking']) { <fieldset class="personalblock"> <h2><?php p($l->t('Log'));?></h2> <?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'> - <option value='<?php p($_['loglevel'])?>'><?php p($levels[$_['loglevel']])?></option> - <?php for ($i = 0; $i < 5; $i++): - if ($i !== $_['loglevel']):?> - <option value='<?php p($i)?>'><?php p($levels[$i])?></option> - <?php endif; -endfor;?> +<?php for ($i = 0; $i < 5; $i++): + $selected = ''; + if ($i == $_['loglevel']): + $selected = 'selected="selected"'; + endif; ?> + <option value='<?php p($i)?>' <?php p($selected) ?>><?php p($levelLabels[$i])?></option> +<?php endfor;?> </select> <table id="log" class="grid"> <?php foreach ($_['entries'] as $entry): ?> |