diff options
Diffstat (limited to 'apps')
97 files changed, 340 insertions, 654 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index 93d8b14d9c9..bdaf73d46e7 100644 --- a/apps/dav/lib/Connector/Sabre/Auth.php +++ b/apps/dav/lib/Connector/Sabre/Auth.php @@ -174,7 +174,7 @@ class Auth extends AbstractBasic { return false; } - // Official ownCloud clients require no checks + // Official Nextcloud clients require no checks if($this->request->isUserAgent([ IRequest::USER_AGENT_CLIENT_DESKTOP, IRequest::USER_AGENT_CLIENT_ANDROID, diff --git a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php index a9e339f9ffc..f8193f38e1f 100644 --- a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php +++ b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php @@ -27,7 +27,7 @@ use Sabre\HTTP\RequestInterface; /** * Class DummyGetResponsePlugin is a plugin used to not show a "Not implemented" - * error to clients that rely on verifying the functionality of the ownCloud + * error to clients that rely on verifying the functionality of the Nextcloud * WebDAV backend using a simple GET to /. * * This is considered a legacy behaviour and implementers should consider sending diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php index 4aef5fc8a5a..f0958c353a1 100644 --- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php +++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php @@ -106,7 +106,7 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin { $uri = rtrim($parentUri, '/') . '/' . $info['name']; } $freeSpace = $this->getFreeSpace($uri); - if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $length > $freeSpace) { + if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && $length > $freeSpace) { if (isset($chunkHandler)) { $chunkHandler->cleanup(); } diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index 24c93ee571d..f04362dfc08 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -142,7 +142,7 @@ class ServerFactory { $rootInfo = $view->getFileInfo(''); } - // Create ownCloud Dir + // Create Nextcloud Dir if ($rootInfo->getType() === 'dir') { $root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree); } else { diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php index b37abdc9b05..6286362f47d 100644 --- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php @@ -24,6 +24,7 @@ * */ namespace OCA\DAV\Tests\unit\Connector\Sabre; +use OCP\Files\FileInfo; use Test\TestCase; /** @@ -107,11 +108,16 @@ class QuotaPluginTest extends TestCase { array(1024, array('X-EXPECTED-ENTITY-LENGTH' => '1024')), array(1024, array('CONTENT-LENGTH' => '512')), array(1024, array('OC-TOTAL-LENGTH' => '1024', 'CONTENT-LENGTH' => '512')), - // \OCP\Files\FileInfo::SPACE-UNKNOWN = -2 - array(-2, array()), - array(-2, array('X-EXPECTED-ENTITY-LENGTH' => '1024')), - array(-2, array('CONTENT-LENGTH' => '512')), - array(-2, array('OC-TOTAL-LENGTH' => '1024', 'CONTENT-LENGTH' => '512')), + + array(FileInfo::SPACE_UNKNOWN, array()), + array(FileInfo::SPACE_UNKNOWN, array('X-EXPECTED-ENTITY-LENGTH' => '1024')), + array(FileInfo::SPACE_UNKNOWN, array('CONTENT-LENGTH' => '512')), + array(FileInfo::SPACE_UNKNOWN, array('OC-TOTAL-LENGTH' => '1024', 'CONTENT-LENGTH' => '512')), + + array(FileInfo::SPACE_UNLIMITED, array()), + array(FileInfo::SPACE_UNLIMITED, array('X-EXPECTED-ENTITY-LENGTH' => '1024')), + array(FileInfo::SPACE_UNLIMITED, array('CONTENT-LENGTH' => '512')), + array(FileInfo::SPACE_UNLIMITED, array('OC-TOTAL-LENGTH' => '1024', 'CONTENT-LENGTH' => '512')), ); } diff --git a/apps/encryption/l10n/fi.js b/apps/encryption/l10n/fi.js index 10229e7706e..0a1887a5f3d 100644 --- a/apps/encryption/l10n/fi.js +++ b/apps/encryption/l10n/fi.js @@ -30,11 +30,14 @@ OC.L10N.register( "one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hei,\n\nYlläpiäjä on ottanut käyttöön palvelimen salauksen. Tiedostosi salattiin salasanalla '%s'.\n\nOle hyvä ja kirjaudu palveluun verkkokäyttöliittymän kautta, siirry henkilökohtaisten asetustesi kohtaan \"perussalausmoduuli\" ja päivitä salaukseen käytettävä salasanasi syöttämällä yllä mainittu salasana \"vanha kirjautumissalasana\"-kenttään ja nykyinen kirjautumissalasanasi.\n\n", "The share will expire on %s." : "Jakaminen päättyy %s.", "Cheers!" : "Kiitos!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Ylläpiäjä on ottanut käyttöön palvelimen salauksen. Tiedostosi salattiin salasanalla <strong>%s</srong>.<br><br>Ole hyvä ja kirjaudu palveluun verkkokäyttöliittymän kautta, siirry henkilökohtaisten asetustesi kohtaan \"perussalausmoduuli\" ja päivitä salaukseen käytettävä salasanasi syöttämällä yllä mainittu salasana \"vanha kirjautumissalasana\"-kenttään ja nykyinen kirjautumissalasanasi.<br><br>", "Default encryption module" : "Oletus salausmoduuli", "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on aktivoitu, mutta avaimia ei ole alustettu, kirjaudu uudelleen sisään", "Encrypt the home storage" : "Salaa oma kotitila", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Tämän valinnan ollessa valittuna salataan kaikki päätallennustilaan tallennetut tiedostot. Muussa tapauksessa ainoastaan ulkoisessa tallennustilassa sijaitsevat tiedostot salataan.", "Enable recovery key" : "Ota palautusavain käyttöön", "Disable recovery key" : "Poista palautusavain käytöstä", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.", diff --git a/apps/encryption/l10n/fi.json b/apps/encryption/l10n/fi.json index 14b3b95fc24..5768d7a9d82 100644 --- a/apps/encryption/l10n/fi.json +++ b/apps/encryption/l10n/fi.json @@ -28,11 +28,14 @@ "one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hei,\n\nYlläpiäjä on ottanut käyttöön palvelimen salauksen. Tiedostosi salattiin salasanalla '%s'.\n\nOle hyvä ja kirjaudu palveluun verkkokäyttöliittymän kautta, siirry henkilökohtaisten asetustesi kohtaan \"perussalausmoduuli\" ja päivitä salaukseen käytettävä salasanasi syöttämällä yllä mainittu salasana \"vanha kirjautumissalasana\"-kenttään ja nykyinen kirjautumissalasanasi.\n\n", "The share will expire on %s." : "Jakaminen päättyy %s.", "Cheers!" : "Kiitos!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Ylläpiäjä on ottanut käyttöön palvelimen salauksen. Tiedostosi salattiin salasanalla <strong>%s</srong>.<br><br>Ole hyvä ja kirjaudu palveluun verkkokäyttöliittymän kautta, siirry henkilökohtaisten asetustesi kohtaan \"perussalausmoduuli\" ja päivitä salaukseen käytettävä salasanasi syöttämällä yllä mainittu salasana \"vanha kirjautumissalasana\"-kenttään ja nykyinen kirjautumissalasanasi.<br><br>", "Default encryption module" : "Oletus salausmoduuli", "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on aktivoitu, mutta avaimia ei ole alustettu, kirjaudu uudelleen sisään", "Encrypt the home storage" : "Salaa oma kotitila", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Tämän valinnan ollessa valittuna salataan kaikki päätallennustilaan tallennetut tiedostot. Muussa tapauksessa ainoastaan ulkoisessa tallennustilassa sijaitsevat tiedostot salataan.", "Enable recovery key" : "Ota palautusavain käyttöön", "Disable recovery key" : "Poista palautusavain käytöstä", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.", diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 4303cb9e940..9a9ac27b96f 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -38,7 +38,7 @@ use OCP\ILogger; use OCP\IUserSession; /** - * Class Crypt provides the encryption implementation of the default ownCloud + * Class Crypt provides the encryption implementation of the default Nextcloud * encryption module. As default AES-256-CTR is used, it does however offer support * for the following modes: * @@ -54,10 +54,10 @@ use OCP\IUserSession; class Crypt { const DEFAULT_CIPHER = 'AES-256-CTR'; - // default cipher from old ownCloud versions + // default cipher from old Nextcloud versions const LEGACY_CIPHER = 'AES-128-CFB'; - // default key format, old ownCloud version encrypted the private key directly + // default key format, old Nextcloud version encrypted the private key directly // with the user password const LEGACY_KEY_FORMAT = 'password'; diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index fdcbd41a09c..7f7665a24fc 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -458,7 +458,7 @@ class Encryption implements IEncryptionModule { /** * get size of the unencrypted payload per block. - * ownCloud read/write files with a block size of 8192 byte + * Nextcloud read/write files with a block size of 8192 byte * * @param bool $signed * @return int diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index d189ce3eeef..e0826e2c7e3 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -236,7 +236,7 @@ class UserHooks implements IHook { } /** - * If the password can't be changed within ownCloud, than update the key password in advance. + * If the password can't be changed within Nextcloud, than update the key password in advance. * * @param array $params : uid, password * @return boolean|null diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index 32872ae99b3..6b260c39bfb 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -687,7 +687,7 @@ class KeyManager { public function getMasterKeyPassword() { $password = $this->config->getSystemValue('secret'); if (empty($password)){ - throw new \Exception('Can not get secret from ownCloud instance'); + throw new \Exception('Can not get secret from Nextcloud instance'); } return $password; diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index 3525d2d4aec..7e074a5b9e8 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -345,7 +345,7 @@ class EncryptionTest extends TestCase { } /** - * Test case if the public key is missing. ownCloud should still encrypt + * Test case if the public key is missing. Nextcloud should still encrypt * the file for the remaining users */ public function testUpdateMissingPublicKey() { diff --git a/apps/federatedfilesharing/l10n/de.js b/apps/federatedfilesharing/l10n/de.js index 53f9b137b74..2f2387c01be 100644 --- a/apps/federatedfilesharing/l10n/de.js +++ b/apps/federatedfilesharing/l10n/de.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Nutzern durchsuchen und lokale Nutzer ihre Daten veröffentlichen lassen", + "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuche zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", diff --git a/apps/federatedfilesharing/l10n/de.json b/apps/federatedfilesharing/l10n/de.json index 960a8747be7..fe1f884181c 100644 --- a/apps/federatedfilesharing/l10n/de.json +++ b/apps/federatedfilesharing/l10n/de.json @@ -39,6 +39,8 @@ "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Nutzern durchsuchen und lokale Nutzer ihre Daten veröffentlichen lassen", + "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuche zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", "Share it:" : "Zum Teilen:", diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js index f4f90b8d2a3..11983a5e2fd 100644 --- a/apps/federatedfilesharing/l10n/de_DE.js +++ b/apps/federatedfilesharing/l10n/de_DE.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Nutzern durchsuchen und lokale Nutzer ihre Daten veröffentlichen lassen", + "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuche zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", "Share it:" : "Teilen:", diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json index 80502295363..ad6d84c8171 100644 --- a/apps/federatedfilesharing/l10n/de_DE.json +++ b/apps/federatedfilesharing/l10n/de_DE.json @@ -39,6 +39,8 @@ "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Nutzern durchsuchen und lokale Nutzer ihre Daten veröffentlichen lassen", + "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuche zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", "Share it:" : "Teilen:", diff --git a/apps/federatedfilesharing/l10n/es.js b/apps/federatedfilesharing/l10n/es.js index cf46d88e12a..881e0e17ee4 100644 --- a/apps/federatedfilesharing/l10n/es.js +++ b/apps/federatedfilesharing/l10n/es.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Documentación abierta", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Search global and public address book for users and let local users publish their data" : "Buscar libreta de direcciones global y pública para usuarios y permitir a los usuarios locales publicar su información", + "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar su información en la libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID Nube Federada:", "Share it:" : "Compartir:", diff --git a/apps/federatedfilesharing/l10n/es.json b/apps/federatedfilesharing/l10n/es.json index fa5af452d95..da75410734e 100644 --- a/apps/federatedfilesharing/l10n/es.json +++ b/apps/federatedfilesharing/l10n/es.json @@ -39,6 +39,8 @@ "Open documentation" : "Documentación abierta", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Search global and public address book for users and let local users publish their data" : "Buscar libreta de direcciones global y pública para usuarios y permitir a los usuarios locales publicar su información", + "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar su información en la libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID Nube Federada:", "Share it:" : "Compartir:", diff --git a/apps/federatedfilesharing/l10n/es_MX.js b/apps/federatedfilesharing/l10n/es_MX.js index 36a1d224140..77bd5724abb 100644 --- a/apps/federatedfilesharing/l10n/es_MX.js +++ b/apps/federatedfilesharing/l10n/es_MX.js @@ -40,6 +40,8 @@ OC.L10N.register( "Open documentation" : "Abrir documentación", "Allow users on this server to send shares to other servers" : "Permitirle a los usuarios de este servidor enviar elementos compartidos a otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que los usuarios de este servidor recibir elementos compartidos de otros servidores", + "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos", + "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar sus datos a una libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID de Nube Federada:", "Share it:" : "Compartirlo:", diff --git a/apps/federatedfilesharing/l10n/es_MX.json b/apps/federatedfilesharing/l10n/es_MX.json index a7f46715e57..2530c7f5337 100644 --- a/apps/federatedfilesharing/l10n/es_MX.json +++ b/apps/federatedfilesharing/l10n/es_MX.json @@ -38,6 +38,8 @@ "Open documentation" : "Abrir documentación", "Allow users on this server to send shares to other servers" : "Permitirle a los usuarios de este servidor enviar elementos compartidos a otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que los usuarios de este servidor recibir elementos compartidos de otros servidores", + "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos", + "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar sus datos a una libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID de Nube Federada:", "Share it:" : "Compartirlo:", diff --git a/apps/federatedfilesharing/l10n/fi.js b/apps/federatedfilesharing/l10n/fi.js index 8b44da1e2a7..8274af6c25a 100644 --- a/apps/federatedfilesharing/l10n/fi.js +++ b/apps/federatedfilesharing/l10n/fi.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Search global and public address book for users and let local users publish their data" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta sekä salli paikallisten käyttäjien julkaista omia tietojaan", + "Allow users to publish their data to a global and public address book" : "Salli käyttäjien julkaista tietojaan maailmanlaajuisessa ja julkisessa osoitekirjassa", "Federated Cloud" : "Federoitu pilvi", "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", "Share it:" : "Jaa se:", diff --git a/apps/federatedfilesharing/l10n/fi.json b/apps/federatedfilesharing/l10n/fi.json index c8130859bd4..0a2dc0193ce 100644 --- a/apps/federatedfilesharing/l10n/fi.json +++ b/apps/federatedfilesharing/l10n/fi.json @@ -39,6 +39,8 @@ "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Search global and public address book for users and let local users publish their data" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta sekä salli paikallisten käyttäjien julkaista omia tietojaan", + "Allow users to publish their data to a global and public address book" : "Salli käyttäjien julkaista tietojaan maailmanlaajuisessa ja julkisessa osoitekirjassa", "Federated Cloud" : "Federoitu pilvi", "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", "Share it:" : "Jaa se:", diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js index faecd394bf8..2d2f087a04a 100644 --- a/apps/federatedfilesharing/l10n/fr.js +++ b/apps/federatedfilesharing/l10n/fr.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Voir la documentation", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", + "Search global and public address book for users and let local users publish their data" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs et laisser les utilisateurs publier leurs données", + "Allow users to publish their data to a global and public address book" : "Autoriser les utilisateurs à publier leurs données dans un carnet d'adresse global et public", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", "Share it:" : "Partager :", diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json index fb8b907b729..65f6a55b862 100644 --- a/apps/federatedfilesharing/l10n/fr.json +++ b/apps/federatedfilesharing/l10n/fr.json @@ -39,6 +39,8 @@ "Open documentation" : "Voir la documentation", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", + "Search global and public address book for users and let local users publish their data" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs et laisser les utilisateurs publier leurs données", + "Allow users to publish their data to a global and public address book" : "Autoriser les utilisateurs à publier leurs données dans un carnet d'adresse global et public", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", "Share it:" : "Partager :", diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js index d3f5723ce69..b6eb9737dba 100644 --- a/apps/federatedfilesharing/l10n/nl.js +++ b/apps/federatedfilesharing/l10n/nl.js @@ -41,12 +41,14 @@ OC.L10N.register( "Open documentation" : "Open documentatie", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Search global and public address book for users and let local users publish their data" : "Openbare adresboeken voor gebruikers doorzoeken en laat lokale gebruikers de data plubliceren", + "Allow users to publish their data to a global and public address book" : "Publiek maken van data met een openbaar adresboek toestaan", "Federated Cloud" : "Gefedereerde Cloud", "Your Federated Cloud ID:" : "Je Federated Cloud ID:", "Share it:" : "Deel het:", "Add to your website" : "Toevoegen aan je website", "Share with me via Nextcloud" : "Deel met mij via Nextcloud", "HTML Code:" : "HTML Code:", - "Search global and public address book for users" : "Doorzoeken globale en openbare adresboeken naar gebruikers" + "Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json index 713d4957689..fa1348d634d 100644 --- a/apps/federatedfilesharing/l10n/nl.json +++ b/apps/federatedfilesharing/l10n/nl.json @@ -39,12 +39,14 @@ "Open documentation" : "Open documentatie", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Search global and public address book for users and let local users publish their data" : "Openbare adresboeken voor gebruikers doorzoeken en laat lokale gebruikers de data plubliceren", + "Allow users to publish their data to a global and public address book" : "Publiek maken van data met een openbaar adresboek toestaan", "Federated Cloud" : "Gefedereerde Cloud", "Your Federated Cloud ID:" : "Je Federated Cloud ID:", "Share it:" : "Deel het:", "Add to your website" : "Toevoegen aan je website", "Share with me via Nextcloud" : "Deel met mij via Nextcloud", "HTML Code:" : "HTML Code:", - "Search global and public address book for users" : "Doorzoeken globale en openbare adresboeken naar gebruikers" + "Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/pt_BR.js b/apps/federatedfilesharing/l10n/pt_BR.js index 0efdb3ba91c..cbb09e90474 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.js +++ b/apps/federatedfilesharing/l10n/pt_BR.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que os usuários deste servidor recebam compartilhamentos de outros servidores", + "Search global and public address book for users and let local users publish their data" : "Pesquise o catálogo de endereços global e público para usuários e deixe os usuários locais publicarem seus dados", + "Allow users to publish their data to a global and public address book" : "Permitir que os usuários publiquem seus dados em um catálogo de endereços global e público", "Federated Cloud" : "Nuvem Federada", "Your Federated Cloud ID:" : "Sua ID na Nuvem Federada:", "Share it:" : "Compartilhe:", diff --git a/apps/federatedfilesharing/l10n/pt_BR.json b/apps/federatedfilesharing/l10n/pt_BR.json index 83ed77b5278..e2a45ede216 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.json +++ b/apps/federatedfilesharing/l10n/pt_BR.json @@ -39,6 +39,8 @@ "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que os usuários deste servidor recebam compartilhamentos de outros servidores", + "Search global and public address book for users and let local users publish their data" : "Pesquise o catálogo de endereços global e público para usuários e deixe os usuários locais publicarem seus dados", + "Allow users to publish their data to a global and public address book" : "Permitir que os usuários publiquem seus dados em um catálogo de endereços global e público", "Federated Cloud" : "Nuvem Federada", "Your Federated Cloud ID:" : "Sua ID na Nuvem Federada:", "Share it:" : "Compartilhe:", diff --git a/apps/federatedfilesharing/l10n/ru.js b/apps/federatedfilesharing/l10n/ru.js index dd3c51d19d7..d71f1bc912c 100644 --- a/apps/federatedfilesharing/l10n/ru.js +++ b/apps/federatedfilesharing/l10n/ru.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", + "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям ", + "Allow users to publish their data to a global and public address book" : "Резрешить пользователям публиковать свои данные в глобальной и общедосупной адресной книге", "Federated Cloud" : "Федерация облачных хранилищ", "Your Federated Cloud ID:" : "Ваш ID в федерации облачных хранилищ:", "Share it:" : "Поделиться:", diff --git a/apps/federatedfilesharing/l10n/ru.json b/apps/federatedfilesharing/l10n/ru.json index 6e15f0c353b..76208f7b048 100644 --- a/apps/federatedfilesharing/l10n/ru.json +++ b/apps/federatedfilesharing/l10n/ru.json @@ -39,6 +39,8 @@ "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", + "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям ", + "Allow users to publish their data to a global and public address book" : "Резрешить пользователям публиковать свои данные в глобальной и общедосупной адресной книге", "Federated Cloud" : "Федерация облачных хранилищ", "Your Federated Cloud ID:" : "Ваш ID в федерации облачных хранилищ:", "Share it:" : "Поделиться:", diff --git a/apps/federatedfilesharing/l10n/tr.js b/apps/federatedfilesharing/l10n/tr.js index 79e7b02bc56..c1d9a655557 100644 --- a/apps/federatedfilesharing/l10n/tr.js +++ b/apps/federatedfilesharing/l10n/tr.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Belgeleri aç", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcılar diğer sunuculara paylaşım gönderebilsin", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcılar diğer sunuculardan paylaşım alabilsin", + "Search global and public address book for users and let local users publish their data" : "Genel ve herkese açık adres defterinde kullanıcı ara ve yerel kullanıcıların bilgilerini paylaşmasını sağla", + "Allow users to publish their data to a global and public address book" : "Kullanıcıların bilgilerini genel ve herkese açık bir adres defterinde paylaşabilsin", "Federated Cloud" : "Birleşmiş Bulut", "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", "Share it:" : "Paylaşın:", diff --git a/apps/federatedfilesharing/l10n/tr.json b/apps/federatedfilesharing/l10n/tr.json index d92d39a7f60..c9969087598 100644 --- a/apps/federatedfilesharing/l10n/tr.json +++ b/apps/federatedfilesharing/l10n/tr.json @@ -39,6 +39,8 @@ "Open documentation" : "Belgeleri aç", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcılar diğer sunuculara paylaşım gönderebilsin", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcılar diğer sunuculardan paylaşım alabilsin", + "Search global and public address book for users and let local users publish their data" : "Genel ve herkese açık adres defterinde kullanıcı ara ve yerel kullanıcıların bilgilerini paylaşmasını sağla", + "Allow users to publish their data to a global and public address book" : "Kullanıcıların bilgilerini genel ve herkese açık bir adres defterinde paylaşabilsin", "Federated Cloud" : "Birleşmiş Bulut", "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", "Share it:" : "Paylaşın:", diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 5623b60ad06..120365263a9 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -945,7 +945,7 @@ class FederatedShareProvider implements IShareProvider { } /** - * check if users are allowed to mount public links from other ownClouds + * check if users are allowed to mount public links from other Nextclouds * * @return bool */ diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php index b25c51afd0e..4a6e720ae2c 100644 --- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php @@ -42,7 +42,7 @@ use OCP\OCS\IDiscoveryService; /** * Class GetSharedSecret * - * request shared secret from remote ownCloud + * request shared secret from remote Nextcloud * * @package OCA\Federation\Backgroundjob */ diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index 1587a3b16e9..60b22cd6283 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -42,7 +42,7 @@ use OCP\OCS\IDiscoveryService; /** * Class RequestSharedSecret * - * Ask remote ownCloud to request a sharedSecret from this server + * Ask remote Nextcloud to request a sharedSecret from this server * * @package OCA\Federation\Backgroundjob */ diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php index 1176434a4b8..594299a2d02 100644 --- a/apps/federation/lib/Controller/OCSAuthAPIController.php +++ b/apps/federation/lib/Controller/OCSAuthAPIController.php @@ -40,7 +40,7 @@ use OCP\Security\ISecureRandom; /** * Class OCSAuthAPI * - * OCS API end-points to exchange shared secret between two connected ownClouds + * OCS API end-points to exchange shared secret between two connected Nextclouds * * @package OCA\Federation\Controller */ diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php index 40cc4c084a0..afbaa4abeee 100644 --- a/apps/federation/lib/Controller/SettingsController.php +++ b/apps/federation/lib/Controller/SettingsController.php @@ -58,7 +58,7 @@ class SettingsController extends Controller { /** - * add server to the list of trusted ownClouds + * add server to the list of trusted Nextclouds * * @param string $url * @return DataResponse @@ -78,7 +78,7 @@ class SettingsController extends Controller { } /** - * add server to the list of trusted ownClouds + * add server to the list of trusted Nextclouds * * @param int $id * @return DataResponse diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index 1376dd683d3..9bf1452eab3 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -183,7 +183,7 @@ class TrustedServers { } /** - * check if given server is a trusted ownCloud server + * check if given server is a trusted Nextcloud server * * @param string $url * @return bool diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 2cd09765435..d91db8744c4 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -71,7 +71,6 @@ try { $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); } - $files = \OCA\Files\Helper::populateTags($files); $data['directory'] = $dir; $data['files'] = \OCA\Files\Helper::formatFileInfos($files); $data['permissions'] = $permissions; diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php deleted file mode 100644 index 6a0cfe6caa1..00000000000 --- a/apps/files/appinfo/update.php +++ /dev/null @@ -1,98 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * @author Joas Schilling <coding@schilljs.com> - * @author Stefan Weil <sw@weilnetz.de> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ -$installedVersion = \OC::$server->getConfig()->getAppValue('files', 'installed_version'); -$ocVersion = explode('.', \OC::$server->getSystemConfig()->getValue('version')); - -/** - * In case encryption was not enabled, we accidentally set encrypted = 1 for - * files inside mount points, since 8.1.0. This breaks opening the files in - * 8.1.1 because we fixed the code that checks if a file is encrypted. - * In order to fix the file, we need to reset the flag of the file. However, - * the flag might be set because the file is in fact encrypted because it was - * uploaded at a time where encryption was enabled. - * - * So we can only do this when: - * - Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2) - * - Encryption is disabled - * - files_encryption is not known in the app config - * - * If the first two are not the case, we are save. However, if files_encryption - * values exist in the config, we might have a false negative here. - * Now if there is no file with unencrypted size greater 0, that means there are - * no files that are still encrypted with "files_encryption" encryption. So we - * can also safely reset the flag here. - * - * If this is not the case, we go with "better save then sorry" and don't change - * the flag but write a message to the ownCloud log file. - */ - -/** - * @param \OCP\IDBConnection $conn - */ -function owncloud_reset_encrypted_flag(\OCP\IDBConnection $conn) { - $conn->executeUpdate('UPDATE `*PREFIX*filecache` SET `encrypted` = 0 WHERE `encrypted` = 1'); -} - -// Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2) -if ($installedVersion === '1.1.9' && ( - // 8.1.0.x - (((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 1 && ((int) $ocVersion[2]) === 0) - || - // < 8.2.0.3 - (((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 2 && ((int) $ocVersion[2]) === 0 && ((int) $ocVersion[3]) < 3) - )) { - - // Encryption is not enabled - if (!\OC::$server->getEncryptionManager()->isEnabled()) { - $conn = \OC::$server->getDatabaseConnection(); - - // Old encryption is not known in app config - $oldEncryption = \OC::$server->getConfig()->getAppKeys('files_encryption'); - if (empty($oldEncryption)) { - owncloud_reset_encrypted_flag($conn); - } else { - $query = $conn->prepare('SELECT * FROM `*PREFIX*filecache` WHERE `encrypted` = 1 AND `unencrypted_size` > 0', 1); - $query->execute(); - $empty = $query->fetch(); - - if (empty($empty)) { - owncloud_reset_encrypted_flag($conn); - } else { - /** - * Sorry in case you are a false positive, but we are not 100% that - * you don't have any encrypted files anymore, so we can not reset - * the value safely - */ - \OC::$server->getLogger()->warning( - 'If you have a problem with files not being accessible and ' - . 'you are not using encryption, please have a look at the following' - . 'issue: {issue}', - [ - 'issue' => 'https://github.com/owncloud/core/issues/17846', - ] - ); - } - } - } -} diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 7e79399bba5..0fcb10a21ee 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -856,7 +856,7 @@ title = ''; } title += this.appName; - // Sets the page title with the " - ownCloud" suffix as in templates + // Sets the page title with the " - Nextcloud" suffix as in templates window.document.title = title + ' - ' + oc_defaults.title; return true; diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js index 67bd9c667c8..9bd20be4bf8 100644 --- a/apps/files/js/tagsplugin.js +++ b/apps/files/js/tagsplugin.js @@ -75,7 +75,11 @@ allowedLists: [ 'files', - 'favorites' + 'favorites', + 'systemtags', + 'shares.self', + 'shares.others', + 'shares.link' ], _extendFileActions: function(fileActions) { @@ -241,4 +245,3 @@ })(OCA); OC.Plugins.register('OCA.Files.FileList', OCA.Files.TagsPlugin); - diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index b6b209dea70..c3d80957913 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -208,19 +208,40 @@ class Helper { * Populate the result set with file tags * * @param array $fileList + * @param string $fileIdentifier identifier attribute name for values in $fileList * @return array file list populated with tags */ - public static function populateTags(array $fileList) { - $filesById = array(); + public static function populateTags(array $fileList, $fileIdentifier = 'fileid') { + $filesById = []; foreach ($fileList as $fileData) { - $filesById[$fileData['fileid']] = $fileData; + $filesById[$fileData[$fileIdentifier]] = $fileData; } $tagger = \OC::$server->getTagManager()->load('files'); $tags = $tagger->getTagsForObjects(array_keys($filesById)); - if ($tags) { + + if (!is_array($tags)) { + throw new \UnexpectedValueException('$tags must be an array'); + } + + if (!empty($tags)) { foreach ($tags as $fileId => $fileTags) { $filesById[$fileId]['tags'] = $fileTags; } + + foreach ($filesById as $key => $fileWithTags) { + foreach($fileList as $key2 => $file){ + if( $file[$fileIdentifier] == $key){ + $fileList[$key2] = $fileWithTags; + } + } + } + + foreach ($fileList as $key => $file) { + if (!array_key_exists('tags', $file)) { + $fileList[$key]['tags'] = []; + } + } + } return $fileList; } diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index 3f6a48d2e22..74ad050d30e 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -3,7 +3,7 @@ <id>files_external</id> <name>External storage support</name> <description> -This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, which they can access and use like any other ownCloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file. +This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file. External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation. </description> diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php deleted file mode 100644 index 3d173f300e7..00000000000 --- a/apps/files_external/appinfo/update.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Joas Schilling <coding@schilljs.com> - * @author Robin Appelman <robin@icewind.nl> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -$installedVersion = \OC::$server->getConfig()->getAppValue('files_external', 'installed_version'); - -$app = new \OCA\Files_External\AppInfo\Application(); - -// Migration to db config -if (version_compare($installedVersion, '0.5.0', '<')) { - $migrator = $app->getContainer()->query('OCA\Files_External\Migration\StorageMigrator'); - $migrator->migrateGlobal(); -} diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php index b22b0c29263..2211686055e 100644 --- a/apps/files_external/lib/Lib/Storage/Google.php +++ b/apps/files_external/lib/Lib/Storage/Google.php @@ -126,7 +126,7 @@ class Google extends \OC\Files\Storage\Common { $q = "title='" . str_replace("'","\\'", $name) . "' and '" . str_replace("'","\\'", $parentId) . "' in parents and trashed = false"; $result = $this->service->files->listFiles(array('q' => $q))->getItems(); if (!empty($result)) { - // Google Drive allows files with the same name, ownCloud doesn't + // Google Drive allows files with the same name, Nextcloud doesn't if (count($result) > 1) { $this->onDuplicateFileDetected($path); return false; @@ -294,7 +294,7 @@ class Google extends \OC\Files\Storage\Common { } else { $filepath = $path.'/'.$name; } - // Google Drive allows files with the same name, ownCloud doesn't + // Google Drive allows files with the same name, Nextcloud doesn't // Prevent opendir() from returning any duplicate files $key = array_search($name, $files); if ($key !== false || isset($duplicates[$filepath])) { diff --git a/apps/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php index 427b55a4a54..9669b5f3dad 100644 --- a/apps/files_external/lib/Lib/Storage/OwnCloud.php +++ b/apps/files_external/lib/Lib/Storage/OwnCloud.php @@ -26,9 +26,9 @@ namespace OCA\Files_External\Lib\Storage; use Sabre\DAV\Client; /** - * ownCloud backend for external storage based on DAV backend. + * Nextcloud backend for external storage based on DAV backend. * - * The ownCloud URL consists of three parts: + * The Nextcloud URL consists of three parts: * http://%host/%context/remote.php/webdav/%root * */ diff --git a/apps/files_external/lib/Migration/StorageMigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php index e48c6726136..2ecc5d6cd66 100644 --- a/apps/files_external/lib/Migration/StorageMigrator.php +++ b/apps/files_external/lib/Migration/StorageMigrator.php @@ -118,16 +118,6 @@ class StorageMigrator { } /** - * Migrate admin configured storages - */ - public function migrateGlobal() { - $legacyService = new GlobalLegacyStoragesService($this->backendService); - $storageService = new GlobalStoragesService($this->backendService, $this->dbConfig, $this->userMountCache); - - $this->migrate($legacyService, $storageService); - } - - /** * Migrate personal storages configured by the current user * * @param IUser $user diff --git a/apps/files_external/lib/Service/GlobalLegacyStoragesService.php b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php deleted file mode 100644 index ee7f158b792..00000000000 --- a/apps/files_external/lib/Service/GlobalLegacyStoragesService.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Joas Schilling <coding@schilljs.com> - * @author Robin Appelman <robin@icewind.nl> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OCA\Files_External\Service; - -/** - * Read admin defined mounts from the legacy mount.json - */ -class GlobalLegacyStoragesService extends LegacyStoragesService { - /** - * @param BackendService $backendService - */ - public function __construct(BackendService $backendService) { - $this->backendService = $backendService; - } - - /** - * Read legacy config data - * - * @return array list of mount configs - */ - protected function readLegacyConfig() { - // read global config - return \OC_Mount_Config::readData(); - } -} diff --git a/apps/files_external/tests/README.md b/apps/files_external/tests/README.md index 0b3c7fd004f..202ae8eee9a 100644 --- a/apps/files_external/tests/README.md +++ b/apps/files_external/tests/README.md @@ -20,7 +20,7 @@ freely. ## Hands-on way of unit test execution -Run all files_external unit tests by invoking the following in the ownCloud +Run all files_external unit tests by invoking the following in the Nextcloud core root folder: ./autotest-external.sh diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php index 45b5071d941..f1564304e2f 100644 --- a/apps/files_external/tests/Storage/OwncloudTest.php +++ b/apps/files_external/tests/Storage/OwncloudTest.php @@ -45,7 +45,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage { $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) { - $this->markTestSkipped('ownCloud backend not configured'); + $this->markTestSkipped('Nextcloud backend not configured'); } $this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in $this->instance = new OwnCloud($this->config['owncloud']); diff --git a/apps/files_external/tests/env/start-webdav-apache.sh b/apps/files_external/tests/env/start-webdav-apache.sh index 48acb8572d6..a5464c9cfab 100755 --- a/apps/files_external/tests/env/start-webdav-apache.sh +++ b/apps/files_external/tests/env/start-webdav-apache.sh @@ -6,7 +6,7 @@ # against. It will also change the files_external config to use the docker # container as testing environment. This is reverted in the stop step. # -# If the environment variable RUN_DOCKER_MYSQL is set the ownCloud will +# If the environment variable RUN_DOCKER_MYSQL is set the Nextcloud will # be set up using MySQL instead of SQLite. # # Set environment variable DEBUG to print config file @@ -74,7 +74,7 @@ return array( DELIM -echo "ownCloud container: $container" +echo "Nextcloud container: $container" # put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host) echo $container >> $thisFolder/dockerContainerWebdav.$EXECUTOR_NUMBER.webdav diff --git a/apps/files_external/tests/env/start-webdav-ownCloud.sh b/apps/files_external/tests/env/start-webdav-ownCloud.sh index d992516d7b1..870bd5bcdf8 100755 --- a/apps/files_external/tests/env/start-webdav-ownCloud.sh +++ b/apps/files_external/tests/env/start-webdav-ownCloud.sh @@ -6,7 +6,7 @@ # against. It will also change the files_external config to use the docker # container as testing environment. This is reverted in the stop step. # -# If the environment variable RUN_DOCKER_MYSQL is set the ownCloud will +# If the environment variable RUN_DOCKER_MYSQL is set the Nextcloud will # be set up using MySQL instead of SQLite. # # Set environment variable DEBUG to print config file @@ -48,7 +48,7 @@ container=`docker run -P $parameter -d -e ADMINLOGIN=test -e ADMINPWD=test morri host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` -echo -n "Waiting for ownCloud initialization" +echo -n "Waiting for Nextcloud initialization" if ! "$thisFolder"/env/wait-for-connection ${host} 80 60; then echo "[ERROR] Waited 60 seconds, no response" >&2 exit 1 @@ -74,7 +74,7 @@ return array( DELIM -echo "ownCloud container: $container" +echo "Nextcloud container: $container" # put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host) echo $container >> $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 917cb7b6639..a83a0c7b5b8 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -24,17 +24,6 @@ use OCA\Files_Sharing\Migration; $installedVersion = \OC::$server->getConfig()->getAppValue('files_sharing', 'installed_version'); -// Migration OC8.2 -> OC9 -if (version_compare($installedVersion, '0.9.1', '<')) { - $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()); - $m->removeReShares(); - $m->updateInitiatorInfo(); -} - -if (version_compare($installedVersion, '1.1.1', '<')) { - $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()); -} - if (version_compare($installedVersion, '1.4.0', '<')) { $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()); $m->addPasswordColumn(); diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index dccd6027b02..b11b302c6c2 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -56,7 +56,6 @@ if (options && options.linksOnly) { this._linksOnly = true; } - OC.Plugins.attach('OCA.Sharing.FileList', this); }, _renderRow: function() { @@ -83,7 +82,7 @@ // add row with expiration date for link only shares - influenced by _createRow of filelist if (this._linksOnly) { var expirationTimestamp = 0; - if(fileData.shares[0].expiration !== null) { + if(fileData.shares && fileData.shares[0].expiration !== null) { expirationTimestamp = moment(fileData.shares[0].expiration).valueOf(); } $tr.attr('data-expiration', expirationTimestamp); @@ -169,7 +168,8 @@ /* jshint camelcase: false */ data: { format: 'json', - shared_with_me: !!this._sharedWithUser + shared_with_me: !!this._sharedWithUser, + include_tags: true }, type: 'GET', beforeSend: function(xhr) { @@ -183,7 +183,8 @@ url: OC.linkToOCS('apps/files_sharing/api/v1') + 'remote_shares', /* jshint camelcase: false */ data: { - format: 'json' + format: 'json', + include_tags: true }, type: 'GET', beforeSend: function(xhr) { @@ -238,7 +239,8 @@ type: share.type, id: share.file_id, path: OC.dirname(share.mountpoint), - permissions: share.permissions + permissions: share.permissions, + tags: share.tags || [] }; file.shares = [{ @@ -276,7 +278,8 @@ var file = { id: share.file_source, icon: OC.MimeType.getIconUrl(share.mimetype), - mimetype: share.mimetype + mimetype: share.mimetype, + tags: share.tags || [] }; if (share.item_type === 'folder') { file.type = 'dir'; @@ -382,6 +385,12 @@ // Sort by expected sort comparator return files.sort(this._sortComparator); + }, + + _onUrlChanged: function(e) { + if (e && _.isString(e.dir)) { + this.changeDirectory(e.dir, false, true); + } } }); diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index bc525b6ef82..bd57d80dab0 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -23,6 +23,7 @@ */ namespace OCA\Files_Sharing\Controller; +use OCA\Files\Helper; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSBadRequestException; use OCP\AppFramework\OCS\OCSException; @@ -484,9 +485,10 @@ class ShareAPIController extends OCSController { /** * @param \OCP\Files\File|\OCP\Files\Folder $node + * @param boolean $includeTags * @return DataResponse */ - private function getSharedWithMe($node = null) { + private function getSharedWithMe($node = null, $includeTags) { $userShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, -1, 0); $groupShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, -1, 0); @@ -509,6 +511,10 @@ class ShareAPIController extends OCSController { } } + if ($includeTags) { + $formatted = Helper::populateTags($formatted, 'file_source'); + } + return new DataResponse($formatted); } @@ -572,7 +578,8 @@ class ShareAPIController extends OCSController { $shared_with_me = 'false', $reshares = 'false', $subfiles = 'false', - $path = null + $path = null, + $include_tags = 'false' ) { if ($path !== null) { @@ -588,7 +595,7 @@ class ShareAPIController extends OCSController { } if ($shared_with_me === 'true') { - $result = $this->getSharedWithMe($path); + $result = $this->getSharedWithMe($path, $include_tags); return $result; } @@ -634,6 +641,10 @@ class ShareAPIController extends OCSController { } } + if ($include_tags) { + $formatted = Helper::populateTags($formatted, 'file_source'); + } + return new DataResponse($formatted); } diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php index 12ee3265c2a..b84ba5d96ab 100644 --- a/apps/files_sharing/lib/External/Storage.php +++ b/apps/files_sharing/lib/External/Storage.php @@ -206,16 +206,16 @@ class Storage extends DAV implements ISharedStorage { try { $this->getShareInfo(); } catch (NotFoundException $e) { - // a 404 can either mean that the share no longer exists or there is no ownCloud on the remote + // a 404 can either mean that the share no longer exists or there is no Nextcloud on the remote if ($this->testRemote()) { - // valid ownCloud instance means that the public share no longer exists + // valid Nextcloud instance means that the public share no longer exists // since this is permanent (re-sharing the file will create a new token) // we remove the invalid storage $this->manager->removeShare($this->mountPoint); $this->manager->getMountManager()->removeMount($this->mountPoint); throw new StorageInvalidException(); } else { - // ownCloud instance is gone, likely to be a temporary server configuration error + // Nextcloud instance is gone, likely to be a temporary server configuration error throw new StorageNotAvailableException(); } } catch (ForbiddenException $e) { @@ -284,7 +284,7 @@ class Storage extends DAV implements ISharedStorage { } /** - * Whether the remote is an ownCloud, used since some sharing features are not + * Whether the remote is an ownCloud/Nextcloud, used since some sharing features are not * standardized. Let's use this to detect whether to use it. * * @return bool diff --git a/apps/files_sharing/tests/MigrationTest.php b/apps/files_sharing/tests/MigrationTest.php index 708de1c0eca..c8dfefb96b4 100644 --- a/apps/files_sharing/tests/MigrationTest.php +++ b/apps/files_sharing/tests/MigrationTest.php @@ -68,198 +68,6 @@ class MigrationTest extends TestCase { $query->delete($this->table)->execute(); } - public function addDummyValues() { - $query = $this->connection->getQueryBuilder(); - $query->insert($this->table) - ->values( - array( - 'share_type' => $query->createParameter('share_type'), - 'share_with' => $query->createParameter('share_with'), - 'uid_owner' => $query->createParameter('uid_owner'), - 'uid_initiator' => $query->createParameter('uid_initiator'), - 'parent' => $query->createParameter('parent'), - 'item_type' => $query->createParameter('item_type'), - 'item_source' => $query->createParameter('item_source'), - 'item_target' => $query->createParameter('item_target'), - 'file_source' => $query->createParameter('file_source'), - 'file_target' => $query->createParameter('file_target'), - 'permissions' => $query->createParameter('permissions'), - 'stime' => $query->createParameter('stime'), - ) - ); - // shared contact, shouldn't be modified - $query->setParameter('share_type', Share::SHARE_TYPE_CONTACT) - ->setParameter('share_with', 'user1') - ->setParameter('uid_owner', 'owner1') - ->setParameter('uid_initiator', '') - ->setParameter('parent', null) - ->setParameter('item_type', 'contact') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', null) - ->setParameter('file_target', null) - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - // shared calendar, shouldn't be modified - $query->setParameter('share_type', Share::SHARE_TYPE_USER) - ->setParameter('share_with', 'user1') - ->setParameter('uid_owner', 'owner1') - ->setParameter('uid_initiator', '') - ->setParameter('parent', null) - ->setParameter('item_type', 'calendar') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', null) - ->setParameter('file_target', null) - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - // single user share, shouldn't be modified - $query->setParameter('share_type', Share::SHARE_TYPE_USER) - ->setParameter('share_with', 'user1') - ->setParameter('uid_owner', 'owner1') - ->setParameter('uid_initiator', '') - ->setParameter('parent', null) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foo') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - // single group share, shouldn't be modified - $query->setParameter('share_type', Share::SHARE_TYPE_GROUP) - ->setParameter('share_with', 'group1') - ->setParameter('uid_owner', 'owner1') - ->setParameter('uid_initiator', '') - ->setParameter('parent', null) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foo') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - $parent = $query->getLastInsertId(); - // unique target for group share, shouldn't be modified - $query->setParameter('share_type', 2) - ->setParameter('share_with', 'group1') - ->setParameter('uid_owner', 'owner1') - ->setParameter('uid_initiator', '') - ->setParameter('parent', $parent) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foo renamed') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - // first user share, shouldn't be modified - $query->setParameter('share_type', Share::SHARE_TYPE_USER) - ->setParameter('share_with', 'user1') - ->setParameter('uid_owner', 'owner2') - ->setParameter('uid_initiator', '') - ->setParameter('parent', null) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foobar') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - $parent = $query->getLastInsertId(); - // first re-share, should be attached to the first user share after migration - $query->setParameter('share_type', Share::SHARE_TYPE_USER) - ->setParameter('share_with', 'user2') - ->setParameter('uid_owner', 'user1') - ->setParameter('uid_initiator', '') - ->setParameter('parent', $parent) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foobar') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - $parent = $query->getLastInsertId(); - // second re-share, should be attached to the first user share after migration - $query->setParameter('share_type', Share::SHARE_TYPE_USER) - ->setParameter('share_with', 'user3') - ->setParameter('uid_owner', 'user2') - ->setParameter('uid_initiator', '') - ->setParameter('parent', $parent) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foobar') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - $parent = $query->getLastInsertId(); - // third re-share, should be attached to the first user share after migration - $query->setParameter('share_type', Share::SHARE_TYPE_REMOTE) - ->setParameter('share_with', 'user@server.com') - ->setParameter('uid_owner', 'user3') - ->setParameter('uid_initiator', '') - ->setParameter('parent', $parent) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foobar') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - - // Link reshare should keep its parent - $query->setParameter('share_type', Share::SHARE_TYPE_LINK) - ->setParameter('share_with', null) - ->setParameter('uid_owner', 'user3') - ->setParameter('uid_initiator', '') - ->setParameter('parent', $parent) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foobar') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - $this->assertSame(1, - $query->execute() - ); - } - - public function testRemoveReShares() { - $this->addDummyValues(); - $this->migration->removeReShares(); - $this->verifyResult(); - } - public function verifyResult() { $query = $this->connection->getQueryBuilder(); $query->select('*')->from($this->table)->orderBy('id'); @@ -297,66 +105,6 @@ class MigrationTest extends TestCase { $this->assertSame($result[7]['id'], $result[9]['parent']); } - public function test1001DeepReshares() { - $parent = null; - for ($i = 0; $i < 1001; $i++) { - $query = $this->connection->getQueryBuilder(); - $query->insert($this->table) - ->values( - [ - 'share_type' => $query->createParameter('share_type'), - 'share_with' => $query->createParameter('share_with'), - 'uid_owner' => $query->createParameter('uid_owner'), - 'uid_initiator' => $query->createParameter('uid_initiator'), - 'parent' => $query->createParameter('parent'), - 'item_type' => $query->createParameter('item_type'), - 'item_source' => $query->createParameter('item_source'), - 'item_target' => $query->createParameter('item_target'), - 'file_source' => $query->createParameter('file_source'), - 'file_target' => $query->createParameter('file_target'), - 'permissions' => $query->createParameter('permissions'), - 'stime' => $query->createParameter('stime'), - ] - ) - ->setParameter('share_type', Share::SHARE_TYPE_USER) - ->setParameter('share_with', 'user'.($i+1)) - ->setParameter('uid_owner', 'user'.($i)) - ->setParameter('uid_initiator', null) - ->setParameter('parent', $parent) - ->setParameter('item_type', 'file') - ->setParameter('item_source', '2') - ->setParameter('item_target', '/2') - ->setParameter('file_source', 2) - ->setParameter('file_target', '/foobar') - ->setParameter('permissions', 31) - ->setParameter('stime', time()); - - $this->assertSame(1, $query->execute()); - $parent = $query->getLastInsertId(); - } - - $this->migration->removeReShares(); - $this->migration->updateInitiatorInfo(); - - $qb = $this->connection->getQueryBuilder(); - - $stmt = $qb->select('id', 'share_with', 'uid_owner', 'uid_initiator', 'parent') - ->from('share') - ->orderBy('id', 'asc') - ->execute(); - - $i = 0; - while($share = $stmt->fetch()) { - $this->assertEquals('user'.($i+1), $share['share_with']); - $this->assertEquals('user' . ($i), $share['uid_initiator']); - $this->assertEquals('user0', $share['uid_owner']); - $this->assertEquals(null, $share['parent']); - $i++; - } - $stmt->closeCursor(); - $this->assertEquals(1001, $i); - } - /** * test that we really remove the "shareapi_allow_mail_notification" setting only */ diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js index f177b61c78a..3efbb8fcea3 100644 --- a/apps/files_sharing/tests/js/sharedfilelistSpec.js +++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js @@ -48,6 +48,8 @@ describe('OCA.Sharing.FileList tests', function() { '<div id="emptycontent">Empty content message</div>' + '</div>' ); + + OC.Plugins.register('OCA.Files.FileList', OCA.Files.TagsPlugin); }); afterEach(function() { testFiles = undefined; @@ -93,6 +95,7 @@ describe('OCA.Sharing.FileList tests', function() { share_type: OC.Share.SHARE_TYPE_USER, share_with: 'user1', share_with_displayname: 'User One', + tags: [OC.TAG_FAVORITE], mimetype: 'text/plain', uid_owner: 'user2', displayname_owner: 'User Two' @@ -133,12 +136,12 @@ describe('OCA.Sharing.FileList tests', function() { expect(fakeServer.requests.length).toEqual(2); expect(fakeServer.requests[0].url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=true' + 'shares?format=json&shared_with_me=true&include_tags=true' ); expect(fakeServer.requests[1].url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'remote_shares?format=json' + 'remote_shares?format=json&include_tags=true' ); fakeServer.requests[0].respond( @@ -150,7 +153,7 @@ describe('OCA.Sharing.FileList tests', function() { fakeServer.requests[1].respond( 200, { 'Content-Type': 'application/json' }, - JSON.stringify(ocsResponseRemote) + JSON.stringify(ocsResponseRemote) ); var $rows = fileList.$el.find('tbody tr'); @@ -167,6 +170,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).toEqual('User Two'); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt' @@ -185,6 +190,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('22222000'); expect($tr.attr('data-share-owner')).toEqual('user3@foo.bar/'); expect($tr.attr('data-share-id')).toEqual('8'); + expect($tr.attr('data-favorite')).not.toBeDefined(); + expect($tr.attr('data-tags')).toEqual(''); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/b.txt' @@ -209,11 +216,11 @@ describe('OCA.Sharing.FileList tests', function() { expect(fakeServer.requests.length).toEqual(2); expect(fakeServer.requests[0].url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=true' + 'shares?format=json&shared_with_me=true&include_tags=true' ); expect(fakeServer.requests[1].url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'remote_shares?format=json' + 'remote_shares?format=json&include_tags=true' ); fakeServer.requests[0].respond( @@ -241,6 +248,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).toEqual('User Two'); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/index.php/apps/files' + @@ -260,6 +269,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('22222000'); expect($tr.attr('data-share-owner')).toEqual('user3@foo.bar/'); expect($tr.attr('data-share-id')).toEqual('8'); + expect($tr.attr('data-favorite')).not.toBeDefined(); + expect($tr.attr('data-tags')).toEqual(''); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/index.php/apps/files' + @@ -301,6 +312,7 @@ describe('OCA.Sharing.FileList tests', function() { share_type: OC.Share.SHARE_TYPE_USER, share_with: 'user2', share_with_displayname: 'User Two', + tags: [OC.TAG_FAVORITE], mimetype: 'text/plain', uid_owner: 'user1', displayname_owner: 'User One' @@ -315,7 +327,7 @@ describe('OCA.Sharing.FileList tests', function() { request = fakeServer.requests[0]; expect(request.url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=false' + 'shares?format=json&shared_with_me=false&include_tags=true' ); fakeServer.requests[0].respond( @@ -337,6 +349,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt' @@ -355,7 +369,7 @@ describe('OCA.Sharing.FileList tests', function() { request = fakeServer.requests[0]; expect(request.url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=false' + 'shares?format=json&shared_with_me=false&include_tags=true' ); fakeServer.requests[0].respond( @@ -377,6 +391,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/index.php/apps/files' + @@ -400,13 +416,14 @@ describe('OCA.Sharing.FileList tests', function() { token: 'abc', mimetype: 'text/plain', uid_owner: 'user1', - displayname_owner: 'User One' + displayname_owner: 'User One', + tags: [OC.TAG_FAVORITE] }; expect(fakeServer.requests.length).toEqual(1); request = fakeServer.requests[0]; expect(request.url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=false' + 'shares?format=json&shared_with_me=false&include_tags=true' ); fakeServer.requests[0].respond( @@ -428,6 +445,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt' ); @@ -451,7 +470,8 @@ describe('OCA.Sharing.FileList tests', function() { token: 'abc', mimetype: 'text/plain', uid_owner: 'user1', - displayname_owner: 'User One' + displayname_owner: 'User One', + tags: [OC.TAG_FAVORITE], }); // another share of the same file ocsResponse.ocs.data.push({ @@ -473,7 +493,7 @@ describe('OCA.Sharing.FileList tests', function() { request = fakeServer.requests[0]; expect(request.url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=false' + 'shares?format=json&shared_with_me=false&include_tags=true' ); fakeServer.requests[0].respond( @@ -496,6 +516,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-mtime')).toEqual('22222000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); expect($tr.attr('data-share-id')).toEqual('7,8,9'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt' ); @@ -540,7 +562,8 @@ describe('OCA.Sharing.FileList tests', function() { token: 'abc', mimetype: 'text/plain', uid_owner: 'user1', - displayname_owner: 'User One' + displayname_owner: 'User One', + tags: [OC.TAG_FAVORITE] },{ id: 8, item_type: 'file', @@ -577,13 +600,14 @@ describe('OCA.Sharing.FileList tests', function() { share_with_displayname: 'User Two', mimetype: 'text/plain', uid_owner: 'user1', - displayname_owner: 'User One' + displayname_owner: 'User One', + tags: [OC.TAG_FAVORITE] }); expect(fakeServer.requests.length).toEqual(1); request = fakeServer.requests[0]; expect(request.url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=false' + 'shares?format=json&shared_with_me=false&include_tags=true' ); fakeServer.requests[0].respond( @@ -607,6 +631,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-share-recipients')).not.toBeDefined(); expect($tr.attr('data-share-owner')).not.toBeDefined(); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt' ); @@ -620,6 +646,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-id')).toEqual('50'); expect($tr.attr('data-file')).toEqual('local name2.txt'); expect($tr.attr('data-expiration')).not.toEqual('0'); + expect($tr.attr('data-favorite')).not.toBeDefined(); + expect($tr.attr('data-tags')).toEqual(''); expect($tr.find('td:last-child span').text()).toEqual('in a day'); }); it('does not show virtual token recipient as recipient when password was set', function() { @@ -632,7 +660,7 @@ describe('OCA.Sharing.FileList tests', function() { request = fakeServer.requests[0]; expect(request.url).toEqual( OC.linkToOCS('apps/files_sharing/api/v1') + - 'shares?format=json&shared_with_me=false' + 'shares?format=json&shared_with_me=false&include_tags=true' ); fakeServer.requests[0].respond( @@ -656,6 +684,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-share-recipients')).not.toBeDefined(); expect($tr.attr('data-share-owner')).not.toBeDefined(); expect($tr.attr('data-share-id')).toEqual('7'); + expect($tr.attr('data-favorite')).toEqual('true'); + expect($tr.attr('data-tags')).toEqual(OC.TAG_FAVORITE); expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt'); diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php deleted file mode 100644 index 6685eea80da..00000000000 --- a/apps/files_trashbin/appinfo/update.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * @author Victor Dubiniuk <dubiniuk@owncloud.com> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -$config = \OC::$server->getConfig(); -$installedVersion = $config->getAppValue('files_trashbin', 'installed_version'); - -if (version_compare($installedVersion, '0.6.4', '<')) { - $isExpirationEnabled = $config->getSystemValue('trashbin_auto_expire', true); - $oldObligation = $config->getSystemValue('trashbin_retention_obligation', null); - - $newObligation = 'auto'; - if ($isExpirationEnabled) { - if (!is_null($oldObligation)) { - $newObligation = strval($oldObligation) . ', auto'; - } - } else { - $newObligation = 'disabled'; - } - - $config->setSystemValue('trashbin_retention_obligation', $newObligation); - $config->deleteSystemValue('trashbin_auto_expire'); -} diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 78f0c9212f9..48dc3fbd055 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -680,7 +680,7 @@ class Trashbin { } /** - * resize trash bin if necessary after a new file was added to ownCloud + * resize trash bin if necessary after a new file was added to Nextcloud * * @param string $user user id */ diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index e633df00bd9..ede999ffec6 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/apps/provisioning_api/appinfo/info.xml @@ -4,9 +4,9 @@ <name>Provisioning API</name> <description> This application enables a set of APIs that external systems can use to create, edit, delete and query user - attributes, query, set and remove groups, set quota and query total storage used in ownCloud. Group admin users - can also query ownCloud and perform the same functions as an admin for groups they manage. The API also enables - an admin to query for active ownCloud applications, application info, and to enable or disable an app remotely. + attributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin users + can also query Nextcloud and perform the same functions as an admin for groups they manage. The API also enables + an admin to query for active Nextcloud applications, application info, and to enable or disable an app remotely. Once the app is enabled, http requests can be used via a Basic Auth header to perform any of the functions listed above. More information is available in the Provisioning API documentation, including example calls and server responses. diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 24de84a0690..1d1cd97b6d2 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -32,7 +32,7 @@ namespace OCA\Provisioning_API\Tests\Controller; use Exception; use OC\Accounts\AccountManager; use OC\Group\Manager; -use OC\Mail\IEMailTemplate; +use OCP\Mail\IEMailTemplate; use OC\Settings\Mailer\NewUserMailHelper; use OC\SubAdmin; use OCA\Provisioning_API\Controller\UsersController; diff --git a/apps/sharebymail/l10n/nl.js b/apps/sharebymail/l10n/nl.js index 8ec5af1defe..4a69b3a2eb1 100644 --- a/apps/sharebymail/l10n/nl.js +++ b/apps/sharebymail/l10n/nl.js @@ -13,12 +13,18 @@ OC.L10N.register( "Failed to send share by E-mail" : "Fout bij delen via e-mail", "%s shared »%s« with you" : "%s deelde »%s« met jou", "%s shared »%s« with you on behalf of %s" : "%s deelde »%s« met jou in naam van %s", - "Failed to create the E-mail" : "Opmaken e-mail mislukt", - "Could not find share" : "Kon share niet vinden", + "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt", + "Password to access »%s« shared to you by %s" : "Toegangswachtwoord »%s« gedeeld met je door %s", + "Could not find share" : "Kon gedeeld niet vinden", "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou namens %s.\n\n%s\n\n", "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou.\n\n%s\n\n", - "Cheers!" : "Proficiat!", + "Cheers!" : "Proost!", + "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo daar,\n\n%s deelt »%s« met je.\nJe zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.\n\nDe link is beschermd met het volgende wachtwoord: %s\n", "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou namens %s.<br><br>", - "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>" + "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>", + "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Halllo daar ,<br><br>%s deelt<i>%s</i> met je.<br>Je zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.<br><br>De link is beschermd met het volgende wachtwoord: %s<br><br>", + "Share by mail" : "Gedeeld via een E-mail", + "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.", + "Send password by mail" : "Wachtwoord per E-mail verzenden" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/sharebymail/l10n/nl.json b/apps/sharebymail/l10n/nl.json index ce77189bb2f..cb517ba5268 100644 --- a/apps/sharebymail/l10n/nl.json +++ b/apps/sharebymail/l10n/nl.json @@ -11,12 +11,18 @@ "Failed to send share by E-mail" : "Fout bij delen via e-mail", "%s shared »%s« with you" : "%s deelde »%s« met jou", "%s shared »%s« with you on behalf of %s" : "%s deelde »%s« met jou in naam van %s", - "Failed to create the E-mail" : "Opmaken e-mail mislukt", - "Could not find share" : "Kon share niet vinden", + "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt", + "Password to access »%s« shared to you by %s" : "Toegangswachtwoord »%s« gedeeld met je door %s", + "Could not find share" : "Kon gedeeld niet vinden", "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou namens %s.\n\n%s\n\n", "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou.\n\n%s\n\n", - "Cheers!" : "Proficiat!", + "Cheers!" : "Proost!", + "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo daar,\n\n%s deelt »%s« met je.\nJe zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.\n\nDe link is beschermd met het volgende wachtwoord: %s\n", "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou namens %s.<br><br>", - "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>" + "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>", + "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Halllo daar ,<br><br>%s deelt<i>%s</i> met je.<br>Je zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.<br><br>De link is beschermd met het volgende wachtwoord: %s<br><br>", + "Share by mail" : "Gedeeld via een E-mail", + "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.", + "Send password by mail" : "Wachtwoord per E-mail verzenden" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/sharebymail/l10n/sv.js b/apps/sharebymail/l10n/sv.js index fb0a4fc44db..486f0666593 100644 --- a/apps/sharebymail/l10n/sv.js +++ b/apps/sharebymail/l10n/sv.js @@ -14,8 +14,17 @@ OC.L10N.register( "%s shared »%s« with you" : "%s delade »%s« med dig", "%s shared »%s« with you on behalf of %s" : "%s delade »%s« med dig på begäran av %s", "Failed to create the E-mail" : "Misslyckades att skapa e-post", + "Password to access »%s« shared to you by %s" : "Lösenord för att få tillgång till »%s« delat med dig av %s", "Could not find share" : "Kunde inte hitta delning", + "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hej!\n\n%s delade »%s« med dig från%s.\n\n%s\n\n", "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hej,\n\n%s delade »%s« med dig.\n\n%s\n", - "Cheers!" : "Skål!" + "Cheers!" : "Ha det fint!", + "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hej!\n\n%s delade »%s« med dig.\nDu borde ha fått ett separat e-mejl med länk för att få tillgång till det.\n\nDet är skyddat med följande lösnord: %s\n\n", + "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig från %s.<br><br>", + "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig.<br><br>", + "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hej!<br><br>%s delade <i>%s</i> med dig.<br>Du borde ha fått ett separat e-mejl med en länk för att få tillgång till det.<br><br>Det är skyddat med följande lösenord: %s<br><br>", + "Share by mail" : "Dela via e-mejl", + "Send a personalized link to a file or folder by mail." : "Skicka en personlig länk till en fil eller mapp via e-mejl", + "Send password by mail" : "Skicka lösenord med e-post" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/sharebymail/l10n/sv.json b/apps/sharebymail/l10n/sv.json index 028271c60f2..e295de544ea 100644 --- a/apps/sharebymail/l10n/sv.json +++ b/apps/sharebymail/l10n/sv.json @@ -12,8 +12,17 @@ "%s shared »%s« with you" : "%s delade »%s« med dig", "%s shared »%s« with you on behalf of %s" : "%s delade »%s« med dig på begäran av %s", "Failed to create the E-mail" : "Misslyckades att skapa e-post", + "Password to access »%s« shared to you by %s" : "Lösenord för att få tillgång till »%s« delat med dig av %s", "Could not find share" : "Kunde inte hitta delning", + "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hej!\n\n%s delade »%s« med dig från%s.\n\n%s\n\n", "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hej,\n\n%s delade »%s« med dig.\n\n%s\n", - "Cheers!" : "Skål!" + "Cheers!" : "Ha det fint!", + "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hej!\n\n%s delade »%s« med dig.\nDu borde ha fått ett separat e-mejl med länk för att få tillgång till det.\n\nDet är skyddat med följande lösnord: %s\n\n", + "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig från %s.<br><br>", + "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig.<br><br>", + "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hej!<br><br>%s delade <i>%s</i> med dig.<br>Du borde ha fått ett separat e-mejl med en länk för att få tillgång till det.<br><br>Det är skyddat med följande lösenord: %s<br><br>", + "Share by mail" : "Dela via e-mejl", + "Send a personalized link to a file or folder by mail." : "Skicka en personlig länk till en fil eller mapp via e-mejl", + "Send password by mail" : "Skicka lösenord med e-post" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/testing/clean_opcode_cache.php b/apps/testing/clean_opcode_cache.php new file mode 100644 index 00000000000..d48d3131b70 --- /dev/null +++ b/apps/testing/clean_opcode_cache.php @@ -0,0 +1,22 @@ +<?php +/** + * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +opcache_reset(); diff --git a/apps/user_ldap/js/wizard/configModel.js b/apps/user_ldap/js/wizard/configModel.js index 3732409c3e1..d99392660c8 100644 --- a/apps/user_ldap/js/wizard/configModel.js +++ b/apps/user_ldap/js/wizard/configModel.js @@ -10,11 +10,11 @@ OCA = OCA || {}; /** * @classdesc this class represents a server configuration. It communicates - * with the ownCloud server to ensure to always have the up to date LDAP + * with the Nextcloud server to ensure to always have the up to date LDAP * configuration. It sends various events that views can listen to and * provides methods so they can modify the configuration based upon user * input. This model is also extended by so-called "detectors" who let the - * ownCloud server try to auto-detect settings and manipulate the + * Nextcloud server try to auto-detect settings and manipulate the * configuration as well. * * @constructor @@ -108,7 +108,7 @@ OCA = OCA || {}; */ /** - * calls an AJAX endpoint at ownCloud. This method should be called by + * calls an AJAX endpoint at Nextcloud. This method should be called by * detectors only! * * @param {string} [params] - as return by OC.buildQueryString @@ -121,7 +121,7 @@ OCA = OCA || {}; }, /** - * calls an AJAX endpoint at ownCloud. This method should be called by + * calls an AJAX endpoint at Nextcloud. This method should be called by * detectors only! * * @param {string} destination - the desired end point @@ -148,7 +148,7 @@ OCA = OCA || {}; /** * modifies a configuration key. If a provided configuration key does * not exist or the provided value equals the current setting, false is - * returned. Otherwise ownCloud server will be called to save the new + * returned. Otherwise Nextcloud server will be called to save the new * value, an event will notify when this is done. True is returned when * the request is sent, however it does not mean whether saving was * successful or not. @@ -195,7 +195,7 @@ OCA = OCA || {}; /** * updates the model's configuration data. This should be called only, - * when a new configuration value was received from the ownCloud server. + * when a new configuration value was received from the Nextcloud server. * This is typically done by detectors, but never by views. * * Cancels with false if old and new values already match. @@ -314,7 +314,7 @@ OCA = OCA || {}; }, /** - * starts a configuration test on the ownCloud server + * starts a configuration test on the Nextcloud server */ requestConfigurationTest: function() { var url = OC.generateUrl('apps/user_ldap/ajax/testConfiguration.php'); diff --git a/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js b/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js index f0272351749..fd43b032ad5 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js +++ b/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc an Attributes Detector. It executes the auto-detection of - * available attributes by the ownCloud server, if requirements are met. + * available attributes by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js b/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js index 70b9923e58d..f81d342b692 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js +++ b/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Base DN Detector. It executes the auto-detection of the base - * DN by the ownCloud server, if requirements are met. + * DN by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js b/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js index cca889839e4..f56550a919e 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js +++ b/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js index e796b81e0eb..7012847193b 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js +++ b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js index d34e244a1f5..3cd2935bd87 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js +++ b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorGeneric.js b/apps/user_ldap/js/wizard/wizardDetectorGeneric.js index fd80018943e..2126828c197 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorGeneric.js +++ b/apps/user_ldap/js/wizard/wizardDetectorGeneric.js @@ -90,7 +90,7 @@ OCA = OCA || {}; }, /** - * processes the result of the ownCloud server + * processes the result of the Nextcloud server * * @param {OCA.LDAP.Wizard.ConfigModel} model * @param {WizardDetectorGeneric} detector diff --git a/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js b/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js index 12d7df7514b..d2f3dd978c5 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js +++ b/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorPort.js b/apps/user_ldap/js/wizard/wizardDetectorPort.js index ba075189667..50b1a1b4746 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorPort.js +++ b/apps/user_ldap/js/wizard/wizardDetectorPort.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js b/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js index 37e41f42a64..8a1da617aa0 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js +++ b/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js b/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js index df0b0a2200a..e371dbf0f63 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js +++ b/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js b/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js index 1308c182909..aed99539384 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js +++ b/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js @@ -11,7 +11,7 @@ OCA = OCA || {}; /** * @classdesc a Port Detector. It executes the auto-detection of the port - * by the ownCloud server, if requirements are met. + * by the Nextcloud server, if requirements are met. * * @constructor */ diff --git a/apps/user_ldap/js/wizard/wizardTabAdvanced.js b/apps/user_ldap/js/wizard/wizardTabAdvanced.js index d0922bbff32..7d8d0b70269 100644 --- a/apps/user_ldap/js/wizard/wizardTabAdvanced.js +++ b/apps/user_ldap/js/wizard/wizardTabAdvanced.js @@ -332,7 +332,7 @@ OCA = OCA || {}; }, /** - * sets the attribute for the ownCloud user specific home folder location + * sets the attribute for the Nextcloud user specific home folder location * * @param {string} attribute */ diff --git a/apps/user_ldap/js/wizard/wizardTabExpert.js b/apps/user_ldap/js/wizard/wizardTabExpert.js index 7cfd49ba0f6..634d30212ac 100644 --- a/apps/user_ldap/js/wizard/wizardTabExpert.js +++ b/apps/user_ldap/js/wizard/wizardTabExpert.js @@ -65,7 +65,7 @@ OCA = OCA || {}; }, /** - * sets the attribute to be used to create an ownCloud ID (username) + * sets the attribute to be used to create an Nextcloud ID (username) * * @param {string} attribute */ diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js index 4415172a18c..98e26d303b5 100644 --- a/apps/user_ldap/js/wizard/wizardTabGeneric.js +++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js @@ -73,7 +73,7 @@ OCA = OCA || {}; /** * the method can be used to display a different error/information - * message than provided by the ownCloud server response. The concrete + * message than provided by the Nextcloud server response. The concrete * Tab View may optionally implement it. Returning an empty string will * avoid any notification. * diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index ff95d96ebdb..dbc4f5b0448 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -407,8 +407,8 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the LDAP DN for the given internal ownCloud name of the group - * @param string $name the ownCloud name in question + * returns the LDAP DN for the given internal Nextcloud name of the group + * @param string $name the Nextcloud name in question * @return string|false LDAP DN on success, otherwise false */ public function groupname2dn($name) { @@ -416,8 +416,8 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the LDAP DN for the given internal ownCloud name of the user - * @param string $name the ownCloud name in question + * returns the LDAP DN for the given internal Nextcloud name of the user + * @param string $name the Nextcloud name in question * @return string|false with the LDAP DN on success, otherwise false */ public function username2dn($name) { @@ -433,10 +433,10 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure + * returns the internal Nextcloud name for the given LDAP DN of the group, false on DN outside of search DN or failure * @param string $fdn the dn of the group object * @param string $ldapName optional, the display name of the object - * @return string|false with the name to use in ownCloud, false on DN outside of search DN + * @return string|false with the name to use in Nextcloud, false on DN outside of search DN */ public function dn2groupname($fdn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances @@ -489,10 +489,10 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure + * returns the internal Nextcloud name for the given LDAP DN of the user, false on DN outside of search DN or failure * @param string $dn the dn of the user object * @param string $ldapName optional, the display name of the object - * @return string|false with with the name to use in ownCloud + * @return string|false with with the name to use in Nextcloud */ public function dn2username($fdn, $ldapName = null) { //To avoid bypassing the base DN settings under certain circumstances @@ -506,11 +506,11 @@ class Access extends LDAPUtility implements IUserTools { } /** - * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN + * returns an internal Nextcloud name for the given LDAP DN, false on DN outside of search DN * @param string $dn the dn of the user object * @param string $ldapName optional, the display name of the object * @param bool $isUser optional, whether it is a user object (otherwise group assumed) - * @return string|false with with the name to use in ownCloud + * @return string|false with with the name to use in Nextcloud */ public function dn2ocname($fdn, $ldapName = null, $isUser = true) { if($isUser) { @@ -521,7 +521,7 @@ class Access extends LDAPUtility implements IUserTools { $nameAttribute = $this->connection->ldapGroupDisplayName; } - //let's try to retrieve the ownCloud name from the mappings table + //let's try to retrieve the Nextcloud name from the mappings table $ocName = $mapper->getNameByDN($fdn); if(is_string($ocName)) { return $ocName; @@ -591,7 +591,7 @@ class Access extends LDAPUtility implements IUserTools { /** * gives back the user names as they are used ownClod internally * @param array $ldapUsers as returned by fetchList() - * @return array an array with the user names to use in ownCloud + * @return array an array with the user names to use in Nextcloud * * gives back the user names as they are used ownClod internally */ @@ -602,7 +602,7 @@ class Access extends LDAPUtility implements IUserTools { /** * gives back the group names as they are used ownClod internally * @param array $ldapGroups as returned by fetchList() - * @return array an array with the group names to use in ownCloud + * @return array an array with the group names to use in Nextcloud * * gives back the group names as they are used ownClod internally */ @@ -649,12 +649,12 @@ class Access extends LDAPUtility implements IUserTools { } } } - return $ownCloudNames; + return $NextcloudNames; } /** * caches the user display name - * @param string $ocName the internal ownCloud username + * @param string $ocName the internal Nextcloud username * @param string|false $home the home directory path */ public function cacheUserHome($ocName, $home) { @@ -664,7 +664,7 @@ class Access extends LDAPUtility implements IUserTools { /** * caches a user as existing - * @param string $ocName the internal ownCloud username + * @param string $ocName the internal Nextcloud username */ public function cacheUserExists($ocName) { $this->connection->writeToCache('userExists'.$ocName, true); @@ -672,7 +672,7 @@ class Access extends LDAPUtility implements IUserTools { /** * caches the user display name - * @param string $ocName the internal ownCloud username + * @param string $ocName the internal Nextcloud username * @param string $displayName the display name * @param string $displayName2 the second display name */ @@ -687,9 +687,9 @@ class Access extends LDAPUtility implements IUserTools { } /** - * creates a unique name for internal ownCloud use for users. Don't call it directly. + * creates a unique name for internal Nextcloud use for users. Don't call it directly. * @param string $name the display name of the object - * @return string|false with with the name to use in ownCloud or false if unsuccessful + * @return string|false with with the name to use in Nextcloud or false if unsuccessful * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, true) @@ -709,9 +709,9 @@ class Access extends LDAPUtility implements IUserTools { } /** - * creates a unique name for internal ownCloud use for groups. Don't call it directly. + * creates a unique name for internal Nextcloud use for groups. Don't call it directly. * @param string $name the display name of the object - * @return string|false with with the name to use in ownCloud or false if unsuccessful. + * @return string|false with with the name to use in Nextcloud or false if unsuccessful. * * Instead of using this method directly, call * createAltInternalOwnCloudName($name, false) @@ -747,10 +747,10 @@ class Access extends LDAPUtility implements IUserTools { } /** - * creates a unique name for internal ownCloud use. + * creates a unique name for internal Nextcloud use. * @param string $name the display name of the object * @param boolean $isUser whether name should be created for a user (true) or a group (false) - * @return string|false with with the name to use in ownCloud or false if unsuccessful + * @return string|false with with the name to use in Nextcloud or false if unsuccessful */ private function createAltInternalOwnCloudName($name, $isUser) { $originalTTL = $this->connection->ldapCacheTTL; @@ -1141,7 +1141,7 @@ class Access extends LDAPUtility implements IUserTools { $offset = $savedoffset; // if we're here, probably no connection resource is returned. - // to make ownCloud behave nicely, we simply give back an empty array. + // to make Nextcloud behave nicely, we simply give back an empty array. if(is_null($findings)) { return array(); } diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php index 236d2e51d0b..af2806e8cc6 100644 --- a/apps/user_ldap/lib/Command/CheckUser.php +++ b/apps/user_ldap/lib/Command/CheckUser.php @@ -69,7 +69,7 @@ class CheckUser extends Command { ->addArgument( 'ocName', InputArgument::REQUIRED, - 'the user name as used in ownCloud' + 'the user name as used in Nextcloud' ) ->addOption( 'force', @@ -102,7 +102,7 @@ class CheckUser extends Command { /** * checks whether a user is actually mapped - * @param string $ocName the username as used in ownCloud + * @param string $ocName the username as used in Nextcloud * @throws \Exception * @return true */ diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php index 0e6aea6a5ab..365c8967ee0 100644 --- a/apps/user_ldap/lib/Command/ShowRemnants.php +++ b/apps/user_ldap/lib/Command/ShowRemnants.php @@ -54,7 +54,7 @@ class ShowRemnants extends Command { protected function configure() { $this ->setName('ldap:show-remnants') - ->setDescription('shows which users are not available on LDAP anymore, but have remnants in ownCloud.') + ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.') ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.'); } @@ -67,7 +67,7 @@ class ShowRemnants extends Command { /** @var \Symfony\Component\Console\Helper\Table $table */ $table = new Table($output); $table->setHeaders(array( - 'ownCloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login', + 'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login', 'Dir', 'Sharer')); $rows = array(); $resultSet = $this->dui->getUsers(); diff --git a/apps/user_ldap/lib/FilesystemHelper.php b/apps/user_ldap/lib/FilesystemHelper.php index 689fcfeda7e..e5b0a9ecef3 100644 --- a/apps/user_ldap/lib/FilesystemHelper.php +++ b/apps/user_ldap/lib/FilesystemHelper.php @@ -25,7 +25,7 @@ namespace OCA\User_LDAP; /** - * @brief wraps around static ownCloud core methods + * @brief wraps around static Nextcloud core methods */ class FilesystemHelper { @@ -39,7 +39,7 @@ class FilesystemHelper { /** * @brief initializes the filesystem for the given user - * @param string $uid the ownCloud username of the user + * @param string $uid the Nextcloud username of the user */ public function setup($uid) { \OC_Util::setupFS($uid); diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index fb9920d3cc2..f1ea831e485 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -267,7 +267,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface { } /** - * translates a primary group ID into an ownCloud internal name + * translates a primary group ID into an Nextcloud internal name * @param string $gid as given by primaryGroupID on AD * @param string $dn a DN that belongs to the same domain as the group * @return string|bool @@ -296,7 +296,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface { $dn = $result[0]['dn'][0]; //and now the group name - //NOTE once we have separate ownCloud group IDs and group names we can + //NOTE once we have separate Nextcloud group IDs and group names we can //directly read the display name attribute instead of the DN $name = $this->access->dn2groupname($dn); diff --git a/apps/user_ldap/lib/ILDAPWrapper.php b/apps/user_ldap/lib/ILDAPWrapper.php index e2089fa8a47..4034d0baea4 100644 --- a/apps/user_ldap/lib/ILDAPWrapper.php +++ b/apps/user_ldap/lib/ILDAPWrapper.php @@ -196,7 +196,7 @@ interface ILDAPWrapper { */ public function unbind($link); - //additional required methods in ownCloud + //additional required methods in Nextcloud /** * Checks whether the server supports LDAP diff --git a/apps/user_ldap/lib/LogWrapper.php b/apps/user_ldap/lib/LogWrapper.php index dd05b58666d..af5323565f8 100644 --- a/apps/user_ldap/lib/LogWrapper.php +++ b/apps/user_ldap/lib/LogWrapper.php @@ -25,7 +25,7 @@ namespace OCA\User_LDAP; /** - * @brief wraps around static ownCloud core methods + * @brief wraps around static Nextcloud core methods */ class LogWrapper { protected $app = 'user_ldap'; diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php index 1a9138176b0..18430a90cc7 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -175,7 +175,7 @@ class Manager { /** * Checks whether the specified user is marked as deleted - * @param string $id the ownCloud user name + * @param string $id the Nextcloud user name * @return bool */ public function isDeletedUser($id) { @@ -198,7 +198,7 @@ class Manager { } /** - * @brief returns a User object by it's ownCloud username + * @brief returns a User object by it's Nextcloud username * @param string $id the DN or username of the user * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null */ @@ -215,7 +215,7 @@ class Manager { } /** - * @brief returns a User object by it's DN or ownCloud username + * @brief returns a User object by it's DN or Nextcloud username * @param string $id the DN or username of the user * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null * @throws \Exception when connection could not be established diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php index 4ee3bd09911..0e60a29514e 100644 --- a/apps/user_ldap/lib/User/OfflineUser.php +++ b/apps/user_ldap/lib/User/OfflineUser.php @@ -112,7 +112,7 @@ class OfflineUser { } /** - * getter for ownCloud internal name + * getter for Nextcloud internal name * @return string */ public function getOCName() { diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index 5d4af1fd09c..4419c4983d4 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -251,7 +251,7 @@ class User { } /** - * @brief returns the ownCloud internal username of the user + * @brief returns the Nextcloud internal username of the user * @return string */ public function getUsername() { @@ -429,7 +429,7 @@ class User { } /** - * fetches the email from LDAP and stores it as ownCloud user value + * fetches the email from LDAP and stores it as Nextcloud user value * @param string $valueFromLDAP if known, to save an LDAP read request * @return null */ @@ -462,7 +462,7 @@ class User { * Overall process goes as follow: * 1. fetch the quota from LDAP and check if it's parseable with the "verifyQuotaValue" function * 2. if the value can't be fetched, is empty or not parseable, use the default LDAP quota - * 3. if the default LDAP quota can't be parsed, use the ownCloud's default quota (use 'default') + * 3. if the default LDAP quota can't be parsed, use the Nextcloud's default quota (use 'default') * 4. check if the target user exists and set the quota for the user. * * In order to improve performance and prevent an unwanted extra LDAP call, the $valueFromLDAP @@ -470,10 +470,10 @@ class User { * quota for the user coming from the LDAP server (step 1 of the process) It can be useful to * fetch all the user's attributes in one call and use the fetched values in this function. * The expected value for that parameter is a string describing the quota for the user. Valid - * values are 'none' (unlimited), 'default' (the ownCloud's default quota), '1234' (quota in + * values are 'none' (unlimited), 'default' (the Nextcloud's default quota), '1234' (quota in * bytes), '1234 MB' (quota in MB - check the \OC_Helper::computerFileSize method for more info) * - * fetches the quota from LDAP and stores it as ownCloud user value + * fetches the quota from LDAP and stores it as Nextcloud user value * @param string $valueFromLDAP the quota attribute's value can be passed, * to save the readAttribute request * @return null @@ -541,7 +541,7 @@ class User { } /** - * @brief attempts to get an image from LDAP and sets it as ownCloud avatar + * @brief attempts to get an image from LDAP and sets it as Nextcloud avatar * @return null */ public function updateAvatar() { @@ -558,7 +558,7 @@ class User { } /** - * @brief sets an image as ownCloud avatar + * @brief sets an image as Nextcloud avatar * @return null */ private function setOwnCloudAvatar() { diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index cfd2450a122..44de3f5da40 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -60,8 +60,8 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn } /** - * checks whether the user is allowed to change his avatar in ownCloud - * @param string $uid the ownCloud user name + * checks whether the user is allowed to change his avatar in Nextcloud + * @param string $uid the Nextcloud user name * @return boolean either the user can or cannot */ public function canChangeAvatar($uid) { @@ -244,7 +244,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn /** * checks whether a user is still available on LDAP * - * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user + * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user * name or an instance of that user * @return bool * @throws \Exception diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php index 2cdf401880e..6417841f245 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -163,7 +163,7 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, /** * check if a user exists on LDAP - * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user + * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user * name or an instance of that user * @return boolean */ @@ -225,8 +225,8 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, } /** - * checks whether the user is allowed to change his avatar in ownCloud - * @param string $uid the ownCloud user name + * checks whether the user is allowed to change his avatar in Nextcloud + * @param string $uid the Nextcloud user name * @return boolean either the user can or cannot */ public function canChangeAvatar($uid) { diff --git a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php index 918dad6d5d0..0dc80e87238 100644 --- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php +++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php @@ -87,7 +87,7 @@ class ExceptionOnLostConnection { } /** - * prepares everything for the test run. Includes loading ownCloud and + * prepares everything for the test run. Includes loading Nextcloud and * the LDAP backend, as well as getting information about toxiproxy. * Also creates an instance of the LDAP class, the testee * diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php index 2200ac327a1..9db4cafea41 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php @@ -79,7 +79,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest { /** * homeDirectory on LDAP is empty. Return values of getHome should be - * identical to user name, following ownCloud default. + * identical to user name, following Nextcloud default. * * @return bool */ @@ -135,7 +135,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest { /** * homeDirectory on LDAP is set to "attr:" which is effectively empty. - * Return values of getHome should be ownCloud default. + * Return values of getHome should be Nextcloud default. * * @return bool */ |