mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into oc_preview

This commit is contained in:
Georg Ehrke 2013-05-29 13:24:14 +02:00
parent a76360347c 7c0c6bd779
commit d8008ae421
848 changed files with 5335 additions and 35196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/js/files.js
View File

@ -708,14 +708,14 @@ function scanFiles(force, dir){
var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
scannerEventSource.listen('count',function(count){
console.log(count + 'files scanned')
console.log(count + ' files scanned')
});
scannerEventSource.listen('folder',function(path){
console.log('now scanning ' + path)
});
scannerEventSource.listen('done',function(count){
scanFiles.scanning=false;
console.log('done after ' + count + 'files');
console.log('done after ' + count + ' files');
});
}
scanFiles.scanning=false;

1
apps/files/l10n/hu_HU.php
View File

@ -46,6 +46,7 @@
"{count} folders" => "{count} mappa",
"1 file" => "1 fájl",
"{count} files" => "{count} fájl",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
"Unable to rename file" => "Nem lehet átnevezni a fájlt",
"Upload" => "Feltöltés",
"File handling" => "Fájlkezelés",

1
apps/files/l10n/pt_PT.php
View File

@ -46,6 +46,7 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
"Unable to rename file" => "Não foi possível renomear o ficheiro",
"Upload" => "Carregar",
"File handling" => "Manuseamento de ficheiros",

1
apps/files/l10n/zh_TW.php
View File

@ -46,6 +46,7 @@
"{count} folders" => "{count} 個資料夾",
"1 file" => "1 個檔案",
"{count} files" => "{count} 個檔案",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
"Unable to rename file" => "無法重新命名檔案",
"Upload" => "上傳",
"File handling" => "檔案處理",

2
apps/files_encryption/appinfo/info.xml
View File

@ -2,7 +2,7 @@
<info>
<id>files_encryption</id>
<name>Encryption</name>
<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. Encryption is not yet compatible with LDAP.</description>
<licence>AGPL</licence>
<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
<require>4</require>

2
apps/files_encryption/appinfo/version
View File

@ -1 +1 @@
0.3
0.4

12
apps/files_encryption/hooks/hooks.php
View File

@ -57,7 +57,7 @@ class Hooks {
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
$session = new Session( $view );
$session = new \OCA\Encryption\Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
@ -76,13 +76,11 @@ class Hooks {
&& $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
) {
$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
$plainLegacyKey = Crypt::legacyBlockDecrypt( $encLegacyKey, $params['password'] );
$session->setLegacyKey( $plainLegacyKey );
}
$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
@ -153,7 +151,7 @@ class Hooks {
$view = new \OC_FilesystemView('/');
$session = new Session($view);
$session = new \OCA\Encryption\Session($view);
// Get existing decrypted private key
$privateKey = $session->getPrivateKey();
@ -268,7 +266,7 @@ class Hooks {
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
$view = new \OC_FilesystemView('/');
$session = new Session($view);
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
@ -440,7 +438,7 @@ class Hooks {
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView('/');
$session = new Session($view);
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );

1
apps/files_encryption/l10n/ar.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "جاري الحفظ...",
"Encryption" => "التشفير"
);

1
apps/files_encryption/l10n/bg_BG.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Записване...",
"Encryption" => "Криптиране"
);

1
apps/files_encryption/l10n/bn_BD.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "সংরক্ষণ করা হচ্ছে..",
"Encryption" => "সংকেতায়ন"
);

1
apps/files_encryption/l10n/ca.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Desant...",
"Encryption" => "Xifrat"
);

1
apps/files_encryption/l10n/cs_CZ.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Ukládám...",
"Encryption" => "Šifrování"
);

1
apps/files_encryption/l10n/cy_GB.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Yn cadw...",
"Encryption" => "Amgryptiad"
);

1
apps/files_encryption/l10n/da.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Gemmer...",
"Encryption" => "Kryptering"
);

1
apps/files_encryption/l10n/de.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Speichern...",
"Encryption" => "Verschlüsselung"
);

8
apps/files_encryption/l10n/de_DE.php
View File

@ -1,3 +1,9 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Verschlüsselung"
"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",
"Enabled" => "Aktiviert",
"Disabled" => "Deaktiviert",
"Change Password" => "Passwort ändern"
);

1
apps/files_encryption/l10n/el.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Γίνεται αποθήκευση...",
"Encryption" => "Κρυπτογράφηση"
);

1
apps/files_encryption/l10n/eo.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Konservante...",
"Encryption" => "Ĉifrado"
);

1
apps/files_encryption/l10n/es.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Guardando...",
"Encryption" => "Cifrado"
);

1
apps/files_encryption/l10n/es_AR.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Guardando...",
"Encryption" => "Encriptación"
);

6
apps/files_encryption/l10n/et_EE.php
View File

@ -1,3 +1,7 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Krüpteerimine"
"Saving..." => "Salvestamine...",
"Encryption" => "Krüpteerimine",
"Enabled" => "Sisse lülitatud",
"Disabled" => "Väljalülitatud",
"Change Password" => "Muuda parooli"
);

1
apps/files_encryption/l10n/eu.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Gordetzen...",
"Encryption" => "Enkriptazioa"
);

1
apps/files_encryption/l10n/fa.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "در حال ذخیره سازی...",
"Encryption" => "رمزگذاری"
);

8
apps/files_encryption/l10n/fi_FI.php
View File

@ -1,3 +1,9 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Salaus"
"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
"Saving..." => "Tallennetaan...",
"Encryption" => "Salaus",
"Enabled" => "Käytössä",
"Disabled" => "Ei käytössä",
"Change Password" => "Vaihda salasana"
);

1
apps/files_encryption/l10n/fr.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Enregistrement...",
"Encryption" => "Chiffrement"
);

19
apps/files_encryption/l10n/gl.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifrado"
"Recovery key successfully " => "O contrasinal foi recuperado satisfactoriamente",
"Could not " => "Non foi posíbel",
"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...",
"Encryption" => "Cifrado",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
"Recovery account password" => "Recuperación do contrasinal da conta",
"Enabled" => "Activado",
"Disabled" => "Desactivado",
"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
"New Recovery account password" => "Novo contrasinal de recuperación da conta",
"Change Password" => "Cambiar o contrasinal",
"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal",
"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
);

1
apps/files_encryption/l10n/he.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "שמירה…",
"Encryption" => "הצפנה"
);

3
apps/files_encryption/l10n/hr.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Spremanje..."
);

1
apps/files_encryption/l10n/hu_HU.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Mentés...",
"Encryption" => "Titkosítás"
);

1
apps/files_encryption/l10n/id.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Menyimpan...",
"Encryption" => "Enkripsi"
);

1
apps/files_encryption/l10n/is.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Er að vista ...",
"Encryption" => "Dulkóðun"
);

19
apps/files_encryption/l10n/it.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifratura"
"Recovery key successfully " => "Chiave ripristinata correttamente",
"Could not " => "Impossibile",
"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...",
"Encryption" => "Cifratura",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
"Recovery account password" => "Password di ripristino dell'account",
"Enabled" => "Abilitata",
"Disabled" => "Disabilitata",
"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
"Old Recovery account password" => "Vecchia password di ripristino dell'account",
"New Recovery account password" => "Nuova password di ripristino dell'account",
"Change Password" => "Modifica password",
"Enable password recovery by sharing all files with your administrator:" => "Abilita il ripristino della password condividendo tutti i file con l'amministratore:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "L'abilitazione di questa opzione ti consentirà di ottenere nuovamente accesso ai tuoi file cifrati in caso di smarrimento della password",
"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
);

19
apps/files_encryption/l10n/ja_JP.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "暗号化"
"Recovery key successfully " => "鍵を復旧することができました。",
"Could not " => "できませんでした。",
"Password successfully changed." => "パスワードを変更できました。",
"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
"Saving..." => "保存中...",
"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
apps/files_encryption/l10n/ka_GE.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "შენახვა...",
"Encryption" => "ენკრიპცია"
);

1
apps/files_encryption/l10n/ko.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "저장 중...",
"Encryption" => "암호화"
);

1
apps/files_encryption/l10n/ku_IQ.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "پاشکه‌وتده‌کات...",
"Encryption" => "نهێنیکردن"
);

3
apps/files_encryption/l10n/lb.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Speicheren..."
);

1
apps/files_encryption/l10n/lt_LT.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Saugoma...",
"Encryption" => "Šifravimas"
);

1
apps/files_encryption/l10n/lv.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Saglabā...",
"Encryption" => "Šifrēšana"
);

1
apps/files_encryption/l10n/mk.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Снимам...",
"Encryption" => "Енкрипција"
);

3
apps/files_encryption/l10n/ms_MY.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Simpan..."
);

1
apps/files_encryption/l10n/nb_NO.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Lagrer...",
"Encryption" => "Kryptering"
);

19
apps/files_encryption/l10n/nl.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Versleuteling"
"Recovery key successfully " => "Sleutelherstel succesvol",
"Could not " => "Kon niet",
"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",
"Encryption" => "Versleuteling",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
"Recovery account password" => "Herstel account wachtwoord",
"Enabled" => "Geactiveerd",
"Disabled" => "Gedeactiveerd",
"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
"Old Recovery account password" => "Oude herstel account wachtwoord",
"New Recovery account password" => "Nieuwe herstel account wachtwoord",
"Change Password" => "Wijzigen wachtwoord",
"Enable password recovery by sharing all files with your administrator:" => "Activeer wachtwoordherstel door alle bestanden met uw beheerder te delen:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Door deze optie te activeren kunt u toegang tot uw versleutelde bestanden krijgen als u uw wachtwoord kwijt bent",
"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
);

3
apps/files_encryption/l10n/nn_NO.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Lagrar …"
);

3
apps/files_encryption/l10n/oc.php Normal file
View File

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Enregistra..."
);

19
apps/files_encryption/l10n/pl.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Szyfrowanie"
"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...",
"Encryption" => "Szyfrowanie",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
"Recovery account password" => "Odzyskiwanie hasła konta",
"Enabled" => "Włączone",
"Disabled" => "Wyłączone",
"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
"Old Recovery account password" => "Stare hasło odzyskiwania",
"New Recovery account password" => "Nowe hasło odzyskiwania",
"Change Password" => "Zmień hasło",
"Enable password recovery by sharing all files with your administrator:" => "Włączyć hasło odzyskiwania przez udostępnianie wszystkich plików z administratorem:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
);

19
apps/files_encryption/l10n/pt_BR.php
View File

@ -1,3 +1,20 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Criptografia"
"Recovery key successfully " => "Recuperação de chave com sucesso",
"Could not " => "Não foi possível",
"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...",
"Encryption" => "Criptografia",
"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
"Recovery account password" => "Recuperar a senha da conta",
"Enabled" => "Habilidado",
"Disabled" => "Desabilitado",
"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
"Old Recovery account password" => "Recuperação de senha de conta antiga",
"New Recovery account password" => "Senha Nova da conta de Recuperação",
"Change Password" => "Trocar Senha",
"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:",
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida",
"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
);

9
apps/files_encryption/l10n/pt_PT.php
View File

@ -1,3 +1,10 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Encriptação"
"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...",
"Encryption" => "Encriptação",
"Enabled" => "Activado",
"Disabled" => "Desactivado",
"Change Password" => "Mudar a Password"
);

1
apps/files_encryption/l10n/ro.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Se salvează...",
"Encryption" => "Încriptare"
);

1
apps/files_encryption/l10n/ru.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Сохранение...",
"Encryption" => "Шифрование"
);

3
apps/files_encryption/l10n/ru_RU.php
View File

@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Шифрование",
"None" => "Ни один"
"Saving..." => "Сохранение"
);

1
apps/files_encryption/l10n/si_LK.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "සුරැකෙමින් පවතී...",
"Encryption" => "ගුප්ත කේතනය"
);

1
apps/files_encryption/l10n/sk_SK.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Ukladám...",
"Encryption" => "Šifrovanie"
);

1
apps/files_encryption/l10n/sl.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Poteka shranjevanje ...",
"Encryption" => "Šifriranje"
);

1
apps/files_encryption/l10n/sr.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Чување у току...",
"Encryption" => "Шифровање"
);

1
apps/files_encryption/l10n/sv.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Sparar...",
"Encryption" => "Kryptering"
);

1
apps/files_encryption/l10n/ta_LK.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "சேமிக்கப்படுகிறது...",
"Encryption" => "மறைக்குறியீடு"
);

1
apps/files_encryption/l10n/th_TH.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "กำลังบันทึกข้อมูล...",
"Encryption" => "การเข้ารหัส"
);

1
apps/files_encryption/l10n/tr.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Kaydediliyor...",
"Encryption" => "Şifreleme"
);

1
apps/files_encryption/l10n/ug.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "ساقلاۋاتىدۇ…",
"Encryption" => "شىفىرلاش"
);

1
apps/files_encryption/l10n/uk.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Зберігаю...",
"Encryption" => "Шифрування"
);

1
apps/files_encryption/l10n/vi.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "Đang lưu...",
"Encryption" => "Mã hóa"
);

1
apps/files_encryption/l10n/zh_CN.GB2312.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "保存中...",
"Encryption" => "加密"
);

1
apps/files_encryption/l10n/zh_CN.php
View File

@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
"Saving..." => "保存中",
"Encryption" => "加密"
);

15
apps/files_encryption/l10n/zh_TW.php
View File

@ -1,3 +1,16 @@
<?php $TRANSLATIONS = array(
"Encryption" => "加密"
"Recovery key successfully " => "成功還原金鑰",
"Could not " => "無法",
"Password successfully changed." => "成功變更密碼。",
"Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
"Saving..." => "儲存中...",
"Encryption" => "加密",
"Enabled" => "已啓用",
"Disabled" => "已停用",
"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
"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" => "無法更新檔案還原設定"
);

6
apps/files_encryption/lib/crypt.php
View File

@ -607,13 +607,13 @@ class Crypt
*
* This function decrypts an content
*/
public static function legacyDecrypt( $content, $passphrase = '' ) {
private static function legacyDecrypt( $content, $passphrase = '' ) {
$bf = self::getBlowfish( $passphrase );
$decrypted = $bf->decrypt( $content );
return rtrim( $decrypted, "\0" );;
return $decrypted;
}
@ -623,7 +623,7 @@ class Crypt
* @param int $maxLength
* @return string
*/
private static function legacyBlockDecrypt( $data, $key = '', $maxLength = 0 ) {
public static function legacyBlockDecrypt( $data, $key = '', $maxLength = 0 ) {
$result = '';
while ( strlen( $data ) ) {
$result .= self::legacyDecrypt( substr( $data, 0, 8192 ), $key );

16
apps/files_encryption/lib/helper.php
View File

@ -173,4 +173,20 @@ class Helper
return $return;
}
/**
* @brief checks if access is public/anonymous user
* @return bool
*/
public static function isPublicAccess() {
if (\OCP\USER::getUser() === false
|| (isset($_GET['service']) && $_GET['service'] == 'files'
&& isset($_GET['t']))
) {
return true;
} else {
return false;
}
}
}

10
apps/files_encryption/lib/proxy.php
View File

@ -111,7 +111,7 @@ class Proxy extends \OC_FileProxy
$userId = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' );
$util = new Util( $view, $userId );
$session = new Session( $view );
$session = new \OCA\Encryption\Session( $view );
$privateKey = $session->getPrivateKey();
$filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
@ -197,7 +197,7 @@ class Proxy extends \OC_FileProxy
\OC_FileProxy::$enabled = false;
// init session
$session = new Session( $view );
$session = new \OCA\Encryption\Session( $view );
// If data is a catfile
if (
@ -220,10 +220,10 @@ class Proxy extends \OC_FileProxy
} elseif (
Crypt::mode() == 'server'
&& isset( $_SESSION['legacyenckey'] )
&&\OC::$session->exists('legacyenckey')
&& Crypt::isEncryptedMeta( $path )
) {
$plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
$plainData = Crypt::legacyBlockDecrypt( $data, $session->getLegacyKey() );
}
\OC_FileProxy::$enabled = $proxyStatus;
@ -439,7 +439,7 @@ class Proxy extends \OC_FileProxy
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView( '/' );
$session = new Session( $view );
$session = new \OCA\Encryption\Session( $view );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );

69
apps/files_encryption/lib/session.php
View File

@ -83,17 +83,14 @@ class Session
}
if ( \OCP\USER::getUser() === false ||
( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
isset( $_GET['t'] ) )
) {
if (\OCA\Encryption\Helper::isPublicAccess()) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key' );
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
$this->setPrivateKey( $privateKey );
$this->setPublicSharePrivateKey( $privateKey );
\OC_FileProxy::$enabled = $proxyStatus;
}
@ -103,37 +100,64 @@ class Session
* @brief Sets user private key to session
* @param string $privateKey
* @return bool
*
* @note this should only be set on login
*/
public function setPrivateKey( $privateKey ) {
$_SESSION['privateKey'] = $privateKey;
\OC::$session->set('privateKey', $privateKey);
return true;
}
/**
* @brief Gets user private key from session
* @brief Gets user or public share private key from session
* @returns string $privateKey The user's plaintext private key
*
*/
public function getPrivateKey() {
if (
isset( $_SESSION['privateKey'] )
&& !empty( $_SESSION['privateKey'] )
) {
return $_SESSION['privateKey'];
// return the public share private key if this is a public access
if (\OCA\Encryption\Helper::isPublicAccess()) {
return $this->getPublicSharePrivateKey();
} else {
return false;
if (!is_null( \OC::$session->get('privateKey') )) {
return \OC::$session->get('privateKey');
} else {
return false;
}
}
}
/**
* @brief Sets public user private key to session
* @param string $privateKey
* @return bool
*/
public function setPublicSharePrivateKey($privateKey) {
\OC::$session->set('publicSharePrivateKey', $privateKey);
return true;
}
/**
* @brief Gets public share private key from session
* @returns string $privateKey
*
*/
public function getPublicSharePrivateKey() {
if (!is_null( \OC::$session->get('publicSharePrivateKey') )) {
return \OC::$session->get('publicSharePrivateKey');
} else {
return false;
}
}
/**
* @brief Sets user legacy key to session
* @param $legacyKey
@ -141,7 +165,7 @@ class Session
*/
public function setLegacyKey( $legacyKey ) {
$_SESSION['legacyKey'] = $legacyKey;
\OC::$session->set('legacyKey', $legacyKey);
return true;
}
@ -153,12 +177,9 @@ class Session
*/
public function getLegacyKey() {
if (
isset( $_SESSION['legacyKey'] )
&& !empty( $_SESSION['legacyKey'] )
) {
if ( !is_null( \OC::$session->get('legacyKey') ) ) {
return $_SESSION['legacyKey'];
return \OC::$session->get('legacyKey');
} else {
@ -168,4 +189,4 @@ class Session
}
}
}

2
apps/files_encryption/lib/stream.php
View File

@ -228,7 +228,7 @@ class Stream
// If a keyfile already exists
if ( $this->encKeyfile ) {
$session = new Session( $this->rootView );
$session = new \OCA\Encryption\Session( $this->rootView );
$privateKey = $session->getPrivateKey( $this->userId );

746
apps/files_encryption/lib/util.php
View File

File diff suppressed because it is too large Load Diff

186
apps/files_encryption/tests/crypt.php
View File

@ -16,14 +16,16 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
/**
* Class Test_Encryption_Crypt
*/
class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
public $userId;
public $pass;
@ -39,12 +41,31 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
public $genPrivateKey;
public $genPublicKey;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
}
function setUp() {
// set user id
\OC_User::setUserId(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
$this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
// set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->dataShort = 'hats';
@ -60,53 +81,29 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view = new \OC_FilesystemView('/');
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
\OC_FileProxy::clearProxies();
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
function testGenerateKey()
{
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
}
function testGenerateKey() {
# TODO: use more accurate (larger) string length for test confirmation
@ -119,8 +116,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @return String
*/
function testGenerateIv()
{
function testGenerateIv() {
$iv = Encryption\Crypt::generateIv();
@ -133,8 +129,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @depends testGenerateIv
*/
function testConcatIv($iv)
{
function testConcatIv($iv) {
$catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
@ -157,7 +152,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
return array(
'iv' => $iv
, 'catfile' => $catFile
,
'catfile' => $catFile
);
}
@ -165,8 +161,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @depends testConcatIv
*/
function testSplitIv($testConcatIv)
{
function testSplitIv($testConcatIv) {
// Split catfile into components
$splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
@ -182,8 +177,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @return string padded
*/
function testAddPadding()
{
function testAddPadding() {
$padded = Encryption\Crypt::addPadding($this->dataLong);
@ -198,8 +192,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @depends testAddPadding
*/
function testRemovePadding($padded)
{
function testRemovePadding($padded) {
$noPadding = Encryption\Crypt::RemovePadding($padded);
@ -207,8 +200,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testEncrypt()
{
function testEncrypt() {
$random = openssl_random_pseudo_bytes(13);
@ -220,8 +212,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testDecrypt()
{
function testDecrypt() {
$random = openssl_random_pseudo_bytes(13);
@ -235,8 +226,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testSymmetricEncryptFileContent()
{
function testSymmetricEncryptFileContent() {
# TODO: search in keyfile for actual content as IV will ensure this test always passes
@ -251,8 +241,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testSymmetricStreamEncryptShortFileContent()
{
function testSymmetricStreamEncryptShortFileContent() {
$filename = 'tmp-' . time() . '.test';
@ -281,7 +270,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
// get session
$session = new Encryption\Session($this->view);
$session = new \OCA\Encryption\Session($this->view);
// get private key
$privateKey = $session->getPrivateKey($this->userId);
@ -307,8 +296,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
* reassembly of its data
*/
function testSymmetricStreamEncryptLongFileContent()
{
function testSymmetricStreamEncryptLongFileContent() {
// Generate a a random filename
$filename = 'tmp-' . time() . '.test';
@ -339,7 +327,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
//print_r($r);
// Join IVs and their respective data chunks
$e = array($r[0] . $r[1], $r[2] . $r[3], $r[4] . $r[5], $r[6] . $r[7], $r[8] . $r[9], $r[10] . $r[11]); //.$r[11], $r[12].$r[13], $r[14] );
$e = array(
$r[0] . $r[1],
$r[2] . $r[3],
$r[4] . $r[5],
$r[6] . $r[7],
$r[8] . $r[9],
$r[10] . $r[11]
); //.$r[11], $r[12].$r[13], $r[14] );
//print_r($e);
@ -350,7 +345,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
// get session
$session = new Encryption\Session($this->view);
$session = new \OCA\Encryption\Session($this->view);
// get private key
$privateKey = $session->getPrivateKey($this->userId);
@ -384,8 +379,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @brief Test that data that is read by the crypto stream wrapper
*/
function testSymmetricStreamDecryptShortFileContent()
{
function testSymmetricStreamDecryptShortFileContent() {
$filename = 'tmp-' . time();
@ -412,8 +406,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view->unlink($this->userId . '/files/' . $filename);
}
function testSymmetricStreamDecryptLongFileContent()
{
function testSymmetricStreamDecryptLongFileContent() {
$filename = 'tmp-' . time();
@ -432,8 +425,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view->unlink($this->userId . '/files/' . $filename);
}
function testSymmetricEncryptFileContentKeyfile()
{
function testSymmetricEncryptFileContentKeyfile() {
# TODO: search in keyfile for actual content as IV will ensure this test always passes
@ -448,8 +440,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testIsEncryptedContent()
{
function testIsEncryptedContent() {
$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
@ -461,8 +452,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testMultiKeyEncrypt()
{
function testMultiKeyEncrypt() {
# TODO: search in keyfile for actual content as IV will ensure this test always passes
@ -486,8 +476,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testKeyEncrypt()
{
function testKeyEncrypt() {
// Generate keypair
$pair1 = Encryption\Crypt::createKeypair();
@ -507,8 +496,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @brief test encryption using legacy blowfish method
*/
function testLegacyEncryptShort()
{
function testLegacyEncryptShort() {
$crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
@ -525,10 +513,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptShort
*/
function testLegacyDecryptShort($crypted)
{
function testLegacyDecryptShort($crypted) {
$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
$this->assertEquals($this->dataShort, $decrypted);
@ -537,8 +524,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
/**
* @brief test encryption using legacy blowfish method
*/
function testLegacyEncryptLong()
{
function testLegacyEncryptLong() {
$crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
@ -555,10 +541,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptLong
*/
function testLegacyDecryptLong($crypted)
{
function testLegacyDecryptLong($crypted) {
$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
$this->assertEquals($this->dataLong, $decrypted);
@ -569,14 +554,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test generation of legacy encryption key
* @depends testLegacyDecryptShort
*/
function testLegacyCreateKey()
{
function testLegacyCreateKey() {
// Create encrypted key
$encKey = Encryption\Crypt::legacyCreateKey($this->pass);
// Decrypt key
$key = Encryption\Crypt::legacyDecrypt($encKey, $this->pass);
$key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
$this->assertTrue(is_numeric($key));
@ -589,8 +573,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptLong
*/
function testLegacyKeyRecryptKeyfileEncrypt($crypted)
{
function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
@ -603,8 +586,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
}
function testRenameFile()
{
function testRenameFile() {
$filename = 'tmp-' . time();
@ -632,8 +614,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($newFilename);
}
function testMoveFileIntoFolder()
{
function testMoveFileIntoFolder() {
$filename = 'tmp-' . time();
@ -663,8 +644,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($newFolder);
}
function testMoveFolder()
{
function testMoveFolder() {
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -696,11 +676,11 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
// tear down
$view->unlink($newFolder);
$view->unlink('/newfolder');
}
function testChangePassphrase()
{
$filename = 'tmp-' . time();
function testChangePassphrase() {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
@ -733,8 +713,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testViewFilePutAndGetContents()
{
function testViewFilePutAndGetContents() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -765,8 +744,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testTouchExistingFile()
{
function testTouchExistingFile() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -787,8 +765,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testTouchFile()
{
function testTouchFile() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@ -809,8 +786,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$view->unlink($filename);
}
function testFopenFile()
{
function testFopenFile() {
$filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');

BIN
apps/files_encryption/tests/encryption.key
View File

Binary file not shown.

78
apps/files_encryption/tests/keymanager.php
View File

@ -20,8 +20,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Keymanager
*/
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
public $userId;
public $pass;
@ -33,14 +32,35 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
public $randomKey;
public $dataShort;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// disable file proxy by default
\OC_FileProxy::$enabled = false;
// setup filesystem
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS('admin');
\OC_User::setUserId('admin');
// login admin
$params['uid'] = 'admin';
$params['password'] = 'admin';
OCA\Encryption\Hooks::login($params);
}
function setUp() {
// set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->dataShort = 'hats';
@ -62,44 +82,28 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
\OC_FileProxy::$enabled = true;
\OC_FileProxy::clearProxies();
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
function testGetPrivateKey()
{
public static function tearDownAfterClass() {
\OC_FileProxy::$enabled = true;
}
function testGetPrivateKey() {
$key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
@ -115,8 +119,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
}
function testGetPublicKey()
{
function testGetPublicKey() {
$publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
@ -129,8 +132,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('key', $sslInfo);
}
function testSetFileKey()
{
function testSetFileKey() {
# NOTE: This cannot be tested until we are able to break out
# of the FileSystemView data directory root
@ -163,8 +165,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
}
function testGetUserKeys()
{
function testGetUserKeys() {
$keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
@ -187,8 +188,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('key', $sslInfoPrivate);
}
function testFixPartialFilePath()
{
function testFixPartialFilePath() {
$partFilename = 'testfile.txt.part';
$filename = 'testfile.txt';
@ -202,8 +202,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
}
function testRecursiveDelShareKeys()
{
function testRecursiveDelShareKeys() {
// generate filename
$filename = '/tmp-' . time() . '.txt';
@ -230,7 +229,8 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
$this->assertFalse($this->view->file_exists(
'/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
// enable encryption proxy
$proxyStatus = \OC_FileProxy::$enabled;

2
apps/files_encryption/tests/legacy-encrypted-text.txt
View File

@ -1 +1 @@
«ß• ’tÕ.µ¤—dS@t9 øQJ
ð˜¯5–¡‹Ç¡i›òë³Zg§ESlÁF=<3D>Àªð

563
apps/files_encryption/tests/share.php
View File

File diff suppressed because it is too large Load Diff

66
apps/files_encryption/tests/stream.php
View File

@ -27,6 +27,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
@ -34,8 +35,9 @@ use OCA\Encryption;
* Class Test_Encryption_Stream
* @brief this class provide basic stream tests
*/
class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_STREAM_USER1 = "test-stream-user1";
public $userId;
public $pass;
@ -46,15 +48,27 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
public $dataShort;
public $stateFilesTrashbin;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
}
function setUp() {
// set user id
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
\OC_User::setUserId(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
$this->userId = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
$this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
// init filesystem view
$this->view = new \OC_FilesystemView('/');
@ -62,42 +76,26 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
// init short data
$this->dataShort = 'hats';
// init filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// register encryption file proxy
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
// init filesystem for user
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
// login user
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
// clear all proxies
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
}
function testStreamOptions() {
@ -113,7 +111,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// check if stream is at position zero
$this->assertEquals(0,ftell($handle));
$this->assertEquals(0, ftell($handle));
// set stream options
$this->assertTrue(flock($handle, LOCK_SH));
@ -136,7 +134,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// set stream options
$this->assertTrue(stream_set_blocking($handle,1));
$this->assertTrue(stream_set_blocking($handle, 1));
// tear down
$view->unlink($filename);
@ -155,7 +153,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// set stream options
$this->assertFalse(stream_set_timeout($handle,1));
$this->assertFalse(stream_set_timeout($handle, 1));
// tear down
$view->unlink($filename);
@ -174,7 +172,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
$handle = $view->fopen($filename, 'r');
// set stream options
$this->assertEquals(0, stream_set_write_buffer($handle,1024));
$this->assertEquals(0, stream_set_write_buffer($handle, 1024));
// tear down
$view->unlink($filename);

178
apps/files_encryption/tests/trashbin.php
View File

@ -28,6 +28,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
@ -35,8 +36,9 @@ use OCA\Encryption;
* Class Test_Encryption_Trashbin
* @brief this class provide basic trashbin app tests
*/
class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
public $userId;
public $pass;
@ -50,15 +52,33 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
public $subfolder;
public $subsubfolder;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
\OC_Hook::clear('OC_Filesystem');
\OC_Hook::clear('OC_User');
// trashbin hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1, true);
}
function setUp() {
// set user id
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
\OC_User::setUserId(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
$this->userId = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
// init filesystem view
$this->view = new \OC_FilesystemView('/');
@ -70,48 +90,26 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->subfolder = '/subfolder1';
$this->subsubfolder = '/subsubfolder1';
\OC_Hook::clear('OC_Filesystem');
\OC_Hook::clear('OC_User');
// init filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// register encryption file proxy
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// trashbin hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
// we want to tests with app files_trashbin enabled
\OC_App::enable('files_trashbin');
// init filesystem for user
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
// login user
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
// clear all proxies
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
}
/**
@ -129,30 +127,40 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertTrue(is_int($cryptedFile));
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// delete file
\OC\FIles\Filesystem::unlink($filename);
// check if file not exists
$this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// get files
$trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
$trashFiles = $this->view->getDirectoryContent(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
$trashFileSuffix = null;
// find created file with timestamp
foreach($trashFiles as $file) {
if(strncmp($file['path'], $filename, strlen($filename))) {
foreach ($trashFiles as $file) {
if (strncmp($file['path'], $filename, strlen($filename))) {
$path_parts = pathinfo($file['name']);
$trashFileSuffix = $path_parts['extension'];
}
@ -162,10 +170,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertNotNull($trashFileSuffix);
// check if key for admin not exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
. '.key.' . $trashFileSuffix));
// check if share key for admin not exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
// return filename for next test
return $filename . '.' . $trashFileSuffix;
@ -182,19 +194,24 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$path_parts = pathinfo($filename);
$trashFileSuffix = $path_parts['extension'];
$timestamp = str_replace('d', '', $trashFileSuffix);
$fileNameWithoutSuffix = str_replace('.'.$trashFileSuffix, '', $filename);
$fileNameWithoutSuffix = str_replace('.' . $trashFileSuffix, '', $filename);
// restore file
$this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
// check if file exists
$this->assertTrue($this->view->file_exists('/admin/files/' . $fileNameWithoutSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $fileNameWithoutSuffix));
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $fileNameWithoutSuffix . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
. $fileNameWithoutSuffix . '.key'));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $fileNameWithoutSuffix . '.admin.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $fileNameWithoutSuffix . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
}
/**
@ -212,44 +229,51 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertTrue(is_int($cryptedFile));
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// delete file
\OC\FIles\Filesystem::unlink($filename);
// check if file not exists
$this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
. '.key'));
// check if share key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
// get files
$trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
$trashFileSuffix = null;
// find created file with timestamp
foreach($trashFiles as $file) {
if(strncmp($file['name'], $filename, strlen($filename)) == 0) {
$path_parts = pathinfo($file['name']);
$trashFileSuffix = $path_parts['extension'];
break;
}
}
$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
. ' WHERE `id`=?');
$result = $query->execute(array($filename))->fetchRow();
// check if we found the file we created
$this->assertNotNull($trashFileSuffix);
$this->assertTrue(is_array($result));
// build suffix
$trashFileSuffix = 'd' . $result['timestamp'];
// check if key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
. '.key.' . $trashFileSuffix));
// check if share key for admin exists
$this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
$this->assertTrue($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
// get timestamp from file
$timestamp = str_replace('d', '', $trashFileSuffix);
@ -258,13 +282,19 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_trashbin/files/' . $filename . '.' . $trashFileSuffix));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
. $trashFileSuffix));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
. '.key.' . $trashFileSuffix));
// check if share key for admin not exists
$this->assertFalse($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
$this->assertFalse($this->view->file_exists(
'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
}
}

186
apps/files_encryption/tests/util.php
View File

@ -19,8 +19,10 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Util
*/
class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_UTIL_USER1 = "test-util-user1";
const TEST_ENCRYPTION_UTIL_LEGACY_USER = "test-legacy-user";
public $userId;
public $encryptionDir;
@ -40,16 +42,31 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
public $dataShort;
public $legacyEncryptedData;
public $legacyEncryptedDataKey;
public $lagacyKey;
public $legacyKey;
public $stateFilesTrashbin;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, true);
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
}
function setUp() {
\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
$this->userId = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
// set content for encrypting / decrypting in tests
$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
@ -58,7 +75,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
$this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
$this->lagacyKey = '62829813025828180801';
$this->legacyKey = '30943623843030686906';
$keypair = Encryption\Crypt::createKeypair();
@ -68,43 +85,42 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->publicKeyDir = '/' . 'public-keys';
$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
$this->publicKeyPath =
$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath =
$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
$this->view = new \OC_FilesystemView('/');
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
$this->util = new Encryption\Util($this->view, $this->userId);
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
}
else {
OC_App::disable('files_trashbin');
}
}
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
}
/**
* @brief test that paths set during User construction are correct
*/
function testKeyPaths()
{
function testKeyPaths() {
$util = new Encryption\Util($this->view, $this->userId);
$this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
@ -118,39 +134,37 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
/**
* @brief test setup of encryption directories
*/
function testSetupServerSide()
{
function testSetupServerSide() {
$this->assertEquals(true, $this->util->setupServerSide($this->pass));
}
/**
* @brief test checking whether account is ready for encryption,
*/
function testUserIsReady()
{
function testUserIsReady() {
$this->assertEquals(true, $this->util->ready());
}
/**
* @brief test checking whether account is not ready for encryption,
*/
function testUserIsNotReady()
{
$this->view->unlink($this->publicKeyDir);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
$this->assertFalse(OCA\Encryption\Hooks::login($params));
$this->view->unlink($this->privateKeyPath);
}
// function testUserIsNotReady() {
// $this->view->unlink($this->publicKeyDir);
//
// $params['uid'] = $this->userId;
// $params['password'] = $this->pass;
// $this->assertFalse(OCA\Encryption\Hooks::login($params));
//
// $this->view->unlink($this->privateKeyPath);
// }
/**
* @brief test checking whether account is not ready for encryption,
*/
function testIsLagacyUser()
{
$userView = new \OC_FilesystemView( '/' . $this->userId );
function testIsLegacyUser() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@ -161,19 +175,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
\OC_FileProxy::$enabled = $proxyStatus;
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$util = new Encryption\Util($this->view, $this->userId);
$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$util->setMigrationStatus(0);
$this->assertTrue(OCA\Encryption\Hooks::login($params));
$this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
}
function testRecoveryEnabledForUser()
{
function testRecoveryEnabledForUser() {
$util = new Encryption\Util($this->view, $this->userId);
@ -193,10 +206,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
}
function testGetUidAndFilename()
{
function testGetUidAndFilename() {
\OC_User::setUserId('admin');
\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
$filename = 'tmp-' . time() . '.test';
@ -213,9 +225,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
$this->assertEquals('admin', $fileOwnerUid);
$this->assertEquals(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
$this->assertEquals($file, $filename);
$this->view->unlink($this->userId . '/files/' . $filename);
}
function testIsSharedPath() {
@ -227,10 +241,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->util->isSharedPath($path));
}
function testEncryptLagacyFiles()
{
$userView = new \OC_FilesystemView( '/' . $this->userId);
$view = new \OC_FilesystemView( '/' . $this->userId . '/files' );
function testEncryptLegacyFiles() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@ -250,23 +265,23 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
\OC_FileProxy::$enabled = $proxyStatus;
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
$util = new Encryption\Util($this->view, $this->userId);
$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
$util->setMigrationStatus(0);
$this->assertTrue(OCA\Encryption\Hooks::login($params));
$this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
$files = $util->findEncFiles('/' . $this->userId . '/files/');
$files = $util->findEncFiles('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files/');
$this->assertTrue(is_array($files));
$found = false;
foreach($files['encrypted'] as $encryptedFile) {
if($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
foreach ($files['encrypted'] as $encryptedFile) {
if ($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
$found = true;
break;
}
@ -274,4 +289,29 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->assertTrue($found);
}
}
/**
* @param $user
* @param bool $create
* @param bool $password
*/
public static function loginHelper($user, $create = false, $password = false) {
if ($create) {
\OC_User::createUser($user, $user);
}
if ($password === false) {
$password = $user;
}
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($user);
\OC_User::setUserId($user);
$params['uid'] = $user;
$params['password'] = $password;
OCA\Encryption\Hooks::login($params);
}
}

79
apps/files_encryption/tests/webdav.php
View File

@ -27,6 +27,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
require_once realpath(dirname(__FILE__) . '/../lib/util.php');
require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
require_once realpath(dirname(__FILE__) . '/util.php');
use OCA\Encryption;
@ -34,8 +35,9 @@ use OCA\Encryption;
* Class Test_Encryption_Webdav
* @brief this class provide basic webdav tests for PUT,GET and DELETE
*/
class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
{
class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_WEBDAV_USER1 = "test-webdav-user1";
public $userId;
public $pass;
@ -46,15 +48,33 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
public $dataShort;
public $stateFilesTrashbin;
function setUp()
{
public static function setUpBeforeClass() {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
// clear and register hooks
\OC_FileProxy::clearProxies();
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
}
function setUp() {
// reset backend
\OC_User::useBackend('database');
// set user id
\OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
\OC_User::setUserId(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
$this->userId = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
$this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
// init filesystem view
$this->view = new \OC_FilesystemView('/');
@ -62,42 +82,29 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
// init short data
$this->dataShort = 'hats';
// init filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
// register encryption file proxy
\OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
// init filesystem for user
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
// login user
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
}
function tearDown()
{
function tearDown() {
// reset app files_trashbin
if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
}
else {
OC_App::disable('files_trashbin');
}
}
// clear all proxies
\OC_FileProxy::clearProxies();
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
}
/**
@ -125,10 +132,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
// check if key-file was created
$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
$this->assertTrue($this->view->file_exists(
'/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
// check if shareKey-file was created
$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
$this->assertTrue($this->view->file_exists(
'/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@ -194,10 +203,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
// check if key-file was removed
$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
$this->assertFalse($this->view->file_exists(
'/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
// check if shareKey-file was removed
$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
$this->assertFalse($this->view->file_exists(
'/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
}
/**
@ -229,7 +240,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
// And off we go!
if($body) {
if ($body) {
$server->httpRequest->setBody($body);
}

6
apps/files_sharing/public.php
View File

@ -84,7 +84,7 @@ if (isset($path)) {
exit();
} else {
// Save item id in session for future requests
$_SESSION['public_link_authenticated'] = $linkItem['id'];
\OC::$session->set('public_link_authenticated', $linkItem['id']);
}
} else {
OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
@ -97,8 +97,8 @@ if (isset($path)) {
} else {
// Check if item id is set in session
if (!isset($_SESSION['public_link_authenticated'])
|| $_SESSION['public_link_authenticated'] !== $linkItem['id']
if ( ! \OC::$session->exists('public_link_authenticated')
|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']
) {
// Prompt for password
$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');

2
apps/files_trashbin/js/trash.js
View File

@ -93,6 +93,7 @@ $(document).ready(function() {
});
$('.undelete').click('click',function(event) {
event.preventDefault();
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
@ -117,6 +118,7 @@ $(document).ready(function() {
});
$('.delete').click('click',function(event) {
event.preventDefault();
console.log("delete selected");
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');

4
apps/user_ldap/l10n/hu_HU.php
View File

@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
"Failed to clear the mappings." => "Nem sikerült törölni a hozzárendeléseket.",
"Failed to delete the server configuration" => "Nem sikerült törölni a kiszolgáló konfigurációját",
"The configuration is valid and the connection could be established!" => "A konfiguráció érvényes, és a kapcsolat létrehozható!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
@ -7,6 +8,8 @@
"Take over settings from recent server configuration?" => "Vegyük át a beállításokat az előző konfigurációból?",
"Keep settings?" => "Tartsuk meg a beállításokat?",
"Cannot add server configuration" => "Az új kiszolgáló konfigurációja nem hozható létre",
"mappings cleared" => "Töröltük a hozzárendeléseket",
"Success" => "Sikeres végrehajtás",
"Error" => "Hiba",
"Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
@ -71,6 +74,7 @@
"Email Field" => "Email mező",
"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",
"Test Configuration" => "A beállítások tesztelése",
"Help" => "Súgó"
);

BIN
core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 157 B

BIN
core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 157 B

BIN
core/css/images/ui-bg_flat_100_ffffff_40x100.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 86 B

BIN
core/css/images/ui-bg_flat_10_000000_40x100.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 86 B

BIN
core/css/images/ui-bg_flat_35_1d2d44_40x100.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 86 B

BIN
core/css/images/ui-icons_1d2d44_256x240.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
core/css/images/ui-icons_222222_256x240.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
core/css/images/ui-icons_ffd27a_256x240.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
core/css/images/ui-icons_ffffff_256x240.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

115
core/img/actions/add.svg
View File

@ -1,109 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="22"
height="22"
id="svg2406"
inkscape:version="0.48.2 r9819"
sodipodi:docname="add.svg">
<metadata
id="metadata3125">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
id="namedview3123"
showgrid="false"
inkscape:zoom="10.727273"
inkscape:cx="11.843286"
inkscape:cy="14.728814"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2406" />
<defs
id="defs2408">
<linearGradient
id="linearGradient2264">
<stop
id="stop2266"
style="stop-color:#d7e866;stop-opacity:1"
offset="0" />
<stop
id="stop2268"
style="stop-color:#8cab2a;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
x1="24.103895"
y1="15.180944"
x2="24.103895"
y2="34.224861"
id="linearGradient2401"
xlink:href="#linearGradient2264"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
<linearGradient
id="linearGradient4222">
<stop
id="stop4224"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop4226"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<linearGradient
x1="24.138529"
y1="6.5316639"
x2="24.138529"
y2="45.690399"
id="linearGradient2398"
xlink:href="#linearGradient4222"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4222"
id="linearGradient3128"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
x1="24.138529"
y1="6.5316639"
x2="24.138529"
y2="45.690399" />
</defs>
<path
inkscape:connector-curvature="0"
style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
id="path2272"
d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs>
<linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139">
<stop stop-color="#fff" offset="0"/>
<stop stop-color="#fff" stop-opacity="0" offset="1"/>
</linearGradient>
</defs>
<path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 754 B

BIN
core/img/actions/caret-dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 229 B

103
core/img/actions/caret-dark.svg
View File

@ -1,102 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="10"
height="10"
id="svg2403"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="caret.svg"
inkscape:export-filename="caret.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="773"
id="namedview3047"
showgrid="false"
inkscape:zoom="25.279067"
inkscape:cx="-3.063006"
inkscape:cy="6.0978375"
inkscape:window-x="0"
inkscape:window-y="-1"
inkscape:window-maximized="1"
inkscape:current-layer="svg2403"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata15">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2405">
<linearGradient
x1="11.644068"
y1="2.4988678"
x2="11.644068"
y2="15.00281"
id="linearGradient2392"
xlink:href="#linearGradient3678"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.0000001,1.1920928e-8)" />
<linearGradient
x1="8.4964771"
y1="-0.061573759"
x2="8.4964771"
y2="8.083209"
id="linearGradient2395"
xlink:href="#linearGradient3678"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
<linearGradient
id="linearGradient3678">
<stop
id="stop3680"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop3682"
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1" />
</linearGradient>
</defs>
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path3768"
d="M 1,2 5,10 9,2.011 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="M 1,1 5,9 9,1.011 z"
id="path3716"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/>
<path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 565 B

BIN
core/img/actions/caret.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 269 B

119
core/img/actions/caret.svg
View File

@ -1,112 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="10"
height="10"
id="svg2403"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="logout.svg"
inkscape:export-filename="caret.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="800"
id="namedview3047"
showgrid="false"
inkscape:zoom="25.279067"
inkscape:cx="3.6223673"
inkscape:cy="6.0978375"
inkscape:window-x="0"
inkscape:window-y="-31"
inkscape:window-maximized="1"
inkscape:current-layer="svg2403"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata15">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2405">
<linearGradient
x1="11.644068"
y1="2.4988678"
x2="11.644068"
y2="15.00281"
id="linearGradient2392"
xlink:href="#linearGradient3678"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.0000001,1.1920928e-8)" />
<linearGradient
x1="8.4964771"
y1="-0.061573759"
x2="8.4964771"
y2="8.083209"
id="linearGradient2395"
xlink:href="#linearGradient3678"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
<linearGradient
id="linearGradient3678">
<stop
id="stop3680"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop3682"
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3678"
id="linearGradient2993"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0526316,0,0,0.9843625,-3.4210526,1.060243)"
x1="8.4964771"
y1="-0.061573759"
x2="8.4964771"
y2="8.083209" />
</defs>
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path3023"
d="M 1,2 5,10 9,2.011 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient2993);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="M 1,1 5,9 9,1.011 z"
id="path3716"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs>
<linearGradient id="a" y2="8.0832" gradientUnits="userSpaceOnUse" x2="8.4965" gradientTransform="matrix(1.0526 0 0 .98436 -3.4211 1.0602)" y1="-.061574" x1="8.4965">
<stop stop-color="#fff" offset="0"/>
<stop stop-color="#e6e6e6" offset="1"/>
</linearGradient>
</defs>
<path opacity=".5" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z"/>
<path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="url(#a)"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 857 B

BIN
core/img/actions/clock.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 466 B

After

Width:  |  Height:  |  Size: 367 B

41
core/img/actions/clock.svg Executable file → Normal file
View File

@ -1,20 +1,21 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419 C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505 s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456 c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146 l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
<circle cx="49.999" cy="12.956" r="1.617"/>
<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823 C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414 s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
<circle cx="34.343" cy="20.301" r="1.47"/>
<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538 c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
<circle cx="15.536" cy="47.42" r="1.618"/>
<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822 C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414 s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008 c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005 c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618 C49.104,83.498,48.385,82.775,48.382,81.884z"/>
<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823 c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414 c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537 c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537 c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618 c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287 c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006 c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414 c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008 c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008 c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 100 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
<path d="m50 89.836c-23.389 0-42.418-19.027-42.418-42.417s19.029-42.419 42.418-42.419 42.418 19.029 42.418 42.419-19.029 42.417-42.418 42.417zm0-79.924c-20.681 0-37.506 16.826-37.506 37.508 0 20.681 16.826 37.505 37.506 37.505s37.507-16.824 37.507-37.505c0-20.683-16.826-37.508-37.507-37.508z"/>
<path d="m50.001 49.875c-0.141 0-0.283-0.011-0.427-0.037-1.173-0.206-2.03-1.226-2.03-2.419v-17.977c0-1.355 1.1-2.456 2.456-2.456 1.355 0 2.456 1.1 2.456 2.456v4.003l5.431-14.974c0.464-1.274 1.872-1.937 3.146-1.471 1.274 0.462 1.934 1.871 1.471 3.146l-10.195 28.11c-0.357 0.985-1.29 1.619-2.308 1.619z"/>
<circle cy="12.956" cx="49.999" r="1.617"/>
<path d="m50 14.778c-1.006 0-1.823-0.817-1.823-1.823 0-1.005 0.817-1.823 1.823-1.823 1.004 0 1.821 0.817 1.821 1.823s-0.817 1.823-1.821 1.823zm0-3.236c-0.779 0-1.414 0.635-1.414 1.413 0 0.779 0.635 1.414 1.414 1.414s1.412-0.635 1.412-1.414c0-0.778-0.633-1.413-1.412-1.413z"/>
<circle cy="20.301" cx="34.343" r="1.47"/>
<path d="m23.617 30.488c0.703 0.409 0.945 1.305 0.537 2.008-0.405 0.704-1.305 0.947-2.007 0.538-0.703-0.403-0.945-1.305-0.539-2.008 0.408-0.701 1.305-0.941 2.009-0.538z"/>
<circle cy="47.42" cx="15.536" r="1.618"/>
<path d="m15.536 49.242c-1.006 0-1.823-0.817-1.823-1.823 0.001-1 0.819-1.819 1.823-1.822 1.006 0 1.823 0.817 1.823 1.822 0 1.006-0.817 1.823-1.823 1.823zm0-3.236c-0.777 0.003-1.412 0.636-1.414 1.413 0 0.779 0.635 1.414 1.414 1.414s1.413-0.635 1.413-1.414c0-0.778-0.634-1.413-1.413-1.413z"/>
<path d="m22.147 61.803c0.705-0.406 1.602-0.167 2.007 0.537 0.408 0.703 0.166 1.602-0.537 2.008-0.704 0.406-1.604 0.163-2.008-0.537-0.407-0.707-0.162-1.602 0.538-2.008z"/>
<path d="m33.07 73.803c0.408-0.706 1.305-0.946 2.008-0.537 0.704 0.403 0.945 1.302 0.538 2.005-0.405 0.704-1.307 0.947-2.007 0.537-0.705-0.406-0.942-1.301-0.539-2.005z"/>
<path d="m48.382 81.884c0-0.896 0.725-1.618 1.618-1.618 0.892-0.003 1.618 0.723 1.618 1.618 0 0.892-0.728 1.618-1.618 1.618-0.896-0.004-1.615-0.727-1.618-1.618z"/>
<path d="m50 83.706c-1.002-0.003-1.819-0.82-1.823-1.822 0-1.006 0.817-1.823 1.823-1.823 1.007 0 1.822 0.817 1.822 1.823 0 1.005-0.816 1.822-1.822 1.822zm0.006-3.236c-0.785 0-1.42 0.635-1.42 1.414 0.003 0.775 0.637 1.41 1.414 1.413 0.78 0 1.413-0.635 1.413-1.413 0-0.78-0.631-1.414-1.407-1.414z"/>
<path d="m64.385 75.271c-0.408-0.703-0.167-1.602 0.537-2.005 0.702-0.409 1.601-0.169 2.008 0.537 0.406 0.7 0.163 1.603-0.539 2.005-0.705 0.406-1.6 0.163-2.006-0.537z"/>
<path d="m76.384 64.348c-0.704-0.406-0.945-1.305-0.537-2.008 0.402-0.704 1.301-0.943 2.006-0.537 0.704 0.402 0.945 1.308 0.539 2.008-0.412 0.7-1.305 0.94-2.008 0.537z"/>
<path d="m84.464 49.038c-0.896-0.003-1.618-0.726-1.618-1.618-0.001-0.892 0.723-1.618 1.618-1.618 0.893-0.003 1.618 0.726 1.618 1.618-0.005 0.895-0.726 1.614-1.618 1.618z"/>
<path d="m84.464 49.242c-1.006-0.003-1.822-0.822-1.822-1.823-0.002-0.486 0.188-0.943 0.532-1.287 0.344-0.345 0.803-0.535 1.29-0.535 1.007 0 1.822 0.817 1.822 1.822-0.004 1.003-0.823 1.82-1.822 1.823zm0.007-3.236c-0.386 0-0.74 0.147-1.008 0.416-0.267 0.267-0.412 0.621-0.412 0.998 0 0.777 0.635 1.41 1.413 1.414 0.775-0.003 1.408-0.638 1.413-1.415 0-0.778-0.631-1.413-1.406-1.413z"/>
<path d="m77.853 33.034c-0.705 0.409-1.604 0.166-2.006-0.538-0.408-0.7-0.168-1.599 0.537-2.008 0.701-0.406 1.604-0.163 2.008 0.537 0.403 0.707 0.161 1.602-0.539 2.009z"/>
<path d="m66.93 21.036c-0.407 0.704-1.308 0.943-2.008 0.537-0.704-0.403-0.945-1.305-0.537-2.008 0.404-0.703 1.306-0.943 2.006-0.537 0.704 0.409 0.942 1.305 0.539 2.008z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
core/img/actions/close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 254 B

Some files were not shown because too many files have changed in this diff Show More