diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/l10n/ca.js | 1 | ||||
| -rw-r--r-- | lib/l10n/ca.json | 1 | ||||
| -rw-r--r-- | lib/l10n/sk.js | 1 | ||||
| -rw-r--r-- | lib/l10n/sk.json | 1 | ||||
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/Fetcher.php | 17 | ||||
| -rw-r--r-- | lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php | 4 | ||||
| -rw-r--r-- | lib/public/WorkflowEngine/IManager.php | 10 |
8 files changed, 31 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 61db221ac68..27862fc82f8 100644 --- a/lib/base.php +++ b/lib/base.php @@ -371,7 +371,6 @@ class OC { $oldTheme = $systemConfig->getValue('theme'); $systemConfig->setValue('theme', ''); - OC_Util::addScript('config'); // needed for web root OC_Util::addScript('update'); /** @var \OC\App\AppManager $appManager */ diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js index b9a3423fc67..b2cafc26bd1 100644 --- a/lib/l10n/ca.js +++ b/lib/l10n/ca.js @@ -23,6 +23,7 @@ OC.L10N.register( "PHP %s or higher is required." : "Es requereix PHP %s o superior.", "PHP with a version lower than %s is required." : "Es requereix PHP amb versió inferior a %s.", "%sbit or higher PHP required." : "Es requereix PHP de %s bits o superior.", + "The following architectures are supported: %s" : "S'admeten les següents arquitectures: %s", "The following databases are supported: %s" : "S'admeten les bases de dades següents: %s", "The command line tool %s could not be found" : "No s’ha trobat l’eina de línia d’ordres %s", "The library %s is not available." : "La llibreria %s no està disponible.", diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json index 1af4705f9ce..108622ed747 100644 --- a/lib/l10n/ca.json +++ b/lib/l10n/ca.json @@ -21,6 +21,7 @@ "PHP %s or higher is required." : "Es requereix PHP %s o superior.", "PHP with a version lower than %s is required." : "Es requereix PHP amb versió inferior a %s.", "%sbit or higher PHP required." : "Es requereix PHP de %s bits o superior.", + "The following architectures are supported: %s" : "S'admeten les següents arquitectures: %s", "The following databases are supported: %s" : "S'admeten les bases de dades següents: %s", "The command line tool %s could not be found" : "No s’ha trobat l’eina de línia d’ordres %s", "The library %s is not available." : "La llibreria %s no està disponible.", diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js index 9e5c94b32d7..9968dd8f5fb 100644 --- a/lib/l10n/sk.js +++ b/lib/l10n/sk.js @@ -23,6 +23,7 @@ OC.L10N.register( "PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.", "PHP with a version lower than %s is required." : "PHP je vyžadované vo vyššej verzii ako %s.", "%sbit or higher PHP required." : "%sbit alebo vyššie PHP je vyžadované.", + "The following architectures are supported: %s" : "Podporované sú nasledujúce architektúry: %s", "The following databases are supported: %s" : "Podporované sú nasledujúce databázy: %s", "The command line tool %s could not be found" : "Nástroj príkazového riadka %s nebol nájdený", "The library %s is not available." : "Knižnica %s je nedostupná.", diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json index cf5f2774814..7a78b6d42fe 100644 --- a/lib/l10n/sk.json +++ b/lib/l10n/sk.json @@ -21,6 +21,7 @@ "PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.", "PHP with a version lower than %s is required." : "PHP je vyžadované vo vyššej verzii ako %s.", "%sbit or higher PHP required." : "%sbit alebo vyššie PHP je vyžadované.", + "The following architectures are supported: %s" : "Podporované sú nasledujúce architektúry: %s", "The following databases are supported: %s" : "Podporované sú nasledujúce databázy: %s", "The command line tool %s could not be found" : "Nástroj príkazového riadka %s nebol nájdený", "The library %s is not available." : "Knižnica %s je nedostupná.", diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 8415eed1ff0..45b2edddf6b 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -41,6 +41,7 @@ use OCP\Util; abstract class Fetcher { const INVALIDATE_AFTER_SECONDS = 3600; + const RETRY_AFTER_FAILURE_SECONDS = 300; /** @var IAppData */ protected $appData; @@ -90,6 +91,9 @@ abstract class Fetcher { */ protected function fetch($ETag, $content) { $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true); + if ((int)$this->config->getAppValue('settings', 'appstore-fetcher-lastFailure', '0') > time() - self::RETRY_AFTER_FAILURE_SECONDS) { + return []; + } if (!$appstoreenabled) { return []; @@ -105,7 +109,12 @@ abstract class Fetcher { } $client = $this->clientService->newClient(); - $response = $client->get($this->getEndpoint(), $options); + try { + $response = $client->get($this->getEndpoint(), $options); + } catch (ConnectException $e) { + $this->config->setAppValue('settings', 'appstore-fetcher-lastFailure', (string)time()); + throw $e; + } $responseJson = []; if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) { @@ -114,6 +123,7 @@ abstract class Fetcher { $responseJson['data'] = json_decode($response->getBody(), true); $ETag = $response->getHeader('ETag'); } + $this->config->deleteAppValue('settings', 'appstore-fetcher-lastFailure'); $responseJson['timestamp'] = $this->timeFactory->getTime(); $responseJson['ncversion'] = $this->getVersion(); @@ -170,6 +180,11 @@ abstract class Fetcher { // Refresh the file content try { $responseJson = $this->fetch($ETag, $content); + + if (empty($responseJson)) { + return []; + } + $file->putContent(json_encode($responseJson)); return json_decode($file->getContent(), true)['data']; } catch (ConnectException $e) { diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php index 12719b2aaad..23afcbd9f96 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php @@ -186,8 +186,6 @@ class OCIExpressionBuilder extends ExpressionBuilder { * @inheritdoc */ public function iLike($x, $y, $type = null) { - $x = $this->helper->quoteColumnName($x); - $y = $this->helper->quoteColumnName($y); - return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')'); + return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y)); } } diff --git a/lib/public/WorkflowEngine/IManager.php b/lib/public/WorkflowEngine/IManager.php index 490467663ae..5956228ce7e 100644 --- a/lib/public/WorkflowEngine/IManager.php +++ b/lib/public/WorkflowEngine/IManager.php @@ -35,6 +35,16 @@ interface IManager { const SCOPE_USER = 1; /** + * @since 21.0.0 + */ + public const MAX_CHECK_VALUE_BYTES = 2048; + + /** + * @since 21.0.0 + */ + public const MAX_OPERATION_VALUE_BYTES = 4096; + + /** * @depreacted Will be removed in NC19. Use the dedicated events in OCP\WorkflowEngine\Events */ const EVENT_NAME_REG_OPERATION = 'OCP\WorkflowEngine::registerOperations'; |