Merge branch 'master' into improve_app-management
Conflicts: settings/js/apps.js
This commit is contained in:
kondou
commit
0ce35af02a
926 changed files with 14606 additions and 14291 deletions
2
AUTHORS
2
AUTHORS
|
|
@ -28,4 +28,4 @@ With help from many libraries and frameworks including:
|
|||
…
|
||||
|
||||
"Lock” symbol from thenounproject.com collection
|
||||
"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
|
||||
"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ Licensing of components:
|
|||
All unmodified files from these and other sources retain their original copyright
|
||||
and license notices: see the relevant individual files.
|
||||
|
||||
Attribution information for ownCloud is contained in the AUTHORS file.
|
||||
Attribution information for ownCloud is contained in the AUTHORS file.
|
||||
|
|
|
|||
|
|
@ -39,4 +39,4 @@ if (!is_array($files_list)) {
|
|||
$files_list = array($files);
|
||||
}
|
||||
|
||||
OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
|
||||
OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ OCP\JSON::checkLoggedIn();
|
|||
|
||||
// Load the files
|
||||
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
|
||||
$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
|
||||
$doBreadcrumb = isset($_GET['breadcrumb']);
|
||||
$data = array();
|
||||
|
||||
// Make breadcrumb
|
||||
|
|
|
|||
|
|
@ -38,4 +38,4 @@ if($result['success'] === true){
|
|||
OCP\JSON::success(array('data' => $result['data']));
|
||||
} else {
|
||||
OCP\JSON::error(array('data' => $result['data']));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,4 +24,6 @@ OC_Search::registerProvider('OC_Search_Provider_File');
|
|||
|
||||
$templateManager = OC_Helper::getFileTemplateManager();
|
||||
$templateManager->registerTemplate('text/html', 'core/templates/filetemplates/template.html');
|
||||
|
||||
$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
|
||||
$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
|
||||
$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ $this->create('download', 'download{file}')
|
|||
->actionInclude('files/download.php');
|
||||
|
||||
// Register with the capabilities API
|
||||
OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);
|
||||
OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);
|
||||
|
|
|
|||
|
|
@ -46,12 +46,22 @@
|
|||
z-index:20; position:relative; cursor:pointer; overflow:hidden;
|
||||
}
|
||||
|
||||
#uploadprogresswrapper { float: right; position: relative; }
|
||||
#uploadprogresswrapper #uploadprogressbar {
|
||||
position:relative; float: right;
|
||||
margin-left: 12px; width:10em; height:1.5em; top:.4em;
|
||||
#uploadprogresswrapper {
|
||||
position: relative;
|
||||
display: inline;
|
||||
}
|
||||
#uploadprogressbar {
|
||||
position:relative;
|
||||
float: left;
|
||||
margin-left: 12px;
|
||||
width: 130px;
|
||||
height: 26px;
|
||||
display:inline-block;
|
||||
}
|
||||
#uploadprogressbar + stop {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
|
||||
/* FILE TABLE */
|
||||
|
||||
|
|
|
|||
|
|
@ -150,5 +150,6 @@ if ($needUpgrade) {
|
|||
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
|
||||
$tmpl->assign('isPublic', false);
|
||||
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
|
||||
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
|
||||
$tmpl->printPage();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$(document).ready(function() {
|
||||
|
||||
file_upload_param = {
|
||||
var file_upload_param = {
|
||||
dropZone: $('#content'), // restrict dropZone to content div
|
||||
//singleFileUploads is on by default, so the data.files array will always have length 1
|
||||
add: function(e, data) {
|
||||
|
|
@ -142,7 +142,7 @@ $(document).ready(function() {
|
|||
$('#uploadprogressbar').progressbar('value',100);
|
||||
$('#uploadprogressbar').fadeOut();
|
||||
}
|
||||
}
|
||||
};
|
||||
var file_upload_handler = function() {
|
||||
$('#file_upload_start').fileupload(file_upload_param);
|
||||
};
|
||||
|
|
@ -163,13 +163,14 @@ $(document).ready(function() {
|
|||
|
||||
// warn user not to leave the page while upload is in progress
|
||||
$(window).bind('beforeunload', function(e) {
|
||||
if ($.assocArraySize(uploadingFiles) > 0)
|
||||
if ($.assocArraySize(uploadingFiles) > 0) {
|
||||
return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
|
||||
}
|
||||
});
|
||||
|
||||
//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
|
||||
if(navigator.userAgent.search(/konqueror/i)==-1){
|
||||
$('#file_upload_start').attr('multiple','multiple')
|
||||
$('#file_upload_start').attr('multiple','multiple');
|
||||
}
|
||||
|
||||
//if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
|
||||
|
|
@ -302,8 +303,7 @@ $(document).ready(function() {
|
|||
}
|
||||
localName = getUniqueName(localName);
|
||||
//IE < 10 does not fire the necessary events for the progress bar.
|
||||
if($('html.lte9').length > 0) {
|
||||
} else {
|
||||
if($('html.lte9').length === 0) {
|
||||
$('#uploadprogressbar').progressbar({value:0});
|
||||
$('#uploadprogressbar').fadeIn();
|
||||
}
|
||||
|
|
@ -311,8 +311,7 @@ $(document).ready(function() {
|
|||
var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
|
||||
eventSource.listen('progress',function(progress){
|
||||
//IE < 10 does not fire the necessary events for the progress bar.
|
||||
if($('html.lte9').length > 0) {
|
||||
} else {
|
||||
if($('html.lte9').length === 0) {
|
||||
$('#uploadprogressbar').progressbar('value',progress);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
|
|||
|
||||
|
||||
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
|
||||
var dir = $('#dir').val()
|
||||
var dir = $('#dir').val();
|
||||
if (dir !== '/') {
|
||||
dir = dir + '/';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,9 +81,23 @@ Files={
|
|||
if (usedSpacePercent > 90) {
|
||||
OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
|
||||
}
|
||||
},
|
||||
|
||||
displayEncryptionWarning: function() {
|
||||
|
||||
if (!OC.Notification.isHidden()) {
|
||||
return;
|
||||
}
|
||||
|
||||
var encryptedFiles = $('#encryptedFiles').val();
|
||||
if (encryptedFiles === '1') {
|
||||
OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
|
||||
return;
|
||||
}
|
||||
}
|
||||
};
|
||||
$(document).ready(function() {
|
||||
Files.displayEncryptionWarning();
|
||||
Files.bindKeyboardShortcuts(document, jQuery);
|
||||
$('#fileList tr').each(function(){
|
||||
//little hack to set unescape filenames in attribute
|
||||
|
|
|
|||
|
|
@ -131,7 +131,9 @@ var Files = Files || {};
|
|||
return;
|
||||
}
|
||||
var preventDefault = false;
|
||||
if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
|
||||
if ($.inArray(event.keyCode, keys) === -1) {
|
||||
keys.push(event.keyCode);
|
||||
}
|
||||
if (
|
||||
$.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) {
|
||||
preventDefault = true; //new file/folder prevent browser from responding
|
||||
|
|
@ -165,4 +167,4 @@ var Files = Files || {};
|
|||
removeA(keys, event.keyCode);
|
||||
});
|
||||
};
|
||||
})(Files);
|
||||
})(Files);
|
||||
|
|
|
|||
|
|
@ -32,20 +32,21 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "zrušit",
|
||||
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
|
||||
"undo" => "vrátit zpět",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
|
||||
"files uploading" => "soubory se odesílají",
|
||||
"'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
|
||||
"File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud",
|
||||
"Name" => "Název",
|
||||
"Size" => "Velikost",
|
||||
"Modified" => "Upraveno",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
|
||||
"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
|
||||
"%s could not be renamed" => "%s nemůže být přejmenován",
|
||||
"Upload" => "Odeslat",
|
||||
"File handling" => "Zacházení se soubory",
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ $TRANSLATIONS = array(
|
|||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
|
||||
"Name" => "Navn",
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ $TRANSLATIONS = array(
|
|||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten.",
|
||||
"Name" => "Name",
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ $TRANSLATIONS = array(
|
|||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
|
||||
"Name" => "Name",
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ $TRANSLATIONS = array(
|
|||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud",
|
||||
"Name" => "Nome",
|
||||
|
|
|
|||
|
|
@ -32,13 +32,14 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "キャンセル",
|
||||
"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
|
||||
"undo" => "元に戻す",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array(""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
|
||||
"files uploading" => "ファイルをアップロード中",
|
||||
"'.' is an invalid file name." => "'.' は無効なファイル名です。",
|
||||
"File name cannot be empty." => "ファイル名を空にすることはできません。",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。",
|
||||
"Name" => "名前",
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
$TRANSLATIONS = array(
|
||||
"Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
|
||||
"Could not move %s" => "Nevarēja pārvietot %s",
|
||||
"Unable to set upload directory." => "Nevar uzstādīt augšupielādes mapi.",
|
||||
"Invalid Token" => "Nepareiza pilnvara",
|
||||
"No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
|
||||
"There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
|
||||
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
|
||||
|
|
@ -18,6 +20,7 @@ $TRANSLATIONS = array(
|
|||
"Upload cancelled." => "Augšupielāde ir atcelta.",
|
||||
"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
|
||||
"URL cannot be empty." => "URL nevar būt tukšs.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud",
|
||||
"Error" => "Kļūda",
|
||||
"Share" => "Dalīties",
|
||||
"Delete permanently" => "Dzēst pavisam",
|
||||
|
|
@ -29,7 +32,8 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "atcelt",
|
||||
"replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
|
||||
"undo" => "atsaukt",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
|
||||
"files uploading" => "fails augšupielādējas",
|
||||
"'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
|
||||
"File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
|
||||
|
|
@ -40,8 +44,9 @@ $TRANSLATIONS = array(
|
|||
"Name" => "Nosaukums",
|
||||
"Size" => "Izmērs",
|
||||
"Modified" => "Mainīts",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
|
||||
"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
|
||||
"%s could not be renamed" => "%s nevar tikt pārsaukts",
|
||||
"Upload" => "Augšupielādēt",
|
||||
"File handling" => "Datņu pārvaldība",
|
||||
"Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
|
||||
|
|
@ -66,6 +71,8 @@ $TRANSLATIONS = array(
|
|||
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
|
||||
"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
|
||||
"Current scanning" => "Šobrīd tiek caurskatīts",
|
||||
"directory" => "direktorija",
|
||||
"directories" => "direktorijas",
|
||||
"file" => "fails",
|
||||
"files" => "faili",
|
||||
"Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ $TRANSLATIONS = array(
|
|||
"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
|
||||
"Could not move %s" => "Kunne ikke flytte %s",
|
||||
"Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
|
||||
"Invalid Token" => "Ugyldig nøkkel",
|
||||
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
|
||||
"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
|
||||
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
|
||||
|
|
@ -23,28 +24,29 @@ $TRANSLATIONS = array(
|
|||
"Error" => "Feil",
|
||||
"Share" => "Del",
|
||||
"Delete permanently" => "Slett permanent",
|
||||
"Rename" => "Omdøp",
|
||||
"Rename" => "Gi nytt navn",
|
||||
"Pending" => "Ventende",
|
||||
"{new_name} already exists" => "{new_name} finnes allerede",
|
||||
"replace" => "erstatt",
|
||||
"suggest name" => "foreslå navn",
|
||||
"cancel" => "avbryt",
|
||||
"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
|
||||
"replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
|
||||
"undo" => "angre",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
|
||||
"files uploading" => "filer lastes opp",
|
||||
"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
|
||||
"File name cannot be empty." => "Filnavn kan ikke være tomt.",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
|
||||
"Name" => "Navn",
|
||||
"Size" => "Størrelse",
|
||||
"Modified" => "Endret",
|
||||
"_%n folder_::_%n folders_" => array("",""),
|
||||
"_%n file_::_%n files_" => array("",""),
|
||||
"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
|
||||
"_%n file_::_%n files_" => array("%n fil","%n filer"),
|
||||
"%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
|
||||
"Upload" => "Last opp",
|
||||
"File handling" => "Filhåndtering",
|
||||
"Maximum upload size" => "Maksimum opplastingsstørrelse",
|
||||
|
|
@ -67,7 +69,7 @@ $TRANSLATIONS = array(
|
|||
"Delete" => "Slett",
|
||||
"Upload too large" => "Filen er for stor",
|
||||
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
|
||||
"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
|
||||
"Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
|
||||
"Current scanning" => "Pågående skanning",
|
||||
"directory" => "katalog",
|
||||
"directories" => "kataloger",
|
||||
|
|
|
|||
|
|
@ -32,20 +32,21 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "annuleren",
|
||||
"replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
|
||||
"undo" => "ongedaan maken",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
|
||||
"files uploading" => "bestanden aan het uploaden",
|
||||
"'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
|
||||
"File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
|
||||
"Name" => "Naam",
|
||||
"Size" => "Grootte",
|
||||
"Modified" => "Aangepast",
|
||||
"_%n folder_::_%n folders_" => array("",""),
|
||||
"_%n file_::_%n files_" => array("",""),
|
||||
"_%n folder_::_%n folders_" => array("","%n mappen"),
|
||||
"_%n file_::_%n files_" => array("","%n bestanden"),
|
||||
"%s could not be renamed" => "%s kon niet worden hernoemd",
|
||||
"Upload" => "Uploaden",
|
||||
"File handling" => "Bestand",
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "отмена",
|
||||
"replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
|
||||
"undo" => "отмена",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
|
||||
"files uploading" => "файлы загружаются",
|
||||
"'.' is an invalid file name." => "'.' - неправильное имя файла.",
|
||||
"File name cannot be empty." => "Имя файла не может быть пустым.",
|
||||
|
|
@ -44,8 +44,8 @@ $TRANSLATIONS = array(
|
|||
"Name" => "Имя",
|
||||
"Size" => "Размер",
|
||||
"Modified" => "Изменён",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
|
||||
"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
|
||||
"%s could not be renamed" => "%s не может быть переименован",
|
||||
"Upload" => "Загрузка",
|
||||
"File handling" => "Управление файлами",
|
||||
|
|
|
|||
|
|
@ -32,20 +32,21 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "zrušiť",
|
||||
"replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
|
||||
"undo" => "vrátiť",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
|
||||
"files uploading" => "nahrávanie súborov",
|
||||
"'.' is an invalid file name." => "'.' je neplatné meno súboru.",
|
||||
"File name cannot be empty." => "Meno súboru nemôže byť prázdne",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud",
|
||||
"Name" => "Názov",
|
||||
"Size" => "Veľkosť",
|
||||
"Modified" => "Upravené",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
|
||||
"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
|
||||
"%s could not be renamed" => "%s nemohol byť premenovaný",
|
||||
"Upload" => "Odoslať",
|
||||
"File handling" => "Nastavenie správania sa k súborom",
|
||||
|
|
|
|||
|
|
@ -32,20 +32,21 @@ $TRANSLATIONS = array(
|
|||
"cancel" => "avbryt",
|
||||
"replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
|
||||
"undo" => "ångra",
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("",""),
|
||||
"_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
|
||||
"files uploading" => "filer laddas upp",
|
||||
"'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
|
||||
"File name cannot be empty." => "Filnamn kan inte vara tomt.",
|
||||
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
|
||||
"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
|
||||
"Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
|
||||
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
|
||||
"Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
|
||||
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud",
|
||||
"Name" => "Namn",
|
||||
"Size" => "Storlek",
|
||||
"Modified" => "Ändrad",
|
||||
"_%n folder_::_%n folders_" => array("",""),
|
||||
"_%n file_::_%n files_" => array("",""),
|
||||
"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
|
||||
"_%n file_::_%n files_" => array("%n fil","%n filer"),
|
||||
"%s could not be renamed" => "%s kunde inte namnändras",
|
||||
"Upload" => "Ladda upp",
|
||||
"File handling" => "Filhantering",
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ $TRANSLATIONS = array(
|
|||
"Name" => "名称",
|
||||
"Size" => "大小",
|
||||
"Modified" => "修改日期",
|
||||
"_%n folder_::_%n folders_" => array(""),
|
||||
"_%n file_::_%n files_" => array(""),
|
||||
"_%n folder_::_%n folders_" => array("%n 文件夹"),
|
||||
"_%n file_::_%n files_" => array("%n个文件"),
|
||||
"%s could not be renamed" => "%s 不能被重命名",
|
||||
"Upload" => "上传",
|
||||
"File handling" => "文件处理",
|
||||
|
|
|
|||
|
|
@ -76,4 +76,4 @@ class App {
|
|||
return $result;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ class Capabilities {
|
|||
));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,3 +119,4 @@
|
|||
<!-- config hints for javascript -->
|
||||
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
|
||||
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
|
||||
<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
|
||||
|
|
|
|||
|
|
@ -114,4 +114,4 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
$this->assertEquals($expected, $result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,4 +49,4 @@ if ($return) {
|
|||
\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
|
||||
} else {
|
||||
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,4 +51,4 @@ if ($return) {
|
|||
\OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.'))));
|
||||
} else {
|
||||
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.'))));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,4 +38,4 @@ if (
|
|||
}
|
||||
|
||||
// Return success or failure
|
||||
($return) ? \OCP\JSON::success() : \OCP\JSON::error();
|
||||
($return) ? \OCP\JSON::success() : \OCP\JSON::error();
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
*/
|
||||
|
||||
// Register with the capabilities API
|
||||
OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH);
|
||||
OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH);
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@
|
|||
, #recoveryEnabledError
|
||||
, #recoveryEnabledSuccess {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,18 +59,7 @@ class Hooks {
|
|||
return false;
|
||||
}
|
||||
|
||||
$encryptedKey = Keymanager::getPrivateKey($view, $params['uid']);
|
||||
|
||||
$privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);
|
||||
|
||||
if ($privateKey === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'Private key for user "' . $params['uid']
|
||||
. '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access', \OCP\Util::ERROR);
|
||||
}
|
||||
|
||||
$session = new \OCA\Encryption\Session($view);
|
||||
|
||||
$session->setPrivateKey($privateKey);
|
||||
$session = $util->initEncryption($params);
|
||||
|
||||
// Check if first-run file migration has already been performed
|
||||
$ready = false;
|
||||
|
|
|
|||
|
|
@ -99,4 +99,4 @@ $(document).ready(function(){
|
|||
);
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -95,4 +95,4 @@ $(document).ready(function(){
|
|||
updatePrivateKeyPasswd();
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ $TRANSLATIONS = array(
|
|||
"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
|
||||
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
|
||||
"Missing requirements." => "Требования отсутствуют.",
|
||||
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
|
||||
"Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
|
||||
"Saving..." => "Сохранение...",
|
||||
"Your private key is not valid! Maybe the your password was changed from outside." => "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе.",
|
||||
"You can unlock your private key in your " => "Вы можете разблокировать закрытый ключ в своём ",
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ class Capabilities {
|
|||
));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,12 +199,39 @@ class Helper {
|
|||
public static function stripUserFilesPath($path) {
|
||||
$trimmed = ltrim($path, '/');
|
||||
$split = explode('/', $trimmed);
|
||||
|
||||
// it is not a file relative to data/user/files
|
||||
if (count($split) < 3 || $split[1] !== 'files') {
|
||||
return false;
|
||||
}
|
||||
|
||||
$sliced = array_slice($split, 2);
|
||||
$relPath = implode('/', $sliced);
|
||||
|
||||
return $relPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief get path to the correspondig file in data/user/files
|
||||
* @param string $path path to a version or a file in the trash
|
||||
* @return string path to correspondig file relative to data/user/files
|
||||
*/
|
||||
public static function getPathToRealFile($path) {
|
||||
$trimmed = ltrim($path, '/');
|
||||
$split = explode('/', $trimmed);
|
||||
|
||||
if (count($split) < 3 || $split[1] !== "files_versions") {
|
||||
return false;
|
||||
}
|
||||
|
||||
$sliced = array_slice($split, 2);
|
||||
$realPath = implode('/', $sliced);
|
||||
//remove the last .v
|
||||
$realPath = substr($realPath, 0, strrpos($realPath, '.v'));
|
||||
|
||||
return $realPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief redirect to a error page
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -593,4 +593,4 @@ class Keymanager {
|
|||
return $targetPath;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ class Proxy extends \OC_FileProxy {
|
|||
return true;
|
||||
}
|
||||
|
||||
$handle = fopen('crypt://' . $relativePath . '.etmp', 'w');
|
||||
$handle = fopen('crypt://' . $path . '.etmp', 'w');
|
||||
if (is_resource($handle)) {
|
||||
|
||||
// write data to stream
|
||||
|
|
@ -154,9 +154,6 @@ class Proxy extends \OC_FileProxy {
|
|||
$plainData = null;
|
||||
$view = new \OC_FilesystemView('/');
|
||||
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
// init session
|
||||
$session = new \OCA\Encryption\Session($view);
|
||||
|
||||
|
|
@ -166,7 +163,7 @@ class Proxy extends \OC_FileProxy {
|
|||
&& Crypt::isCatfileContent($data)
|
||||
) {
|
||||
|
||||
$handle = fopen('crypt://' . $relativePath, 'r');
|
||||
$handle = fopen('crypt://' . $path, 'r');
|
||||
|
||||
if (is_resource($handle)) {
|
||||
while (($plainDataChunk = fgets($handle, 8192)) !== false) {
|
||||
|
|
@ -296,14 +293,14 @@ class Proxy extends \OC_FileProxy {
|
|||
|
||||
// Open the file using the crypto stream wrapper
|
||||
// protocol and let it do the decryption work instead
|
||||
$result = fopen('crypt://' . $relativePath, $meta['mode']);
|
||||
$result = fopen('crypt://' . $path, $meta['mode']);
|
||||
|
||||
} elseif (
|
||||
self::shouldEncrypt($path)
|
||||
and $meta ['mode'] !== 'r'
|
||||
and $meta['mode'] !== 'rb'
|
||||
) {
|
||||
$result = fopen('crypt://' . $relativePath, $meta['mode']);
|
||||
$result = fopen('crypt://' . $path, $meta['mode']);
|
||||
}
|
||||
|
||||
// Re-enable the proxy
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ class Stream {
|
|||
private $unencryptedSize;
|
||||
private $publicKey;
|
||||
private $encKeyfile;
|
||||
private $newFile; // helper var, we only need to write the keyfile for new files
|
||||
/**
|
||||
* @var \OC\Files\View
|
||||
*/
|
||||
|
|
@ -73,13 +74,16 @@ class Stream {
|
|||
private $privateKey;
|
||||
|
||||
/**
|
||||
* @param $path
|
||||
* @param $path raw path relative to data/
|
||||
* @param $mode
|
||||
* @param $options
|
||||
* @param $opened_path
|
||||
* @return bool
|
||||
*/
|
||||
public function stream_open($path, $mode, $options, &$opened_path) {
|
||||
|
||||
// assume that the file already exist before we decide it finally in getKey()
|
||||
$this->newFile = false;
|
||||
|
||||
if (!isset($this->rootView)) {
|
||||
$this->rootView = new \OC_FilesystemView('/');
|
||||
|
|
@ -93,12 +97,21 @@ class Stream {
|
|||
|
||||
$this->userId = $util->getUserId();
|
||||
|
||||
// Strip identifier text from path, this gives us the path relative to data/<user>/files
|
||||
$this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
|
||||
|
||||
// rawPath is relative to the data directory
|
||||
$this->rawPath = $util->getUserFilesDir() . $this->relPath;
|
||||
$this->rawPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
|
||||
|
||||
// Strip identifier text from path, this gives us the path relative to data/<user>/files
|
||||
$this->relPath = Helper::stripUserFilesPath($this->rawPath);
|
||||
// if raw path doesn't point to a real file, check if it is a version or a file in the trash bin
|
||||
if ($this->relPath === false) {
|
||||
$this->relPath = Helper::getPathToRealFile($this->rawPath);
|
||||
}
|
||||
|
||||
if($this->relPath === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'failed to open file "' . $this->rawPath . '" expecting a path to user/files or to user/files_versions', \OCP\Util::ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Disable fileproxies so we can get the file size and open the source file without recursive encryption
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
|
@ -258,6 +271,8 @@ class Stream {
|
|||
|
||||
} else {
|
||||
|
||||
$this->newFile = true;
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
|
@ -436,9 +451,7 @@ class Stream {
|
|||
fwrite($this->handle, $encrypted);
|
||||
|
||||
$this->writeCache = '';
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -451,56 +464,63 @@ class Stream {
|
|||
// if there is no valid private key return false
|
||||
if ($this->privateKey === false) {
|
||||
|
||||
// cleanup
|
||||
if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
|
||||
// cleanup
|
||||
if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
|
||||
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
if ($this->rootView->file_exists($this->rawPath) && $this->size === 0) {
|
||||
$this->rootView->unlink($this->rawPath);
|
||||
}
|
||||
|
||||
// Re-enable proxy - our work is done
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
if ($this->rootView->file_exists($this->rawPath) && $this->size === 0) {
|
||||
$this->rootView->unlink($this->rawPath);
|
||||
}
|
||||
|
||||
// Re-enable proxy - our work is done
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
}
|
||||
|
||||
// if private key is not valid redirect user to a error page
|
||||
\OCA\Encryption\Helper::redirectToErrorPage();
|
||||
}
|
||||
|
||||
if (
|
||||
$this->meta['mode'] !== 'r'
|
||||
and $this->meta['mode'] !== 'rb'
|
||||
and $this->size > 0
|
||||
$this->meta['mode'] !== 'r' &&
|
||||
$this->meta['mode'] !== 'rb' &&
|
||||
$this->size > 0
|
||||
) {
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
// only write keyfiles if it was a new file
|
||||
if ($this->newFile === true) {
|
||||
|
||||
// Fetch user's public key
|
||||
$this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
$proxyStatus = \OC_FileProxy::$enabled;
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
// Check if OC sharing api is enabled
|
||||
$sharingEnabled = \OCP\Share::isEnabled();
|
||||
// Fetch user's public key
|
||||
$this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
|
||||
|
||||
$util = new Util($this->rootView, $this->userId);
|
||||
// Check if OC sharing api is enabled
|
||||
$sharingEnabled = \OCP\Share::isEnabled();
|
||||
|
||||
// Get all users sharing the file includes current user
|
||||
$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
|
||||
$util = new Util($this->rootView, $this->userId);
|
||||
|
||||
// Fetch public keys for all sharing users
|
||||
$publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
|
||||
// Get all users sharing the file includes current user
|
||||
$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
|
||||
|
||||
// Encrypt enc key for all sharing users
|
||||
$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
|
||||
// Fetch public keys for all sharing users
|
||||
$publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
|
||||
|
||||
// Save the new encrypted file key
|
||||
Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
|
||||
// Encrypt enc key for all sharing users
|
||||
$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
|
||||
|
||||
// Save the sharekeys
|
||||
Keymanager::setShareKeys($this->rootView, $this->relPath, $this->encKeyfiles['keys']);
|
||||
// Save the new encrypted file key
|
||||
Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
|
||||
|
||||
// Save the sharekeys
|
||||
Keymanager::setShareKeys($this->rootView, $this->relPath, $this->encKeyfiles['keys']);
|
||||
|
||||
// Re-enable proxy - our work is done
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
}
|
||||
|
||||
// get file info
|
||||
$fileInfo = $this->rootView->getFileInfo($this->rawPath);
|
||||
|
|
@ -508,9 +528,6 @@ class Stream {
|
|||
$fileInfo = array();
|
||||
}
|
||||
|
||||
// Re-enable proxy - our work is done
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
||||
// set encryption data
|
||||
$fileInfo['encrypted'] = true;
|
||||
$fileInfo['size'] = $this->size;
|
||||
|
|
@ -521,7 +538,6 @@ class Stream {
|
|||
}
|
||||
|
||||
return fclose($this->handle);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -340,7 +340,7 @@ class Util {
|
|||
$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
|
||||
$relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
|
||||
|
||||
// If the path is a directory, search
|
||||
// If the path is a directory, search
|
||||
// its contents
|
||||
if ($this->view->is_dir($filePath)) {
|
||||
|
||||
|
|
@ -356,8 +356,8 @@ class Util {
|
|||
|
||||
$isEncryptedPath = $this->isEncryptedPath($filePath);
|
||||
// If the file is encrypted
|
||||
// NOTE: If the userId is
|
||||
// empty or not set, file will
|
||||
// NOTE: If the userId is
|
||||
// empty or not set, file will
|
||||
// detected as plain
|
||||
// NOTE: This is inefficient;
|
||||
// scanning every file like this
|
||||
|
|
@ -502,9 +502,6 @@ class Util {
|
|||
// split the path parts
|
||||
$pathParts = explode('/', $path);
|
||||
|
||||
// get relative path
|
||||
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
|
||||
|
||||
if (isset($pathParts[2]) && $pathParts[2] === 'files' && $this->view->file_exists($path)
|
||||
&& $this->isEncryptedPath($path)
|
||||
) {
|
||||
|
|
@ -517,7 +514,7 @@ class Util {
|
|||
$lastChunkNr = floor($size / 8192);
|
||||
|
||||
// open stream
|
||||
$stream = fopen('crypt://' . $relativePath, "r");
|
||||
$stream = fopen('crypt://' . $path, "r");
|
||||
|
||||
if (is_resource($stream)) {
|
||||
// calculate last chunk position
|
||||
|
|
@ -599,6 +596,205 @@ class Util {
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief encrypt versions from given file
|
||||
* @param array $filelist list of encrypted files, relative to data/user/files
|
||||
* @return boolean
|
||||
*/
|
||||
private function encryptVersions($filelist) {
|
||||
|
||||
$successful = true;
|
||||
|
||||
if (\OCP\App::isEnabled('files_versions')) {
|
||||
|
||||
foreach ($filelist as $filename) {
|
||||
|
||||
$versions = \OCA\Files_Versions\Storage::getVersions($this->userId, $filename);
|
||||
foreach ($versions as $version) {
|
||||
|
||||
$path = '/' . $this->userId . '/files_versions/' . $version['path'] . '.v' . $version['version'];
|
||||
|
||||
$encHandle = fopen('crypt://' . $path . '.part', 'wb');
|
||||
|
||||
if ($encHandle === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
$plainHandle = $this->view->fopen($path, 'rb');
|
||||
if ($plainHandle === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '.part", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
stream_copy_to_stream($plainHandle, $encHandle);
|
||||
|
||||
fclose($encHandle);
|
||||
fclose($plainHandle);
|
||||
|
||||
$this->view->rename($path . '.part', $path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $successful;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief decrypt versions from given file
|
||||
* @param string $filelist list of decrypted files, relative to data/user/files
|
||||
* @return boolean
|
||||
*/
|
||||
private function decryptVersions($filelist) {
|
||||
|
||||
$successful = true;
|
||||
|
||||
if (\OCP\App::isEnabled('files_versions')) {
|
||||
|
||||
foreach ($filelist as $filename) {
|
||||
|
||||
$versions = \OCA\Files_Versions\Storage::getVersions($this->userId, $filename);
|
||||
foreach ($versions as $version) {
|
||||
|
||||
$path = '/' . $this->userId . '/files_versions/' . $version['path'] . '.v' . $version['version'];
|
||||
|
||||
$encHandle = fopen('crypt://' . $path, 'rb');
|
||||
|
||||
if ($encHandle === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
$plainHandle = $this->view->fopen($path . '.part', 'wb');
|
||||
if ($plainHandle === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '.part", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
stream_copy_to_stream($encHandle, $plainHandle);
|
||||
|
||||
fclose($encHandle);
|
||||
fclose($plainHandle);
|
||||
|
||||
$this->view->rename($path . '.part', $path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $successful;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Decrypt all files
|
||||
* @return bool
|
||||
*/
|
||||
public function decryptAll() {
|
||||
|
||||
$found = $this->findEncFiles($this->userId . '/files');
|
||||
|
||||
$successful = true;
|
||||
|
||||
if ($found) {
|
||||
|
||||
$versionStatus = \OCP\App::isEnabled('files_versions');
|
||||
\OC_App::disable('files_versions');
|
||||
|
||||
$decryptedFiles = array();
|
||||
|
||||
// Encrypt unencrypted files
|
||||
foreach ($found['encrypted'] as $encryptedFile) {
|
||||
|
||||
//get file info
|
||||
$fileInfo = \OC\Files\Filesystem::getFileInfo($encryptedFile['path']);
|
||||
|
||||
//relative to data/<user>/file
|
||||
$relPath = Helper::stripUserFilesPath($encryptedFile['path']);
|
||||
|
||||
//relative to /data
|
||||
$rawPath = $encryptedFile['path'];
|
||||
|
||||
//get timestamp
|
||||
$timestamp = $this->view->filemtime($rawPath);
|
||||
|
||||
//enable proxy to use OC\Files\View to access the original file
|
||||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
// Open enc file handle for binary reading
|
||||
$encHandle = $this->view->fopen($rawPath, 'rb');
|
||||
|
||||
// Disable proxy to prevent file being encrypted again
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
if ($encHandle === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $rawPath . '", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Open plain file handle for binary writing, with same filename as original plain file
|
||||
$plainHandle = $this->view->fopen($rawPath . '.part', 'wb');
|
||||
if ($plainHandle === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $rawPath . '.part", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Move plain file to a temporary location
|
||||
$size = stream_copy_to_stream($encHandle, $plainHandle);
|
||||
if ($size === 0) {
|
||||
\OCP\Util::writeLog('Encryption library', 'Zero bytes copied of "' . $rawPath . '", decryption failed!', \OCP\Util::FATAL);
|
||||
$successful = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
fclose($encHandle);
|
||||
fclose($plainHandle);
|
||||
|
||||
$fakeRoot = $this->view->getRoot();
|
||||
$this->view->chroot('/' . $this->userId . '/files');
|
||||
|
||||
$this->view->rename($relPath . '.part', $relPath);
|
||||
|
||||
$this->view->chroot($fakeRoot);
|
||||
|
||||
//set timestamp
|
||||
$this->view->touch($rawPath, $timestamp);
|
||||
|
||||
// Add the file to the cache
|
||||
\OC\Files\Filesystem::putFileInfo($relPath, array(
|
||||
'encrypted' => false,
|
||||
'size' => $size,
|
||||
'unencrypted_size' => $size,
|
||||
'etag' => $fileInfo['etag']
|
||||
));
|
||||
|
||||
$decryptedFiles[] = $relPath;
|
||||
|
||||
}
|
||||
|
||||
if ($versionStatus) {
|
||||
\OC_App::enable('files_versions');
|
||||
}
|
||||
|
||||
if (!$this->decryptVersions($decryptedFiles)) {
|
||||
$successful = false;
|
||||
}
|
||||
|
||||
if ($successful) {
|
||||
$this->view->deleteAll($this->keyfilesPath);
|
||||
$this->view->deleteAll($this->shareKeysPath);
|
||||
}
|
||||
|
||||
\OC_FileProxy::$enabled = true;
|
||||
}
|
||||
|
||||
return $successful;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Encrypt all files in a directory
|
||||
* @param string $dirPath the directory whose files will be encrypted
|
||||
|
|
@ -609,30 +805,44 @@ class Util {
|
|||
*/
|
||||
public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
|
||||
|
||||
if ($found = $this->findEncFiles($dirPath)) {
|
||||
$found = $this->findEncFiles($dirPath);
|
||||
|
||||
if ($found) {
|
||||
|
||||
// Disable proxy to prevent file being encrypted twice
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
$versionStatus = \OCP\App::isEnabled('files_versions');
|
||||
\OC_App::disable('files_versions');
|
||||
|
||||
$encryptedFiles = array();
|
||||
|
||||
// Encrypt unencrypted files
|
||||
foreach ($found['plain'] as $plainFile) {
|
||||
|
||||
//get file info
|
||||
$fileInfo = \OC\Files\Filesystem::getFileInfo($plainFile['path']);
|
||||
|
||||
//relative to data/<user>/file
|
||||
$relPath = $plainFile['path'];
|
||||
|
||||
//relative to /data
|
||||
$rawPath = '/' . $this->userId . '/files/' . $plainFile['path'];
|
||||
|
||||
// keep timestamp
|
||||
$timestamp = $this->view->filemtime($rawPath);
|
||||
|
||||
// Open plain file handle for binary reading
|
||||
$plainHandle = $this->view->fopen($rawPath, 'rb');
|
||||
|
||||
// Open enc file handle for binary writing, with same filename as original plain file
|
||||
$encHandle = fopen('crypt://' . $relPath . '.part', 'wb');
|
||||
$encHandle = fopen('crypt://' . $rawPath . '.part', 'wb');
|
||||
|
||||
// Move plain file to a temporary location
|
||||
$size = stream_copy_to_stream($plainHandle, $encHandle);
|
||||
|
||||
fclose($encHandle);
|
||||
fclose($plainHandle);
|
||||
|
||||
$fakeRoot = $this->view->getRoot();
|
||||
$this->view->chroot('/' . $this->userId . '/files');
|
||||
|
|
@ -641,12 +851,19 @@ class Util {
|
|||
|
||||
$this->view->chroot($fakeRoot);
|
||||
|
||||
// set timestamp
|
||||
$this->view->touch($rawPath, $timestamp);
|
||||
|
||||
// Add the file to the cache
|
||||
\OC\Files\Filesystem::putFileInfo($relPath, array(
|
||||
'encrypted' => true,
|
||||
'size' => $size,
|
||||
'unencrypted_size' => $size
|
||||
));
|
||||
'encrypted' => true,
|
||||
'size' => $size,
|
||||
'unencrypted_size' => $size,
|
||||
'etag' => $fileInfo['etag']
|
||||
));
|
||||
|
||||
$encryptedFiles[] = $relPath;
|
||||
|
||||
}
|
||||
|
||||
// Encrypt legacy encrypted files
|
||||
|
|
@ -687,6 +904,12 @@ class Util {
|
|||
|
||||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
if ($versionStatus) {
|
||||
\OC_App::enable('files_versions');
|
||||
}
|
||||
|
||||
$this->encryptVersions($encryptedFiles);
|
||||
|
||||
// If files were found, return true
|
||||
return true;
|
||||
} else {
|
||||
|
|
@ -925,7 +1148,7 @@ class Util {
|
|||
|
||||
}
|
||||
|
||||
// If recovery is enabled, add the
|
||||
// If recovery is enabled, add the
|
||||
// Admin UID to list of users to share to
|
||||
if ($recoveryEnabled) {
|
||||
// Find recoveryAdmin user ID
|
||||
|
|
@ -1492,4 +1715,28 @@ class Util {
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief decrypt private key and add it to the current session
|
||||
* @param array $params with 'uid' and 'password'
|
||||
* @return mixed session or false
|
||||
*/
|
||||
public function initEncryption($params) {
|
||||
|
||||
$encryptedKey = Keymanager::getPrivateKey($this->view, $params['uid']);
|
||||
|
||||
$privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);
|
||||
|
||||
if ($privateKey === false) {
|
||||
\OCP\Util::writeLog('Encryption library', 'Private key for user "' . $params['uid']
|
||||
. '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access', \OCP\Util::ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
$session = new \OCA\Encryption\Session($this->view);
|
||||
|
||||
$session->setPrivateKey($privateKey);
|
||||
|
||||
return $session;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ $view = new \OC_FilesystemView('/');
|
|||
$util = new \OCA\Encryption\Util($view, $user);
|
||||
$session = new \OCA\Encryption\Session($view);
|
||||
|
||||
$privateKeySet = ($session->getPrivateKey() !== false) ? true : false;
|
||||
$privateKeySet = $session->getPrivateKey() !== false;
|
||||
|
||||
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
||||
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
$filename = 'tmp-' . time() . '.test';
|
||||
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -215,7 +215,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time() . '.test';
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong . $this->dataLong);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -296,7 +296,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time();
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///'. $this->userId . '/files/' . $filename, $this->dataShort);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -310,7 +310,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
|
||||
// Get file decrypted contents
|
||||
$decrypt = file_get_contents('crypt://' . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
|
||||
|
||||
$this->assertEquals($this->dataShort, $decrypt);
|
||||
|
||||
|
|
@ -326,13 +326,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time();
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
||||
// Get file decrypted contents
|
||||
$decrypt = file_get_contents('crypt://' . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $decrypt);
|
||||
|
||||
|
|
@ -417,13 +417,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time();
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
||||
// Get file decrypted contents
|
||||
$decrypt = file_get_contents('crypt://' . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $decrypt);
|
||||
|
||||
|
|
@ -432,7 +432,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$view->rename($filename, $newFilename);
|
||||
|
||||
// Get file decrypted contents
|
||||
$newDecrypt = file_get_contents('crypt://' . $newFilename);
|
||||
$newDecrypt = file_get_contents('crypt:///'. $this->userId . '/files/' . $newFilename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $newDecrypt);
|
||||
|
||||
|
|
@ -448,13 +448,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time();
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
||||
// Get file decrypted contents
|
||||
$decrypt = file_get_contents('crypt://' . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $decrypt);
|
||||
|
||||
|
|
@ -465,7 +465,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$view->rename($filename, $newFolder . '/' . $newFilename);
|
||||
|
||||
// Get file decrypted contents
|
||||
$newDecrypt = file_get_contents('crypt://' . $newFolder . '/' . $newFilename);
|
||||
$newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $newFolder . '/' . $newFilename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $newDecrypt);
|
||||
|
||||
|
|
@ -486,13 +486,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$view->mkdir($folder);
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $folder . $filename, $this->dataLong);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
||||
// Get file decrypted contents
|
||||
$decrypt = file_get_contents('crypt://' . $folder . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $folder . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $decrypt);
|
||||
|
||||
|
|
@ -502,7 +502,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$view->rename($folder, $newFolder);
|
||||
|
||||
// Get file decrypted contents
|
||||
$newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
|
||||
$newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $newFolder . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $newDecrypt);
|
||||
|
||||
|
|
@ -518,13 +518,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time();
|
||||
|
||||
// Save long data as encrypted file using stream wrapper
|
||||
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
|
||||
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
|
||||
|
||||
// Test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
||||
// Get file decrypted contents
|
||||
$decrypt = file_get_contents('crypt://' . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $decrypt);
|
||||
|
||||
|
|
@ -537,7 +537,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
OCA\Encryption\Hooks::login($params);
|
||||
|
||||
// Get file decrypted contents
|
||||
$newDecrypt = file_get_contents('crypt://' . $filename);
|
||||
$newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
|
||||
|
||||
$this->assertEquals($this->dataLong, $newDecrypt);
|
||||
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt:///folder1/subfolder/subsubfolder/' . $filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder/subsubfolder' . $filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -293,7 +293,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
. $this->subsubfolder);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
|
||||
$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
|
||||
. $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
|
|
@ -499,7 +499,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -540,7 +540,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\OC_User::setUserId(false);
|
||||
|
||||
// get file contents
|
||||
$retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
|
||||
$retrievedCryptedFile = file_get_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
|
||||
|
||||
// check if data is the same as we previously written
|
||||
$this->assertEquals($this->dataShort, $retrievedCryptedFile);
|
||||
|
|
@ -575,7 +575,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -649,6 +649,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
* @large
|
||||
*/
|
||||
function testRecoveryFile() {
|
||||
$this->markTestIncomplete(
|
||||
'No idea what\'s wrong here, this works perfectly in real-world. removeRecoveryKeys(\'/\') L709 removes correctly the keys, but for some reasons afterwards also the top-level folder "share-keys" is gone...'
|
||||
);
|
||||
// login as admin
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||
|
||||
|
|
@ -675,8 +678,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
. $this->subsubfolder);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
|
||||
$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
|
||||
$cryptedFile1 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
|
||||
$cryptedFile2 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
|
||||
. $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
|
|
@ -717,7 +720,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
// enable recovery for admin
|
||||
$this->assertTrue($util->setRecoveryForUser(1));
|
||||
|
||||
// remove all recovery keys
|
||||
// add recovery keys again
|
||||
$util->addRecoveryKeys('/');
|
||||
|
||||
// check if share key for admin and recovery exists
|
||||
|
|
@ -752,7 +755,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
*/
|
||||
function testRecoveryForUser() {
|
||||
$this->markTestIncomplete(
|
||||
'This test drives Jenkins crazy - "Cannot modify header information - headers already sent" - line 811'
|
||||
'This test drives Jenkins crazy - "Cannot modify header information - headers already sent" - line 811'
|
||||
);
|
||||
// login as admin
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||
|
|
@ -760,7 +763,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
||||
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
||||
|
||||
// login as user1
|
||||
// login as user2
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
|
||||
|
||||
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
|
||||
|
|
@ -777,8 +780,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
. $this->subsubfolder);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
|
||||
$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
|
||||
$cryptedFile1 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2. '/files/' . $this->filename, $this->dataShort);
|
||||
$cryptedFile2 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
|
||||
. $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
|
|
@ -807,13 +810,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
// change password
|
||||
\OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
|
||||
|
||||
// login as user1
|
||||
// login as user2
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
|
||||
|
||||
// get file contents
|
||||
$retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
|
||||
$retrievedCryptedFile1 = file_get_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->filename);
|
||||
$retrievedCryptedFile2 = file_get_contents(
|
||||
'crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
|
||||
'crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
|
||||
|
||||
// check if data is the same as we previously written
|
||||
$this->assertEquals($this->dataShort, $retrievedCryptedFile1);
|
||||
|
|
@ -854,7 +857,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
|
|||
|
|
@ -180,4 +180,4 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
|
|||
// tear down
|
||||
$view->unlink($filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time() . '.txt';
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' .\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -226,7 +226,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
|
|||
$filename = 'tmp-' . time() . '.txt';
|
||||
|
||||
// save file with content
|
||||
$cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
|
||||
$cryptedFile = file_put_contents('crypt:///' .$this->userId. '/files/' . $filename, $this->dataShort);
|
||||
|
||||
// test that data was successfully written
|
||||
$this->assertTrue(is_int($cryptedFile));
|
||||
|
|
@ -300,4 +300,4 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
|
|||
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
$this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
|
||||
|
||||
// get decrypted file contents
|
||||
$decrypt = file_get_contents('crypt://' . $filename);
|
||||
$decrypt = file_get_contents('crypt:///' . $this->userId . '/files'. $filename);
|
||||
|
||||
// check if file content match with the written content
|
||||
$this->assertEquals($this->dataShort, $decrypt);
|
||||
|
|
@ -259,4 +259,4 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
// return captured content
|
||||
return $content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ $status = OC_Mount_Config::addMountPoint($_POST['mountPoint'],
|
|||
$_POST['mountType'],
|
||||
$_POST['applicable'],
|
||||
$isPersonal);
|
||||
OCP\JSON::success(array('data' => array('message' => $status)));
|
||||
OCP\JSON::success(array('data' => array('message' => $status)));
|
||||
|
|
|
|||
|
|
@ -39,4 +39,4 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,4 +126,4 @@ $(document).ready(function() {
|
|||
}
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ $TRANSLATIONS = array(
|
|||
"Error configuring Google Drive storage" => "Kļūda, konfigurējot Google Drive krātuvi",
|
||||
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē.",
|
||||
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē.",
|
||||
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> PHP Curl atbalsts nav instalēts. OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts.",
|
||||
"External Storage" => "Ārējā krātuve",
|
||||
"Folder name" => "Mapes nosaukums",
|
||||
"External storage" => "Ārējā krātuve",
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
|
|||
|
||||
$this->bucket = $params['bucket'];
|
||||
$scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https';
|
||||
$this->test = ( isset($params['test'])) ? true : false;
|
||||
$this->test = isset($params['test']);
|
||||
$this->timeout = ( ! isset($params['timeout'])) ? 15 : $params['timeout'];
|
||||
$params['region'] = ( ! isset($params['region'])) ? 'eu-west-1' : $params['region'];
|
||||
$params['hostname'] = ( !isset($params['hostname'])) ? 's3.amazonaws.com' : $params['hostname'];
|
||||
|
|
@ -183,7 +183,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
|
|||
}
|
||||
|
||||
$dh = $this->opendir($path);
|
||||
while ($file = readdir($dh)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if ($file === '.' || $file === '..') {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -464,7 +464,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
|
|||
}
|
||||
|
||||
$dh = $this->opendir($path1);
|
||||
while ($file = readdir($dh)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if ($file === '.' || $file === '..') {
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -418,9 +418,9 @@ class OC_Mount_Config {
|
|||
public static function checksmbclient() {
|
||||
if(function_exists('shell_exec')) {
|
||||
$output=shell_exec('which smbclient');
|
||||
return (empty($output)?false:true);
|
||||
return !empty($output);
|
||||
}else{
|
||||
return(false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -429,9 +429,9 @@ class OC_Mount_Config {
|
|||
*/
|
||||
public static function checkphpftp() {
|
||||
if(function_exists('ftp_login')) {
|
||||
return(true);
|
||||
return true;
|
||||
}else{
|
||||
return(false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -439,7 +439,7 @@ class OC_Mount_Config {
|
|||
* check if curl is installed
|
||||
*/
|
||||
public static function checkcurl() {
|
||||
return (function_exists('curl_init'));
|
||||
return function_exists('curl_init');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -460,6 +460,6 @@ class OC_Mount_Config {
|
|||
$txt.=$l->t('<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.').'<br />';
|
||||
}
|
||||
|
||||
return($txt);
|
||||
return $txt;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ class Google extends \OC\Files\Storage\Common {
|
|||
public function rmdir($path) {
|
||||
if (trim($path, '/') === '') {
|
||||
$dir = $this->opendir($path);
|
||||
while ($file = readdir($dir)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
|
||||
if (!$this->unlink($path.'/'.$file)) {
|
||||
return false;
|
||||
|
|
@ -284,7 +284,7 @@ class Google extends \OC\Files\Storage\Common {
|
|||
// Check if this is a Google Doc
|
||||
if ($this->getMimeType($path) !== $file->getMimeType()) {
|
||||
// Return unknown file size
|
||||
$stat['size'] = \OC\Files\FREE_SPACE_UNKNOWN;
|
||||
$stat['size'] = \OC\Files\SPACE_UNKNOWN;
|
||||
} else {
|
||||
$stat['size'] = $file->getFileSize();
|
||||
}
|
||||
|
|
@ -587,4 +587,4 @@ class Google extends \OC\Files\Storage\Common {
|
|||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
|
|||
private function collectionMTime($path) {
|
||||
$dh = $this->opendir($path);
|
||||
$lastCTime = $this->filemtime($path);
|
||||
while ($file = readdir($dh)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if ($file != '.' and $file != '..') {
|
||||
$time = $this->filemtime($file);
|
||||
if ($time > $lastCTime) {
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ class SFTP extends \OC\Files\Storage\Common {
|
|||
|
||||
public function file_exists($path) {
|
||||
try {
|
||||
return $this->client->stat($this->abs_path($path)) === false ? false : true;
|
||||
return $this->client->stat($this->abs_path($path)) !== false;
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
|
|||
private function shareMTime() {
|
||||
$dh=$this->opendir('');
|
||||
$lastCtime=0;
|
||||
while($file=readdir($dh)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if ($file!='.' and $file!='..') {
|
||||
$ctime=$this->filemtime($file);
|
||||
if ($ctime>$lastCtime) {
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ class DAV extends \OC\Files\Storage\Common{
|
|||
$curl = curl_init();
|
||||
$fp = fopen('php://temp', 'r+');
|
||||
curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
|
||||
curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path);
|
||||
curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $path));
|
||||
curl_setopt($curl, CURLOPT_FILE, $fp);
|
||||
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ class DAV extends \OC\Files\Storage\Common{
|
|||
return 0;
|
||||
}
|
||||
} catch(\Exception $e) {
|
||||
return \OC\Files\FREE_SPACE_UNKNOWN;
|
||||
return \OC\Files\SPACE_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -256,7 +256,7 @@ class DAV extends \OC\Files\Storage\Common{
|
|||
|
||||
$curl = curl_init();
|
||||
curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
|
||||
curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$target);
|
||||
curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $target));
|
||||
curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
|
||||
curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
|
||||
curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
|
||||
|
|
|
|||
|
|
@ -42,4 +42,4 @@ class Google extends Storage {
|
|||
$this->instance->rmdir('/');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@ OCP\Util::addScript('files_sharing', 'share');
|
|||
\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
|
||||
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
|
||||
\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
|
||||
\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
|
||||
\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
|
||||
|
|
|
|||
|
|
@ -31,19 +31,19 @@ $(document).ready(function() {
|
|||
}
|
||||
}
|
||||
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename) {
|
||||
var tr = $('tr').filterAttr('data-file', filename)
|
||||
var tr = $('tr').filterAttr('data-file', filename);
|
||||
if (tr.length > 0) {
|
||||
window.location = $(tr).find('a.name').attr('href');
|
||||
}
|
||||
});
|
||||
FileActions.register('file', 'Download', OC.PERMISSION_READ, '', function(filename) {
|
||||
var tr = $('tr').filterAttr('data-file', filename)
|
||||
var tr = $('tr').filterAttr('data-file', filename);
|
||||
if (tr.length > 0) {
|
||||
window.location = $(tr).find('a.name').attr('href');
|
||||
}
|
||||
});
|
||||
FileActions.register('dir', 'Download', OC.PERMISSION_READ, '', function(filename) {
|
||||
var tr = $('tr').filterAttr('data-file', filename)
|
||||
var tr = $('tr').filterAttr('data-file', filename);
|
||||
if (tr.length > 0) {
|
||||
window.location = $(tr).find('a.name').attr('href')+'&download';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,4 +38,4 @@ $(document).ready(function() {
|
|||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,14 @@
|
|||
<?php
|
||||
$TRANSLATIONS = array(
|
||||
"The password is wrong. Try again." => "用户名或密码错误！请重试",
|
||||
"Password" => "密码",
|
||||
"Submit" => "提交",
|
||||
"Sorry, this link doesn’t seem to work anymore." => "抱歉，此链接已失效",
|
||||
"Reasons might be:" => "可能原因是：",
|
||||
"the item was removed" => "此项已移除",
|
||||
"the link expired" => "链接过期",
|
||||
"sharing is disabled" => "共享已禁用",
|
||||
"For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。",
|
||||
"%s shared the folder %s with you" => "%s与您共享了%s文件夹",
|
||||
"%s shared the file %s with you" => "%s与您共享了%s文件",
|
||||
"Download" => "下载",
|
||||
|
|
|
|||
|
|
@ -288,4 +288,4 @@ class Shared_Cache extends Cache {
|
|||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,4 +106,4 @@ class Shared_Permissions extends Permissions {
|
|||
// Not a valid action for Shared Permissions
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common {
|
|||
|
||||
public function free_space($path) {
|
||||
if ($path == '') {
|
||||
return \OC\Files\FREE_SPACE_UNKNOWN;
|
||||
return \OC\Files\SPACE_UNKNOWN;
|
||||
}
|
||||
$source = $this->getSourcePath($path);
|
||||
if ($source) {
|
||||
|
|
|
|||
|
|
@ -48,4 +48,4 @@ class Shared_Watcher extends Watcher {
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,9 +112,9 @@ if (isset($path)) {
|
|||
if ($files_list === NULL ) {
|
||||
$files_list = array($files);
|
||||
}
|
||||
OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
|
||||
OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
|
||||
} else {
|
||||
OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
|
||||
OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD');
|
||||
}
|
||||
exit();
|
||||
} else {
|
||||
|
|
@ -133,7 +133,7 @@ if (isset($path)) {
|
|||
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
|
||||
$tmpl->assign('fileTarget', basename($linkItem['file_target']));
|
||||
$tmpl->assign('dirToken', $linkItem['token']);
|
||||
$allowPublicUploadEnabled = (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false );
|
||||
$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
|
||||
if (\OCP\App::isEnabled('files_encryption')) {
|
||||
$allowPublicUploadEnabled = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
</ul>
|
||||
<p><?php p($l->t('For more info, please ask the person who sent this link.')); ?></p>
|
||||
</li>
|
||||
</ul>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
|
|||
OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
|
||||
|
||||
// register hooks
|
||||
\OCA\Files_Trashbin\Trashbin::registerHooks();
|
||||
\OCA\Files_Trashbin\Trashbin::registerHooks();
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ if (version_compare($installedVersion, '0.4', '<')) {
|
|||
//enforce a recalculation during next usage.
|
||||
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`');
|
||||
$result = $query->execute();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ if ($dir) {
|
|||
$dirlisting = true;
|
||||
$dirContent = $view->opendir($dir);
|
||||
$i = 0;
|
||||
while($entryName = readdir($dirContent)) {
|
||||
while(($entryName = readdir($dirContent)) !== false) {
|
||||
if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
|
||||
$pos = strpos($dir.'/', '/', 1);
|
||||
$tmp = substr($dir, 0, $pos);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* disable download and sharing actions */
|
||||
var disableDownloadActions = true;
|
||||
var disableSharing = true;
|
||||
var trashBinApp = true;
|
||||
var trashBinApp = true;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Trvale odstranit",
|
||||
"Name" => "Název",
|
||||
"Deleted" => "Smazáno",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("%n adresář","%n adresáře","%n adresářů"),
|
||||
"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
|
||||
"restored" => "obnoveno",
|
||||
"Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
|
||||
"Restore" => "Obnovit",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Dzēst pavisam",
|
||||
"Name" => "Nosaukums",
|
||||
"Deleted" => "Dzēsts",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("Nekas, %n mapes","%n mape","%n mapes"),
|
||||
"_%n file_::_%n files_" => array("Neviens! %n faaili","%n fails","%n faili"),
|
||||
"restored" => "atjaunots",
|
||||
"Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
|
||||
"Restore" => "Atjaunot",
|
||||
"Delete" => "Dzēst",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Slett permanent",
|
||||
"Name" => "Navn",
|
||||
"Deleted" => "Slettet",
|
||||
"_%n folder_::_%n folders_" => array("",""),
|
||||
"_%n file_::_%n files_" => array("",""),
|
||||
"_%n folder_::_%n folders_" => array("","%n mapper"),
|
||||
"_%n file_::_%n files_" => array("","%n filer"),
|
||||
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
|
||||
"Restore" => "Gjenopprett",
|
||||
"Delete" => "Slett",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Verwijder definitief",
|
||||
"Name" => "Naam",
|
||||
"Deleted" => "Verwijderd",
|
||||
"_%n folder_::_%n folders_" => array("",""),
|
||||
"_%n file_::_%n files_" => array("",""),
|
||||
"_%n folder_::_%n folders_" => array("%n map","%n mappen"),
|
||||
"_%n file_::_%n files_" => array("%n bestand","%n bestanden"),
|
||||
"restored" => "hersteld",
|
||||
"Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
|
||||
"Restore" => "Herstellen",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Удалено навсегда",
|
||||
"Name" => "Имя",
|
||||
"Deleted" => "Удалён",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("","","%n папок"),
|
||||
"_%n file_::_%n files_" => array("","","%n файлов"),
|
||||
"restored" => "восстановлен",
|
||||
"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
|
||||
"Restore" => "Восстановить",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Zmazať trvalo",
|
||||
"Name" => "Názov",
|
||||
"Deleted" => "Zmazané",
|
||||
"_%n folder_::_%n folders_" => array("","",""),
|
||||
"_%n file_::_%n files_" => array("","",""),
|
||||
"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
|
||||
"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
|
||||
"restored" => "obnovené",
|
||||
"Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
|
||||
"Restore" => "Obnoviť",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "Radera permanent",
|
||||
"Name" => "Namn",
|
||||
"Deleted" => "Raderad",
|
||||
"_%n folder_::_%n folders_" => array("",""),
|
||||
"_%n file_::_%n files_" => array("",""),
|
||||
"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
|
||||
"_%n file_::_%n files_" => array("%n fil","%n filer"),
|
||||
"restored" => "återställd",
|
||||
"Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
|
||||
"Restore" => "Återskapa",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@ $TRANSLATIONS = array(
|
|||
"Delete permanently" => "永久删除",
|
||||
"Name" => "名称",
|
||||
"Deleted" => "已删除",
|
||||
"_%n folder_::_%n folders_" => array(""),
|
||||
"_%n file_::_%n files_" => array(""),
|
||||
"_%n folder_::_%n folders_" => array("%n 文件夹"),
|
||||
"_%n file_::_%n files_" => array("%n个文件"),
|
||||
"restored" => "已恢复",
|
||||
"Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
|
||||
"Restore" => "恢复",
|
||||
"Delete" => "删除",
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@ class Trashbin {
|
|||
\OC_Log::write('files_trashbin', 'remove "' . $filename . '" fom trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
|
||||
}
|
||||
}
|
||||
$availableSpace = $availableSpace + $size;
|
||||
$availableSpace += $size;
|
||||
// if size limit for trash bin reached, delete oldest files in trash bin
|
||||
if ($availableSpace < 0) {
|
||||
$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
*/
|
||||
|
||||
// Register with the capabilities API
|
||||
OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
|
||||
OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
|
||||
|
|
|
|||
|
|
@ -124,19 +124,19 @@ function createVersionsDropdown(filename, files) {
|
|||
}
|
||||
|
||||
function addVersion( revision ) {
|
||||
title = formatDate(revision.version*1000);
|
||||
name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
|
||||
var title = formatDate(revision.version*1000);
|
||||
var name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
|
||||
|
||||
path = OC.filePath('files_versions', '', 'download.php');
|
||||
var path = OC.filePath('files_versions', '', 'download.php');
|
||||
|
||||
download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
|
||||
var download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
|
||||
download+='<img';
|
||||
download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
|
||||
download+=' name="downloadVersion" />';
|
||||
download+=name;
|
||||
download+='</a>';
|
||||
|
||||
revert='<span class="revertVersion"';
|
||||
var revert='<span class="revertVersion"';
|
||||
revert+=' id="' + revision.version + '"';
|
||||
revert+=' value="' + files + '">';
|
||||
revert+='<img';
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ class Capabilities {
|
|||
));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ class Hooks {
|
|||
*/
|
||||
public static function write_hook( $params ) {
|
||||
|
||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||
if (\OCP\App::isEnabled('files_versions')) {
|
||||
$path = $params[\OC\Files\Filesystem::signal_param_path];
|
||||
if($path<>'') {
|
||||
Storage::store($path);
|
||||
|
|
@ -36,12 +36,12 @@ class Hooks {
|
|||
* cleanup the versions directory if the actual file gets deleted
|
||||
*/
|
||||
public static function remove_hook($params) {
|
||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||
|
||||
if (\OCP\App::isEnabled('files_versions')) {
|
||||
$path = $params[\OC\Files\Filesystem::signal_param_path];
|
||||
if($path<>'') {
|
||||
Storage::delete($path);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -53,13 +53,13 @@ class Hooks {
|
|||
* of the stored versions along the actual file
|
||||
*/
|
||||
public static function rename_hook($params) {
|
||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||
|
||||
if (\OCP\App::isEnabled('files_versions')) {
|
||||
$oldpath = $params['oldpath'];
|
||||
$newpath = $params['newpath'];
|
||||
if($oldpath<>'' && $newpath<>'') {
|
||||
Storage::rename( $oldpath, $newpath );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -71,10 +71,11 @@ class Hooks {
|
|||
* to remove the used space for versions stored in the database
|
||||
*/
|
||||
public static function deleteUser_hook($params) {
|
||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||
|
||||
if (\OCP\App::isEnabled('files_versions')) {
|
||||
$uid = $params['uid'];
|
||||
Storage::deleteUser($uid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,4 +32,4 @@ if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
|
|||
} else {
|
||||
$l=OC_L10N::get('user_ldap');
|
||||
OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ OCP\JSON::callCheck();
|
|||
|
||||
$prefix = $_POST['ldap_serverconfig_chooser'];
|
||||
$connection = new \OCA\user_ldap\lib\Connection($prefix);
|
||||
OCP\JSON::success(array('configuration' => $connection->getConfiguration()));
|
||||
OCP\JSON::success(array('configuration' => $connection->getConfiguration()));
|
||||
|
|
|
|||
|
|
@ -31,4 +31,4 @@ sort($serverConnections);
|
|||
$lk = array_pop($serverConnections);
|
||||
$ln = intval(str_replace('s', '', $lk));
|
||||
$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
|
||||
OCP\JSON::success(array('configPrefix' => $nk));
|
||||
OCP\JSON::success(array('configPrefix' => $nk));
|
||||
|
|
|
|||
|
|
@ -30,4 +30,4 @@ $prefix = $_POST['ldap_serverconfig_chooser'];
|
|||
$connection = new \OCA\user_ldap\lib\Connection($prefix);
|
||||
$connection->setConfiguration($_POST);
|
||||
$connection->saveConfiguration();
|
||||
OCP\JSON::success();
|
||||
OCP\JSON::success();
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@
|
|||
.ldapwarning {
|
||||
margin-left: 1.4em;
|
||||
color: #FF3B3B;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,4 +198,4 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
|
|||
//it's the same across all our user backends obviously
|
||||
return $this->refBackend->implementsActions($actions);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ var LdapConfiguration = {
|
|||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
$(document).ready(function() {
|
||||
$('#ldapAdvancedAccordion').accordion({ heightStyle: 'content', animate: 'easeInOutCirc'});
|
||||
|
|
@ -211,4 +211,4 @@ $(document).ready(function() {
|
|||
LdapConfiguration.refreshConfig();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,19 +10,12 @@ $TRANSLATIONS = array(
|
|||
"Password" => "কূটশব্দ",
|
||||
"For anonymous access, leave DN and Password empty." => "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।",
|
||||
"User Login Filter" => "ব্যবহারকারির প্রবেশ ছাঁকনী",
|
||||
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "প্রবেশের চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid দিয়ে প্রতিস্থাপিত হবে।",
|
||||
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ \"uid=%%uid\"",
|
||||
"User List Filter" => "ব্যবহারকারী তালিকা ছাঁকনী",
|
||||
"Defines the filter to apply, when retrieving users." => "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।",
|
||||
"without any placeholder, e.g. \"objectClass=person\"." => "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।",
|
||||
"Group Filter" => "গোষ্ঠী ছাঁকনী",
|
||||
"Defines the filter to apply, when retrieving groups." => "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।",
|
||||
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।",
|
||||
"Port" => "পোর্ট",
|
||||
"Use TLS" => "TLS ব্যবহার কর",
|
||||
"Case insensitve LDAP server (Windows)" => "বর্ণ অসংবেদী LDAP সার্ভার (উইন্ডোজ)",
|
||||
"Turn off SSL certificate validation." => "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
|
||||
"Not recommended, use for testing only." => "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।",
|
||||
"in seconds. A change empties the cache." => "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
|
||||
"User Display Name Field" => "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র",
|
||||
"Base User Tree" => "ভিত্তি ব্যবহারকারি বৃক্ষাকারে",
|
||||
|
|
|
|||
|
|
@ -30,14 +30,8 @@ $TRANSLATIONS = array(
|
|||
"Password" => "Contrasenya",
|
||||
"For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
|
||||
"User Login Filter" => "Filtre d'inici de sessió d'usuari",
|
||||
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió.",
|
||||
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\"",
|
||||
"User List Filter" => "Llista de filtres d'usuari",
|
||||
"Defines the filter to apply, when retrieving users." => "Defineix el filtre a aplicar quan es mostren usuaris",
|
||||
"without any placeholder, e.g. \"objectClass=person\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=persona\"",
|
||||
"Group Filter" => "Filtre de grup",
|
||||
"Defines the filter to apply, when retrieving groups." => "Defineix el filtre a aplicar quan es mostren grups.",
|
||||
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\".",
|
||||
"Connection Settings" => "Arranjaments de connexió",
|
||||
"Configuration Active" => "Configuració activa",
|
||||
"When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.",
|
||||
|
|
@ -51,8 +45,6 @@ $TRANSLATIONS = array(
|
|||
"Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.",
|
||||
"Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
|
||||
"Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
|
||||
"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor %s.",
|
||||
"Not recommended, use for testing only." => "No recomanat, ús només per proves.",
|
||||
"Cache Time-To-Live" => "Memòria de cau Time-To-Live",
|
||||
"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
|
||||
"Directory Settings" => "Arranjaments de carpetes",
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue