Merge branch 'master' into oc_preview
This commit is contained in:
Georg Ehrke
commit
85ecec8b01
2
3rdparty
2
3rdparty
|
|
@ -1 +1 @@
|
|||
Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
|
||||
Subproject commit e312294ef62873df2b8c02e774f9dfe1b7fbc38d
|
||||
|
|
@ -20,4 +20,4 @@ OC_Search::registerProvider('OC_Search_Provider_File');
|
|||
\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
|
||||
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
|
||||
|
||||
\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
|
||||
\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
|
||||
|
|
|
|||
|
|
@ -16,28 +16,44 @@ use OCA\Encryption;
|
|||
$l = OC_L10N::get('files_encryption');
|
||||
|
||||
$return = false;
|
||||
|
||||
// Enable recoveryAdmin
|
||||
|
||||
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
||||
|
||||
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
|
||||
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') {
|
||||
|
||||
$return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
|
||||
$action = "enable";
|
||||
|
||||
// Return success or failure
|
||||
if ($return) {
|
||||
\OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully enabled'))));
|
||||
} else {
|
||||
\OCP\JSON::error(array(
|
||||
'data' => array(
|
||||
'message' => $l->t(
|
||||
'Could not enable recovery key. Please check your recovery key password!')
|
||||
)
|
||||
));
|
||||
}
|
||||
|
||||
// Disable recoveryAdmin
|
||||
} elseif (
|
||||
isset($_POST['adminEnableRecovery'])
|
||||
&& 0 == $_POST['adminEnableRecovery']
|
||||
&& '0' === $_POST['adminEnableRecovery']
|
||||
) {
|
||||
$return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
|
||||
$action = "disable";
|
||||
}
|
||||
|
||||
// Return success or failure
|
||||
if ($return) {
|
||||
\OCP\JSON::success(array("data" => array( "message" => $l->t('Recovery key successfully ' . $action.'d'))));
|
||||
\OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully disabled'))));
|
||||
} else {
|
||||
\OCP\JSON::error(array("data" => array( "message" => $l->t('Could not '.$action.' recovery key. Please check your recovery key password!'))));
|
||||
\OCP\JSON::error(array(
|
||||
'data' => array(
|
||||
'message' => $l->t(
|
||||
'Could not disable recovery key. Please check your recovery key password!')
|
||||
)
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ $result = $util->checkRecoveryPassword($oldPassword);
|
|||
|
||||
if ($result) {
|
||||
$keyId = $util->getRecoveryKeyId();
|
||||
$keyPath = '/owncloud_private_key/' . $keyId . ".private.key";
|
||||
$keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
|
||||
$view = new \OC\Files\View('/');
|
||||
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
|
|
@ -46,7 +46,7 @@ if ($result) {
|
|||
|
||||
// success or failure
|
||||
if ($return) {
|
||||
\OCP\JSON::success(array("data" => array( "message" => $l->t('Password successfully changed.'))));
|
||||
\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
|
||||
} else {
|
||||
\OCP\JSON::error(array("data" => array( "message" => $l->t('Could not change the password. Maybe the old password was not correct.'))));
|
||||
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@ use OCA\Encryption;
|
|||
|
||||
if (
|
||||
isset($_POST['userEnableRecovery'])
|
||||
&& ( 0 == $_POST['userEnableRecovery'] || 1 == $_POST['userEnableRecovery'] )
|
||||
&& (0 == $_POST['userEnableRecovery'] || '1' === $_POST['userEnableRecovery'])
|
||||
) {
|
||||
|
||||
$userId = \OCP\USER::getUser();
|
||||
|
|
@ -25,7 +25,7 @@ if (
|
|||
// Save recovery preference to DB
|
||||
$return = $util->setRecoveryForUser($_POST['userEnableRecovery']);
|
||||
|
||||
if ($_POST['userEnableRecovery'] == "1") {
|
||||
if ($_POST['userEnableRecovery'] === '1') {
|
||||
$util->addRecoveryKeys();
|
||||
} else {
|
||||
$util->removeRecoveryKeys();
|
||||
|
|
|
|||
|
|
@ -25,6 +25,12 @@ stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
|
|||
|
||||
// check if we are logged in
|
||||
if (OCP\User::isLoggedIn()) {
|
||||
|
||||
// ensure filesystem is loaded
|
||||
if(!\OC\Files\Filesystem::$loaded) {
|
||||
\OC_Util::setupFS();
|
||||
}
|
||||
|
||||
$view = new OC_FilesystemView('/');
|
||||
$session = new \OCA\Encryption\Session($view);
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,11 @@ class Hooks {
|
|||
|
||||
$view = new \OC_FilesystemView('/');
|
||||
|
||||
// ensure filesystem is loaded
|
||||
if(!\OC\Files\Filesystem::$loaded) {
|
||||
\OC_Util::setupFS($params['uid']);
|
||||
}
|
||||
|
||||
$util = new Util($view, $params['uid']);
|
||||
|
||||
// setup user, if user not ready force relogin
|
||||
|
|
@ -145,9 +150,9 @@ class Hooks {
|
|||
// Only attempt to change passphrase if server-side encryption
|
||||
// is in use (client-side encryption does not have access to
|
||||
// the necessary keys)
|
||||
if (Crypt::mode() == 'server') {
|
||||
if (Crypt::mode() === 'server') {
|
||||
|
||||
if ($params['uid'] == \OCP\User::getUser()) {
|
||||
if ($params['uid'] === \OCP\User::getUser()) {
|
||||
|
||||
$view = new \OC_FilesystemView('/');
|
||||
|
||||
|
|
@ -191,7 +196,8 @@ class Hooks {
|
|||
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword);
|
||||
|
||||
// Save private key
|
||||
$view->file_put_contents( '/'.$user.'/files_encryption/'.$user.'.private.key', $encryptedPrivateKey );
|
||||
$view->file_put_contents(
|
||||
'/' . $user . '/files_encryption/' . $user . '.private.key', $encryptedPrivateKey);
|
||||
|
||||
if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
|
||||
$util = new Util($view, $user);
|
||||
|
|
@ -231,10 +237,11 @@ class Hooks {
|
|||
}
|
||||
}
|
||||
|
||||
if($error)
|
||||
// Set flag var 'run' to notify emitting
|
||||
if ($error) // Set flag var 'run' to notify emitting
|
||||
// script that hook execution failed
|
||||
{
|
||||
$params['run']->run = false;
|
||||
}
|
||||
// TODO: Make sure files_sharing provides user
|
||||
// feedback on failed share
|
||||
}
|
||||
|
|
@ -273,7 +280,7 @@ class Hooks {
|
|||
|
||||
$share = $util->getParentFromShare($params['id']);
|
||||
//if parent is set, then this is a re-share action
|
||||
if ($share['parent'] != null) {
|
||||
if ($share['parent'] !== null) {
|
||||
|
||||
// get the parent from current share
|
||||
$parent = $util->getShareParent($params['parent']);
|
||||
|
|
@ -325,6 +332,12 @@ class Hooks {
|
|||
|
||||
$sharingEnabled = \OCP\Share::isEnabled();
|
||||
|
||||
// get the path including mount point only if not a shared folder
|
||||
if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {
|
||||
// get path including the the storage mount point
|
||||
$path = $util->getPathWithMountPoint($params['itemSource']);
|
||||
}
|
||||
|
||||
// if a folder was shared, get a list of all (sub-)folders
|
||||
if ($params['itemType'] === 'folder') {
|
||||
$allFiles = $util->getAllFiles($path);
|
||||
|
|
@ -374,17 +387,11 @@ class Hooks {
|
|||
|
||||
// rebuild path
|
||||
foreach ($targetPathSplit as $pathPart) {
|
||||
|
||||
if ($pathPart !== $sharedPart) {
|
||||
|
||||
$path = '/' . $pathPart . $path;
|
||||
|
||||
} else {
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// prefix path with Shared
|
||||
|
|
@ -392,21 +399,26 @@ class Hooks {
|
|||
}
|
||||
|
||||
// for group shares get a list of the group members
|
||||
if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP ) {
|
||||
if ($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
|
||||
$userIds = \OC_Group::usersInGroup($params['shareWith']);
|
||||
} else if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_LINK ){
|
||||
} else {
|
||||
if ($params['shareType'] === \OCP\Share::SHARE_TYPE_LINK) {
|
||||
$userIds = array($util->getPublicShareKeyId());
|
||||
} else {
|
||||
$userIds = array($params['shareWith']);
|
||||
}
|
||||
}
|
||||
|
||||
// get the path including mount point only if not a shared folder
|
||||
if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {
|
||||
// get path including the the storage mount point
|
||||
$path = $util->getPathWithMountPoint($params['itemSource']);
|
||||
}
|
||||
|
||||
// if we unshare a folder we need a list of all (sub-)files
|
||||
if ($params['itemType'] === 'folder') {
|
||||
|
||||
$allFiles = $util->getAllFiles( $path );
|
||||
|
||||
} else {
|
||||
|
||||
$allFiles = array($path);
|
||||
}
|
||||
|
||||
|
|
@ -443,8 +455,10 @@ class Hooks {
|
|||
$util = new Util($view, $userId);
|
||||
|
||||
// Format paths to be relative to user files dir
|
||||
$oldKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
|
||||
$newKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
|
||||
$oldKeyfilePath = \OC\Files\Filesystem::normalizePath(
|
||||
$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
|
||||
$newKeyfilePath = \OC\Files\Filesystem::normalizePath(
|
||||
$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
|
||||
|
||||
// add key ext if this is not an folder
|
||||
if (!$view->is_dir($oldKeyfilePath)) {
|
||||
|
|
@ -467,8 +481,10 @@ class Hooks {
|
|||
|
||||
} else {
|
||||
// handle share-keys folders
|
||||
$oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
|
||||
$newShareKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
|
||||
$oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
|
||||
$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
|
||||
$newShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
|
||||
$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
|
||||
|
||||
// create destination folder if not exists
|
||||
if (!$view->file_exists(dirname($newShareKeyfilePath))) {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,19 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
|
||||
"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
|
||||
"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
|
||||
"Saving..." => "Speichern...",
|
||||
"Encryption" => "Verschlüsselung",
|
||||
"Recovery account password" => "Account-Passwort wiederherstellen",
|
||||
"Enabled" => "Aktiviert",
|
||||
"Disabled" => "Deaktiviert",
|
||||
"Change Password" => "Passwort ändern"
|
||||
"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung",
|
||||
"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung",
|
||||
"Change Password" => "Passwort ändern",
|
||||
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
|
||||
"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
|
||||
"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,22 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
|
||||
"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
|
||||
"Password successfully changed." => "Su contraseña ha sido cambiada",
|
||||
"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
|
||||
"Saving..." => "Guardando...",
|
||||
"Encryption" => "Cifrado"
|
||||
"Encryption" => "Cifrado",
|
||||
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
|
||||
"Recovery account password" => "Recuperar contraseña",
|
||||
"Enabled" => "Habilitar",
|
||||
"Disabled" => "Deshabilitado",
|
||||
"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:",
|
||||
"Old Recovery account password" => "Contraseña de recuperación actual",
|
||||
"New Recovery account password" => "Contraseña de recuperación nueva",
|
||||
"Change Password" => "Cambiar contraseña",
|
||||
"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador",
|
||||
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su contraseña",
|
||||
"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
|
||||
"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,22 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
|
||||
"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
|
||||
"Password successfully changed." => "Parool edukalt vahetatud.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
|
||||
"Saving..." => "Salvestamine...",
|
||||
"Encryption" => "Krüpteerimine",
|
||||
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
|
||||
"Recovery account password" => "Konto taasteparool",
|
||||
"Enabled" => "Sisse lülitatud",
|
||||
"Disabled" => "Väljalülitatud",
|
||||
"Change Password" => "Muuda parooli"
|
||||
"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
|
||||
"Old Recovery account password" => "Konto vana taaste parool",
|
||||
"New Recovery account password" => "Konto uus taasteparool",
|
||||
"Change Password" => "Muuda parooli",
|
||||
"Enable password recovery by sharing all files with your administrator:" => "Luba parooli taaste jagades kõik failid administraatoriga:",
|
||||
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parool on kadunud",
|
||||
"File recovery settings updated" => "Faili taaste seaded uuendatud",
|
||||
"Could not update file recovery" => "Ei suuda uuendada taastefaili"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "O contrasinal foi recuperado satisfactoriamente",
|
||||
"Could not " => "Non foi posíbel",
|
||||
"Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
|
||||
"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
|
||||
"Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
|
||||
"Saving..." => "Gardando...",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "Chiave ripristinata correttamente",
|
||||
"Could not " => "Impossibile",
|
||||
"Recovery key successfully enabled" => "Chiave di ripristino abilitata correttamente",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
|
||||
"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
|
||||
"Password successfully changed." => "Password modificata correttamente.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
|
||||
"Saving..." => "Salvataggio in corso...",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "鍵を復旧することができました。",
|
||||
"Could not " => "できませんでした。",
|
||||
"Recovery key successfully enabled" => "リカバリ用のキーは正常に有効化されました",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい！",
|
||||
"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！",
|
||||
"Password successfully changed." => "パスワードを変更できました。",
|
||||
"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
|
||||
"Saving..." => "保存中...",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "Sleutelherstel succesvol",
|
||||
"Could not " => "Kon niet",
|
||||
"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
|
||||
"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
|
||||
"Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
|
||||
"Saving..." => "Opslaan",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "Odzyskanie klucza udane",
|
||||
"Could not " => "Nie można",
|
||||
"Password successfully changed." => "Zmiana hasła udana.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
|
||||
"Saving..." => "Zapisywanie...",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "Recuperação de chave com sucesso",
|
||||
"Could not " => "Não foi possível",
|
||||
"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
|
||||
"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
|
||||
"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
|
||||
"Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
|
||||
"Password successfully changed." => "Senha alterada com sucesso.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
|
||||
"Saving..." => "Salvando...",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Could not " => "Não foi possivel",
|
||||
"Password successfully changed." => "Password alterada com sucesso.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
|
||||
"Saving..." => "A guardar...",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,18 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Password successfully changed." => "Пароль изменен удачно.",
|
||||
"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
|
||||
"Saving..." => "Сохранение...",
|
||||
"Encryption" => "Шифрование"
|
||||
"Encryption" => "Шифрование",
|
||||
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
|
||||
"Recovery account password" => "Восстановление пароля учетной записи",
|
||||
"Enabled" => "Включено",
|
||||
"Disabled" => "Отключено",
|
||||
"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
|
||||
"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
|
||||
"New Recovery account password" => "Новое Восстановление пароля учетной записи",
|
||||
"Change Password" => "Изменить пароль",
|
||||
"Enable password recovery by sharing all files with your administrator:" => "Включить восстановление пароля путем доступа Вашего администратора ко всем файлам",
|
||||
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля",
|
||||
"File recovery settings updated" => "Настройки файла восстановления обновлены",
|
||||
"Could not update file recovery" => "Невозможно обновить файл восстановления"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Password successfully changed." => "Heslo úspešne zmenené.",
|
||||
"Saving..." => "Ukladám...",
|
||||
"Encryption" => "Šifrovanie"
|
||||
"Encryption" => "Šifrovanie",
|
||||
"Enabled" => "Povolené",
|
||||
"Disabled" => "Zakázané",
|
||||
"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
|
||||
"Change Password" => "Zmeniť heslo",
|
||||
"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
|
||||
"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "成功還原金鑰",
|
||||
"Could not " => "無法",
|
||||
"Password successfully changed." => "成功變更密碼。",
|
||||
"Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
|
||||
"Saving..." => "儲存中...",
|
||||
|
|
|
|||
|
|
@ -32,8 +32,7 @@ require_once realpath( dirname( __FILE__ ) . '/../3rdparty/Crypt_Blowfish/Blowfi
|
|||
* Class for common cryptography functionality
|
||||
*/
|
||||
|
||||
class Crypt
|
||||
{
|
||||
class Crypt {
|
||||
|
||||
/**
|
||||
* @brief return encryption mode client or server side encryption
|
||||
|
|
@ -62,7 +61,10 @@ class Crypt
|
|||
|
||||
$publicKey = $publicKey['key'];
|
||||
|
||||
return ( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
|
||||
return (array(
|
||||
'publicKey' => $publicKey,
|
||||
'privateKey' => $privateKey
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -90,7 +92,7 @@ class Crypt
|
|||
*/
|
||||
public static function removePadding($padded) {
|
||||
|
||||
if ( substr( $padded, -2 ) == 'xx' ) {
|
||||
if (substr($padded, -2) === 'xx') {
|
||||
|
||||
$data = substr($padded, 0, -2);
|
||||
|
||||
|
|
@ -130,7 +132,7 @@ class Crypt
|
|||
// Fetch identifier from start of metadata
|
||||
$identifier = substr($meta, 0, 6);
|
||||
|
||||
if ( $identifier == '00iv00' ) {
|
||||
if ($identifier === '00iv00') {
|
||||
|
||||
return true;
|
||||
|
||||
|
|
@ -155,7 +157,7 @@ class Crypt
|
|||
$metadata = \OC\Files\Filesystem::getFileInfo($path);
|
||||
|
||||
// Return encryption status
|
||||
return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
|
||||
return isset($metadata['encrypted']) && ( bool )$metadata['encrypted'];
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -174,10 +176,9 @@ class Crypt
|
|||
// If a file is flagged with encryption in DB, but isn't a
|
||||
// valid content + IV combination, it's probably using the
|
||||
// legacy encryption system
|
||||
if (
|
||||
isset( $metadata['encrypted'] )
|
||||
and $metadata['encrypted'] === true
|
||||
and !self::isCatfileContent( $data )
|
||||
if (isset($metadata['encrypted'])
|
||||
&& $metadata['encrypted'] === true
|
||||
&& !self::isCatfileContent($data)
|
||||
) {
|
||||
|
||||
return true;
|
||||
|
|
@ -205,7 +206,7 @@ class Crypt
|
|||
|
||||
} else {
|
||||
|
||||
\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);
|
||||
|
||||
return false;
|
||||
|
||||
|
|
@ -266,8 +267,8 @@ class Crypt
|
|||
$encrypted = substr($catFile, 0, -22);
|
||||
|
||||
$split = array(
|
||||
'encrypted' => $encrypted
|
||||
, 'iv' => $iv
|
||||
'encrypted' => $encrypted,
|
||||
'iv' => $iv
|
||||
);
|
||||
|
||||
return $split;
|
||||
|
|
@ -304,7 +305,7 @@ class Crypt
|
|||
|
||||
} else {
|
||||
|
||||
\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);
|
||||
|
||||
return false;
|
||||
|
||||
|
|
@ -451,7 +452,7 @@ class Crypt
|
|||
|
||||
} else {
|
||||
|
||||
\OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OCP\Util::ERROR);
|
||||
|
||||
return false;
|
||||
|
||||
|
|
@ -461,6 +462,8 @@ class Crypt
|
|||
|
||||
/**
|
||||
* @brief Asymetrically encrypt a string using a public key
|
||||
* @param $plainContent
|
||||
* @param $publicKey
|
||||
* @return string encrypted file
|
||||
*/
|
||||
public static function keyEncrypt($plainContent, $publicKey) {
|
||||
|
|
@ -473,6 +476,8 @@ class Crypt
|
|||
|
||||
/**
|
||||
* @brief Asymetrically decrypt a file using a private key
|
||||
* @param $encryptedContent
|
||||
* @param $privatekey
|
||||
* @return string decrypted file
|
||||
*/
|
||||
public static function keyDecrypt($encryptedContent, $privatekey) {
|
||||
|
|
@ -498,7 +503,7 @@ class Crypt
|
|||
if (!$strong) {
|
||||
|
||||
// If OpenSSL indicates randomness is insecure, log error
|
||||
\OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );
|
||||
\OCP\Util::writeLog('Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OCP\Util::WARN);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -545,7 +550,7 @@ class Crypt
|
|||
/**
|
||||
* @brief Get the blowfish encryption handeler for a key
|
||||
* @param $key string (optional)
|
||||
* @return Crypt_Blowfish blowfish object
|
||||
* @return \Crypt_Blowfish blowfish object
|
||||
*
|
||||
* if the key is left out, the default handeler will be used
|
||||
*/
|
||||
|
|
@ -583,8 +588,6 @@ class Crypt
|
|||
* @brief encrypts content using legacy blowfish system
|
||||
* @param string $content the cleartext message you want to encrypt
|
||||
* @param string $passphrase
|
||||
* @return
|
||||
* @internal param \OCA\Encryption\the $key encryption key (optional)
|
||||
* @returns string encrypted content
|
||||
*
|
||||
* This function encrypts an content
|
||||
|
|
@ -601,8 +604,6 @@ class Crypt
|
|||
* @brief decrypts content using legacy blowfish system
|
||||
* @param string $content the cleartext message you want to decrypt
|
||||
* @param string $passphrase
|
||||
* @return string
|
||||
* @internal param \OCA\Encryption\the $key encryption key (optional)
|
||||
* @return string cleartext content
|
||||
*
|
||||
* This function decrypts an content
|
||||
|
|
@ -614,7 +615,6 @@ class Crypt
|
|||
$decrypted = $bf->decrypt($content);
|
||||
|
||||
return $decrypted;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -624,6 +624,7 @@ class Crypt
|
|||
* @return string
|
||||
*/
|
||||
public static function legacyBlockDecrypt($data, $key = '', $maxLength = 0) {
|
||||
|
||||
$result = '';
|
||||
while (strlen($data)) {
|
||||
$result .= self::legacyDecrypt(substr($data, 0, 8192), $key);
|
||||
|
|
@ -640,11 +641,9 @@ class Crypt
|
|||
* @param $legacyEncryptedContent
|
||||
* @param $legacyPassphrase
|
||||
* @param $publicKeys
|
||||
* @param $newPassphrase
|
||||
* @param $path
|
||||
* @return array
|
||||
*/
|
||||
public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
|
||||
public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys) {
|
||||
|
||||
$decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);
|
||||
|
||||
|
|
@ -654,7 +653,11 @@ class Crypt
|
|||
// Encrypt plain keyfile to multiple sharefiles
|
||||
$multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);
|
||||
|
||||
return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
|
||||
return array(
|
||||
'data' => $cryptedData['encrypted'],
|
||||
'filekey' => $multiEncrypted['data'],
|
||||
'sharekeys' => $multiEncrypted['keys']
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,13 +25,9 @@ namespace OCA\Encryption;
|
|||
|
||||
/**
|
||||
* @brief Class to manage registration of hooks an various helper methods
|
||||
*/
|
||||
/**
|
||||
* Class Helper
|
||||
* @package OCA\Encryption
|
||||
*/
|
||||
class Helper
|
||||
{
|
||||
class Helper {
|
||||
|
||||
/**
|
||||
* @brief register share related hooks
|
||||
|
|
@ -76,7 +72,8 @@ class Helper
|
|||
// Check files_encryption infrastructure is ready for action
|
||||
if (!$util->ready()) {
|
||||
|
||||
\OC_Log::write( 'Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
|
||||
\OCP\Util::writeLog('Encryption library', 'User account "' . $util->getUserId()
|
||||
. '" is not ready for encryption; configuration started', \OCP\Util::DEBUG);
|
||||
|
||||
if (!$util->setupServerSide($password)) {
|
||||
return false;
|
||||
|
|
@ -189,4 +186,18 @@ class Helper
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Format a path to be relative to the /user/files/ directory
|
||||
* @param string $path the absolute path
|
||||
* @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
|
||||
*/
|
||||
public static function stripUserFilesPath($path) {
|
||||
$trimmed = ltrim($path, '/');
|
||||
$split = explode('/', $trimmed);
|
||||
$sliced = array_slice($split, 2);
|
||||
$relPath = implode('/', $sliced);
|
||||
|
||||
return $relPath;
|
||||
}
|
||||
}
|
||||
|
|
@ -27,8 +27,7 @@ namespace OCA\Encryption;
|
|||
* @brief Class to manage storage and retrieval of encryption keys
|
||||
* @note Where a method requires a view object, it's root must be '/'
|
||||
*/
|
||||
class Keymanager
|
||||
{
|
||||
class Keymanager {
|
||||
|
||||
/**
|
||||
* @brief retrieve the ENCRYPTED private key from a user
|
||||
|
|
@ -80,8 +79,8 @@ class Keymanager
|
|||
public static function getUserKeys(\OC_FilesystemView $view, $userId) {
|
||||
|
||||
return array(
|
||||
'publicKey' => self::getPublicKey( $view, $userId )
|
||||
, 'privateKey' => self::getPrivateKey( $view, $userId )
|
||||
'publicKey' => self::getPublicKey($view, $userId),
|
||||
'privateKey' => self::getPrivateKey($view, $userId)
|
||||
);
|
||||
|
||||
}
|
||||
|
|
@ -147,7 +146,8 @@ class Keymanager
|
|||
// try reusing key file if part file
|
||||
if (self::isPartialFilePath($targetPath)) {
|
||||
|
||||
$result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
|
||||
$result = $view->file_put_contents(
|
||||
$basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile);
|
||||
|
||||
} else {
|
||||
|
||||
|
|
@ -169,7 +169,7 @@ class Keymanager
|
|||
*/
|
||||
public static function fixPartialFilePath($path) {
|
||||
|
||||
if ( preg_match( '/\.part$/', $path ) ) {
|
||||
if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
|
||||
|
||||
$newLength = strlen($path) - 5;
|
||||
$fPath = substr($path, 0, $newLength);
|
||||
|
|
@ -191,7 +191,7 @@ class Keymanager
|
|||
*/
|
||||
public static function isPartialFilePath($path) {
|
||||
|
||||
if ( preg_match( '/\.part$/', $path ) ) {
|
||||
if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
|
||||
|
||||
return true;
|
||||
|
||||
|
|
@ -275,15 +275,18 @@ class Keymanager
|
|||
|
||||
$result = $view->unlink($keyPath);
|
||||
|
||||
} else if ( $view->file_exists( $keyPath . '.key' ) ) {
|
||||
} else {
|
||||
if ($view->file_exists($keyPath . '.key')) {
|
||||
|
||||
$result = $view->unlink($keyPath . '.key');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (!$result) {
|
||||
|
||||
\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library',
|
||||
'Could not delete keyfile; does not exist: "' . $keyPath, \OCP\Util::ERROR);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -437,7 +440,8 @@ class Keymanager
|
|||
$util = new Util($view, \OCP\User::getUser());
|
||||
|
||||
list($owner, $filename) = $util->getUidAndFilename($filePath);
|
||||
$shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey' );
|
||||
$shareKeyPath = \OC\Files\Filesystem::normalizePath(
|
||||
'/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
|
||||
|
||||
if ($view->file_exists($shareKeyPath)) {
|
||||
|
||||
|
|
@ -471,7 +475,8 @@ class Keymanager
|
|||
foreach ($matches as $ma) {
|
||||
$result = unlink($ma);
|
||||
if (!$result) {
|
||||
\OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library',
|
||||
'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OCP\Util::ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -502,7 +507,9 @@ class Keymanager
|
|||
foreach ($userIds as $userId) {
|
||||
|
||||
if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
|
||||
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library',
|
||||
'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId
|
||||
. '.shareKey"', \OCP\Util::ERROR);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -524,7 +531,8 @@ class Keymanager
|
|||
/** @var $matches array */
|
||||
foreach ($matches as $ma) {
|
||||
if (!unlink($ma)) {
|
||||
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library',
|
||||
'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
|
||||
}
|
||||
}
|
||||
$subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
|
||||
|
|
|
|||
|
|
@ -34,8 +34,7 @@ namespace OCA\Encryption;
|
|||
* Class Proxy
|
||||
* @package OCA\Encryption
|
||||
*/
|
||||
class Proxy extends \OC_FileProxy
|
||||
{
|
||||
class Proxy extends \OC_FileProxy {
|
||||
|
||||
private static $blackList = null; //mimetypes blacklisted from encryption
|
||||
|
||||
|
|
@ -53,8 +52,8 @@ class Proxy extends \OC_FileProxy
|
|||
if (is_null(self::$enableEncryption)) {
|
||||
|
||||
if (
|
||||
\OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
|
||||
&& Crypt::mode() == 'server'
|
||||
\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
|
||||
&& Crypt::mode() === 'server'
|
||||
) {
|
||||
|
||||
self::$enableEncryption = true;
|
||||
|
|
@ -105,74 +104,40 @@ class Proxy extends \OC_FileProxy
|
|||
|
||||
if (self::shouldEncrypt($path)) {
|
||||
|
||||
// Stream put contents should have been converted to fopen
|
||||
if (!is_resource($data)) {
|
||||
|
||||
$userId = \OCP\USER::getUser();
|
||||
// get root view
|
||||
$view = new \OC_FilesystemView('/');
|
||||
$util = new Util( $view, $userId );
|
||||
$session = new \OCA\Encryption\Session( $view );
|
||||
$privateKey = $session->getPrivateKey();
|
||||
$filePath = $util->stripUserFilesPath( $path );
|
||||
// Set the filesize for userland, before encrypting
|
||||
$size = strlen( $data );
|
||||
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
if (!isset($relativePath)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$handle = fopen('crypt://' . $relativePath . '.etmp', 'w');
|
||||
if (is_resource($handle)) {
|
||||
|
||||
// write data to stream
|
||||
fwrite($handle, $data);
|
||||
|
||||
// close stream
|
||||
fclose($handle);
|
||||
|
||||
// disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
// Check if there is an existing key we can reuse
|
||||
if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
|
||||
// get encrypted content
|
||||
$data = $view->file_get_contents($path . '.etmp');
|
||||
|
||||
// Fetch shareKey
|
||||
$shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
|
||||
// remove our temp file
|
||||
$view->unlink($path . '.etmp');
|
||||
|
||||
// Decrypt the keyfile
|
||||
$plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
|
||||
|
||||
} else {
|
||||
|
||||
// Make a new key
|
||||
$plainKey = Crypt::generateKey();
|
||||
|
||||
}
|
||||
|
||||
// Encrypt data
|
||||
$encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
|
||||
|
||||
$sharingEnabled = \OCP\Share::isEnabled();
|
||||
|
||||
// if file exists try to get sharing users
|
||||
if ( $view->file_exists( $path ) ) {
|
||||
$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
|
||||
} else {
|
||||
$uniqueUserIds[] = $userId;
|
||||
}
|
||||
|
||||
// Fetch public keys for all users who will share the file
|
||||
$publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
|
||||
|
||||
// Encrypt plain keyfile to multiple sharefiles
|
||||
$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
|
||||
|
||||
// Save sharekeys to user folders
|
||||
Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
|
||||
|
||||
// Set encrypted keyfile as common varname
|
||||
$encKey = $multiEncrypted['data'];
|
||||
|
||||
// Save keyfile for newly encrypted file in parallel directory tree
|
||||
Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
|
||||
|
||||
// Replace plain content with encrypted content by reference
|
||||
$data = $encData;
|
||||
|
||||
// Update the file cache with file info
|
||||
\OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted' => true, 'size' => strlen( $data ), 'unencrypted_size' => $size ), '' );
|
||||
|
||||
// Re-enable proxy - our work is done
|
||||
// re-enable proxy - our work is done
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -186,47 +151,42 @@ class Proxy extends \OC_FileProxy
|
|||
*/
|
||||
public function postFile_get_contents($path, $data) {
|
||||
|
||||
$userId = \OCP\USER::getUser();
|
||||
$plainData = null;
|
||||
$view = new \OC_FilesystemView('/');
|
||||
$util = new Util( $view, $userId );
|
||||
|
||||
$relPath = $util->stripUserFilesPath( $path );
|
||||
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
// init session
|
||||
$session = new \OCA\Encryption\Session($view);
|
||||
|
||||
// If data is a catfile
|
||||
if (
|
||||
Crypt::mode() == 'server'
|
||||
Crypt::mode() === 'server'
|
||||
&& Crypt::isCatfileContent($data)
|
||||
) {
|
||||
|
||||
$privateKey = $session->getPrivateKey( $userId );
|
||||
$handle = fopen('crypt://' . $relativePath, 'r');
|
||||
|
||||
// Get the encrypted keyfile
|
||||
$encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
|
||||
|
||||
// Attempt to fetch the user's shareKey
|
||||
$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
|
||||
|
||||
// Decrypt keyfile with shareKey
|
||||
$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
|
||||
|
||||
$plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
|
||||
if (is_resource($handle)) {
|
||||
while (($plainDataChunk = fgets($handle, 8192)) !== false) {
|
||||
$plainData .= $plainDataChunk;
|
||||
}
|
||||
}
|
||||
|
||||
} elseif (
|
||||
Crypt::mode() == 'server'
|
||||
&& \OC::$session->exists('legacyenckey')
|
||||
&& Crypt::isEncryptedMeta($path)
|
||||
) {
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
$plainData = Crypt::legacyBlockDecrypt($data, $session->getLegacyKey());
|
||||
}
|
||||
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
}
|
||||
|
||||
if (!isset($plainData)) {
|
||||
|
||||
|
|
@ -258,14 +218,15 @@ class Proxy extends \OC_FileProxy
|
|||
|
||||
$util = new Util($view, $userId);
|
||||
|
||||
// Format path to be relative to user files dir
|
||||
$relPath = $util->stripUserFilesPath( $path );
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
|
||||
list($owner, $ownerPath) = $util->getUidAndFilename($relativePath);
|
||||
|
||||
// Delete keyfile & shareKey so it isn't orphaned
|
||||
if (!Keymanager::deleteFileKey($view, $owner, $ownerPath)) {
|
||||
\OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR );
|
||||
\OCP\Util::writeLog('Encryption library',
|
||||
'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OCP\Util::ERROR);
|
||||
}
|
||||
|
||||
Keymanager::delAllShareKeys($view, $owner, $ownerPath);
|
||||
|
|
@ -301,12 +262,14 @@ class Proxy extends \OC_FileProxy
|
|||
|
||||
}
|
||||
|
||||
// Reformat path for use with OC_FSV
|
||||
$path_split = explode( '/', $path );
|
||||
$path_f = implode( '/', array_slice( $path_split, 3 ) );
|
||||
// split the path parts
|
||||
$pathParts = explode('/', $path);
|
||||
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
// FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
|
||||
if ( count($path_split) >= 2 && $path_split[2] == 'cache' ) {
|
||||
if (isset($pathParts[2]) && $pathParts[2] === 'cache') {
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
|
@ -322,7 +285,7 @@ class Proxy extends \OC_FileProxy
|
|||
|
||||
// If file is already encrypted, decrypt using crypto protocol
|
||||
if (
|
||||
Crypt::mode() == 'server'
|
||||
Crypt::mode() === 'server'
|
||||
&& $util->isEncryptedPath($path)
|
||||
) {
|
||||
|
||||
|
|
@ -331,14 +294,14 @@ class Proxy extends \OC_FileProxy
|
|||
|
||||
// Open the file using the crypto stream wrapper
|
||||
// protocol and let it do the decryption work instead
|
||||
$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
|
||||
$result = fopen('crypt://' . $relativePath, $meta['mode']);
|
||||
|
||||
} elseif (
|
||||
self::shouldEncrypt($path)
|
||||
and $meta ['mode'] != 'r'
|
||||
and $meta['mode'] != 'rb'
|
||||
and $meta ['mode'] !== 'r'
|
||||
and $meta['mode'] !== 'rb'
|
||||
) {
|
||||
$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
|
||||
$result = fopen('crypt://' . $relativePath, $meta['mode']);
|
||||
}
|
||||
|
||||
// Re-enable the proxy
|
||||
|
|
@ -386,12 +349,11 @@ class Proxy extends \OC_FileProxy
|
|||
return $size;
|
||||
}
|
||||
|
||||
// Reformat path for use with OC_FSV
|
||||
$path_split = explode( '/', $path );
|
||||
$path_f = implode( '/', array_slice( $path_split, 3 ) );
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
// if path is empty we cannot resolve anything
|
||||
if ( empty( $path_f ) ) {
|
||||
if (empty($relativePath)) {
|
||||
return $size;
|
||||
}
|
||||
|
||||
|
|
@ -420,7 +382,7 @@ class Proxy extends \OC_FileProxy
|
|||
$fileInfo['unencrypted_size'] = $size;
|
||||
|
||||
// put file info if not .part file
|
||||
if ( !Keymanager::isPartialFilePath( $path_f ) ) {
|
||||
if (!Keymanager::isPartialFilePath($relativePath)) {
|
||||
$view->putFileInfo($path, $fileInfo);
|
||||
}
|
||||
}
|
||||
|
|
@ -443,21 +405,23 @@ class Proxy extends \OC_FileProxy
|
|||
$userId = \OCP\User::getUser();
|
||||
$util = new Util($view, $userId);
|
||||
|
||||
// Reformat path for use with OC_FSV
|
||||
$path_split = explode( '/', $path );
|
||||
$path_f = implode( '/', array_slice( $path_split, 3 ) );
|
||||
// split the path parts
|
||||
$pathParts = explode('/', $path);
|
||||
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
// only if file is on 'files' folder fix file size and sharing
|
||||
if ( count($path_split) >= 2 && $path_split[2] == 'files' && $util->fixFileSize( $path ) ) {
|
||||
if (isset($pathParts[2]) && $pathParts[2] === 'files' && $util->fixFileSize($path)) {
|
||||
|
||||
// get sharing app state
|
||||
$sharingEnabled = \OCP\Share::isEnabled();
|
||||
|
||||
// get users
|
||||
$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path_f );
|
||||
$usersSharing = $util->getSharingUsersArray($sharingEnabled, $relativePath);
|
||||
|
||||
// update sharing-keys
|
||||
$util->setSharedFileKeyfiles( $session, $usersSharing, $path_f );
|
||||
$util->setSharedFileKeyfiles($session, $usersSharing, $relativePath);
|
||||
}
|
||||
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@ namespace OCA\Encryption;
|
|||
* Class for handling encryption related session data
|
||||
*/
|
||||
|
||||
class Session
|
||||
{
|
||||
class Session {
|
||||
|
||||
private $view;
|
||||
|
||||
|
|
@ -77,7 +76,8 @@ class Session
|
|||
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '');
|
||||
|
||||
// Save private key
|
||||
$this->view->file_put_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey );
|
||||
$this->view->file_put_contents(
|
||||
'/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey);
|
||||
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
||||
|
|
@ -117,7 +117,6 @@ class Session
|
|||
*
|
||||
*/
|
||||
public function getPrivateKey() {
|
||||
|
||||
// return the public share private key if this is a public access
|
||||
if (\OCA\Encryption\Helper::isPublicAccess()) {
|
||||
return $this->getPublicSharePrivateKey();
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ namespace OCA\Encryption;
|
|||
* previous version deleted, this is handled by OC\Files\View, and thus the
|
||||
* encryption proxies are used and keyfiles deleted.
|
||||
*/
|
||||
class Stream
|
||||
{
|
||||
class Stream {
|
||||
private $plainKey;
|
||||
private $encKeyfiles;
|
||||
|
||||
|
|
@ -98,10 +97,10 @@ class Stream
|
|||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
if (
|
||||
$mode == 'w'
|
||||
or $mode == 'w+'
|
||||
or $mode == 'wb'
|
||||
or $mode == 'wb+'
|
||||
$mode === 'w'
|
||||
or $mode === 'w+'
|
||||
or $mode === 'wb'
|
||||
or $mode === 'wb+'
|
||||
) {
|
||||
|
||||
// We're writing a new file so start write counter with 0 bytes
|
||||
|
|
@ -153,7 +152,7 @@ class Stream
|
|||
|
||||
$this->writeCache = '';
|
||||
|
||||
if ( $count != 8192 ) {
|
||||
if ($count !== 8192) {
|
||||
|
||||
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
|
||||
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
|
||||
|
|
@ -173,7 +172,8 @@ class Stream
|
|||
if (!$this->getKey()) {
|
||||
|
||||
// Error! We don't have a key to decrypt the file with
|
||||
throw new \Exception( 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream' );
|
||||
throw new \Exception(
|
||||
'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -425,8 +425,8 @@ class Stream
|
|||
$this->flush();
|
||||
|
||||
if (
|
||||
$this->meta['mode'] != 'r'
|
||||
and $this->meta['mode'] != 'rb'
|
||||
$this->meta['mode'] !== 'r'
|
||||
and $this->meta['mode'] !== 'rb'
|
||||
and $this->size > 0
|
||||
) {
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
|
|
|
|||
|
|
@ -188,7 +188,9 @@ class Util {
|
|||
|
||||
/**
|
||||
* @brief Sets up user folders and keys for serverside encryption
|
||||
* @param string $passphrase passphrase to encrypt server-stored private key with
|
||||
*
|
||||
* @param string $passphrase to encrypt server-stored private key with
|
||||
* @return bool
|
||||
*/
|
||||
public function setupServerSide($passphrase = null) {
|
||||
|
||||
|
|
@ -382,7 +384,7 @@ class Util {
|
|||
// we handle them
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
if ($found == false) {
|
||||
if ($found === false) {
|
||||
$found = array(
|
||||
'plain' => array(),
|
||||
'encrypted' => array(),
|
||||
|
|
@ -398,12 +400,12 @@ class Util {
|
|||
while (false !== ($file = readdir($handle))) {
|
||||
|
||||
if (
|
||||
$file != "."
|
||||
&& $file != ".."
|
||||
$file !== "."
|
||||
&& $file !== ".."
|
||||
) {
|
||||
|
||||
$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
|
||||
$relPath = $this->stripUserFilesPath($filePath);
|
||||
$relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
|
||||
|
||||
// If the path is a directory, search
|
||||
// its contents
|
||||
|
|
@ -528,7 +530,7 @@ class Util {
|
|||
|
||||
/**
|
||||
* @brief Check if a given path identifies an encrypted file
|
||||
* @param $path
|
||||
* @param string $path
|
||||
* @return boolean
|
||||
*/
|
||||
public function isEncryptedPath($path) {
|
||||
|
|
@ -541,7 +543,7 @@ class Util {
|
|||
// we only need 24 byte from the last chunk
|
||||
$data = '';
|
||||
$handle = $this->view->fopen($path, 'r');
|
||||
if (!fseek($handle, -24, SEEK_END)) {
|
||||
if (is_resource($handle) && !fseek($handle, -24, SEEK_END)) {
|
||||
$data = fgets($handle);
|
||||
}
|
||||
|
||||
|
|
@ -565,11 +567,13 @@ class Util {
|
|||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
// Reformat path for use with OC_FSV
|
||||
$pathSplit = explode('/', $path);
|
||||
$pathRelative = implode('/', array_slice($pathSplit, 3));
|
||||
// split the path parts
|
||||
$pathParts = explode('/', $path);
|
||||
|
||||
if ($pathSplit[2] == 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
if (isset($pathParts[2]) && $pathParts[2] === 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
|
||||
|
||||
// get the size from filesystem
|
||||
$fullPath = $this->view->getLocalFile($path);
|
||||
|
|
@ -579,7 +583,7 @@ class Util {
|
|||
$lastChunkNr = floor($size / 8192);
|
||||
|
||||
// open stream
|
||||
$stream = fopen('crypt://' . $pathRelative, "r");
|
||||
$stream = fopen('crypt://' . $relativePath, "r");
|
||||
|
||||
if (is_resource($stream)) {
|
||||
// calculate last chunk position
|
||||
|
|
@ -639,20 +643,6 @@ class Util {
|
|||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Format a path to be relative to the /user/files/ directory
|
||||
* @note e.g. turns '/admin/files/test.txt' into 'test.txt'
|
||||
*/
|
||||
public function stripUserFilesPath($path) {
|
||||
|
||||
$trimmed = ltrim($path, '/');
|
||||
$split = explode('/', $trimmed);
|
||||
$sliced = array_slice($split, 2);
|
||||
$relPath = implode('/', $sliced);
|
||||
|
||||
return $relPath;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $path
|
||||
|
|
@ -663,7 +653,7 @@ class Util {
|
|||
$trimmed = ltrim($path, '/');
|
||||
$split = explode('/', $trimmed);
|
||||
|
||||
if ($split[2] == "Shared") {
|
||||
if (isset($split[2]) && $split[2] === 'Shared') {
|
||||
|
||||
return true;
|
||||
|
||||
|
|
@ -745,10 +735,10 @@ class Util {
|
|||
$publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
|
||||
|
||||
// Recrypt data, generate catfile
|
||||
$recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path']);
|
||||
$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys );
|
||||
|
||||
$rawPath = $legacyFile['path'];
|
||||
$relPath = $this->stripUserFilesPath($rawPath);
|
||||
$relPath = \OCA\Encryption\Helper::stripUserFilesPath($rawPath);
|
||||
|
||||
// Save keyfile
|
||||
Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
|
||||
|
|
@ -869,8 +859,8 @@ class Util {
|
|||
// Check that the user is encryption capable, or is the
|
||||
// public system user 'ownCloud' (for public shares)
|
||||
if (
|
||||
$user == $this->publicShareKeyId
|
||||
or $user == $this->recoveryKeyId
|
||||
$user === $this->publicShareKeyId
|
||||
or $user === $this->recoveryKeyId
|
||||
or $util->ready()
|
||||
) {
|
||||
|
||||
|
|
@ -903,6 +893,7 @@ class Util {
|
|||
* @param string $filePath
|
||||
* @param string $fileOwner
|
||||
* @param string $privateKey
|
||||
* @return bool|string
|
||||
* @note Checks whether file was encrypted with openssl_seal or
|
||||
* openssl_encrypt, and decrypts accrdingly
|
||||
* @note This was used when 2 types of encryption for keyfiles was used,
|
||||
|
|
@ -918,7 +909,7 @@ class Util {
|
|||
// We need to decrypt the keyfile
|
||||
// Has the file been shared yet?
|
||||
if (
|
||||
$this->userId == $fileOwner
|
||||
$this->userId === $fileOwner
|
||||
&& !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
|
||||
) {
|
||||
|
||||
|
|
@ -1028,7 +1019,7 @@ class Util {
|
|||
if ($sharingEnabled) {
|
||||
|
||||
// Find out who, if anyone, is sharing the file
|
||||
$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true, true, true);
|
||||
$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true);
|
||||
$userIds = $result['users'];
|
||||
if ($result['public']) {
|
||||
$userIds[] = $this->publicShareKeyId;
|
||||
|
|
@ -1049,7 +1040,7 @@ class Util {
|
|||
}
|
||||
|
||||
// add current user if given
|
||||
if ($currentUserId != false) {
|
||||
if ($currentUserId !== false) {
|
||||
|
||||
$userIds[] = $currentUserId;
|
||||
|
||||
|
|
@ -1136,6 +1127,7 @@ class Util {
|
|||
/**
|
||||
* @brief get uid of the owners of the file and the path to the file
|
||||
* @param string $path Path of the file to check
|
||||
* @throws \Exception
|
||||
* @note $shareFilePath must be relative to data/UID/files. Files
|
||||
* relative to /Shared are also acceptable
|
||||
* @return array
|
||||
|
|
@ -1166,7 +1158,7 @@ class Util {
|
|||
\OC\Files\Filesystem::initMountPoints($fileOwnerUid);
|
||||
|
||||
// If the file owner is the currently logged in user
|
||||
if ($fileOwnerUid == $this->userId) {
|
||||
if ($fileOwnerUid === $this->userId) {
|
||||
|
||||
// Assume the path supplied is correct
|
||||
$filename = $path;
|
||||
|
|
@ -1199,14 +1191,14 @@ class Util {
|
|||
|
||||
$result = array();
|
||||
|
||||
$content = $this->view->getDirectoryContent($this->userFilesDir . $dir);
|
||||
$content = $this->view->getDirectoryContent(\OC\Files\Filesystem::normalizePath($this->userFilesDir . '/' . $dir));
|
||||
|
||||
// handling for re shared folders
|
||||
$path_split = explode('/', $dir);
|
||||
$pathSplit = explode('/', $dir);
|
||||
|
||||
foreach ($content as $c) {
|
||||
|
||||
$sharedPart = $path_split[sizeof($path_split) - 1];
|
||||
$sharedPart = $pathSplit[sizeof($pathSplit) - 1];
|
||||
$targetPathSplit = array_reverse(explode('/', $c['path']));
|
||||
|
||||
$path = '';
|
||||
|
|
@ -1228,7 +1220,7 @@ class Util {
|
|||
|
||||
$path = $dir . $path;
|
||||
|
||||
if ($c['type'] === "dir") {
|
||||
if ($c['type'] === 'dir') {
|
||||
|
||||
$result = array_merge($result, $this->getAllFiles($path));
|
||||
|
||||
|
|
@ -1417,11 +1409,12 @@ class Util {
|
|||
foreach ($dirContent as $item) {
|
||||
// get relative path from files_encryption/keyfiles/
|
||||
$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
|
||||
if ($item['type'] == 'dir') {
|
||||
if ($item['type'] === 'dir') {
|
||||
$this->addRecoveryKeys($filePath . '/');
|
||||
} else {
|
||||
$session = new \OCA\Encryption\Session(new \OC_FilesystemView('/'));
|
||||
$sharingEnabled = \OCP\Share::isEnabled();
|
||||
// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
|
||||
$file = substr($filePath, 0, -4);
|
||||
$usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
|
||||
$this->setSharedFileKeyfiles($session, $usersSharing, $file);
|
||||
|
|
@ -1437,9 +1430,10 @@ class Util {
|
|||
foreach ($dirContent as $item) {
|
||||
// get relative path from files_encryption/keyfiles
|
||||
$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
|
||||
if ($item['type'] == 'dir') {
|
||||
if ($item['type'] === 'dir') {
|
||||
$this->removeRecoveryKeys($filePath . '/');
|
||||
} else {
|
||||
// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
|
||||
$file = substr($filePath, 0, -4);
|
||||
$this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
|
||||
}
|
||||
|
|
@ -1457,7 +1451,7 @@ class Util {
|
|||
|
||||
// Find out who, if anyone, is sharing the file
|
||||
if ($sharingEnabled) {
|
||||
$result = \OCP\Share::getUsersSharingFile($file, $this->userId, true, true, true);
|
||||
$result = \OCP\Share::getUsersSharingFile($file, $this->userId, true);
|
||||
$userIds = $result['users'];
|
||||
$userIds[] = $this->recoveryKeyId;
|
||||
if ($result['public']) {
|
||||
|
|
@ -1502,10 +1496,12 @@ class Util {
|
|||
private function recoverAllFiles($path, $privateKey) {
|
||||
$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
|
||||
foreach ($dirContent as $item) {
|
||||
$filePath = substr($item['path'], 25);
|
||||
if ($item['type'] == 'dir') {
|
||||
// get relative path from files_encryption/keyfiles
|
||||
$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
|
||||
if ($item['type'] === 'dir') {
|
||||
$this->recoverAllFiles($filePath . '/', $privateKey);
|
||||
} else {
|
||||
// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
|
||||
$file = substr($filePath, 0, -4);
|
||||
$this->recoverFile($file, $privateKey);
|
||||
}
|
||||
|
|
@ -1531,4 +1527,21 @@ class Util {
|
|||
$this->recoverAllFiles('/', $privateKey);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the path including the storage mount point
|
||||
* @param int $id
|
||||
* @return string the path including the mount point like AmazonS3/folder/file.txt
|
||||
*/
|
||||
public function getPathWithMountPoint($id) {
|
||||
list($storage, $internalPath) = \OC\Files\Cache\Cache::getById($id);
|
||||
$mount = \OC\Files\Filesystem::getMountByStorageId($storage);
|
||||
$mountPoint = $mount[0]->getMountPoint();
|
||||
$path = \OC\Files\Filesystem::normalizePath($mountPoint.'/'.$internalPath);
|
||||
|
||||
// reformat the path to be relative e.g. /user/files/folder becomes /folder/
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
return $relativePath;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
*/
|
||||
function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
|
||||
|
||||
$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
|
||||
$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey));
|
||||
|
||||
$this->assertNotEquals($this->dataLong, $recrypted['data']);
|
||||
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
// some hacking to simulate public link
|
||||
$GLOBALS['app'] = 'files_sharing';
|
||||
$GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1;
|
||||
\OC_User::setUserId('');
|
||||
\OC_User::setUserId(false);
|
||||
|
||||
// get file contents
|
||||
$retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
$_SERVER['REQUEST_METHOD'] = 'PUT';
|
||||
$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
|
||||
$_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
|
||||
$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
|
||||
$_SERVER['CONTENT_TYPE'] = 'application/octet-stream';
|
||||
$_SERVER['PATH_INFO'] = '/webdav' . $filename;
|
||||
$_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort);
|
||||
|
|
@ -172,7 +172,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
// set server vars
|
||||
$_SERVER['REQUEST_METHOD'] = 'GET';
|
||||
$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
|
||||
$_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
|
||||
$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
|
||||
$_SERVER['PATH_INFO'] = '/webdav' . $filename;
|
||||
|
||||
// handle webdav request
|
||||
|
|
@ -193,7 +193,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
// set server vars
|
||||
$_SERVER['REQUEST_METHOD'] = 'DELETE';
|
||||
$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
|
||||
$_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
|
||||
$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
|
||||
$_SERVER['PATH_INFO'] = '/webdav' . $filename;
|
||||
|
||||
// handle webdav request
|
||||
|
|
@ -216,7 +216,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
*
|
||||
* @param bool $body
|
||||
*
|
||||
* @note this init procedure is copied from /apps/files/remote.php
|
||||
* @note this init procedure is copied from /apps/files/appinfo/remote.php
|
||||
*/
|
||||
function handleWebdavRequest($body = false) {
|
||||
// Backends
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"Error configuring Google Drive storage" => "Klaida nustatinėjant Google Drive talpyklą",
|
||||
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> \"smbclient\" nėra įdiegtas. CIFS/SMB dalinimasis nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas \"smbclient\"",
|
||||
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> FTP palaikymas PHP sistemoje nėra įjungtas arba nėra įdiegtas. FTP dalinimosi įjungimas nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas FTP palaikymas. ",
|
||||
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas.",
|
||||
"External Storage" => "Išorinės saugyklos",
|
||||
"Folder name" => "Katalogo pavadinimas",
|
||||
"External storage" => "Išorinė saugykla",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Configuration" => "Innstillingar",
|
||||
"Groups" => "Grupper",
|
||||
"Users" => "Brukarar",
|
||||
"Delete" => "Slett"
|
||||
|
|
|
|||
|
|
@ -57,12 +57,22 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
|
|||
|
||||
public function stat($path) {
|
||||
if ( ! $path and $this->root=='/') {//mtime doesn't work for shares
|
||||
$mtime=$this->shareMTime();
|
||||
$stat=stat($this->constructUrl($path));
|
||||
if (empty($stat)) {
|
||||
return false;
|
||||
}
|
||||
$mtime=$this->shareMTime();
|
||||
$stat['mtime']=$mtime;
|
||||
return $stat;
|
||||
} else {
|
||||
return stat($this->constructUrl($path));
|
||||
$stat = stat($this->constructUrl($path));
|
||||
|
||||
// smb4php can return an empty array if the connection could not be established
|
||||
if (empty($stat)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $stat;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -70,6 +70,28 @@ class Shared_Permissions extends Permissions {
|
|||
return $filePermissions;
|
||||
}
|
||||
|
||||
/**
|
||||
* get the permissions for all files in a folder
|
||||
*
|
||||
* @param int $parentId
|
||||
* @param string $user
|
||||
* @return int[]
|
||||
*/
|
||||
public function getDirectoryPermissions($parentId, $user) {
|
||||
// Root of the Shared folder
|
||||
if ($parentId === -1) {
|
||||
return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_PERMISSIONS);
|
||||
}
|
||||
$permissions = $this->get($parentId, $user);
|
||||
$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `parent` = ?');
|
||||
$result = $query->execute(array($parentId));
|
||||
$filePermissions = array();
|
||||
while ($row = $result->fetchRow()) {
|
||||
$filePermissions[$row['fileid']] = $permissions;
|
||||
}
|
||||
return $filePermissions;
|
||||
}
|
||||
|
||||
/**
|
||||
* remove the permissions for a file
|
||||
*
|
||||
|
|
@ -83,4 +105,5 @@ class Shared_Permissions extends Permissions {
|
|||
public function removeMultiple($fileIds, $user) {
|
||||
// Not a valid action for Shared Permissions
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -26,6 +26,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
|
|||
const FORMAT_FILE_APP_ROOT = 2;
|
||||
const FORMAT_OPENDIR = 3;
|
||||
const FORMAT_GET_ALL = 4;
|
||||
const FORMAT_PERMISSIONS = 5;
|
||||
|
||||
private $path;
|
||||
|
||||
|
|
@ -125,6 +126,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
|
|||
$ids[] = $item['file_source'];
|
||||
}
|
||||
return $ids;
|
||||
} else if ($format === self::FORMAT_PERMISSIONS) {
|
||||
$filePermissions = array();
|
||||
foreach ($items as $item) {
|
||||
$filePermissions[$item['file_source']] = $item['permissions'];
|
||||
}
|
||||
return $filePermissions;
|
||||
}
|
||||
return array();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,8 +113,16 @@ class Storage {
|
|||
mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
|
||||
}
|
||||
|
||||
// disable proxy to prevent multiple fopen calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
// store a new version of a file
|
||||
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
|
||||
|
||||
// reset proxy state
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
||||
$versionsSize = self::getVersionsSize($uid);
|
||||
if ( $versionsSize === false || $versionsSize < 0 ) {
|
||||
$versionsSize = self::calculateSize($uid);
|
||||
|
|
@ -195,7 +203,16 @@ class Storage {
|
|||
//first create a new version
|
||||
$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
|
||||
if ( !$users_view->file_exists($version)) {
|
||||
|
||||
// disable proxy to prevent multiple fopen calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
|
||||
|
||||
// reset proxy state
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
||||
$versionCreated = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ $entry = array(
|
|||
'name' => 'LDAP'
|
||||
);
|
||||
|
||||
OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
|
||||
OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
|
||||
if(OCP\App::isEnabled('user_webdavauth')) {
|
||||
OCP\Util::writeLog('user_ldap',
|
||||
'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ var LdapConfiguration = {
|
|||
|
||||
//deal with Checkboxes
|
||||
if($(elementID).is('input[type=checkbox]')) {
|
||||
if(configvalue === 1) {
|
||||
if(parseInt(configvalue) === 1) {
|
||||
$(elementID).attr('checked', 'checked');
|
||||
} else {
|
||||
$(elementID).removeAttr('checked');
|
||||
|
|
|
|||
|
|
@ -74,6 +74,8 @@
|
|||
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
|
||||
"Internal Username" => "Interner Benutzername",
|
||||
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
|
||||
"Override UUID detection" => "UUID-Erkennung überschreiben",
|
||||
"UUID Attribute:" => "UUID-Attribut:",
|
||||
"Test Configuration" => "Testkonfiguration",
|
||||
"Help" => "Hilfe"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -75,6 +75,12 @@
|
|||
"User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
|
||||
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
|
||||
"Internal Username" => "Belső felhasználónév",
|
||||
"Internal Username Attribute:" => "A belső felhasználónév attribútuma:",
|
||||
"Override UUID detection" => "Az UUID-felismerés felülbírálása",
|
||||
"UUID Attribute:" => "UUID attribútum:",
|
||||
"Username-LDAP User Mapping" => "Felhasználó - LDAP felhasználó hozzárendelés",
|
||||
"Clear Username-LDAP User Mapping" => "A felhasználó - LDAP felhasználó hozzárendelés törlése",
|
||||
"Clear Groupname-LDAP Group Mapping" => "A csoport - LDAP csoport hozzárendelés törlése",
|
||||
"Test Configuration" => "A beállítások tesztelése",
|
||||
"Help" => "Súgó"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -75,10 +75,13 @@
|
|||
"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
|
||||
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
|
||||
"Internal Username" => "Interne gebruikersnaam",
|
||||
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers.",
|
||||
"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
|
||||
"Override UUID detection" => "Negeren UUID detectie",
|
||||
"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen.",
|
||||
"UUID Attribute:" => "UUID Attribuut:",
|
||||
"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
|
||||
"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving.",
|
||||
"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
|
||||
"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
|
||||
"Test Configuration" => "Test configuratie",
|
||||
|
|
|
|||
|
|
@ -79,6 +79,8 @@
|
|||
"Override UUID detection" => "Zastąp wykrywanie UUID",
|
||||
"UUID Attribute:" => "Atrybuty UUID:",
|
||||
"Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
|
||||
"Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
|
||||
"Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP",
|
||||
"Test Configuration" => "Konfiguracja testowa",
|
||||
"Help" => "Pomoc"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Failed to clear the mappings." => "Nepodarilo sa vymazať mapovania.",
|
||||
"Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
|
||||
"The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilné.",
|
||||
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
|
||||
|
|
@ -7,6 +8,7 @@
|
|||
"Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
|
||||
"Keep settings?" => "Ponechať nastavenia?",
|
||||
"Cannot add server configuration" => "Nemožno pridať nastavenie servera",
|
||||
"mappings cleared" => "mapovanie vymazané",
|
||||
"Success" => "Úspešné",
|
||||
"Error" => "Chyba",
|
||||
"Connection test succeeded" => "Test pripojenia bol úspešný",
|
||||
|
|
@ -72,6 +74,11 @@
|
|||
"Email Field" => "Pole email",
|
||||
"User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena používateľského priečinka dát",
|
||||
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
|
||||
"Internal Username" => "Interné používateľské meno",
|
||||
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách bude číslo byť pridané / odobrané. Interné používateľské meno sa používa na identifikáciu používateľa interne. Je to tiež predvolený názov používateľského domovského priečinka v ownCloud. To je tiež port vzdialeného URL, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo mapovaných (pridaných) LDAP používateľov.",
|
||||
"Internal Username Attribute:" => "Atribút interného používateľského mena:",
|
||||
"Override UUID detection" => "Prepísať UUID detekciu",
|
||||
"UUID Attribute:" => "UUID atribút:",
|
||||
"Test Configuration" => "Test nastavenia",
|
||||
"Help" => "Pomoc"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -441,8 +441,8 @@ abstract class Access {
|
|||
//while loop is just a precaution. If a name is not generated within
|
||||
//20 attempts, something else is very wrong. Avoids infinite loop.
|
||||
while($attempts < 20){
|
||||
$altName = $name . '_' . uniqid();
|
||||
if(\OCP\User::userExists($altName)) {
|
||||
$altName = $name . '_' . rand(1000,9999);
|
||||
if(!\OCP\User::userExists($altName)) {
|
||||
return $altName;
|
||||
}
|
||||
$attempts++;
|
||||
|
|
|
|||
|
|
@ -601,14 +601,13 @@ class Connection {
|
|||
$error = null;
|
||||
}
|
||||
|
||||
$error = null;
|
||||
//if LDAP server is not reachable, try the Backup (Replica!) Server
|
||||
if((!$bindStatus && ($error === -1))
|
||||
if((!$bindStatus && ($error !== 0))
|
||||
|| $this->config['ldapOverrideMainServer']
|
||||
|| $this->getFromCache('overrideMainServer')) {
|
||||
$this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']);
|
||||
$bindStatus = $this->bind();
|
||||
if($bindStatus && $error === -1) {
|
||||
if(!$bindStatus && $error === -1) {
|
||||
//when bind to backup server succeeded and failed to main server,
|
||||
//skip contacting him until next cache refresh
|
||||
$this->writeToCache('overrideMainServer', true);
|
||||
|
|
@ -622,6 +621,10 @@ class Connection {
|
|||
if(empty($host)) {
|
||||
return false;
|
||||
}
|
||||
if(strpos($host, '://') !== false) {
|
||||
//ldap_connect ignores port paramater when URLs are passed
|
||||
$host .= ':' . $port;
|
||||
}
|
||||
$this->ldapConnectionRes = ldap_connect($host, $port);
|
||||
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
|
||||
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
|
||||
|
|
@ -636,10 +639,17 @@ class Connection {
|
|||
* Binds to LDAP
|
||||
*/
|
||||
public function bind() {
|
||||
static $getConnectionResourceAttempt = false;
|
||||
if(!$this->config['ldapConfigurationActive']) {
|
||||
return false;
|
||||
}
|
||||
if($getConnectionResourceAttempt) {
|
||||
$getConnectionResourceAttempt = false;
|
||||
return false;
|
||||
}
|
||||
$getConnectionResourceAttempt = true;
|
||||
$cr = $this->getConnectionResource();
|
||||
$getConnectionResourceAttempt = false;
|
||||
if(!is_resource($cr)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,7 +118,13 @@ class Helper {
|
|||
return false;
|
||||
}
|
||||
|
||||
if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) {
|
||||
$query = \OCP\DB::prepare('DELETE FROM '.$table);
|
||||
} else {
|
||||
$query = \OCP\DB::prepare('TRUNCATE '.$table);
|
||||
}
|
||||
|
||||
|
||||
$res = $query->execute();
|
||||
|
||||
if(\OCP\DB::isError($res)) {
|
||||
|
|
|
|||
|
|
@ -23,20 +23,22 @@
|
|||
|
||||
namespace OCA\user_ldap\lib;
|
||||
|
||||
class Jobs {
|
||||
class Jobs extends \OC\BackgroundJob\TimedJob {
|
||||
static private $groupsFromDB;
|
||||
|
||||
static private $groupBE;
|
||||
static private $connector;
|
||||
|
||||
public function __construct(){
|
||||
$this->interval = self::getRefreshInterval();
|
||||
}
|
||||
|
||||
public function run($argument){
|
||||
Jobs::updateGroups();
|
||||
}
|
||||
|
||||
static public function updateGroups() {
|
||||
\OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', \OCP\Util::DEBUG);
|
||||
$lastUpdate = \OCP\Config::getAppValue('user_ldap', 'bgjUpdateGroupsLastRun', 0);
|
||||
if((time() - $lastUpdate) < self::getRefreshInterval()) {
|
||||
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – last run too fresh, aborting.', \OCP\Util::DEBUG);
|
||||
//komm runter Werner die Maurer geben ein aus
|
||||
return;
|
||||
}
|
||||
|
||||
$knownGroups = array_keys(self::getKnownGroups());
|
||||
$actualGroups = self::getGroupBE()->getGroups();
|
||||
|
|
@ -45,7 +47,6 @@ class Jobs {
|
|||
\OCP\Util::writeLog('user_ldap',
|
||||
'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.',
|
||||
\OCP\Util::INFO);
|
||||
\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -53,8 +54,6 @@ class Jobs {
|
|||
self::handleCreatedGroups(array_diff($actualGroups, $knownGroups));
|
||||
self::handleRemovedGroups(array_diff($knownGroups, $actualGroups));
|
||||
|
||||
\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
|
||||
|
||||
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"WebDAV Authentication" => "WebDAV-autentisering",
|
||||
"URL: http://" => "Nettadresse: http://",
|
||||
"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
|
||||
);
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
.oc-dialog {
|
||||
background: white;
|
||||
color: #333333;
|
||||
border-radius: 3px; box-shadow: 0 0 7px #888888;
|
||||
padding: 15px;
|
||||
z-index: 1000;
|
||||
font-size: 100%;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
min-width: 200px;
|
||||
}
|
||||
.oc-dialog-title {
|
||||
background: white;
|
||||
font-weight: bold;
|
||||
font-size: 110%;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.oc-dialog-content {
|
||||
z-index: 1000;
|
||||
background: white;
|
||||
}
|
||||
.oc-dialog-separator {
|
||||
}
|
||||
.oc-dialog-buttonrow {
|
||||
background: white;
|
||||
float: right;
|
||||
position: relative;
|
||||
bottom: 0;
|
||||
display: block;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.oc-dialog-close {
|
||||
position:absolute;
|
||||
top:7px; right:7px;
|
||||
height:20px; width:20px;
|
||||
background:url('../img/actions/delete.svg') no-repeat center;
|
||||
}
|
||||
|
||||
.oc-dialog-dim {
|
||||
background-color: #000;
|
||||
opacity: .20;filter:Alpha(Opacity=20);
|
||||
z-index: 999;
|
||||
position: absolute;
|
||||
top: 0; left: 0;
|
||||
width: 100%; height: 100%;
|
||||
}
|
||||
|
|
@ -391,7 +391,12 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
|
|||
#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
|
||||
#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
|
||||
#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
|
||||
#oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
|
||||
#oc-dialog-filepicker-content .filelist {
|
||||
overflow-y:auto;
|
||||
max-height: 300px;
|
||||
background-color:white;
|
||||
width:100%;
|
||||
}
|
||||
#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
|
||||
#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
|
||||
#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,217 @@
|
|||
(function($) {
|
||||
$.widget('oc.ocdialog', {
|
||||
options: {
|
||||
width: 'auto',
|
||||
height: 'auto',
|
||||
closeButton: true,
|
||||
closeOnEscape: true,
|
||||
modal: false
|
||||
},
|
||||
_create: function() {
|
||||
var self = this;
|
||||
|
||||
this.originalCss = {
|
||||
display: this.element[0].style.display,
|
||||
width: this.element[0].style.width,
|
||||
height: this.element[0].style.height,
|
||||
};
|
||||
|
||||
this.originalTitle = this.element.attr('title');
|
||||
this.options.title = this.options.title || this.originalTitle;
|
||||
|
||||
this.$dialog = $('<div class="oc-dialog" />')
|
||||
.attr({
|
||||
// Setting tabIndex makes the div focusable
|
||||
tabIndex: -1,
|
||||
role: 'dialog'
|
||||
})
|
||||
.insertBefore(this.element);
|
||||
this.$dialog.append(this.element.detach());
|
||||
this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog);
|
||||
|
||||
this.$dialog.css({
|
||||
display: 'inline-block',
|
||||
position: 'fixed'
|
||||
});
|
||||
|
||||
$(document).on('keydown keyup', function(event) {
|
||||
if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
|
||||
return;
|
||||
}
|
||||
// Escape
|
||||
if(event.keyCode === 27 && self.options.closeOnEscape) {
|
||||
self.close();
|
||||
return false;
|
||||
}
|
||||
// Enter
|
||||
if(event.keyCode === 13) {
|
||||
event.stopImmediatePropagation();
|
||||
if(event.type === 'keyup') {
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}
|
||||
// If no button is selected we trigger the primary
|
||||
if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) {
|
||||
var $button = self.$buttonrow.find('button.primary');
|
||||
if($button) {
|
||||
$button.trigger('click');
|
||||
}
|
||||
} else if(self.$buttonrow) {
|
||||
$(event.target).trigger('click');
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
$(window).resize(function() {
|
||||
self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
|
||||
var pos = self.parent.position();
|
||||
self.$dialog.css({
|
||||
left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
|
||||
top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
|
||||
});
|
||||
});
|
||||
|
||||
this._setOptions(this.options);
|
||||
$(window).trigger('resize');
|
||||
this._createOverlay();
|
||||
},
|
||||
_init: function() {
|
||||
this.$dialog.focus();
|
||||
this._trigger('open');
|
||||
},
|
||||
_setOption: function(key, value) {
|
||||
var self = this;
|
||||
switch(key) {
|
||||
case 'title':
|
||||
var $title = $('<h3 class="oc-dialog-title">' + this.options.title
|
||||
+ '</h3>'); //<hr class="oc-dialog-separator" />');
|
||||
if(this.$title) {
|
||||
this.$title.replaceWith($title);
|
||||
} else {
|
||||
this.$title = $title.prependTo(this.$dialog);
|
||||
}
|
||||
this._setSizes();
|
||||
break;
|
||||
case 'buttons':
|
||||
var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
|
||||
if(this.$buttonrow) {
|
||||
this.$buttonrow.replaceWith($buttonrow);
|
||||
} else {
|
||||
this.$buttonrow = $buttonrow.appendTo(this.$dialog);
|
||||
}
|
||||
$.each(value, function(idx, val) {
|
||||
var $button = $('<button>').text(val.text);
|
||||
if(val.defaultButton) {
|
||||
$button.addClass('primary');
|
||||
self.$defaultButton = $button;
|
||||
}
|
||||
self.$buttonrow.append($button);
|
||||
$button.click(function() {
|
||||
val.click.apply(self.element[0], arguments);
|
||||
});
|
||||
});
|
||||
this.$buttonrow.find('button')
|
||||
.on('focus', function(event) {
|
||||
self.$buttonrow.find('button').removeClass('primary');
|
||||
$(this).addClass('primary');
|
||||
});
|
||||
this._setSizes();
|
||||
break;
|
||||
case 'closeButton':
|
||||
if(value) {
|
||||
var $closeButton = $('<a class="oc-dialog-close svg"></a>');
|
||||
this.$dialog.prepend($closeButton);
|
||||
$closeButton.on('click', function() {
|
||||
self.close();
|
||||
});
|
||||
}
|
||||
break;
|
||||
case 'width':
|
||||
this.$dialog.css('width', value);
|
||||
break;
|
||||
case 'height':
|
||||
this.$dialog.css('height', value);
|
||||
break;
|
||||
case 'close':
|
||||
this.closeCB = value;
|
||||
break;
|
||||
}
|
||||
//this._super(key, value);
|
||||
$.Widget.prototype._setOption.apply(this, arguments );
|
||||
},
|
||||
_setOptions: function(options) {
|
||||
//this._super(options);
|
||||
$.Widget.prototype._setOptions.apply(this, arguments);
|
||||
},
|
||||
_setSizes: function() {
|
||||
var content_height = this.$dialog.height();
|
||||
if(this.$title) {
|
||||
content_height -= this.$title.outerHeight(true);
|
||||
}
|
||||
if(this.$buttonrow) {
|
||||
content_height -= this.$buttonrow.outerHeight(true);
|
||||
}
|
||||
this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
|
||||
content_height = Math.min(content_height, this.parent.height()-20)
|
||||
this.element.css({
|
||||
height: content_height + 'px',
|
||||
width: this.$dialog.innerWidth()-20 + 'px'
|
||||
});
|
||||
},
|
||||
_createOverlay: function() {
|
||||
if(!this.options.modal) {
|
||||
return;
|
||||
}
|
||||
|
||||
var self = this;
|
||||
this.overlay = $('<div>')
|
||||
.addClass('oc-dialog-dim')
|
||||
.appendTo($('#content'));
|
||||
this.overlay.on('click keydown keyup', function(event) {
|
||||
if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
return;
|
||||
}
|
||||
});
|
||||
},
|
||||
_destroyOverlay: function() {
|
||||
if (!this.options.modal) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.overlay) {
|
||||
this.overlay.off('click keydown keyup');
|
||||
this.overlay.remove();
|
||||
this.overlay = null;
|
||||
}
|
||||
},
|
||||
widget: function() {
|
||||
return this.$dialog
|
||||
},
|
||||
close: function() {
|
||||
this._destroyOverlay();
|
||||
var self = this;
|
||||
// Ugly hack to catch remaining keyup events.
|
||||
setTimeout(function() {
|
||||
self._trigger('close', self);
|
||||
self.$dialog.hide();
|
||||
}, 200);
|
||||
},
|
||||
destroy: function() {
|
||||
if(this.$title) {
|
||||
this.$title.remove()
|
||||
}
|
||||
if(this.$buttonrow) {
|
||||
this.$buttonrow.remove()
|
||||
}
|
||||
|
||||
if(this.originalTitle) {
|
||||
this.element.attr('title', this.originalTitle);
|
||||
}
|
||||
this.element.removeClass('oc-dialog-content')
|
||||
.css(this.originalCss).detach().insertBefore(this.$dialog);
|
||||
this.$dialog.remove();
|
||||
}
|
||||
});
|
||||
}(jQuery));
|
||||
|
|
@ -72,7 +72,7 @@ var OCdialogs = {
|
|||
var dialog_name = 'oc-dialog-filepicker-content';
|
||||
var dialog_id = '#' + dialog_name;
|
||||
if(self.$filePicker) {
|
||||
self.$filePicker.dialog('close');
|
||||
self.$filePicker.ocdialog('close');
|
||||
}
|
||||
self.$filePicker = $tmpl.octemplate({
|
||||
dialog_name: dialog_name,
|
||||
|
|
@ -110,26 +110,29 @@ var OCdialogs = {
|
|||
datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text();
|
||||
}
|
||||
callback(datapath);
|
||||
self.$filePicker.dialog('close');
|
||||
self.$filePicker.ocdialog('close');
|
||||
}
|
||||
};
|
||||
var buttonlist = [{
|
||||
text: t('core', 'Choose'),
|
||||
click: functionToCall
|
||||
click: functionToCall,
|
||||
defaultButton: true
|
||||
},
|
||||
{
|
||||
text: t('core', 'Cancel'),
|
||||
click: function(){self.$filePicker.dialog('close'); }
|
||||
click: function(){self.$filePicker.ocdialog('close'); }
|
||||
}];
|
||||
|
||||
self.$filePicker.dialog({
|
||||
self.$filePicker.ocdialog({
|
||||
closeOnEscape: true,
|
||||
width: (4/9)*$(document).width(),
|
||||
height: 420,
|
||||
modal: modal,
|
||||
buttons: buttonlist,
|
||||
close: function(event, ui) {
|
||||
self.$filePicker.dialog('destroy').remove();
|
||||
try {
|
||||
$(this).ocdialog('destroy').remove();
|
||||
} catch(e) {}
|
||||
self.$filePicker = null;
|
||||
}
|
||||
});
|
||||
|
|
@ -161,30 +164,32 @@ var OCdialogs = {
|
|||
text: t('core', 'Yes'),
|
||||
click: function(){
|
||||
if (callback !== undefined) { callback(true) };
|
||||
$(dialog_id).dialog('close');
|
||||
}
|
||||
$(dialog_id).ocdialog('close');
|
||||
},
|
||||
defaultButton: true
|
||||
},
|
||||
{
|
||||
text: t('core', 'No'),
|
||||
click: function(){
|
||||
if (callback !== undefined) { callback(false) };
|
||||
$(dialog_id).dialog('close');
|
||||
$(dialog_id).ocdialog('close');
|
||||
}
|
||||
}];
|
||||
break;
|
||||
case OCdialogs.OK_BUTTON:
|
||||
var functionToCall = function() {
|
||||
$(dialog_id).dialog('close');
|
||||
$(dialog_id).ocdialog('close');
|
||||
if(callback !== undefined) { callback() };
|
||||
};
|
||||
buttonlist[0] = {
|
||||
text: t('core', 'Ok'),
|
||||
click: functionToCall
|
||||
click: functionToCall,
|
||||
defaultButton: true
|
||||
};
|
||||
break;
|
||||
};
|
||||
|
||||
$(dialog_id).dialog({
|
||||
$(dialog_id).ocdialog({
|
||||
closeOnEscape: true,
|
||||
modal: modal,
|
||||
buttons: buttonlist
|
||||
|
|
|
|||
|
|
@ -60,11 +60,11 @@
|
|||
var self = this;
|
||||
|
||||
if(typeof this.options.escapeFunction === 'function') {
|
||||
$.each(this.vars, function(key, val) {
|
||||
if(typeof val === 'string') {
|
||||
self.vars[key] = self.options.escapeFunction(val);
|
||||
for (var key = 0; key < this.vars.length; key++) {
|
||||
if(typeof this.vars[key] === 'string') {
|
||||
this.vars[key] = self.options.escapeFunction(this.vars[key]);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
var _html = this._build(this.vars);
|
||||
|
|
|
|||
|
|
@ -88,6 +88,8 @@
|
|||
"The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
|
||||
"ownCloud password reset" => "Nulstil ownCloud kodeord",
|
||||
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
|
||||
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
|
||||
"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?",
|
||||
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
|
||||
"Username" => "Brugernavn",
|
||||
"Request reset" => "Anmod om nulstilling",
|
||||
|
|
@ -123,6 +125,7 @@
|
|||
"Database host" => "Databasehost",
|
||||
"Finish setup" => "Afslut opsætning",
|
||||
"web services under your control" => "Webtjenester under din kontrol",
|
||||
"%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
|
||||
"Log out" => "Log ud",
|
||||
"Automatic logon rejected!" => "Automatisk login afvist!",
|
||||
"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
"years ago" => "несколько лет назад",
|
||||
"Choose" => "Выбрать",
|
||||
"Cancel" => "Отменить",
|
||||
"Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
|
||||
"Yes" => "Да",
|
||||
"No" => "Нет",
|
||||
"Ok" => "Ок",
|
||||
|
|
|
|||
21
cron.php
21
cron.php
|
|
@ -38,8 +38,7 @@ function handleUnexpectedShutdown() {
|
|||
if (!TemporaryCronClass::$sent) {
|
||||
if (OC::$CLI) {
|
||||
echo 'Unexpected error!' . PHP_EOL;
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
|
||||
}
|
||||
}
|
||||
|
|
@ -66,8 +65,7 @@ if( $appmode == 'none' ) {
|
|||
TemporaryCronClass::$sent = true;
|
||||
if (OC::$CLI) {
|
||||
echo 'Background Jobs are disabled!' . PHP_EOL;
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
|
||||
}
|
||||
exit(1);
|
||||
|
|
@ -95,17 +93,22 @@ if( OC::$CLI ) {
|
|||
touch(TemporaryCronClass::$lockfile);
|
||||
|
||||
// Work
|
||||
OC_BackgroundJob_Worker::doAllSteps();
|
||||
$jobList = new \OC\BackgroundJob\JobList();
|
||||
$jobs = $jobList->getAll();
|
||||
foreach ($jobs as $job) {
|
||||
$job->execute($jobList);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
// We call cron.php from some website
|
||||
if ($appmode == 'cron') {
|
||||
// Cron is cron :-P
|
||||
OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
// Work and success :-)
|
||||
OC_BackgroundJob_Worker::doNextStep();
|
||||
$jobList = new \OC\BackgroundJob\JobList();
|
||||
$job = $jobList->getNext();
|
||||
$job->execute($jobList);
|
||||
$jobList->setLastJob($job);
|
||||
OC_JSON::success();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -859,7 +859,7 @@
|
|||
|
||||
<table>
|
||||
|
||||
<name>*dbprefix*queuedtasks</name>
|
||||
<name>*dbprefix*jobs</name>
|
||||
|
||||
<declaration>
|
||||
|
||||
|
|
@ -874,35 +874,35 @@
|
|||
</field>
|
||||
|
||||
<field>
|
||||
<name>app</name>
|
||||
<name>class</name>
|
||||
<type>text</type>
|
||||
<default></default>
|
||||
<notnull>true</notnull>
|
||||
<length>255</length>
|
||||
<length>256</length>
|
||||
</field>
|
||||
|
||||
<field>
|
||||
<name>klass</name>
|
||||
<name>argument</name>
|
||||
<type>text</type>
|
||||
<default></default>
|
||||
<notnull>true</notnull>
|
||||
<length>255</length>
|
||||
<length>256</length>
|
||||
</field>
|
||||
|
||||
<field>
|
||||
<name>method</name>
|
||||
<type>text</type>
|
||||
<name>last_run</name>
|
||||
<type>integer</type>
|
||||
<default></default>
|
||||
<notnull>true</notnull>
|
||||
<length>255</length>
|
||||
<notnull>false</notnull>
|
||||
</field>
|
||||
|
||||
<index>
|
||||
<name>job_class_index</name>
|
||||
<field>
|
||||
<name>parameters</name>
|
||||
<type>text</type>
|
||||
<notnull>true</notnull>
|
||||
<length>255</length>
|
||||
<name>class</name>
|
||||
<sorting>ascending</sorting>
|
||||
</field>
|
||||
</index>
|
||||
|
||||
</declaration>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -216,23 +216,23 @@ msgstr ""
|
|||
msgid "Choose"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:121
|
||||
#: js/oc-dialogs.js:122
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
|
||||
#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
|
||||
msgid "Error loading file picker template"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:161
|
||||
#: js/oc-dialogs.js:164
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:168
|
||||
#: js/oc-dialogs.js:172
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:181
|
||||
#: js/oc-dialogs.js:185
|
||||
msgid "Ok"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-05-30 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 00:27+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -17,12 +17,22 @@ msgstr ""
|
|||
"Language: af_ZA\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: ajax/adminrecovery.php:40
|
||||
msgid "Recovery key successfully "
|
||||
#: ajax/adminrecovery.php:29
|
||||
msgid "Recovery key successfully enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:42
|
||||
msgid "Could not "
|
||||
#: ajax/adminrecovery.php:34
|
||||
msgid ""
|
||||
"Could not enable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:48
|
||||
msgid "Recovery key successfully disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:53
|
||||
msgid ""
|
||||
"Could not disable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/changeRecoveryPassword.php:49
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -57,7 +57,7 @@ msgstr ""
|
|||
msgid "Selected files too large to generate zip file."
|
||||
msgstr ""
|
||||
|
||||
#: helper.php:228
|
||||
#: helper.php:236
|
||||
msgid "couldn't be determined"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -216,23 +216,23 @@ msgstr "سنة مضت"
|
|||
msgid "Choose"
|
||||
msgstr "اختيار"
|
||||
|
||||
#: js/oc-dialogs.js:121
|
||||
#: js/oc-dialogs.js:122
|
||||
msgid "Cancel"
|
||||
msgstr "الغاء"
|
||||
|
||||
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
|
||||
#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
|
||||
msgid "Error loading file picker template"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:161
|
||||
#: js/oc-dialogs.js:164
|
||||
msgid "Yes"
|
||||
msgstr "نعم"
|
||||
|
||||
#: js/oc-dialogs.js:168
|
||||
#: js/oc-dialogs.js:172
|
||||
msgid "No"
|
||||
msgstr "لا"
|
||||
|
||||
#: js/oc-dialogs.js:181
|
||||
#: js/oc-dialogs.js:185
|
||||
msgid "Ok"
|
||||
msgstr "موافق"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
|
||||
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
|
||||
"POT-Creation-Date: 2013-05-30 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 00:27+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -17,12 +17,22 @@ msgstr ""
|
|||
"Language: ar\n"
|
||||
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
|
||||
|
||||
#: ajax/adminrecovery.php:40
|
||||
msgid "Recovery key successfully "
|
||||
#: ajax/adminrecovery.php:29
|
||||
msgid "Recovery key successfully enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:42
|
||||
msgid "Could not "
|
||||
#: ajax/adminrecovery.php:34
|
||||
msgid ""
|
||||
"Could not enable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:48
|
||||
msgid "Recovery key successfully disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:53
|
||||
msgid ""
|
||||
"Could not disable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/changeRecoveryPassword.php:49
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -57,7 +57,7 @@ msgstr "العودة الى الملفات"
|
|||
msgid "Selected files too large to generate zip file."
|
||||
msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip"
|
||||
|
||||
#: helper.php:228
|
||||
#: helper.php:236
|
||||
msgid "couldn't be determined"
|
||||
msgstr "تعذّر تحديده"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-25 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-25 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-05-30 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 00:27+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -17,12 +17,22 @@ msgstr ""
|
|||
"Language: be\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
|
||||
#: ajax/adminrecovery.php:40
|
||||
msgid "Recovery key successfully "
|
||||
#: ajax/adminrecovery.php:29
|
||||
msgid "Recovery key successfully enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:42
|
||||
msgid "Could not "
|
||||
#: ajax/adminrecovery.php:34
|
||||
msgid ""
|
||||
"Could not enable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:48
|
||||
msgid "Recovery key successfully disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:53
|
||||
msgid ""
|
||||
"Could not disable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/changeRecoveryPassword.php:49
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -216,23 +216,23 @@ msgstr "последните години"
|
|||
msgid "Choose"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:121
|
||||
#: js/oc-dialogs.js:122
|
||||
msgid "Cancel"
|
||||
msgstr "Отказ"
|
||||
|
||||
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
|
||||
#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
|
||||
msgid "Error loading file picker template"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:161
|
||||
#: js/oc-dialogs.js:164
|
||||
msgid "Yes"
|
||||
msgstr "Да"
|
||||
|
||||
#: js/oc-dialogs.js:168
|
||||
#: js/oc-dialogs.js:172
|
||||
msgid "No"
|
||||
msgstr "Не"
|
||||
|
||||
#: js/oc-dialogs.js:181
|
||||
#: js/oc-dialogs.js:185
|
||||
msgid "Ok"
|
||||
msgstr "Добре"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
|
||||
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
|
||||
"POT-Creation-Date: 2013-05-30 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 00:27+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -17,12 +17,22 @@ msgstr ""
|
|||
"Language: bg_BG\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: ajax/adminrecovery.php:40
|
||||
msgid "Recovery key successfully "
|
||||
#: ajax/adminrecovery.php:29
|
||||
msgid "Recovery key successfully enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:42
|
||||
msgid "Could not "
|
||||
#: ajax/adminrecovery.php:34
|
||||
msgid ""
|
||||
"Could not enable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:48
|
||||
msgid "Recovery key successfully disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:53
|
||||
msgid ""
|
||||
"Could not disable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/changeRecoveryPassword.php:49
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -57,7 +57,7 @@ msgstr "Назад към файловете"
|
|||
msgid "Selected files too large to generate zip file."
|
||||
msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
|
||||
|
||||
#: helper.php:228
|
||||
#: helper.php:236
|
||||
msgid "couldn't be determined"
|
||||
msgstr "не може да се определи"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -216,23 +216,23 @@ msgstr "বছর পূর্বে"
|
|||
msgid "Choose"
|
||||
msgstr "বেছে নিন"
|
||||
|
||||
#: js/oc-dialogs.js:121
|
||||
#: js/oc-dialogs.js:122
|
||||
msgid "Cancel"
|
||||
msgstr "বাতির"
|
||||
|
||||
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
|
||||
#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
|
||||
msgid "Error loading file picker template"
|
||||
msgstr ""
|
||||
|
||||
#: js/oc-dialogs.js:161
|
||||
#: js/oc-dialogs.js:164
|
||||
msgid "Yes"
|
||||
msgstr "হ্যাঁ"
|
||||
|
||||
#: js/oc-dialogs.js:168
|
||||
#: js/oc-dialogs.js:172
|
||||
msgid "No"
|
||||
msgstr "না"
|
||||
|
||||
#: js/oc-dialogs.js:181
|
||||
#: js/oc-dialogs.js:185
|
||||
msgid "Ok"
|
||||
msgstr "তথাস্তু"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
|
||||
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
|
||||
"POT-Creation-Date: 2013-05-30 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 00:27+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -17,12 +17,22 @@ msgstr ""
|
|||
"Language: bn_BD\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: ajax/adminrecovery.php:40
|
||||
msgid "Recovery key successfully "
|
||||
#: ajax/adminrecovery.php:29
|
||||
msgid "Recovery key successfully enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:42
|
||||
msgid "Could not "
|
||||
#: ajax/adminrecovery.php:34
|
||||
msgid ""
|
||||
"Could not enable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:48
|
||||
msgid "Recovery key successfully disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:53
|
||||
msgid ""
|
||||
"Could not disable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/changeRecoveryPassword.php:49
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -57,7 +57,7 @@ msgstr "ফাইলে ফিরে চল"
|
|||
msgid "Selected files too large to generate zip file."
|
||||
msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
|
||||
|
||||
#: helper.php:228
|
||||
#: helper.php:236
|
||||
msgid "couldn't be determined"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: rogerc\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -218,23 +218,23 @@ msgstr "anys enrere"
|
|||
msgid "Choose"
|
||||
msgstr "Escull"
|
||||
|
||||
#: js/oc-dialogs.js:121
|
||||
#: js/oc-dialogs.js:122
|
||||
msgid "Cancel"
|
||||
msgstr "Cancel·la"
|
||||
|
||||
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
|
||||
#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
|
||||
msgid "Error loading file picker template"
|
||||
msgstr "Error en carregar la plantilla del seleccionador de fitxers"
|
||||
|
||||
#: js/oc-dialogs.js:161
|
||||
#: js/oc-dialogs.js:164
|
||||
msgid "Yes"
|
||||
msgstr "Sí"
|
||||
|
||||
#: js/oc-dialogs.js:168
|
||||
#: js/oc-dialogs.js:172
|
||||
msgid "No"
|
||||
msgstr "No"
|
||||
|
||||
#: js/oc-dialogs.js:181
|
||||
#: js/oc-dialogs.js:185
|
||||
msgid "Ok"
|
||||
msgstr "D'acord"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: rogerc\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-26 01:58+0200\n"
|
||||
"PO-Revision-Date: 2013-05-25 00:20+0000\n"
|
||||
"POT-Creation-Date: 2013-05-30 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 00:27+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -18,12 +18,22 @@ msgstr ""
|
|||
"Language: ca\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: ajax/adminrecovery.php:40
|
||||
msgid "Recovery key successfully "
|
||||
#: ajax/adminrecovery.php:29
|
||||
msgid "Recovery key successfully enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:42
|
||||
msgid "Could not "
|
||||
#: ajax/adminrecovery.php:34
|
||||
msgid ""
|
||||
"Could not enable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:48
|
||||
msgid "Recovery key successfully disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/adminrecovery.php:53
|
||||
msgid ""
|
||||
"Could not disable recovery key. Please check your recovery key password!"
|
||||
msgstr ""
|
||||
|
||||
#: ajax/changeRecoveryPassword.php:49
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: rogerc\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-29 00:02+0000\n"
|
||||
"POT-Creation-Date: 2013-06-04 02:29+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 00:32+0000\n"
|
||||
"Last-Translator: rogerc\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -58,7 +58,7 @@ msgstr "Torna a Fitxers"
|
|||
msgid "Selected files too large to generate zip file."
|
||||
msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
|
||||
|
||||
#: helper.php:228
|
||||
#: helper.php:236
|
||||
msgid "couldn't be determined"
|
||||
msgstr "no s'ha pogut determinar"
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:02+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:17+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:17+0000\n"
|
||||
"Last-Translator: rogerc\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2013-05-29 02:01+0200\n"
|
||||
"PO-Revision-Date: 2013-05-28 23:18+0000\n"
|
||||
"POT-Creation-Date: 2013-06-03 02:27+0200\n"
|
||||
"PO-Revision-Date: 2013-06-02 23:18+0000\n"
|
||||
"Last-Translator: rogerc\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue