diff options
| -rw-r--r-- | core/css/public.scss | 3 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 10 | ||||
| -rw-r--r-- | core/templates/twofactorselectchallenge.php | 10 | ||||
| -rw-r--r-- | lib/private/legacy/helper.php | 15 | ||||
| -rw-r--r-- | tests/acceptance/features/bootstrap/FilesAppContext.php | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/core/css/public.scss b/core/css/public.scss index 5f02dc1762b..052c98e29ea 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -73,8 +73,11 @@ $footer-height: 65px; a { color: var(--color-text-lighter); font-weight: 600; + white-space: nowrap; + /* increasing clickability to more than the text height */ padding: 13px; margin: -13px; + line-height: 200%; } } } diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 736404e2681..9cd48aaf9a7 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -406,7 +406,7 @@ permissions: permissions }); }, - + showNoteForm: function(event) { event.preventDefault(); event.stopPropagation(); @@ -431,9 +431,9 @@ var shareId = $li.data('share-id'); var $menu = $element.closest('li'); var $form = $menu.next('li.share-note-form'); - + $form.find('.share-note').val(''); - + $form.addClass('hidden'); $menu.find('.share-note-delete').hide(); @@ -600,7 +600,7 @@ var popover = this.popoverMenuTemplate({ cid: this.model.get('linkShare').id, - copyLabel: t('core', 'Copy URL'), + copyLabel: t('core', 'Copy link'), social: social, shareLinkURL: this.model.get('linkShare').link, @@ -745,7 +745,7 @@ var datePicker = $(expirationDatePicker); var state = $element.prop('checked'); datePicker.toggleClass('hidden', !state); - + if (!state) { // disabled, let's hide the input and // set the expireDate to nothing diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php index 55d315d904d..c3c35c7fec4 100644 --- a/core/templates/twofactorselectchallenge.php +++ b/core/templates/twofactorselectchallenge.php @@ -6,6 +6,15 @@ <strong><?php p($l->t('Could not load at least one of your enabled two-factor auth methods. Please contact your admin.')) ?></strong> </p> <?php endif; ?> + <?php if (empty($_['providers'])): ?> + <p> + <?php if (is_null($_['backupProvider'])): ?> + <strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance.')) ?></strong> + <?php else: ?> + <strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong> + <?php endif; ?> + </p> + <?php else: ?> <p> <ul> <?php foreach ($_['providers'] as $provider): ?> @@ -23,6 +32,7 @@ <?php endforeach; ?> </ul> </p> + <?php endif ?> <p class="two-factor-link"> <a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a> <?php if (!is_null($_['backupProvider'])): ?> diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 8373c191dce..5a05e147c2b 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -505,20 +505,7 @@ class OC_Helper { if (self::is_function_enabled('exec')) { $exeSniffer = new ExecutableFinder(); // Returns null if nothing is found - $result = $exeSniffer->find($program); - if (empty($result)) { - $paths = getenv('PATH'); - if (empty($paths)) { - $paths = '/usr/local/bin /usr/bin /opt/bin /bin'; - } else { - $paths = str_replace(':',' ',getenv('PATH')); - } - $command = 'find ' . $paths . ' -name ' . escapeshellarg($program) . ' 2> /dev/null'; - exec($command, $output, $returnCode); - if (count($output) > 0) { - $result = escapeshellcmd($output[0]); - } - } + $result = $exeSniffer->find($program, null, ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin', '/opt/bin']); } // store the value for 5 minutes $memcache->set($program, $result, 300); diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index ab9fc8fe29c..408995b9a83 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -227,9 +227,9 @@ class FilesAppContext implements Context, ActorAwareInterface { * @return Locator */ public static function copyUrlMenuItem() { - return Locator::forThe()->xpath("//a[normalize-space() = 'Copy URL']")-> + return Locator::forThe()->xpath("//a[normalize-space() = 'Copy link']")-> descendantOf(self::shareLinkMenu())-> - describedAs("Copy URL menu item in the share link menu in the details view in Files app"); + describedAs("Copy link menu item in the share link menu in the details view in Files app"); } /** |