diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/private/Share20/Manager.php | 5 | ||||
| -rw-r--r-- | lib/private/legacy/app.php | 6 | ||||
| -rw-r--r-- | lib/private/legacy/defaults.php | 14 |
4 files changed, 18 insertions, 11 deletions
diff --git a/lib/base.php b/lib/base.php index b33687dbab7..be14f49cab3 100644 --- a/lib/base.php +++ b/lib/base.php @@ -501,7 +501,9 @@ class OC { } catch (\RuntimeException $e) { if (!self::$CLI) { - OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); + $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']); + $protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1'; + header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE); } // we can't use the template error page here, because this needs the // DI container which isn't available yet diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ceaaa58cf6e..5921bbc44c8 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -239,8 +239,11 @@ class Manager implements IManager { throw new GenericShareException($message_t, $message_t, 404); } + // Check that read permissions are always set - if (($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) { + // Link shares are allowed to have no read permissions to allow upload to hidden folders + if ($share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK && + ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) { throw new \InvalidArgumentException('Shares need at least read permissions'); } diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 5fac1790424..d4bf4f50c0e 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -421,7 +421,9 @@ class OC_App { $settings = array(); // by default, settings only contain the help menu - if (OC_Util::getEditionString() === '' && + /* + * FIXME: Add help sidebar back once documentation is properly branded. + if (OC_Util::getEditionString() === '' && \OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true ) { $settings = array( @@ -433,7 +435,7 @@ class OC_App { "icon" => $urlGenerator->imagePath("settings", "help.svg") ) ); - } + }*/ // if the user is logged-in if (OC_User::isLoggedIn()) { diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index bcfd5374e0a..2a97cfe89ed 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -51,19 +51,19 @@ class OC_Defaults { $this->l = \OC::$server->getL10N('lib'); $version = \OCP\Util::getVersion(); - $this->defaultEntity = 'ownCloud'; /* e.g. company name, used for footers and copyright notices */ - $this->defaultName = 'ownCloud'; /* short name, used when referring to the software */ - $this->defaultTitle = 'ownCloud'; /* can be a longer name, for titles */ - $this->defaultBaseUrl = 'https://owncloud.org'; - $this->defaultSyncClientUrl = 'https://owncloud.org/install/#install-clients'; + $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */ + $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */ + $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */ + $this->defaultBaseUrl = 'https://nextcloud.com'; + $this->defaultSyncClientUrl = 'https://nextcloud.com/install'; $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8'; $this->defaultiTunesAppId = '543672169'; $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android'; $this->defaultDocBaseUrl = 'https://doc.owncloud.org'; $this->defaultDocVersion = $version[0] . '.' . $version[1]; // used to generate doc links - $this->defaultSlogan = $this->l->t('web services under your control'); + $this->defaultSlogan = $this->l->t('a safe home for all your data'); $this->defaultLogoClaim = ''; - $this->defaultMailHeaderColor = '#1d2d44'; /* header color of mail notifications */ + $this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */ $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php'; if (file_exists($themePath)) { |