aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/cs.js2
-rw-r--r--lib/l10n/cs.json2
-rw-r--r--lib/l10n/nl.js21
-rw-r--r--lib/l10n/nl.json21
-rw-r--r--lib/private/DB/Connection.php11
-rw-r--r--lib/private/DB/QueryBuilder/QueryBuilder.php12
-rw-r--r--lib/private/Template/SCSSCacher.php9
-rw-r--r--lib/public/Calendar/ICalendarQuery.php57
-rw-r--r--lib/public/DB/QueryBuilder/IQueryBuilder.php4
-rw-r--r--lib/public/IDBConnection.php4
10 files changed, 125 insertions, 18 deletions
diff --git a/lib/l10n/cs.js b/lib/l10n/cs.js
index 5c2eab060d7..6d496d9772c 100644
--- a/lib/l10n/cs.js
+++ b/lib/l10n/cs.js
@@ -193,7 +193,7 @@ OC.L10N.register(
"Oct." : "říj.",
"Nov." : "list.",
"Dec." : "pro.",
- "The user limit has been reached and the user was not created." : "Bylo dosaženo limitu uživatelů a uživatel nebyl vytvořen.",
+ "The user limit has been reached and the user was not created." : "Bylo dosaženo limitu počtu uživatelů a uživatel proto nebyl vytvořen.",
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Pouze následující znaky jsou povoleny pro uživatelské jméno: „a-z“, „A-Z“, „0-9“, a „_.@-'“",
"A valid username must be provided" : "Je třeba zadat platné uživatelské jméno",
"Username contains whitespace at the beginning or at the end" : "Uživatelské jméno je chybné – na jeho začátku či konci se nachází prázdný znak (mezera, tabulátor, atp.)",
diff --git a/lib/l10n/cs.json b/lib/l10n/cs.json
index 593b3af46a5..adc20059018 100644
--- a/lib/l10n/cs.json
+++ b/lib/l10n/cs.json
@@ -191,7 +191,7 @@
"Oct." : "říj.",
"Nov." : "list.",
"Dec." : "pro.",
- "The user limit has been reached and the user was not created." : "Bylo dosaženo limitu uživatelů a uživatel nebyl vytvořen.",
+ "The user limit has been reached and the user was not created." : "Bylo dosaženo limitu počtu uživatelů a uživatel proto nebyl vytvořen.",
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Pouze následující znaky jsou povoleny pro uživatelské jméno: „a-z“, „A-Z“, „0-9“, a „_.@-'“",
"A valid username must be provided" : "Je třeba zadat platné uživatelské jméno",
"Username contains whitespace at the beginning or at the end" : "Uživatelské jméno je chybné – na jeho začátku či konci se nachází prázdný znak (mezera, tabulátor, atp.)",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 07fa8f8449f..7b11f101561 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -8,6 +8,10 @@ OC.L10N.register(
"The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server." : "De bestanden van app %1$szijn niet correct vervangen. Zorg ervoor dat de versie compatible is met de server.",
"Sample configuration detected" : "Voorbeeld configuratie gevonden",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Er is gedetecteerd dat de voorbeeld configuratie is gekopieerd. Dit kan je installatie beschadigen en wordt dan ook niet ondersteund. Lees de documentatie voordat je wijzigingen aan config.php doorvoert",
+ "%s email verification" : "%s e-mail verificatie",
+ "Email verification" : "E-mail verificatie",
+ "Click the following button to confirm your email." : "Klik op de knop om je e-mail te bevestigen.",
+ "Click the following link to confirm your email." : "Klik op de volgende link om je e-mail te bevestigen.",
"Confirm your email" : "Bevestig je e-mailadres",
"Other activities" : "Andere activiteiten",
"%1$s and %2$s" : "%1$s en %2$s",
@@ -31,6 +35,7 @@ OC.L10N.register(
"The following platforms are supported: %s" : "De volgende platforms worden ondersteund: %s",
"Server version %s or higher is required." : "Serverversie %s of hoger vereist.",
"Server version %s or lower is required." : "Serverversie %s of lager vereist.",
+ "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ingelogde gebruiken moet beheerder, sub-beheerder of gebruiker met speciale rechten om deze instelling te veranderen zijn",
"Logged in user must be an admin or sub admin" : "Ingelogde gebruiker moet een beheerder of subbeheerder zijn",
"Logged in user must be an admin" : "Ingelogde gebruiker moet een beheerder zijn",
"Wiping of device %s has started" : "Leegmaken van toestel %sis gestart",
@@ -49,6 +54,7 @@ OC.L10N.register(
"Unknown filetype" : "Onbekend bestandsformaat",
"Invalid image" : "Ongeldige afbeelding",
"Avatar image is not square" : "Avatar afbeelding is niet vierkant",
+ "View profile" : "Bekijk profiel",
"today" : "vandaag",
"tomorrow" : "morgen",
"yesterday" : "gisteren",
@@ -88,6 +94,21 @@ OC.L10N.register(
"Settings" : "Instellingen",
"Log out" : "Uitloggen",
"Users" : "Gebruikers",
+ "Email" : "E-mail",
+ "Mail %s" : "Mail %s",
+ "Phone" : "Telefoon",
+ "Call %s" : "Bel %s",
+ "Twitter" : "Twitter",
+ "View %s on Twitter" : "Bekijk %s op Twitter",
+ "Website" : "Website",
+ "Visit %s" : "Bezoek %s",
+ "Address" : "Adres",
+ "Profile picture" : "Profielafbeelding",
+ "About" : "Over",
+ "Full name" : "Volledige naam",
+ "Headline" : "Hoofdlijn",
+ "Organisation" : "Organisatie",
+ "Role" : "Rol",
"Unknown user" : "Onbekende gebruiker",
"Additional settings" : "Aanvullende instellingen",
"%s enter the database username and name." : "%s voer de database gebruikersnaam en naam in .",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index eb28aca6b18..2bdabce07f5 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -6,6 +6,10 @@
"The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server." : "De bestanden van app %1$szijn niet correct vervangen. Zorg ervoor dat de versie compatible is met de server.",
"Sample configuration detected" : "Voorbeeld configuratie gevonden",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Er is gedetecteerd dat de voorbeeld configuratie is gekopieerd. Dit kan je installatie beschadigen en wordt dan ook niet ondersteund. Lees de documentatie voordat je wijzigingen aan config.php doorvoert",
+ "%s email verification" : "%s e-mail verificatie",
+ "Email verification" : "E-mail verificatie",
+ "Click the following button to confirm your email." : "Klik op de knop om je e-mail te bevestigen.",
+ "Click the following link to confirm your email." : "Klik op de volgende link om je e-mail te bevestigen.",
"Confirm your email" : "Bevestig je e-mailadres",
"Other activities" : "Andere activiteiten",
"%1$s and %2$s" : "%1$s en %2$s",
@@ -29,6 +33,7 @@
"The following platforms are supported: %s" : "De volgende platforms worden ondersteund: %s",
"Server version %s or higher is required." : "Serverversie %s of hoger vereist.",
"Server version %s or lower is required." : "Serverversie %s of lager vereist.",
+ "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ingelogde gebruiken moet beheerder, sub-beheerder of gebruiker met speciale rechten om deze instelling te veranderen zijn",
"Logged in user must be an admin or sub admin" : "Ingelogde gebruiker moet een beheerder of subbeheerder zijn",
"Logged in user must be an admin" : "Ingelogde gebruiker moet een beheerder zijn",
"Wiping of device %s has started" : "Leegmaken van toestel %sis gestart",
@@ -47,6 +52,7 @@
"Unknown filetype" : "Onbekend bestandsformaat",
"Invalid image" : "Ongeldige afbeelding",
"Avatar image is not square" : "Avatar afbeelding is niet vierkant",
+ "View profile" : "Bekijk profiel",
"today" : "vandaag",
"tomorrow" : "morgen",
"yesterday" : "gisteren",
@@ -86,6 +92,21 @@
"Settings" : "Instellingen",
"Log out" : "Uitloggen",
"Users" : "Gebruikers",
+ "Email" : "E-mail",
+ "Mail %s" : "Mail %s",
+ "Phone" : "Telefoon",
+ "Call %s" : "Bel %s",
+ "Twitter" : "Twitter",
+ "View %s on Twitter" : "Bekijk %s op Twitter",
+ "Website" : "Website",
+ "Visit %s" : "Bezoek %s",
+ "Address" : "Adres",
+ "Profile picture" : "Profielafbeelding",
+ "About" : "Over",
+ "Full name" : "Volledige naam",
+ "Headline" : "Hoofdlijn",
+ "Organisation" : "Organisatie",
+ "Role" : "Rol",
"Unknown user" : "Onbekende gebruiker",
"Additional settings" : "Aanvullende instellingen",
"%s enter the database username and name." : "%s voer de database gebruikersnaam en naam in .",
diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php
index 58d8d114705..1965bb3eee4 100644
--- a/lib/private/DB/Connection.php
+++ b/lib/private/DB/Connection.php
@@ -189,15 +189,20 @@ class Connection extends \Doctrine\DBAL\Connection {
* Prepares an SQL statement.
*
* @param string $statement The SQL statement to prepare.
- * @param int $limit
- * @param int $offset
+ * @param int|null $limit
+ * @param int|null $offset
*
* @return Statement The prepared statement.
* @throws Exception
*/
public function prepare($statement, $limit = null, $offset = null): Statement {
- if ($limit === -1) {
+ if ($limit === -1 || $limit === null) {
$limit = null;
+ } else {
+ $limit = (int) $limit;
+ }
+ if ($offset !== null) {
+ $offset = (int) $offset;
}
if (!is_null($limit)) {
$platform = $this->getDatabasePlatform();
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index e1f74f5327c..89265c74fae 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -450,12 +450,12 @@ class QueryBuilder implements IQueryBuilder {
/**
* Sets the position of the first result to retrieve (the "offset").
*
- * @param integer $firstResult The first result to return.
+ * @param int $firstResult The first result to return.
*
* @return $this This QueryBuilder instance.
*/
public function setFirstResult($firstResult) {
- $this->queryBuilder->setFirstResult($firstResult);
+ $this->queryBuilder->setFirstResult((int) $firstResult);
return $this;
}
@@ -477,12 +477,16 @@ class QueryBuilder implements IQueryBuilder {
* of the databases will just return an empty result set, Oracle will return
* all entries.
*
- * @param integer $maxResults The maximum number of results to retrieve.
+ * @param int|null $maxResults The maximum number of results to retrieve.
*
* @return $this This QueryBuilder instance.
*/
public function setMaxResults($maxResults) {
- $this->queryBuilder->setMaxResults($maxResults);
+ if ($maxResults === null) {
+ $this->queryBuilder->setMaxResults($maxResults);
+ } else {
+ $this->queryBuilder->setMaxResults((int) $maxResults);
+ }
return $this;
}
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index c1bd556de60..0543427f997 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -32,7 +32,6 @@ namespace OC\Template;
use OC\AppConfig;
use OC\Files\AppData\Factory;
use OC\Memcache\NullCache;
-use OCA\Theming\ThemingDefaults;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
@@ -63,7 +62,7 @@ class SCSSCacher {
/** @var IConfig */
protected $config;
- /** @var ThemingDefaults */
+ /** @var \OC_Defaults */
private $defaults;
/** @var string */
@@ -97,7 +96,7 @@ class SCSSCacher {
* @param Factory $appDataFactory
* @param IURLGenerator $urlGenerator
* @param IConfig $config
- * @param ThemingDefaults $defaults
+ * @param \OC_Defaults $defaults
* @param string $serverRoot
* @param ICacheFactory $cacheFactory
* @param IconsCacher $iconsCacher
@@ -107,7 +106,7 @@ class SCSSCacher {
Factory $appDataFactory,
IURLGenerator $urlGenerator,
IConfig $config,
- ThemingDefaults $defaults,
+ \OC_Defaults $defaults,
$serverRoot,
ICacheFactory $cacheFactory,
IconsCacher $iconsCacher,
@@ -407,7 +406,7 @@ class SCSSCacher {
}
/**
- * @return string SCSS code for variables from ThemingDefaults
+ * @return string SCSS code for variables from OC_Defaults
*/
private function getInjectedVariables(string $cache = ''): string {
if ($this->injectedVariables !== null) {
diff --git a/lib/public/Calendar/ICalendarQuery.php b/lib/public/Calendar/ICalendarQuery.php
index 142810d3fb9..6a1fff619f6 100644
--- a/lib/public/Calendar/ICalendarQuery.php
+++ b/lib/public/Calendar/ICalendarQuery.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
namespace OCP\Calendar;
use DateTimeImmutable;
@@ -35,6 +36,56 @@ use DateTimeImmutable;
interface ICalendarQuery {
/**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_CATEGORIES = 'CATEGORIES';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_COMMENT = 'COMMENT';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_DESCRIPTION = 'DESCRIPTION';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_LOCATION = 'LOCATION';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_RESOURCES = 'RESOURCES';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_STATUS = 'STATUS';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_SUMMARY = 'SUMMARY';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_ATTENDEE = 'ATTENDEE';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_CONTACT = 'CONTACT';
+
+ /**
+ * @since 24.0.0
+ */
+ public const SEARCH_PROPERTY_ORGANIZER = 'ORGANIZER';
+
+ /**
* Limit the results to the calendar uri(s)
*
* @since 23.0.0
@@ -51,6 +102,12 @@ interface ICalendarQuery {
/**
* Define the property name(s) to search for
*
+ * Note: Nextcloud only indexes *some* properties. You can not search for
+ * arbitrary properties.
+ *
+ * @param string $value any of the ICalendarQuery::SEARCH_PROPERTY_* values
+ * @psalm-param ICalendarQuery::SEARCH_PROPERTY_* $value
+ *
* @since 23.0.0
*/
public function addSearchProperty(string $value): void;
diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
index 5d1116075d8..7829696970c 100644
--- a/lib/public/DB/QueryBuilder/IQueryBuilder.php
+++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -280,7 +280,7 @@ interface IQueryBuilder {
/**
* Sets the position of the first result to retrieve (the "offset").
*
- * @param integer $firstResult The first result to return.
+ * @param int $firstResult The first result to return.
*
* @return $this This QueryBuilder instance.
* @since 8.2.0
@@ -299,7 +299,7 @@ interface IQueryBuilder {
/**
* Sets the maximum number of results to retrieve (the "limit").
*
- * @param integer $maxResults The maximum number of results to retrieve.
+ * @param int|null $maxResults The maximum number of results to retrieve.
*
* @return $this This QueryBuilder instance.
* @since 8.2.0
diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php
index cedf0429869..2fa7fa1ad36 100644
--- a/lib/public/IDBConnection.php
+++ b/lib/public/IDBConnection.php
@@ -86,8 +86,8 @@ interface IDBConnection {
/**
* Used to abstract the ownCloud database access away
* @param string $sql the sql query with ? placeholder for params
- * @param int $limit the maximum number of rows
- * @param int $offset from which row we want to start
+ * @param int|null $limit the maximum number of rows
+ * @param int|null $offset from which row we want to start
* @return IPreparedStatement The prepared statement.
* @since 6.0.0
* @throws Exception since 21.0.0
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-20 12:07:44 +0000