diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-08-21 16:29:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 16:29:51 +0200 |
| commit | 28af5012a28cc736940de583b963873688cb5a26 (patch) | |
| tree | 453ce76de82e549babe51a939570536d0545fedc /lib | |
| parent | 1766bff1eda7735848f3e80e07c90ec2ec612aba (diff) | |
| parent | 655b318b23e9a670db2c9b788d1d32cd83a06aa4 (diff) | |
| download | nextcloud-server-28af5012a28cc736940de583b963873688cb5a26.tar.gz nextcloud-server-28af5012a28cc736940de583b963873688cb5a26.zip | |
Merge pull request #47391 from nextcloud/backport/47371/stable30
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 1 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index f790dae226c..c877304c929 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -38,6 +38,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { public const USER_AGENT_CHROME = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\)( Ubuntu Chromium\/[0-9.]+|) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+( (Vivaldi|Brave|OPR)\/[0-9.]+|)$/'; // Safari User Agent from http://www.useragentstring.com/pages/Safari/ public const USER_AGENT_SAFARI = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ Safari\/[0-9.A-Z]+$/'; + public const USER_AGENT_SAFARI_MOBILE = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ (Mobile\/[0-9.A-Z]+) Safari\/[0-9.A-Z]+$/'; // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent public const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; public const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 7b33f88d4db..fd6b7b27a97 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -8,6 +8,7 @@ namespace OC; use bantu\IniGetWrapper\IniGetWrapper; +use OC\AppFramework\Http\Request; use OC\Authentication\Token\IProvider; use OC\Files\FilenameValidator; use OC\Search\SearchQuery; @@ -20,6 +21,7 @@ use OCP\Defaults; use OCP\IConfig; use OCP\IInitialStateService; use OCP\INavigationManager; +use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; use OCP\L10N\IFactory; @@ -286,6 +288,13 @@ class TemplateLayout extends \OC_Template { } } + $request = \OCP\Server::get(IRequest::class); + if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) { + // Prevent auto zoom with iOS but still allow user zoom + // On chrome (and others) this does not work (will also disable user zoom) + $this->assign('viewport_maximum_scale', '1.0'); + } + $this->assign('initialStates', $this->initialState->getInitialStates()); $this->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content'); |