diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/he.js | 4 | ||||
| -rw-r--r-- | lib/l10n/he.json | 4 | ||||
| -rw-r--r-- | lib/l10n/ru.js | 3 | ||||
| -rw-r--r-- | lib/l10n/ru.json | 3 | ||||
| -rw-r--r-- | lib/private/app.php | 5 | ||||
| -rw-r--r-- | lib/private/setup/oci.php | 2 | ||||
| -rw-r--r-- | lib/private/setup/postgresql.php | 2 | ||||
| -rw-r--r-- | lib/private/util.php | 12 | ||||
| -rw-r--r-- | lib/public/util.php | 2 |
9 files changed, 20 insertions, 17 deletions
diff --git a/lib/l10n/he.js b/lib/l10n/he.js index 9a021abe2ec..ce99a984cac 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -13,6 +13,7 @@ OC.L10N.register( "last year" : "שנה שעברה", "seconds ago" : "שניות", "web services under your control" : "שירותי רשת תחת השליטה שלך", + "File name contains at least one invalid character" : "שם קובץ כולל לפחות תו אחד לא חוקי", "Application is not enabled" : "יישומים אינם מופעלים", "Authentication error" : "שגיאת הזדהות", "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.", @@ -20,6 +21,7 @@ OC.L10N.register( "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", "A valid username must be provided" : "יש לספק שם משתמש תקני", - "A valid password must be provided" : "יש לספק ססמה תקנית" + "A valid password must be provided" : "יש לספק ססמה תקנית", + "Storage not available" : "אחסון לא זמין" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/he.json b/lib/l10n/he.json index 91c42907008..2b39879cf82 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -11,6 +11,7 @@ "last year" : "שנה שעברה", "seconds ago" : "שניות", "web services under your control" : "שירותי רשת תחת השליטה שלך", + "File name contains at least one invalid character" : "שם קובץ כולל לפחות תו אחד לא חוקי", "Application is not enabled" : "יישומים אינם מופעלים", "Authentication error" : "שגיאת הזדהות", "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.", @@ -18,6 +19,7 @@ "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", "A valid username must be provided" : "יש לספק שם משתמש תקני", - "A valid password must be provided" : "יש לספק ססמה תקנית" + "A valid password must be provided" : "יש לספק ססמה תקנית", + "Storage not available" : "אחסון לא זמין" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index 3a33d471e50..fcb6d9b42bc 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -112,6 +112,9 @@ OC.L10N.register( "Sharing %s failed, because resharing is not allowed" : "Не удалось поделиться %s, повторное открытие доступа запрещено", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s", "Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.", + "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s", + "Expiration date is in the past" : "Дата окончания срока действия уже прошла", + "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней", "Could not find category \"%s\"" : "Категория \"%s\" не найдена", "Apps" : "Приложения", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"", diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 8851ea0ac0a..79c53f85ace 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -110,6 +110,9 @@ "Sharing %s failed, because resharing is not allowed" : "Не удалось поделиться %s, повторное открытие доступа запрещено", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s", "Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.", + "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s", + "Expiration date is in the past" : "Дата окончания срока действия уже прошла", + "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней", "Could not find category \"%s\"" : "Категория \"%s\" не найдена", "Apps" : "Приложения", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"", diff --git a/lib/private/app.php b/lib/private/app.php index 500a60060e6..705d60cf8d6 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -912,6 +912,11 @@ class OC_App { $apps[$i]['internalclass'] = 'recommendedapp'; } + // Apps from the appstore are always assumed to be compatible with the + // the current release as the initial filtering is done on the appstore + $apps[$i]['dependencies']['owncloud']['@attributes']['min-version'] = implode('.', \OCP\Util::getVersion()); + $apps[$i]['dependencies']['owncloud']['@attributes']['max-version'] = implode('.', \OCP\Util::getVersion()); + $i++; } diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php index e5634572d90..d335df850cf 100644 --- a/lib/private/setup/oci.php +++ b/lib/private/setup/oci.php @@ -106,7 +106,7 @@ class OCI extends AbstractDatabase { //add prefix to the oracle user name to prevent collisions $this->dbUser='oc_'.$username; //create a new password so we don't need to store the admin config in the config file - $this->dbPassword=\OC_Util::generateRandomBytes(30); + $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); //oracle passwords are treated as identifiers: // must start with alphanumeric char diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php index 59762209d08..850551e794f 100644 --- a/lib/private/setup/postgresql.php +++ b/lib/private/setup/postgresql.php @@ -61,7 +61,7 @@ class PostgreSQL extends AbstractDatabase { //add prefix to the postgresql user name to prevent collisions $this->dbUser='oc_'.$username; //create a new password so we don't need to store the admin config in the config file - $this->dbPassword=\OC_Util::generateRandomBytes(30); + $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); $this->createDBUser($connection); } diff --git a/lib/private/util.php b/lib/private/util.php index ecb18946f12..ed62f1afb4a 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -1278,18 +1278,6 @@ class OC_Util { } } - - /** - * Generates a cryptographic secure pseudo-random string - * - * @param int $length of the random string - * @return string - * @deprecated Use \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($length); instead - */ - public static function generateRandomBytes($length = 30) { - return \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($length, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); - } - /** * Checks whether the server is running on Windows * diff --git a/lib/public/util.php b/lib/public/util.php index 493aa0000a5..55bbd01eeaf 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -637,7 +637,7 @@ class Util { * @since 7.0.0 */ public static function generateRandomBytes($length = 30) { - return \OC_Util::generateRandomBytes($length); + return \OC::$server->getSecureRandom()->generate($length, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); } /** |