merge master into filesystem
This commit is contained in:
Robin Appelman
commit
4b940955dd
|
|
@ -44,7 +44,7 @@ if(\OC\Files\Filesystem::file_exists($base) and \OC\Files\Filesystem::is_dir($ba
|
|||
if(substr(strtolower($file), 0, $queryLen)==$query) {
|
||||
$item=$base.$file;
|
||||
if((!$dirOnly or \OC\Files\Filesystem::is_dir($item))) {
|
||||
$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
|
||||
$files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
|
||||
// load needed apps
|
||||
$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
|
||||
$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
|
||||
OC_App::loadApps($RUNTIME_APPTYPES);
|
||||
if(!OC_User::isLoggedIn()) {
|
||||
if(!isset($_SERVER['PHP_AUTH_USER'])) {
|
||||
|
|
@ -36,7 +36,7 @@ if(!OC_User::isLoggedIn()) {
|
|||
}
|
||||
}
|
||||
|
||||
list($type,$file) = explode('/', substr($path_info,1+strlen($service)+1), 2);
|
||||
list($type, $file) = explode('/', substr($path_info, 1+strlen($service)+1), 2);
|
||||
|
||||
if ($type != 'oc_chunked') {
|
||||
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
*
|
||||
*/
|
||||
// load needed apps
|
||||
$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
|
||||
$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
|
||||
|
||||
OC_App::loadApps($RUNTIME_APPTYPES);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ $installedVersion=OCP\Config::getAppValue('files', 'installed_version');
|
|||
if (version_compare($installedVersion, '1.1.6', '<')) {
|
||||
$query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" );
|
||||
$result = $query->execute();
|
||||
while( $row = $result->fetchRow()){
|
||||
while( $row = $result->fetchRow()) {
|
||||
if ( $row["propertyname"][0] != '{' ) {
|
||||
$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' );
|
||||
$query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] ));
|
||||
|
|
@ -39,7 +39,7 @@ foreach($filesToRemove as $file) {
|
|||
$success = OCP\Files::rmdirr($filepath);
|
||||
if($success === false) {
|
||||
//probably not sufficient privileges, give up and give a message.
|
||||
OCP\Util::writeLog('files','Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
|
||||
OCP\Util::writeLog('files', 'Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ $filename = $_GET["file"];
|
|||
if(!\OC\Files\Filesystem::file_exists($filename)) {
|
||||
header("HTTP/1.0 404 Not Found");
|
||||
$tmpl = new OCP\Template( '', '404', 'guest' );
|
||||
$tmpl->assign('file',$filename);
|
||||
$tmpl->assign('file', $filename);
|
||||
$tmpl->printPage();
|
||||
exit;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,13 @@
|
|||
"Size" => "حجم",
|
||||
"Modified" => "معدل",
|
||||
"Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
|
||||
"Save" => "حفظ",
|
||||
"New" => "جديد",
|
||||
"Text file" => "ملف",
|
||||
"Folder" => "مجلد",
|
||||
"Upload" => "إرفع",
|
||||
"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
|
||||
"Share" => "شارك",
|
||||
"Download" => "تحميل",
|
||||
"Upload too large" => "حجم الترفيع أعلى من المسموح",
|
||||
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
"Modified" => "Променено",
|
||||
"Maximum upload size" => "Макс. размер за качване",
|
||||
"0 is unlimited" => "0 означава без ограничение",
|
||||
"Save" => "Запис",
|
||||
"New" => "Нов",
|
||||
"Text file" => "Текстов файл",
|
||||
"Folder" => "Папка",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Nou",
|
||||
"Text file" => "Fitxer de text",
|
||||
"Folder" => "Carpeta",
|
||||
"From link" => "Des d'enllaç",
|
||||
"Upload" => "Puja",
|
||||
"Cancel upload" => "Cancel·la la pujada",
|
||||
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Nový",
|
||||
"Text file" => "Textový soubor",
|
||||
"Folder" => "Složka",
|
||||
"From link" => "Z odkazu",
|
||||
"Upload" => "Odeslat",
|
||||
"Cancel upload" => "Zrušit odesílání",
|
||||
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Neu",
|
||||
"Text file" => "Textdatei",
|
||||
"Folder" => "Ordner",
|
||||
"From link" => "Von einem Link",
|
||||
"Upload" => "Hochladen",
|
||||
"Cancel upload" => "Upload abbrechen",
|
||||
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Neu",
|
||||
"Text file" => "Textdatei",
|
||||
"Folder" => "Ordner",
|
||||
"From link" => "Von einem Link",
|
||||
"Upload" => "Hochladen",
|
||||
"Cancel upload" => "Upload abbrechen",
|
||||
"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"Size" => "Grando",
|
||||
"Modified" => "Modifita",
|
||||
"seconds ago" => "sekundoj antaŭe",
|
||||
"1 minute ago" => "antaŭ 1 minuto",
|
||||
"today" => "hodiaŭ",
|
||||
"yesterday" => "hieraŭ",
|
||||
"last month" => "lastamonate",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Nuevo",
|
||||
"Text file" => "Archivo de texto",
|
||||
"Folder" => "Carpeta",
|
||||
"From link" => "Desde el enlace",
|
||||
"Upload" => "Subir",
|
||||
"Cancel upload" => "Cancelar subida",
|
||||
"Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"Size" => "Tamaina",
|
||||
"Modified" => "Aldatuta",
|
||||
"seconds ago" => "segundu",
|
||||
"1 minute ago" => "orain dela minutu 1",
|
||||
"today" => "gaur",
|
||||
"yesterday" => "atzo",
|
||||
"last month" => "joan den hilabetean",
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
|
||||
"Files" => "فایل ها",
|
||||
"Delete" => "پاک کردن",
|
||||
"Rename" => "تغییرنام",
|
||||
"replace" => "جایگزین",
|
||||
"cancel" => "لغو",
|
||||
"undo" => "بازگشت",
|
||||
|
|
@ -20,6 +21,14 @@
|
|||
"Name" => "نام",
|
||||
"Size" => "اندازه",
|
||||
"Modified" => "تغییر یافته",
|
||||
"seconds ago" => "ثانیهها پیش",
|
||||
"1 minute ago" => "1 دقیقه پیش",
|
||||
"today" => "امروز",
|
||||
"yesterday" => "دیروز",
|
||||
"last month" => "ماه قبل",
|
||||
"months ago" => "ماههای قبل",
|
||||
"last year" => "سال قبل",
|
||||
"years ago" => "سالهای قبل",
|
||||
"File handling" => "اداره پرونده ها",
|
||||
"Maximum upload size" => "حداکثر اندازه بارگزاری",
|
||||
"max. possible: " => "حداکثرمقدارممکن:",
|
||||
|
|
@ -27,6 +36,7 @@
|
|||
"Enable ZIP-download" => "فعال سازی بارگیری پرونده های فشرده",
|
||||
"0 is unlimited" => "0 نامحدود است",
|
||||
"Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده",
|
||||
"Save" => "ذخیره",
|
||||
"New" => "جدید",
|
||||
"Text file" => "فایل متنی",
|
||||
"Folder" => "پوشه",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
|
||||
"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
|
||||
"Files" => "Tiedostot",
|
||||
"Unshare" => "Peru jakaminen",
|
||||
"Delete" => "Poista",
|
||||
"Rename" => "Nimeä uudelleen",
|
||||
"{new_name} already exists" => "{new_name} on jo olemassa",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Nouveau",
|
||||
"Text file" => "Fichier texte",
|
||||
"Folder" => "Dossier",
|
||||
"From link" => "Depuis le lien",
|
||||
"Upload" => "Envoyer",
|
||||
"Cancel upload" => "Annuler l'envoi",
|
||||
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
|
||||
|
|
|
|||
|
|
@ -24,6 +24,14 @@
|
|||
"Name" => "Nome",
|
||||
"Size" => "Tamaño",
|
||||
"Modified" => "Modificado",
|
||||
"seconds ago" => "hai segundos",
|
||||
"1 minute ago" => "hai 1 minuto",
|
||||
"today" => "hoxe",
|
||||
"yesterday" => "onte",
|
||||
"last month" => "último mes",
|
||||
"months ago" => "meses atrás",
|
||||
"last year" => "último ano",
|
||||
"years ago" => "anos atrás",
|
||||
"File handling" => "Manexo de ficheiro",
|
||||
"Maximum upload size" => "Tamaño máximo de envío",
|
||||
"max. possible: " => "máx. posible: ",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"Missing a temporary folder" => "תיקייה זמנית חסרה",
|
||||
"Failed to write to disk" => "הכתיבה לכונן נכשלה",
|
||||
"Files" => "קבצים",
|
||||
"Unshare" => "הסר שיתוף",
|
||||
"Delete" => "מחיקה",
|
||||
"generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
|
||||
"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
|
||||
|
|
@ -17,6 +18,14 @@
|
|||
"Name" => "שם",
|
||||
"Size" => "גודל",
|
||||
"Modified" => "זמן שינוי",
|
||||
"seconds ago" => "שניות",
|
||||
"1 minute ago" => "לפני דקה אחת",
|
||||
"today" => "היום",
|
||||
"yesterday" => "אתמול",
|
||||
"last month" => "חודש שעבר",
|
||||
"months ago" => "חודשים",
|
||||
"last year" => "שנה שעברה",
|
||||
"years ago" => "שנים",
|
||||
"File handling" => "טיפול בקבצים",
|
||||
"Maximum upload size" => "גודל העלאה מקסימלי",
|
||||
"max. possible: " => "המרבי האפשרי: ",
|
||||
|
|
@ -24,6 +33,7 @@
|
|||
"Enable ZIP-download" => "הפעלת הורדת ZIP",
|
||||
"0 is unlimited" => "0 - ללא הגבלה",
|
||||
"Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
|
||||
"Save" => "שמירה",
|
||||
"New" => "חדש",
|
||||
"Text file" => "קובץ טקסט",
|
||||
"Folder" => "תיקייה",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
|
||||
"Failed to write to disk" => "Nem írható lemezre",
|
||||
"Files" => "Fájlok",
|
||||
"Unshare" => "Nem oszt meg",
|
||||
"Delete" => "Törlés",
|
||||
"replace" => "cserél",
|
||||
"cancel" => "mégse",
|
||||
|
|
@ -20,6 +21,14 @@
|
|||
"Name" => "Név",
|
||||
"Size" => "Méret",
|
||||
"Modified" => "Módosítva",
|
||||
"seconds ago" => "másodperccel ezelőtt",
|
||||
"1 minute ago" => "1 perccel ezelőtt",
|
||||
"today" => "ma",
|
||||
"yesterday" => "tegnap",
|
||||
"last month" => "múlt hónapban",
|
||||
"months ago" => "hónappal ezelőtt",
|
||||
"last year" => "tavaly",
|
||||
"years ago" => "évvel ezelőtt",
|
||||
"File handling" => "Fájlkezelés",
|
||||
"Maximum upload size" => "Maximális feltölthető fájlméret",
|
||||
"max. possible: " => "max. lehetséges",
|
||||
|
|
@ -27,6 +36,7 @@
|
|||
"Enable ZIP-download" => "ZIP-letöltés engedélyezése",
|
||||
"0 is unlimited" => "0 = korlátlan",
|
||||
"Maximum input size for ZIP files" => "ZIP file-ok maximum mérete",
|
||||
"Save" => "Mentés",
|
||||
"New" => "Új",
|
||||
"Text file" => "Szövegfájl",
|
||||
"Folder" => "Mappa",
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
|
||||
"No file was uploaded" => "Nulle file esseva incargate",
|
||||
"Missing a temporary folder" => "Manca un dossier temporari",
|
||||
"Files" => "Files",
|
||||
"Delete" => "Deler",
|
||||
"Name" => "Nomine",
|
||||
"Size" => "Dimension",
|
||||
"Modified" => "Modificate",
|
||||
"Maximum upload size" => "Dimension maxime de incargamento",
|
||||
"Save" => "Salveguardar",
|
||||
"New" => "Nove",
|
||||
"Text file" => "File de texto",
|
||||
"Folder" => "Dossier",
|
||||
"Upload" => "Incargar",
|
||||
"Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
|
||||
"Share" => "Compartir",
|
||||
"Download" => "Discargar",
|
||||
"Upload too large" => "Incargamento troppo longe"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"Missing a temporary folder" => "Kehilangan folder temporer",
|
||||
"Failed to write to disk" => "Gagal menulis ke disk",
|
||||
"Files" => "Berkas",
|
||||
"Unshare" => "batalkan berbagi",
|
||||
"Delete" => "Hapus",
|
||||
"replace" => "mengganti",
|
||||
"cancel" => "batalkan",
|
||||
|
|
@ -20,6 +21,14 @@
|
|||
"Name" => "Nama",
|
||||
"Size" => "Ukuran",
|
||||
"Modified" => "Dimodifikasi",
|
||||
"seconds ago" => "beberapa detik yang lalu",
|
||||
"1 minute ago" => "1 menit lalu",
|
||||
"today" => "hari ini",
|
||||
"yesterday" => "kemarin",
|
||||
"last month" => "bulan kemarin",
|
||||
"months ago" => "beberapa bulan lalu",
|
||||
"last year" => "tahun kemarin",
|
||||
"years ago" => "beberapa tahun lalu",
|
||||
"File handling" => "Penanganan berkas",
|
||||
"Maximum upload size" => "Ukuran unggah maksimum",
|
||||
"max. possible: " => "Kemungkinan maks:",
|
||||
|
|
@ -27,6 +36,7 @@
|
|||
"Enable ZIP-download" => "Aktifkan unduhan ZIP",
|
||||
"0 is unlimited" => "0 adalah tidak terbatas",
|
||||
"Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP",
|
||||
"Save" => "simpan",
|
||||
"New" => "Baru",
|
||||
"Text file" => "Berkas teks",
|
||||
"Folder" => "Folder",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Nuovo",
|
||||
"Text file" => "File di testo",
|
||||
"Folder" => "Cartella",
|
||||
"From link" => "Da collegamento",
|
||||
"Upload" => "Carica",
|
||||
"Cancel upload" => "Annulla invio",
|
||||
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"Enable ZIP-download" => "ZIP- 다운로드 허용",
|
||||
"0 is unlimited" => "0은 무제한 입니다",
|
||||
"Maximum input size for ZIP files" => "ZIP 파일에 대한 최대 입력 크기",
|
||||
"Save" => "저장",
|
||||
"New" => "새로 만들기",
|
||||
"Text file" => "텍스트 파일",
|
||||
"Folder" => "폴더",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Name" => "ناو",
|
||||
"Save" => "پاشکهوتکردن",
|
||||
"Folder" => "بوخچه",
|
||||
"Upload" => "بارکردن",
|
||||
"Download" => "داگرتن"
|
||||
);
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
"Enable ZIP-download" => "ZIP-download erlaben",
|
||||
"0 is unlimited" => "0 ass onlimitéiert",
|
||||
"Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren",
|
||||
"Save" => "Späicheren",
|
||||
"New" => "Nei",
|
||||
"Text file" => "Text Fichier",
|
||||
"Folder" => "Dossier",
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
"No file was uploaded" => "Neviens fails netika augšuplādēts",
|
||||
"Failed to write to disk" => "Nav iespējams saglabāt",
|
||||
"Files" => "Faili",
|
||||
"Unshare" => "Pārtraukt līdzdalīšanu",
|
||||
"Delete" => "Izdzēst",
|
||||
"replace" => "aizvietot",
|
||||
"cancel" => "atcelt",
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
"Enable ZIP-download" => "Овозможи ZIP симнување ",
|
||||
"0 is unlimited" => "0 е неограничено",
|
||||
"Maximum input size for ZIP files" => "Максимална големина за внес на ZIP датотеки",
|
||||
"Save" => "Сними",
|
||||
"New" => "Ново",
|
||||
"Text file" => "Текстуална датотека",
|
||||
"Folder" => "Папка",
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
"Enable ZIP-download" => "Aktifkan muatturun ZIP",
|
||||
"0 is unlimited" => "0 adalah tanpa had",
|
||||
"Maximum input size for ZIP files" => "Saiz maksimum input untuk fail ZIP",
|
||||
"Save" => "Simpan",
|
||||
"New" => "Baru",
|
||||
"Text file" => "Fail teks",
|
||||
"Folder" => "Folder",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
"Size" => "Storleik",
|
||||
"Modified" => "Endra",
|
||||
"Maximum upload size" => "Maksimal opplastingsstorleik",
|
||||
"Save" => "Lagre",
|
||||
"New" => "Ny",
|
||||
"Text file" => "Tekst fil",
|
||||
"Folder" => "Mappe",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"Size" => "Talha",
|
||||
"Modified" => "Modificat",
|
||||
"seconds ago" => "secondas",
|
||||
"1 minute ago" => "1 minuta a",
|
||||
"today" => "uèi",
|
||||
"yesterday" => "ièr",
|
||||
"last month" => "mes passat",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
<?php $TRANSLATIONS = array(
|
||||
"Save" => "Zapisz"
|
||||
);
|
||||
|
|
@ -10,25 +10,39 @@
|
|||
"Unshare" => "Descompartilhar",
|
||||
"Delete" => "Excluir",
|
||||
"Rename" => "Renomear",
|
||||
"{new_name} already exists" => "{new_name} já existe",
|
||||
"replace" => "substituir",
|
||||
"suggest name" => "sugerir nome",
|
||||
"cancel" => "cancelar",
|
||||
"replaced {new_name}" => "substituído {new_name}",
|
||||
"undo" => "desfazer",
|
||||
"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
|
||||
"unshared {files}" => "{files} não compartilhados",
|
||||
"deleted {files}" => "{files} apagados",
|
||||
"generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
|
||||
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
|
||||
"Upload Error" => "Erro de envio",
|
||||
"Pending" => "Pendente",
|
||||
"1 file uploading" => "enviando 1 arquivo",
|
||||
"{count} files uploading" => "Enviando {count} arquivos",
|
||||
"Upload cancelled." => "Envio cancelado.",
|
||||
"File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
|
||||
"Invalid name, '/' is not allowed." => "Nome inválido, '/' não é permitido.",
|
||||
"{count} files scanned" => "{count} arquivos scaneados",
|
||||
"error while scanning" => "erro durante verificação",
|
||||
"Name" => "Nome",
|
||||
"Size" => "Tamanho",
|
||||
"Modified" => "Modificado",
|
||||
"1 folder" => "1 pasta",
|
||||
"{count} folders" => "{count} pastas",
|
||||
"1 file" => "1 arquivo",
|
||||
"{count} files" => "{count} arquivos",
|
||||
"seconds ago" => "segundos atrás",
|
||||
"1 minute ago" => "1 minuto atrás",
|
||||
"{minutes} minutes ago" => "{minutes} minutos atrás",
|
||||
"today" => "hoje",
|
||||
"yesterday" => "ontem",
|
||||
"{days} days ago" => "{days} dias atrás",
|
||||
"last month" => "último mês",
|
||||
"months ago" => "meses atrás",
|
||||
"last year" => "último ano",
|
||||
|
|
@ -44,6 +58,7 @@
|
|||
"New" => "Novo",
|
||||
"Text file" => "Arquivo texto",
|
||||
"Folder" => "Pasta",
|
||||
"From link" => "Do link",
|
||||
"Upload" => "Carregar",
|
||||
"Cancel upload" => "Cancelar upload",
|
||||
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"Size" => "Dimensiune",
|
||||
"Modified" => "Modificat",
|
||||
"seconds ago" => "secunde în urmă",
|
||||
"1 minute ago" => "1 minut în urmă",
|
||||
"today" => "astăzi",
|
||||
"yesterday" => "ieri",
|
||||
"last month" => "ultima lună",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Новый",
|
||||
"Text file" => "Текстовый файл",
|
||||
"Folder" => "Папка",
|
||||
"From link" => "По ссылке",
|
||||
"Upload" => "Загрузить ",
|
||||
"Cancel upload" => "Отмена загрузки",
|
||||
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
|
||||
"Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
|
||||
"Files" => "ගොනු",
|
||||
"Unshare" => "නොබෙදු",
|
||||
"Delete" => "මකන්න",
|
||||
"Rename" => "නැවත නම් කරන්න",
|
||||
"replace" => "ප්රතිස්ථාපනය කරන්න",
|
||||
|
|
@ -18,8 +19,14 @@
|
|||
"Size" => "ප්රමාණය",
|
||||
"Modified" => "වෙනස් කළ",
|
||||
"1 file" => "1 ගොනුවක්",
|
||||
"seconds ago" => "තත්පරයන්ට පෙර",
|
||||
"1 minute ago" => "1 මිනිත්තුවකට පෙර",
|
||||
"today" => "අද",
|
||||
"yesterday" => "පෙර දින",
|
||||
"last month" => "පෙර මාසයේ",
|
||||
"months ago" => "මාස කීපයකට පෙර",
|
||||
"last year" => "පෙර අවුරුද්දේ",
|
||||
"years ago" => "අවුරුදු කීපයකට පෙර",
|
||||
"File handling" => "ගොනු පරිහරණය",
|
||||
"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්රමාණය",
|
||||
"max. possible: " => "හැකි උපරිමය:",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Nový",
|
||||
"Text file" => "Textový súbor",
|
||||
"Folder" => "Priečinok",
|
||||
"From link" => "Z odkazu",
|
||||
"Upload" => "Odoslať",
|
||||
"Cancel upload" => "Zrušiť odosielanie",
|
||||
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
"Size" => "Величина",
|
||||
"Modified" => "Задња измена",
|
||||
"Maximum upload size" => "Максимална величина пошиљке",
|
||||
"Save" => "Сними",
|
||||
"New" => "Нови",
|
||||
"Text file" => "текстуални фајл",
|
||||
"Folder" => "фасцикла",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
"Size" => "Veličina",
|
||||
"Modified" => "Zadnja izmena",
|
||||
"Maximum upload size" => "Maksimalna veličina pošiljke",
|
||||
"Save" => "Snimi",
|
||||
"Upload" => "Pošalji",
|
||||
"Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
|
||||
"Download" => "Preuzmi",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"New" => "Ny",
|
||||
"Text file" => "Textfil",
|
||||
"Folder" => "Mapp",
|
||||
"From link" => "Från länk",
|
||||
"Upload" => "Ladda upp",
|
||||
"Cancel upload" => "Avbryt uppladdning",
|
||||
"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
"Missing a temporary folder" => "Geçici bir klasör eksik",
|
||||
"Failed to write to disk" => "Diske yazılamadı",
|
||||
"Files" => "Dosyalar",
|
||||
"Unshare" => "Paylaşılmayan",
|
||||
"Delete" => "Sil",
|
||||
"Rename" => "İsim değiştir.",
|
||||
"replace" => "değiştir",
|
||||
"cancel" => "iptal",
|
||||
"undo" => "geri al",
|
||||
|
|
@ -28,6 +30,7 @@
|
|||
"Enable ZIP-download" => "ZIP indirmeyi aktif et",
|
||||
"0 is unlimited" => "0 limitsiz demektir",
|
||||
"Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi sayısı",
|
||||
"Save" => "Kaydet",
|
||||
"New" => "Yeni",
|
||||
"Text file" => "Metin dosyası",
|
||||
"Folder" => "Klasör",
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"No file was uploaded" => "Не відвантажено жодного файлу",
|
||||
"Missing a temporary folder" => "Відсутній тимчасовий каталог",
|
||||
"Files" => "Файли",
|
||||
"Unshare" => "Заборонити доступ",
|
||||
"Delete" => "Видалити",
|
||||
"undo" => "відмінити",
|
||||
"generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
|
||||
|
|
@ -17,9 +18,18 @@
|
|||
"Name" => "Ім'я",
|
||||
"Size" => "Розмір",
|
||||
"Modified" => "Змінено",
|
||||
"seconds ago" => "секунди тому",
|
||||
"1 minute ago" => "1 хвилину тому",
|
||||
"today" => "сьогодні",
|
||||
"yesterday" => "вчора",
|
||||
"last month" => "минулого місяця",
|
||||
"months ago" => "місяці тому",
|
||||
"last year" => "минулого року",
|
||||
"years ago" => "роки тому",
|
||||
"Maximum upload size" => "Максимальний розмір відвантажень",
|
||||
"max. possible: " => "макс.можливе:",
|
||||
"0 is unlimited" => "0 є безліміт",
|
||||
"Save" => "Зберегти",
|
||||
"New" => "Створити",
|
||||
"Text file" => "Текстовий файл",
|
||||
"Folder" => "Папка",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"Size" => "大小",
|
||||
"Modified" => "修改日期",
|
||||
"seconds ago" => "秒前",
|
||||
"1 minute ago" => "1 分钟前",
|
||||
"today" => "今天",
|
||||
"yesterday" => "昨天",
|
||||
"last month" => "上个月",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
"Missing a temporary folder" => "遺失暫存資料夾",
|
||||
"Failed to write to disk" => "寫入硬碟失敗",
|
||||
"Files" => "檔案",
|
||||
"Unshare" => "取消共享",
|
||||
"Delete" => "刪除",
|
||||
"Rename" => "重新命名",
|
||||
"replace" => "取代",
|
||||
"cancel" => "取消",
|
||||
"generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.",
|
||||
|
|
@ -19,6 +21,14 @@
|
|||
"Name" => "名稱",
|
||||
"Size" => "大小",
|
||||
"Modified" => "修改",
|
||||
"seconds ago" => "幾秒前",
|
||||
"1 minute ago" => "1 分鐘前",
|
||||
"today" => "今天",
|
||||
"yesterday" => "昨天",
|
||||
"last month" => "上個月",
|
||||
"months ago" => "幾個月前",
|
||||
"last year" => "去年",
|
||||
"years ago" => "幾年前",
|
||||
"File handling" => "檔案處理",
|
||||
"Maximum upload size" => "最大上傳容量",
|
||||
"max. possible: " => "最大允許: ",
|
||||
|
|
@ -26,6 +36,7 @@
|
|||
"Enable ZIP-download" => "啟用 Zip 下載",
|
||||
"0 is unlimited" => "0代表沒有限制",
|
||||
"Maximum input size for ZIP files" => "針對ZIP檔案最大輸入大小",
|
||||
"Save" => "儲存",
|
||||
"New" => "新增",
|
||||
"Text file" => "文字檔",
|
||||
"Folder" => "資料夾",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?php OCP\Util::addscript('files','admin'); ?>
|
||||
<?php OCP\Util::addscript('files', 'admin'); ?>
|
||||
|
||||
<form name="filesForm" action='#' method='post'>
|
||||
<fieldset class="personalblock">
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<ul class="popup popupTop">
|
||||
<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
|
||||
<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
|
||||
<li style="background-image:url('<?php echo OCP\image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From link');?></p></li>
|
||||
<li style="background-image:url('<?php echo OCP\image_path('core', 'actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From link');?></p></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="file_upload_wrapper svg">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
|
||||
$crumb = $_["breadcrumb"][$i]; ?>
|
||||
<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
|
||||
<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
|
||||
<a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
|
||||
</div>
|
||||
<?php endfor;?>
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
$relative_modified_date = OCP\relative_modified_date($file['mtime']);
|
||||
$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
|
||||
if($relative_date_color>200) $relative_date_color = 200;
|
||||
$name = str_replace('+','%20', urlencode($file['name']));
|
||||
$name = str_replace('%2F','/', $name);
|
||||
$directory = str_replace('+','%20', urlencode($file['directory']));
|
||||
$directory = str_replace('%2F','/', $directory); ?>
|
||||
$name = str_replace('+', '%20', urlencode($file['name']));
|
||||
$name = str_replace('%2F', '/', $name);
|
||||
$directory = str_replace('+', '%20', urlencode($file['directory']));
|
||||
$directory = str_replace('%2F', '/', $directory); ?>
|
||||
<tr data-id="<?php echo $file['id']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'>
|
||||
<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)">
|
||||
<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php
|
|||
|
||||
OC_FileProxy::register(new OC_FileProxy_Encryption());
|
||||
|
||||
OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener');
|
||||
OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener');
|
||||
|
||||
stream_wrapper_register('crypt','OC_CryptStream');
|
||||
stream_wrapper_register('crypt', 'OC_CryptStream');
|
||||
|
||||
if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
|
||||
OCP\User::logout();
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class OC_Crypt {
|
|||
self::init($params['uid'], $params['password']);
|
||||
}
|
||||
|
||||
public static function init($login,$password) {
|
||||
public static function init($login, $password) {
|
||||
$view=new \OC\Files\View('/');
|
||||
if(!$view->file_exists('/'.$login)) {
|
||||
$view->mkdir('/'.$login);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
/**
|
||||
* transparently encrypted filestream
|
||||
*
|
||||
* you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
|
||||
* you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
|
||||
* and then fopen('crypt://streams/foo');
|
||||
*/
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ class OC_CryptStream{
|
|||
if($currentPos%8192!=0) {
|
||||
//make sure we always start on a block start
|
||||
fseek($this->source, -($currentPos%8192), SEEK_CUR);
|
||||
$encryptedBlock=fread($this->source,8192);
|
||||
$encryptedBlock=fread($this->source, 8192);
|
||||
fseek($this->source, -($currentPos%8192), SEEK_CUR);
|
||||
$block=OC_Crypt::decrypt($encryptedBlock);
|
||||
$data=substr($block, 0, $currentPos%8192).$data;
|
||||
|
|
@ -123,11 +123,11 @@ class OC_CryptStream{
|
|||
$data=substr($data, 8192);
|
||||
}
|
||||
}
|
||||
$this->size=max($this->size,$currentPos+$length);
|
||||
$this->size=max($this->size, $currentPos+$length);
|
||||
return $length;
|
||||
}
|
||||
|
||||
public function stream_set_option($option,$arg1,$arg2) {
|
||||
public function stream_set_option($option, $arg1, $arg2) {
|
||||
switch($option) {
|
||||
case STREAM_OPTION_BLOCKING:
|
||||
stream_set_blocking($this->source, $arg1);
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
|
|||
* @return bool
|
||||
*/
|
||||
private static function isEncrypted($path) {
|
||||
$metadata=\OC\Files\Filesystem::getFileInfo($path,'');
|
||||
$metadata=\OC\Files\Filesystem::getFileInfo($path, '');
|
||||
return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
|
||||
}
|
||||
|
||||
|
|
@ -68,15 +68,15 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
|
|||
if (!is_resource($data)) {//stream put contents should have been converter to fopen
|
||||
$size=strlen($data);
|
||||
$data=OC_Crypt::blockEncrypt($data);
|
||||
\OC\Files\Filesystem::putFileInfo($path, array('encrypted'=>true,'size'=>$size),'');
|
||||
\OC\Files\Filesystem::putFileInfo($path, array('encrypted'=>true, 'size'=>$size), '');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function postFile_get_contents($path,$data) {
|
||||
if(self::isEncrypted($path)) {
|
||||
$cached=\OC\Files\Filesystem::getFileInfo($path,'');
|
||||
$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
|
||||
$cached=\OC\Files\Filesystem::getFileInfo($path, '');
|
||||
$data=OC_Crypt::blockDecrypt($data, '', $cached['size']);
|
||||
}
|
||||
return $data;
|
||||
}
|
||||
|
|
@ -90,13 +90,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
|
|||
fclose($result);
|
||||
$result=fopen('crypt://'.$path,$meta['mode']);
|
||||
}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
|
||||
if(\OC\Files\Filesystem::file_exists($path) and \OC\Files\Filesystem::filesize($path)>0) {
|
||||
if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
|
||||
//first encrypt the target file so we don't end up with a half encrypted file
|
||||
OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG);
|
||||
OCP\Util::writeLog('files_encryption', 'Decrypting ' . $path . ' before writing', OCP\Util::DEBUG);
|
||||
$tmp=fopen('php://temp', 'w+');
|
||||
OCP\Files::streamCopy($result,$tmp);
|
||||
fclose($result);
|
||||
\OC\Files\Filesystem::file_put_contents($path,$tmp);
|
||||
\OC\Files\Filesystem::file_put_contents($path, $tmp);
|
||||
fclose($tmp);
|
||||
}
|
||||
$result=fopen('crypt://'.$path,$meta['mode']);
|
||||
|
|
@ -113,7 +113,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
|
|||
|
||||
public function postStat($path,$data) {
|
||||
if(self::isEncrypted($path)) {
|
||||
$cached=\OC\Files\Filesystem::getFileInfo($path,'');
|
||||
$cached=\OC\Files\Filesystem::getFileInfo($path, '');
|
||||
$data['size']=$cached['size'];
|
||||
}
|
||||
return $data;
|
||||
|
|
@ -121,7 +121,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
|
|||
|
||||
public function postFileSize($path,$size) {
|
||||
if(self::isEncrypted($path)) {
|
||||
$cached=\OC\Files\Filesystem::getFileInfo($path,'');
|
||||
$cached=\OC\Files\Filesystem::getFileInfo($path, '');
|
||||
return $cached['size'];
|
||||
}else{
|
||||
return $size;
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
$tmpl = new OCP\Template( 'files_encryption', 'settings');
|
||||
$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
|
||||
$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
|
||||
$tmpl->assign('blacklist',$blackList);
|
||||
$tmpl->assign('encryption_enabled',$enabled);
|
||||
$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
|
||||
$tmpl->assign('blacklist', $blackList);
|
||||
$tmpl->assign('encryption_enabled', $enabled);
|
||||
|
||||
OCP\Util::addscript('files_encryption','settings');
|
||||
OCP\Util::addscript('core','multiselect');
|
||||
OCP\Util::addscript('files_encryption', 'settings');
|
||||
OCP\Util::addscript('core', 'multiselect');
|
||||
|
||||
return $tmpl->fetchPage();
|
||||
|
|
|
|||
|
|
@ -11,46 +11,46 @@ class Test_Encryption extends UnitTestCase {
|
|||
$key=uniqid();
|
||||
$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
|
||||
$source=file_get_contents($file); //nice large text file
|
||||
$encrypted=OC_Crypt::encrypt($source,$key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted,$key);
|
||||
$encrypted=OC_Crypt::encrypt($source, $key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted, $key);
|
||||
$decrypted=rtrim($decrypted, "\0");
|
||||
$this->assertNotEqual($encrypted,$source);
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$this->assertNotEqual($encrypted, $source);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
$chunk=substr($source,0,8192);
|
||||
$encrypted=OC_Crypt::encrypt($chunk,$key);
|
||||
$chunk=substr($source, 0, 8192);
|
||||
$encrypted=OC_Crypt::encrypt($chunk, $key);
|
||||
$this->assertEqual(strlen($chunk), strlen($encrypted));
|
||||
$decrypted=OC_Crypt::decrypt($encrypted,$key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted, $key);
|
||||
$decrypted=rtrim($decrypted, "\0");
|
||||
$this->assertEqual($decrypted,$chunk);
|
||||
$this->assertEqual($decrypted, $chunk);
|
||||
|
||||
$encrypted=OC_Crypt::blockEncrypt($source,$key);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
|
||||
$this->assertNotEqual($encrypted,$source);
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$encrypted=OC_Crypt::blockEncrypt($source, $key);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
|
||||
$this->assertNotEqual($encrypted, $source);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
$tmpFileEncrypted=OCP\Files::tmpFile();
|
||||
OC_Crypt::encryptfile($file,$tmpFileEncrypted,$key);
|
||||
OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key);
|
||||
$encrypted=file_get_contents($tmpFileEncrypted);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
|
||||
$this->assertNotEqual($encrypted,$source);
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
|
||||
$this->assertNotEqual($encrypted, $source);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
$tmpFileDecrypted=OCP\Files::tmpFile();
|
||||
OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
|
||||
OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key);
|
||||
$decrypted=file_get_contents($tmpFileDecrypted);
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
|
||||
$source=file_get_contents($file); //binary file
|
||||
$encrypted=OC_Crypt::encrypt($source,$key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted,$key);
|
||||
$encrypted=OC_Crypt::encrypt($source, $key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted, $key);
|
||||
$decrypted=rtrim($decrypted, "\0");
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
$encrypted=OC_Crypt::blockEncrypt($source,$key);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$encrypted=OC_Crypt::blockEncrypt($source, $key);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -59,14 +59,14 @@ class Test_Encryption extends UnitTestCase {
|
|||
|
||||
$file=__DIR__.'/binary';
|
||||
$source=file_get_contents($file); //binary file
|
||||
$encrypted=OC_Crypt::encrypt($source,$key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted,$key);
|
||||
$encrypted=OC_Crypt::encrypt($source, $key);
|
||||
$decrypted=OC_Crypt::decrypt($encrypted, $key);
|
||||
|
||||
$decrypted=rtrim($decrypted, "\0");
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$this->assertEqual($decrypted, $source);
|
||||
|
||||
$encrypted=OC_Crypt::blockEncrypt($source,$key);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted,$key, strlen($source));
|
||||
$this->assertEqual($decrypted,$source);
|
||||
$encrypted=OC_Crypt::blockEncrypt($source, $key);
|
||||
$decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source));
|
||||
$this->assertEqual($decrypted, $source);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,27 +10,27 @@ class Test_CryptStream extends UnitTestCase {
|
|||
private $tmpFiles=array();
|
||||
|
||||
function testStream() {
|
||||
$stream=$this->getStream('test1','w', strlen('foobar'));
|
||||
fwrite($stream,'foobar');
|
||||
$stream=$this->getStream('test1', 'w', strlen('foobar'));
|
||||
fwrite($stream, 'foobar');
|
||||
fclose($stream);
|
||||
|
||||
$stream=$this->getStream('test1','r', strlen('foobar'));
|
||||
$data=fread($stream,6);
|
||||
$stream=$this->getStream('test1', 'r', strlen('foobar'));
|
||||
$data=fread($stream, 6);
|
||||
fclose($stream);
|
||||
$this->assertEqual('foobar',$data);
|
||||
$this->assertEqual('foobar', $data);
|
||||
|
||||
$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
|
||||
$source=fopen($file,'r');
|
||||
$target=$this->getStream('test2','w',0);
|
||||
OCP\Files::streamCopy($source,$target);
|
||||
$source=fopen($file, 'r');
|
||||
$target=$this->getStream('test2', 'w', 0);
|
||||
OCP\Files::streamCopy($source, $target);
|
||||
fclose($target);
|
||||
fclose($source);
|
||||
|
||||
$stream=$this->getStream('test2','r', filesize($file));
|
||||
$stream=$this->getStream('test2', 'r', filesize($file));
|
||||
$data=stream_get_contents($stream);
|
||||
$original=file_get_contents($file);
|
||||
$this->assertEqual(strlen($original), strlen($data));
|
||||
$this->assertEqual($original,$data);
|
||||
$this->assertEqual($original, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -40,7 +40,7 @@ class Test_CryptStream extends UnitTestCase {
|
|||
* @param int size
|
||||
* @return resource
|
||||
*/
|
||||
function getStream($id,$mode,$size) {
|
||||
function getStream($id, $mode, $size) {
|
||||
if($id==='') {
|
||||
$id=uniqid();
|
||||
}
|
||||
|
|
@ -50,36 +50,36 @@ class Test_CryptStream extends UnitTestCase {
|
|||
}else{
|
||||
$file=$this->tmpFiles[$id];
|
||||
}
|
||||
$stream=fopen($file,$mode);
|
||||
OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
|
||||
return fopen('crypt://streams/'.$id,$mode);
|
||||
$stream=fopen($file, $mode);
|
||||
OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size);
|
||||
return fopen('crypt://streams/'.$id, $mode);
|
||||
}
|
||||
|
||||
function testBinary() {
|
||||
$file=__DIR__.'/binary';
|
||||
$source=file_get_contents($file);
|
||||
|
||||
$stream=$this->getStream('test','w', strlen($source));
|
||||
fwrite($stream,$source);
|
||||
$stream=$this->getStream('test', 'w', strlen($source));
|
||||
fwrite($stream, $source);
|
||||
fclose($stream);
|
||||
|
||||
$stream=$this->getStream('test','r', strlen($source));
|
||||
$stream=$this->getStream('test', 'r', strlen($source));
|
||||
$data=stream_get_contents($stream);
|
||||
fclose($stream);
|
||||
$this->assertEqual(strlen($data), strlen($source));
|
||||
$this->assertEqual($source,$data);
|
||||
$this->assertEqual($source, $data);
|
||||
|
||||
$file=__DIR__.'/zeros';
|
||||
$source=file_get_contents($file);
|
||||
|
||||
$stream=$this->getStream('test2','w', strlen($source));
|
||||
fwrite($stream,$source);
|
||||
$stream=$this->getStream('test2', 'w', strlen($source));
|
||||
fwrite($stream, $source);
|
||||
fclose($stream);
|
||||
|
||||
$stream=$this->getStream('test2','r', strlen($source));
|
||||
$stream=$this->getStream('test2', 'r', strlen($source));
|
||||
$data=stream_get_contents($stream);
|
||||
fclose($stream);
|
||||
$this->assertEqual(strlen($data), strlen($source));
|
||||
$this->assertEqual($source,$data);
|
||||
$this->assertEqual($source, $data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"Backend" => "Podpůrná vrstva",
|
||||
"Configuration" => "Nastavení",
|
||||
"Options" => "Možnosti",
|
||||
"Applicable" => "Platný",
|
||||
"Applicable" => "Přístupný pro",
|
||||
"Add mount point" => "Přidat bod připojení",
|
||||
"None set" => "Nenastaveno",
|
||||
"All Users" => "Všichni uživatelé",
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ class OC_Mount_Config {
|
|||
foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
|
||||
$content .= "\t\t'".$group."' => array (\n";
|
||||
foreach ($mounts as $mountPoint => $mount) {
|
||||
$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
|
||||
$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
|
||||
|
||||
}
|
||||
$content .= "\t\t),\n";
|
||||
|
|
|
|||
|
|
@ -399,8 +399,8 @@ class Google extends \OC\Files\Storage\Common {
|
|||
case 'x+':
|
||||
case 'c':
|
||||
case 'c+':
|
||||
if (strrpos($path,'.') !== false) {
|
||||
$ext = substr($path, strrpos($path,'.'));
|
||||
if (strrpos($path, '.') !== false) {
|
||||
$ext = substr($path, strrpos($path, '.'));
|
||||
} else {
|
||||
$ext = '';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -422,7 +422,7 @@ class Shared extends \OC\Files\Storage\Common {
|
|||
* @param int $time
|
||||
* @return bool
|
||||
*/
|
||||
public function hasUpdated($path,$time) {
|
||||
public function hasUpdated($path, $time) {
|
||||
//TODO
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
|
|||
OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
|
||||
|
||||
OCP\App::registerAdmin('files_versions', 'settings');
|
||||
OCP\App::registerPersonal('files_versions','settings-personal');
|
||||
OCP\App::registerPersonal('files_versions', 'settings-personal');
|
||||
|
||||
OCP\Util::addscript('files_versions', 'versions');
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
*/
|
||||
|
||||
OCP\User::checkLoggedIn( );
|
||||
OCP\Util::addStyle('files_versions','versions');
|
||||
OCP\Util::addStyle('files_versions', 'versions');
|
||||
$tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
|
||||
|
||||
if ( isset( $_GET['path'] ) ) {
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class Hooks {
|
|||
$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v';
|
||||
if(Storage::isversioned($rel_oldpath)) {
|
||||
$info=pathinfo($abs_newpath);
|
||||
if(!file_exists($info['dirname'])) mkdir($info['dirname'],0750, true);
|
||||
if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true);
|
||||
$versions = Storage::getVersions($rel_oldpath);
|
||||
foreach ($versions as $v) {
|
||||
rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
$tmpl = new OCP\Template( 'files_versions', 'settings-personal');
|
||||
|
||||
OCP\Util::addscript('files_versions','settings-personal');
|
||||
OCP\Util::addscript('files_versions', 'settings-personal');
|
||||
|
||||
return $tmpl->fetchPage();
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
|
|||
$this->connection->ldapGroupFilter,
|
||||
$this->connection->ldapGroupMemberAssocAttr.'='.$uid
|
||||
));
|
||||
$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn'));
|
||||
$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn'));
|
||||
$groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
|
||||
$this->connection->writeToCache($cacheKey, $groups);
|
||||
|
||||
|
|
|
|||
|
|
@ -180,22 +180,22 @@ class Connection {
|
|||
* Caches the general LDAP configuration.
|
||||
*/
|
||||
private function readConfiguration($force = false) {
|
||||
\OCP\Util::writeLog('user_ldap','Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG);
|
||||
\OCP\Util::writeLog('user_ldap', 'Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG);
|
||||
if((!$this->configured || $force) && !is_null($this->configID)) {
|
||||
\OCP\Util::writeLog('user_ldap','Reading the configuration', \OCP\Util::DEBUG);
|
||||
\OCP\Util::writeLog('user_ldap', 'Reading the configuration', \OCP\Util::DEBUG);
|
||||
$this->config['ldapHost'] = \OCP\Config::getAppValue($this->configID, 'ldap_host', '');
|
||||
$this->config['ldapPort'] = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389);
|
||||
$this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn','');
|
||||
$this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password',''));
|
||||
$this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn', '');
|
||||
$this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', ''));
|
||||
$this->config['ldapBase'] = \OCP\Config::getAppValue($this->configID, 'ldap_base', '');
|
||||
$this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users',$this->config['ldapBase']);
|
||||
$this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']);
|
||||
$this->config['ldapBaseGroups'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']);
|
||||
$this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls',0);
|
||||
$this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0);
|
||||
$this->config['ldapNoCase'] = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
|
||||
$this->config['turnOffCertCheck'] = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0);
|
||||
$this->config['ldapUserDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8');
|
||||
$this->config['ldapUserFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person');
|
||||
$this->config['ldapGroupFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
|
||||
$this->config['ldapUserFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter', 'objectClass=person');
|
||||
$this->config['ldapGroupFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter', '(objectClass=posixGroup)');
|
||||
$this->config['ldapLoginFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)');
|
||||
$this->config['ldapGroupDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', 'uid'), 'UTF-8');
|
||||
$this->config['ldapQuotaAttribute'] = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', '');
|
||||
|
|
@ -263,7 +263,7 @@ class Connection {
|
|||
if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
|
||||
\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
|
||||
}
|
||||
if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) {
|
||||
if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) {
|
||||
\OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto');
|
||||
\OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,16 +26,12 @@ OCP\Util::addscript('user_ldap', 'settings');
|
|||
OCP\Util::addstyle('user_ldap', 'settings');
|
||||
|
||||
if ($_POST) {
|
||||
$clearCache = false;
|
||||
foreach($params as $param) {
|
||||
if(isset($_POST[$param])) {
|
||||
$clearCache = true;
|
||||
if('ldap_agent_password' == $param) {
|
||||
OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param]));
|
||||
} elseif('ldap_cache_ttl' == $param) {
|
||||
if(OCP\Config::getAppValue('user_ldap', $param,'') != $_POST[$param]) {
|
||||
$ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
|
||||
$ldap->clearCache();
|
||||
OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
|
||||
}
|
||||
} elseif('home_folder_naming_rule' == $param) {
|
||||
$value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param];
|
||||
OCP\Config::setAppValue('user_ldap', $param, $value);
|
||||
|
|
@ -54,12 +50,16 @@ if ($_POST) {
|
|||
OCP\Config::setAppValue('user_ldap', $param, 0);
|
||||
}
|
||||
}
|
||||
if($clearCache) {
|
||||
$ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
|
||||
$ldap->clearCache();
|
||||
}
|
||||
}
|
||||
|
||||
// fill template
|
||||
$tmpl = new OCP\Template( 'user_ldap', 'settings');
|
||||
foreach($params as $param) {
|
||||
$value = OCP\Config::getAppValue('user_ldap', $param,'');
|
||||
$value = OCP\Config::getAppValue('user_ldap', $param, '');
|
||||
$tmpl->assign($param, $value);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ class Test_Group_Ldap extends UnitTestCase {
|
|||
$this->assertIsA(OC_Group::getGroups(), gettype(array()));
|
||||
$this->assertIsA($group_ldap->getGroups(), gettype(array()));
|
||||
|
||||
$this->assertFalse(OC_Group::inGroup('john','dosers'), gettype(false));
|
||||
$this->assertFalse($group_ldap->inGroup('john','dosers'), gettype(false));
|
||||
$this->assertFalse(OC_Group::inGroup('john', 'dosers'), gettype(false));
|
||||
$this->assertFalse($group_ldap->inGroup('john', 'dosers'), gettype(false));
|
||||
//TODO: check also for expected true result. This backend won't be able to do any modifications, maybe use a dummy for this.
|
||||
|
||||
$this->assertIsA(OC_Group::getUserGroups('john doe'), gettype(array()));
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
require_once 'apps/user_webdavauth/user_webdavauth.php';
|
||||
|
||||
OC_APP::registerAdmin('user_webdavauth','settings');
|
||||
OC_APP::registerAdmin('user_webdavauth', 'settings');
|
||||
|
||||
OC_User::registerBackend("WEBDAVAUTH");
|
||||
OC_User::useBackend( "WEBDAVAUTH" );
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
print_r($_POST);
|
||||
if($_POST) {
|
||||
|
||||
if(isset($_POST['webdav_url'])) {
|
||||
|
|
|
|||
|
|
@ -30,19 +30,19 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
|
|||
|
||||
public function createUser() {
|
||||
// Can't create user
|
||||
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3);
|
||||
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend', 3);
|
||||
return false;
|
||||
}
|
||||
|
||||
public function deleteUser() {
|
||||
// Can't delete user
|
||||
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend',3);
|
||||
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3);
|
||||
return false;
|
||||
}
|
||||
|
||||
public function setPassword ( $uid, $password ) {
|
||||
// We can't change user password
|
||||
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3);
|
||||
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend', 3);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud
|
||||
* @author Christian Reiner
|
||||
* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the license, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file core/ajax/requesttoken.php
|
||||
* @brief Ajax method to retrieve a fresh request protection token for ajax calls
|
||||
* @return json: success/error state indicator including a fresh request token
|
||||
* @author Christian Reiner
|
||||
*/
|
||||
|
||||
// don't load apps or filesystem for this task
|
||||
$RUNTIME_NOAPPS = true;
|
||||
$RUNTIME_NOSETUPFS = true;
|
||||
|
||||
// Sanity checks
|
||||
// using OCP\JSON::callCheck() below protects the token refreshing itself.
|
||||
//OCP\JSON::callCheck ( );
|
||||
OCP\JSON::checkLoggedIn ( );
|
||||
// hand out a fresh token
|
||||
OCP\JSON::success ( array ( 'token' => OCP\Util::callRegister() ) );
|
||||
?>
|
||||
|
|
@ -40,7 +40,7 @@ OC.EventSource=function(src,data){
|
|||
dataStr+=name+'='+encodeURIComponent(data[name])+'&';
|
||||
}
|
||||
}
|
||||
dataStr+='requesttoken='+OC.Request.Token;
|
||||
dataStr+='requesttoken='+OC.EventSource.requesttoken;
|
||||
if(!this.useFallBack && typeof EventSource !='undefined'){
|
||||
this.source=new EventSource(src+'?'+dataStr);
|
||||
this.source.onmessage=function(e){
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
/**
|
||||
* ownCloud
|
||||
*
|
||||
* @file core/js/requesttoken.js
|
||||
* @brief Routine to refresh the Request protection request token periodically
|
||||
* @author Christian Reiner (arkascha)
|
||||
* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the license, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
OC.Request = {
|
||||
// the request token
|
||||
Token: {},
|
||||
// the lifespan span (in secs)
|
||||
Lifespan: {},
|
||||
// method to refresh the local request token periodically
|
||||
Refresh: function(){
|
||||
// just a client side console log to preserve efficiency
|
||||
console.log("refreshing request token (lifebeat)");
|
||||
var dfd=new $.Deferred();
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: OC.filePath('core','ajax','requesttoken.php'),
|
||||
cache: false,
|
||||
data: { },
|
||||
dataType: 'json'
|
||||
}).done(function(response){
|
||||
// store refreshed token inside this class
|
||||
OC.Request.Token=response.token;
|
||||
dfd.resolve();
|
||||
}).fail(dfd.reject);
|
||||
return dfd;
|
||||
}
|
||||
}
|
||||
// accept requesttoken and lifespan into the OC namespace
|
||||
OC.Request.Token = oc_requesttoken;
|
||||
OC.Request.Lifespan = oc_requestlifespan;
|
||||
// refresh the request token periodically shortly before it becomes invalid on the server side
|
||||
setInterval(OC.Request.Refresh,Math.floor(1000*OC.Request.Lifespan*0.93)), // 93% of lifespan value, close to when the token expires
|
||||
// early bind token as additional ajax argument for every single request
|
||||
$(document).bind('ajaxSend', function(elm, xhr, s){xhr.setRequestHeader('requesttoken', OC.Request.Token);});
|
||||
|
|
@ -38,6 +38,8 @@
|
|||
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
|
||||
"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
|
||||
"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
|
||||
"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.",
|
||||
"Request failed!" => "Die Anfrage schlug fehl!",
|
||||
"Username" => "Benutzername",
|
||||
"Request reset" => "Beantrage Zurücksetzung",
|
||||
"Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
"Error while sharing" => "Erreur lors de la mise en partage",
|
||||
"Error while unsharing" => "Erreur lors de l'annulation du partage",
|
||||
"Error while changing permissions" => "Erreur lors du changement des permissions",
|
||||
"Shared with you and the group {group} by {owner}" => "Partagé par {owner} avec vous et le groupe {group}",
|
||||
"Shared with you by {owner}" => "Partagé avec vous par {owner}",
|
||||
"Share with" => "Partager avec",
|
||||
"Share with link" => "Partager via lien",
|
||||
"Password protect" => "Protéger par un mot de passe",
|
||||
|
|
@ -22,6 +24,7 @@
|
|||
"Share via email:" => "Partager via e-mail :",
|
||||
"No people found" => "Aucun utilisateur trouvé",
|
||||
"Resharing is not allowed" => "Le repartage n'est pas autorisé",
|
||||
"Shared in {item} with {user}" => "Partagé dans {item} avec {user}",
|
||||
"Unshare" => "Ne plus partager",
|
||||
"can edit" => "édition autorisée",
|
||||
"access control" => "contrôle des accès",
|
||||
|
|
@ -35,6 +38,8 @@
|
|||
"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
|
||||
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
|
||||
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
|
||||
"Reset email send." => "Mail de réinitialisation envoyé.",
|
||||
"Request failed!" => "La requête a échoué !",
|
||||
"Username" => "Nom d'utilisateur",
|
||||
"Request reset" => "Demander la réinitialisation",
|
||||
"Your password was reset" => "Votre mot de passe a été réinitialisé",
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
"Error while sharing" => "Erro ao compartilhar",
|
||||
"Error while unsharing" => "Erro ao descompartilhar",
|
||||
"Error while changing permissions" => "Erro ao mudar permissões",
|
||||
"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}",
|
||||
"Shared with you by {owner}" => "Compartilhado com você por {owner}",
|
||||
"Share with" => "Compartilhar com",
|
||||
"Share with link" => "Compartilhar com link",
|
||||
"Password protect" => "Proteger com senha",
|
||||
|
|
@ -22,6 +24,7 @@
|
|||
"Share via email:" => "Compartilhar via e-mail:",
|
||||
"No people found" => "Nenhuma pessoa encontrada",
|
||||
"Resharing is not allowed" => "Não é permitido re-compartilhar",
|
||||
"Shared in {item} with {user}" => "Compartilhado em {item} com {user}",
|
||||
"Unshare" => "Descompartilhar",
|
||||
"can edit" => "pode editar",
|
||||
"access control" => "controle de acesso",
|
||||
|
|
@ -35,6 +38,8 @@
|
|||
"ownCloud password reset" => "Redefinir senha ownCloud",
|
||||
"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
|
||||
"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
|
||||
"Reset email send." => "Email de redefinição de senha enviado.",
|
||||
"Request failed!" => "A requisição falhou!",
|
||||
"Username" => "Nome de Usuário",
|
||||
"Request reset" => "Pedido de reposição",
|
||||
"Your password was reset" => "Sua senha foi mudada",
|
||||
|
|
@ -86,6 +91,8 @@
|
|||
"December" => "Dezembro",
|
||||
"web services under your control" => "web services sob seu controle",
|
||||
"Log out" => "Sair",
|
||||
"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
|
||||
"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
|
||||
"Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
|
||||
"Lost your password?" => "Esqueçeu sua senha?",
|
||||
"remember" => "lembrete",
|
||||
|
|
@ -93,5 +100,7 @@
|
|||
"You are logged out." => "Você está desconectado.",
|
||||
"prev" => "anterior",
|
||||
"next" => "próximo",
|
||||
"Security Warning!" => "Aviso de Segurança!"
|
||||
"Security Warning!" => "Aviso de Segurança!",
|
||||
"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.",
|
||||
"Verify" => "Verificar"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@ $this->create('search_ajax_search', '/search/ajax/search.php')
|
|||
// AppConfig
|
||||
$this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
|
||||
->actionInclude('core/ajax/appconfig.php');
|
||||
// RequestToken
|
||||
$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php')
|
||||
->actionInclude('core/ajax/requesttoken.php');
|
||||
// Share
|
||||
$this->create('core_ajax_share', '/core/ajax/share.php')
|
||||
->actionInclude('core/ajax/share.php');
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
|
||||
<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
|
||||
<?php else: ?>
|
||||
<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype','mysql', 'sqlite'); ?>/>
|
||||
<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
|
||||
<label class="mysql" for="mysql">MySQL</label>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
|
||||
<?php else: ?>
|
||||
<label class="pgsql" for="pgsql">PostgreSQL</label>
|
||||
<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/>
|
||||
<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
<input type="hidden" id="dbtype" name="dbtype" value="oci" />
|
||||
<?php else: ?>
|
||||
<label class="oci" for="oci">Oracle</label>
|
||||
<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/>
|
||||
<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
|
||||
var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
|
||||
var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
|
||||
var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
|
||||
</script>
|
||||
<?php foreach ($_['jsfiles'] as $jsfile): ?>
|
||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
|
||||
var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
|
||||
var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
|
||||
var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
|
||||
var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
|
||||
var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
|
||||
var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
|
||||
var oc_current_user = '<?php echo OC_User::getUser() ?>';
|
||||
var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
|
||||
var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
|
||||
var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
|
||||
var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
|
||||
var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
|
||||
|
|
@ -21,6 +20,13 @@
|
|||
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||
<?php endforeach; ?>
|
||||
<script type="text/javascript">
|
||||
requesttoken = '<?php echo $_['requesttoken']; ?>';
|
||||
OC.EventSource.requesttoken=requesttoken;
|
||||
$(document).bind('ajaxSend', function(elm, xhr, s) {
|
||||
xhr.setRequestHeader('requesttoken', requesttoken);
|
||||
});
|
||||
</script>
|
||||
<?php foreach($_['headers'] as $header): ?>
|
||||
<?php
|
||||
echo '<'.$header['tag'].' ';
|
||||
|
|
|
|||
4
cron.php
4
cron.php
|
|
@ -30,7 +30,7 @@ class my_temporary_cron_class {
|
|||
// We use this function to handle (unexpected) shutdowns
|
||||
function handleUnexpectedShutdown() {
|
||||
// Delete lockfile
|
||||
if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )){
|
||||
if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) {
|
||||
unlink( my_temporary_cron_class::$lockfile );
|
||||
}
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ if( OC::$CLI ) {
|
|||
}
|
||||
|
||||
// check if backgroundjobs is still running
|
||||
if( file_exists( my_temporary_cron_class::$lockfile )){
|
||||
if( file_exists( my_temporary_cron_class::$lockfile )) {
|
||||
my_temporary_cron_class::$keeplock = true;
|
||||
my_temporary_cron_class::$sent = true;
|
||||
echo "Another instance of cron.php is still running!";
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -241,9 +241,9 @@ msgstr ""
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr ""
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr ""
|
||||
msgstr "حفظ"
|
||||
|
||||
#: templates/index.php:7
|
||||
msgid "New"
|
||||
|
|
@ -275,7 +275,7 @@ msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
|
|||
|
||||
#: templates/index.php:52
|
||||
msgid "Share"
|
||||
msgstr ""
|
||||
msgstr "شارك"
|
||||
|
||||
#: templates/index.php:54
|
||||
msgid "Download"
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -242,9 +242,9 @@ msgstr "0 означава без ограничение"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr ""
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr ""
|
||||
msgstr "Запис"
|
||||
|
||||
#: templates/index.php:7
|
||||
msgid "New"
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-02 14:36+0000\n"
|
||||
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -244,7 +244,7 @@ msgstr "0 és sense límit"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Mida màxima d'entrada per fitxers ZIP"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Desa"
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ msgstr "Carpeta"
|
|||
|
||||
#: templates/index.php:11
|
||||
msgid "From link"
|
||||
msgstr ""
|
||||
msgstr "Des d'enllaç"
|
||||
|
||||
#: templates/index.php:22
|
||||
msgid "Upload"
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-02 07:02+0000\n"
|
||||
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
|
||||
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -243,7 +243,7 @@ msgstr "0 znamená bez omezení"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Maximální velikost vstupu pro ZIP soubory"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Uložit"
|
||||
|
||||
|
|
@ -261,7 +261,7 @@ msgstr "Složka"
|
|||
|
||||
#: templates/index.php:11
|
||||
msgid "From link"
|
||||
msgstr ""
|
||||
msgstr "Z odkazu"
|
||||
|
||||
#: templates/index.php:22
|
||||
msgid "Upload"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-10-04 02:04+0200\n"
|
||||
"PO-Revision-Date: 2012-10-03 08:09+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-02 10:04+0000\n"
|
||||
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
|
||||
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -67,7 +67,7 @@ msgstr "Možnosti"
|
|||
|
||||
#: templates/settings.php:11
|
||||
msgid "Applicable"
|
||||
msgstr "Platný"
|
||||
msgstr "Přístupný pro"
|
||||
|
||||
#: templates/settings.php:23
|
||||
msgid "Add mount point"
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -247,7 +247,7 @@ msgstr "0 er ubegrænset"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Maksimal størrelse på ZIP filer"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Gem"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:04+0100\n"
|
||||
"PO-Revision-Date: 2012-10-31 23:02+0000\n"
|
||||
"POT-Creation-Date: 2012-11-04 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-02 23:38+0000\n"
|
||||
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
|
||||
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -191,11 +191,11 @@ msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
|
|||
|
||||
#: lostpassword/templates/lostpassword.php:5
|
||||
msgid "Reset email send."
|
||||
msgstr ""
|
||||
msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
|
||||
|
||||
#: lostpassword/templates/lostpassword.php:8
|
||||
msgid "Request failed!"
|
||||
msgstr ""
|
||||
msgstr "Die Anfrage schlug fehl!"
|
||||
|
||||
#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
|
||||
#: templates/login.php:20
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"POT-Creation-Date: 2012-11-04 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-03 00:03+0000\n"
|
||||
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
|
||||
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -256,7 +256,7 @@ msgstr "0 bedeutet unbegrenzt"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Maximale Größe für ZIP-Dateien"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Speichern"
|
||||
|
||||
|
|
@ -274,7 +274,7 @@ msgstr "Ordner"
|
|||
|
||||
#: templates/index.php:11
|
||||
msgid "From link"
|
||||
msgstr ""
|
||||
msgstr "Von einem Link"
|
||||
|
||||
#: templates/index.php:22
|
||||
msgid "Upload"
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"POT-Creation-Date: 2012-11-04 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-02 23:50+0000\n"
|
||||
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
|
||||
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -257,7 +257,7 @@ msgstr "0 bedeutet unbegrenzt"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Maximale Größe für ZIP-Dateien"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Speichern"
|
||||
|
||||
|
|
@ -275,7 +275,7 @@ msgstr "Ordner"
|
|||
|
||||
#: templates/index.php:11
|
||||
msgid "From link"
|
||||
msgstr ""
|
||||
msgstr "Von einem Link"
|
||||
|
||||
#: templates/index.php:22
|
||||
msgid "Upload"
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -246,7 +246,7 @@ msgstr "0 για απεριόριστο"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Αποθήκευση"
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -180,7 +180,7 @@ msgstr "sekundoj antaŭe"
|
|||
|
||||
#: js/files.js:839
|
||||
msgid "1 minute ago"
|
||||
msgstr ""
|
||||
msgstr "antaŭ 1 minuto"
|
||||
|
||||
#: js/files.js:840
|
||||
msgid "{minutes} minutes ago"
|
||||
|
|
@ -242,7 +242,7 @@ msgstr "0 signifas senlime"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Maksimuma enirgrando por ZIP-dosieroj"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Konservi"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
# <devianpctek@gmail.com>, 2012.
|
||||
# Javier Llorente <javier@opensuse.org>, 2012.
|
||||
# <juanma@kde.org.ar>, 2012.
|
||||
# Rubén Trujillo <rubentrf@gmail.com>, 2012.
|
||||
|
|
@ -12,9 +13,9 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"POT-Creation-Date: 2012-11-04 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-03 20:10+0000\n"
|
||||
"Last-Translator: Luis Medina <devianpctek@gmail.com>\n"
|
||||
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -245,7 +246,7 @@ msgstr "0 es ilimitado"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Tamaño máximo para archivos ZIP de entrada"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Guardar"
|
||||
|
||||
|
|
@ -263,7 +264,7 @@ msgstr "Carpeta"
|
|||
|
||||
#: templates/index.php:11
|
||||
msgid "From link"
|
||||
msgstr ""
|
||||
msgstr "Desde el enlace"
|
||||
|
||||
#: templates/index.php:22
|
||||
msgid "Upload"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -241,7 +241,7 @@ msgstr "0 significa ilimitado"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Tamaño máximo para archivos ZIP de entrada"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Guardar"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -241,7 +241,7 @@ msgstr "0 tähendab piiramatut"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Salvesta"
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -180,7 +180,7 @@ msgstr "segundu"
|
|||
|
||||
#: js/files.js:839
|
||||
msgid "1 minute ago"
|
||||
msgstr ""
|
||||
msgstr "orain dela minutu 1"
|
||||
|
||||
#: js/files.js:840
|
||||
msgid "{minutes} minutes ago"
|
||||
|
|
@ -242,7 +242,7 @@ msgstr "0 mugarik gabe esan nahi du"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "ZIP fitxategien gehienezko tamaina"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Gorde"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -64,7 +64,7 @@ msgstr "پاک کردن"
|
|||
|
||||
#: js/fileactions.js:178
|
||||
msgid "Rename"
|
||||
msgstr ""
|
||||
msgstr "تغییرنام"
|
||||
|
||||
#: js/filelist.js:194 js/filelist.js:196
|
||||
msgid "{new_name} already exists"
|
||||
|
|
@ -177,11 +177,11 @@ msgstr ""
|
|||
|
||||
#: js/files.js:838
|
||||
msgid "seconds ago"
|
||||
msgstr ""
|
||||
msgstr "ثانیهها پیش"
|
||||
|
||||
#: js/files.js:839
|
||||
msgid "1 minute ago"
|
||||
msgstr ""
|
||||
msgstr "1 دقیقه پیش"
|
||||
|
||||
#: js/files.js:840
|
||||
msgid "{minutes} minutes ago"
|
||||
|
|
@ -189,11 +189,11 @@ msgstr ""
|
|||
|
||||
#: js/files.js:843
|
||||
msgid "today"
|
||||
msgstr ""
|
||||
msgstr "امروز"
|
||||
|
||||
#: js/files.js:844
|
||||
msgid "yesterday"
|
||||
msgstr ""
|
||||
msgstr "دیروز"
|
||||
|
||||
#: js/files.js:845
|
||||
msgid "{days} days ago"
|
||||
|
|
@ -201,19 +201,19 @@ msgstr ""
|
|||
|
||||
#: js/files.js:846
|
||||
msgid "last month"
|
||||
msgstr ""
|
||||
msgstr "ماه قبل"
|
||||
|
||||
#: js/files.js:848
|
||||
msgid "months ago"
|
||||
msgstr ""
|
||||
msgstr "ماههای قبل"
|
||||
|
||||
#: js/files.js:849
|
||||
msgid "last year"
|
||||
msgstr ""
|
||||
msgstr "سال قبل"
|
||||
|
||||
#: js/files.js:850
|
||||
msgid "years ago"
|
||||
msgstr ""
|
||||
msgstr "سالهای قبل"
|
||||
|
||||
#: templates/admin.php:5
|
||||
msgid "File handling"
|
||||
|
|
@ -243,9 +243,9 @@ msgstr "0 نامحدود است"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "حداکثرمقدار برای بار گزاری پرونده های فشرده"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr ""
|
||||
msgstr "ذخیره"
|
||||
|
||||
#: templates/index.php:7
|
||||
msgid "New"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-11-02 00:03+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:04+0000\n"
|
||||
"POT-Creation-Date: 2012-11-03 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-01 23:21+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -58,7 +58,7 @@ msgstr "Tiedostot"
|
|||
|
||||
#: js/fileactions.js:108 templates/index.php:64
|
||||
msgid "Unshare"
|
||||
msgstr ""
|
||||
msgstr "Peru jakaminen"
|
||||
|
||||
#: js/fileactions.js:110 templates/index.php:66
|
||||
msgid "Delete"
|
||||
|
|
@ -245,7 +245,7 @@ msgstr "0 on rajoittamaton"
|
|||
msgid "Maximum input size for ZIP files"
|
||||
msgstr "ZIP-tiedostojen enimmäiskoko"
|
||||
|
||||
#: templates/admin.php:14
|
||||
#: templates/admin.php:15
|
||||
msgid "Save"
|
||||
msgstr "Tallenna"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ownCloud\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
|
||||
"POT-Creation-Date: 2012-10-29 00:01+0100\n"
|
||||
"PO-Revision-Date: 2012-10-27 22:12+0000\n"
|
||||
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
|
||||
"POT-Creation-Date: 2012-11-04 00:00+0100\n"
|
||||
"PO-Revision-Date: 2012-11-03 11:37+0000\n"
|
||||
"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
|
||||
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -41,23 +41,23 @@ msgstr "Cette catégorie existe déjà : "
|
|||
msgid "Settings"
|
||||
msgstr "Paramètres"
|
||||
|
||||
#: js/oc-dialogs.js:123
|
||||
#: js/oc-dialogs.js:126
|
||||
msgid "Choose"
|
||||
msgstr "Choisir"
|
||||
|
||||
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
|
||||
#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
|
||||
#: js/oc-dialogs.js:159
|
||||
#: js/oc-dialogs.js:162
|
||||
msgid "No"
|
||||
msgstr "Non"
|
||||
|
||||
#: js/oc-dialogs.js:160
|
||||
#: js/oc-dialogs.js:163
|
||||
msgid "Yes"
|
||||
msgstr "Oui"
|
||||
|
||||
#: js/oc-dialogs.js:177
|
||||
#: js/oc-dialogs.js:180
|
||||
msgid "Ok"
|
||||
msgstr "Ok"
|
||||
|
||||
|
|
@ -84,11 +84,11 @@ msgstr "Erreur lors du changement des permissions"
|
|||
|
||||
#: js/share.js:151
|
||||
msgid "Shared with you and the group {group} by {owner}"
|
||||
msgstr ""
|
||||
msgstr "Partagé par {owner} avec vous et le groupe {group}"
|
||||
|
||||
#: js/share.js:153
|
||||
msgid "Shared with you by {owner}"
|
||||
msgstr ""
|
||||
msgstr "Partagé avec vous par {owner}"
|
||||
|
||||
#: js/share.js:158
|
||||
msgid "Share with"
|
||||
|
|
@ -129,7 +129,7 @@ msgstr "Le repartage n'est pas autorisé"
|
|||
|
||||
#: js/share.js:271
|
||||
msgid "Shared in {item} with {user}"
|
||||
msgstr ""
|
||||
msgstr "Partagé dans {item} avec {user}"
|
||||
|
||||
#: js/share.js:292
|
||||
msgid "Unshare"
|
||||
|
|
@ -185,11 +185,11 @@ msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votr
|
|||
|
||||
#: lostpassword/templates/lostpassword.php:5
|
||||
msgid "Reset email send."
|
||||
msgstr ""
|
||||
msgstr "Mail de réinitialisation envoyé."
|
||||
|
||||
#: lostpassword/templates/lostpassword.php:8
|
||||
msgid "Request failed!"
|
||||
msgstr ""
|
||||
msgstr "La requête a échoué !"
|
||||
|
||||
#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
|
||||
#: templates/login.php:20
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue