wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from master

Browse source
This commit is contained in:
Arthur Schiwon 2012-11-04 19:58:48 +01:00
commit 00bb246a0d
271 changed files with 3636 additions and 3601 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/admin.php
View file

@ -35,7 +35,7 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
$post_max_size_possible = OCP\Util::computerFileSize(get_cfg_var('post_max_size'));
$maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size));
$maxUploadFilesizePossible = OCP\Util::humanFileSize(min($upload_max_filesize_possible, $post_max_size_possible));
if($_POST) {
if($_POST && OC_Util::isCallRegistered()) {
if(isset($_POST['maxUploadSize'])) {
if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
$maxUploadFilesize = OCP\Util::humanFileSize($setMaxSize);

2
apps/files/ajax/autocomplete.php
View file

@ -44,7 +44,7 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
if(substr(strtolower($file), 0, $queryLen)==$query) {
$item=$base.$file;
if((!$dirOnly or OC_Filesystem::is_dir($item))) {
$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
$files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item);
}
}
}

2
apps/files/ajax/move.php
View file

@ -12,7 +12,7 @@ $file = stripslashes($_GET["file"]);
$target = stripslashes(rawurldecode($_GET["target"]));
if(OC_Filesystem::file_exists($target . '/' . $file)){
if(OC_Filesystem::file_exists($target . '/' . $file)) {
OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" )));
exit;
}

4
apps/files/ajax/upload.php
View file

@ -38,7 +38,7 @@ $totalSize=0;
foreach($files['size'] as $size) {
$totalSize+=$size;
}
if($totalSize>OC_Filesystem::free_space($dir)){
if($totalSize>OC_Filesystem::free_space($dir)) {
OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
exit();
}
@ -51,7 +51,7 @@ if(strpos($dir, '..') === false) {
if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
$meta = OC_FileCache::get($target);
$id = OC_FileCache::getId($target);
$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target));
$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'], 'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target));
}
}
OCP\JSON::encodedPrint($result);

4
apps/files/appinfo/filesync.php
View file

@ -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);

2
apps/files/appinfo/remote.php
View file

@ -23,7 +23,7 @@
*
*/
// load needed apps
$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
OC_App::loadApps($RUNTIME_APPTYPES);

4
apps/files/appinfo/update.php
View file

@ -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;
}
}

2
apps/files/download.php
View file

@ -32,7 +32,7 @@ $filename = $_GET["file"];
if(!OC_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;
}

4
apps/files/index.php
View file

@ -67,7 +67,7 @@ $breadcrumb = array();
$pathtohere = '';
foreach( explode( '/', $dir ) as $i ) {
if( $i != '' ) {
$pathtohere .= '/'.str_replace('+','%20', urlencode($i));
$pathtohere .= '/'.str_replace('+', '%20', urlencode($i));
$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
}
}
@ -86,7 +86,7 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
$freeSpace=OC_Filesystem::free_space($dir);
$freeSpace=max($freeSpace,0);
$freeSpace=max($freeSpace, 0);
$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
$permissions = OCP\Share::PERMISSION_READ;

2
apps/files/l10n/ar.php
View file

@ -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." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."

2
apps/files/l10n/bg_BG.php
View file

@ -16,10 +16,10 @@
"Modified" => "Променено",
"Maximum upload size" => "Макс. размер за качване",
"0 is unlimited" => "0 означава без ограничение",
"Save" => "Запис",
"New" => "Нов",
"Text file" => "Текстов файл",
"Folder" => "Папка",
"From url" => "От url-адрес",
"Upload" => "Качване",
"Cancel upload" => "Отказване на качването",
"Nothing in here. Upload something!" => "Няма нищо, качете нещо!",

2
apps/files/l10n/ca.php
View file

@ -58,7 +58,7 @@
"New" => "Nou",
"Text file" => "Fitxer de text",
"Folder" => "Carpeta",
"From url" => "Des de la url",
"From link" => "Des d'enllaç",
"Upload" => "Puja",
"Cancel upload" => "Cancel·la la pujada",
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",

2
apps/files/l10n/cs_CZ.php
View file

@ -58,7 +58,7 @@
"New" => "Nový",
"Text file" => "Textový soubor",
"Folder" => "Složka",
"From url" => "Z url",
"From link" => "Z odkazu",
"Upload" => "Odeslat",
"Cancel upload" => "Zrušit odesílání",
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",

1
apps/files/l10n/da.php
View file

@ -58,7 +58,6 @@
"New" => "Ny",
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From url" => "Fra URL",
"Upload" => "Upload",
"Cancel upload" => "Fortryd upload",
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",

2
apps/files/l10n/de.php
View file

@ -58,7 +58,7 @@
"New" => "Neu",
"Text file" => "Textdatei",
"Folder" => "Ordner",
"From url" => "Von einer URL",
"From link" => "Von einem Link",
"Upload" => "Hochladen",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",

2
apps/files/l10n/de_DE.php
View file

@ -58,7 +58,7 @@
"New" => "Neu",
"Text file" => "Textdatei",
"Folder" => "Ordner",
"From url" => "Von einer URL",
"From link" => "Von einem Link",
"Upload" => "Hochladen",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",

1
apps/files/l10n/el.php
View file

@ -58,7 +58,6 @@
"New" => "Νέο",
"Text file" => "Αρχείο κειμένου",
"Folder" => "Φάκελος",
"From url" => "Από την διεύθυνση",
"Upload" => "Αποστολή",
"Cancel upload" => "Ακύρωση αποστολής",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",

2
apps/files/l10n/eo.php
View file

@ -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",
@ -44,7 +45,6 @@
"New" => "Nova",
"Text file" => "Tekstodosiero",
"Folder" => "Dosierujo",
"From url" => "El URL",
"Upload" => "Alŝuti",
"Cancel upload" => "Nuligi alŝuton",
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",

2
apps/files/l10n/es.php
View file

@ -58,7 +58,7 @@
"New" => "Nuevo",
"Text file" => "Archivo de texto",
"Folder" => "Carpeta",
"From url" => "Desde la URL",
"From link" => "Desde el enlace",
"Upload" => "Subir",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",

1
apps/files/l10n/es_AR.php
View file

@ -58,7 +58,6 @@
"New" => "Nuevo",
"Text file" => "Archivo de texto",
"Folder" => "Carpeta",
"From url" => "Desde la URL",
"Upload" => "Subir",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",

1
apps/files/l10n/et_EE.php
View file

@ -58,7 +58,6 @@
"New" => "Uus",
"Text file" => "Tekstifail",
"Folder" => "Kaust",
"From url" => "URL-ilt",
"Upload" => "Lae üles",
"Cancel upload" => "Tühista üleslaadimine",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",

2
apps/files/l10n/eu.php
View file

@ -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",
@ -44,7 +45,6 @@
"New" => "Berria",
"Text file" => "Testu fitxategia",
"Folder" => "Karpeta",
"From url" => "URLtik",
"Upload" => "Igo",
"Cancel upload" => "Ezeztatu igoera",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",

11
apps/files/l10n/fa.php
View file

@ -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,10 +36,10 @@
"Enable ZIP-download" => "فعال سازی بارگیری پرونده های فشرده",
"0 is unlimited" => "0 نامحدود است",
"Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده",
"Save" => "ذخیره",
"New" => "جدید",
"Text file" => "فایل متنی",
"Folder" => "پوشه",
"From url" => "از نشانی",
"Upload" => "بارگذاری",
"Cancel upload" => "متوقف کردن بار گذاری",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",

2
apps/files/l10n/fi_FI.php
View file

@ -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",
@ -49,7 +50,6 @@
"New" => "Uusi",
"Text file" => "Tekstitiedosto",
"Folder" => "Kansio",
"From url" => "Verkko-osoitteesta",
"Upload" => "Lähetä",
"Cancel upload" => "Peru lähetys",
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",

2
apps/files/l10n/fr.php
View file

@ -58,7 +58,7 @@
"New" => "Nouveau",
"Text file" => "Fichier texte",
"Folder" => "Dossier",
"From url" => "Depuis URL",
"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 :)",

9
apps/files/l10n/gl.php
View file

@ -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: ",
@ -35,7 +43,6 @@
"New" => "Novo",
"Text file" => "Ficheiro de texto",
"Folder" => "Cartafol",
"From url" => "Desde url",
"Upload" => "Enviar",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "Nada por aquí. Envíe algo.",

11
apps/files/l10n/he.php
View file

@ -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,10 +33,10 @@
"Enable ZIP-download" => "הפעלת הורדת ZIP",
"0 is unlimited" => "0 - ללא הגבלה",
"Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
"Save" => "שמירה",
"New" => "חדש",
"Text file" => "קובץ טקסט",
"Folder" => "תיקייה",
"From url" => "מכתובת",
"Upload" => "העלאה",
"Cancel upload" => "ביטול ההעלאה",
"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",

1
apps/files/l10n/hr.php
View file

@ -44,7 +44,6 @@
"New" => "novo",
"Text file" => "tekstualna datoteka",
"Folder" => "mapa",
"From url" => "od URL-a",
"Upload" => "Pošalji",
"Cancel upload" => "Prekini upload",
"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",

11
apps/files/l10n/hu_HU.php
View file

@ -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,10 +36,10 @@
"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",
"From url" => "URL-ből",
"Upload" => "Feltöltés",
"Cancel upload" => "Feltöltés megszakítása",
"Nothing in here. Upload something!" => "Töltsön fel egy fájlt.",

3
apps/files/l10n/ia.php
View file

@ -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"
);

11
apps/files/l10n/id.php
View file

@ -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,10 +36,10 @@
"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",
"From url" => "Dari url",
"Upload" => "Unggah",
"Cancel upload" => "Batal mengunggah",
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",

2
apps/files/l10n/it.php
View file

@ -58,7 +58,7 @@
"New" => "Nuovo",
"Text file" => "File di testo",
"Folder" => "Cartella",
"From url" => "Da URL",
"From link" => "Da collegamento",
"Upload" => "Carica",
"Cancel upload" => "Annulla invio",
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",

1
apps/files/l10n/ja_JP.php
View file

@ -58,7 +58,6 @@
"New" => "新規",
"Text file" => "テキストファイル",
"Folder" => "フォルダ",
"From url" => "URL",
"Upload" => "アップロード",
"Cancel upload" => "アップロードをキャンセル",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",

1
apps/files/l10n/ka_GE.php
View file

@ -58,7 +58,6 @@
"New" => "ახალი",
"Text file" => "ტექსტური ფაილი",
"Folder" => "საქაღალდე",
"From url" => "მისამართიდან",
"Upload" => "ატვირთვა",
"Cancel upload" => "ატვირთვის გაუქმება",
"Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",

2
apps/files/l10n/ko.php
View file

@ -27,10 +27,10 @@
"Enable ZIP-download" => "ZIP- 다운로드 허용",
"0 is unlimited" => "0은 무제한 입니다",
"Maximum input size for ZIP files" => "ZIP 파일에 대한 최대 입력 크기",
"Save" => "저장",
"New" => "새로 만들기",
"Text file" => "텍스트 파일",
"Folder" => "폴더",
"From url" => "URL 에서",
"Upload" => "업로드",
"Cancel upload" => "업로드 취소",
"Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",

7
apps/files/l10n/ku_IQ.php Normal file
View file

@ -0,0 +1,7 @@
<?php $TRANSLATIONS = array(
"Name" => "ناو",
"Save" => "پاشکه‌وتکردن",
"Folder" => "بوخچه",
"Upload" => "بارکردن",
"Download" => "داگرتن"
);

2
apps/files/l10n/lb.php
View file

@ -27,10 +27,10 @@
"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",
"From url" => "From URL",
"Upload" => "Eroplueden",
"Cancel upload" => "Upload ofbriechen",
"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",

1
apps/files/l10n/lt_LT.php
View file

@ -58,7 +58,6 @@
"New" => "Naujas",
"Text file" => "Teksto failas",
"Folder" => "Katalogas",
"From url" => "Iš adreso",
"Upload" => "Įkelti",
"Cancel upload" => "Atšaukti siuntimą",
"Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",

2
apps/files/l10n/lv.php
View file

@ -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",
@ -22,7 +23,6 @@
"New" => "Jauns",
"Text file" => "Teksta fails",
"Folder" => "Mape",
"From url" => "No URL saites",
"Upload" => "Augšuplādet",
"Cancel upload" => "Atcelt augšuplādi",
"Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšuplādēt",

2
apps/files/l10n/mk.php
View file

@ -24,10 +24,10 @@
"Enable ZIP-download" => "Овозможи ZIP симнување ",
"0 is unlimited" => "0 е неограничено",
"Maximum input size for ZIP files" => "Максимална големина за внес на ZIP датотеки",
"Save" => "Сними",
"New" => "Ново",
"Text file" => "Текстуална датотека",
"Folder" => "Папка",
"From url" => "Од адреса",
"Upload" => "Подигни",
"Cancel upload" => "Откажи прикачување",
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",

2
apps/files/l10n/ms_MY.php
View file

@ -26,10 +26,10 @@
"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",
"From url" => "Dari url",
"Upload" => "Muat naik",
"Cancel upload" => "Batal muat naik",
"Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",

1
apps/files/l10n/nb_NO.php
View file

@ -57,7 +57,6 @@
"New" => "Ny",
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From url" => "Fra url",
"Upload" => "Last opp",
"Cancel upload" => "Avbryt opplasting",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",

1
apps/files/l10n/nl.php
View file

@ -58,7 +58,6 @@
"New" => "Nieuw",
"Text file" => "Tekstbestand",
"Folder" => "Map",
"From url" => "Van hyperlink",
"Upload" => "Upload",
"Cancel upload" => "Upload afbreken",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",

1
apps/files/l10n/nn_NO.php
View file

@ -11,6 +11,7 @@
"Size" => "Storleik",
"Modified" => "Endra",
"Maximum upload size" => "Maksimal opplastingsstorleik",
"Save" => "Lagre",
"New" => "Ny",
"Text file" => "Tekst fil",
"Folder" => "Mappe",

2
apps/files/l10n/oc.php
View file

@ -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",
@ -44,7 +45,6 @@
"New" => "Nòu",
"Text file" => "Fichièr de tèxte",
"Folder" => "Dorsièr",
"From url" => "Dempuèi l'URL",
"Upload" => "Amontcarga",
"Cancel upload" => " Anulla l'amontcargar",
"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",

1
apps/files/l10n/pl.php
View file

@ -58,7 +58,6 @@
"New" => "Nowy",
"Text file" => "Plik tekstowy",
"Folder" => "Katalog",
"From url" => "Z adresu",
"Upload" => "Prześlij",
"Cancel upload" => "Przestań wysyłać",
"Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!",

3
apps/files/l10n/pl_PL.php Normal file
View file

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"Save" => "Zapisz"
);

16
apps/files/l10n/pt_BR.php
View file

@ -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,7 +58,7 @@
"New" => "Novo",
"Text file" => "Arquivo texto",
"Folder" => "Pasta",
"From url" => "URL de origem",
"From link" => "Do link",
"Upload" => "Carregar",
"Cancel upload" => "Cancelar upload",
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",

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

@ -58,7 +58,6 @@
"New" => "Novo",
"Text file" => "Ficheiro de texto",
"Folder" => "Pasta",
"From url" => "Do endereço",
"Upload" => "Enviar",
"Cancel upload" => "Cancelar envio",
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",

2
apps/files/l10n/ro.php
View file

@ -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ă",
@ -44,7 +45,6 @@
"New" => "Nou",
"Text file" => "Fișier text",
"Folder" => "Dosar",
"From url" => "De la URL",
"Upload" => "Încarcă",
"Cancel upload" => "Anulează încărcarea",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",

1
apps/files/l10n/ru.php
View file

@ -58,7 +58,6 @@
"New" => "Новый",
"Text file" => "Текстовый файл",
"Folder" => "Папка",
"From url" => "С url",
"Upload" => "Загрузить",
"Cancel upload" => "Отмена загрузки",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",

2
apps/files/l10n/ru_RU.php
View file

@ -58,7 +58,7 @@
"New" => "Новый",
"Text file" => "Текстовый файл",
"Folder" => "Папка",
"From url" => "Из url",
"From link" => "По ссылке",
"Upload" => "Загрузить ",
"Cancel upload" => "Отмена загрузки",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",

7
apps/files/l10n/si_LK.php
View file

@ -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: " => "හැකි උපරිමය:",

2
apps/files/l10n/sk_SK.php
View file

@ -58,7 +58,7 @@
"New" => "Nový",
"Text file" => "Textový súbor",
"Folder" => "Priečinok",
"From url" => "Z url",
"From link" => "Z odkazu",
"Upload" => "Odoslať",
"Cancel upload" => "Zrušiť odosielanie",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",

1
apps/files/l10n/sl.php
View file

@ -50,7 +50,6 @@
"New" => "Nova",
"Text file" => "Besedilna datoteka",
"Folder" => "Mapa",
"From url" => "Iz naslova URL",
"Upload" => "Pošlji",
"Cancel upload" => "Prekliči pošiljanje",
"Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",

1
apps/files/l10n/sr.php
View file

@ -11,6 +11,7 @@
"Size" => "Величина",
"Modified" => "Задња измена",
"Maximum upload size" => "Максимална величина пошиљке",
"Save" => "Сними",
"New" => "Нови",
"Text file" => "текстуални фајл",
"Folder" => "фасцикла",

1
apps/files/l10n/sr@latin.php
View file

@ -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",

2
apps/files/l10n/sv.php
View file

@ -58,7 +58,7 @@
"New" => "Ny",
"Text file" => "Textfil",
"Folder" => "Mapp",
"From url" => "Från webbadress",
"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!",

1
apps/files/l10n/ta_LK.php
View file

@ -58,7 +58,6 @@
"New" => "புதிய",
"Text file" => "கோப்பு உரை",
"Folder" => "கோப்புறை",
"From url" => "url இலிருந்து",
"Upload" => "பதிவேற்றுக",
"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
"Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",

1
apps/files/l10n/th_TH.php
View file

@ -58,7 +58,6 @@
"New" => "อัพโหลดไฟล์ใหม่",
"Text file" => "ไฟล์ข้อความ",
"Folder" => "แฟ้มเอกสาร",
"From url" => "จาก url",
"Upload" => "อัพโหลด",
"Cancel upload" => "ยกเลิกการอัพโหลด",
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",

4
apps/files/l10n/tr.php
View file

@ -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,10 +30,10 @@
"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",
"From url" => "Url'den",
"Upload" => "Yükle",
"Cancel upload" => "Yüklemeyi iptal et",
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",

11
apps/files/l10n/uk.php
View file

@ -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,13 +18,21 @@
"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" => "Папка",
"From url" => "З URL",
"Upload" => "Відвантажити",
"Cancel upload" => "Перервати завантаження",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",

1
apps/files/l10n/vi.php
View file

@ -58,7 +58,6 @@
"New" => "Mới",
"Text file" => "Tập tin văn bản",
"Folder" => "Folder",
"From url" => "Từ url",
"Upload" => "Tải lên",
"Cancel upload" => "Hủy upload",
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",

2
apps/files/l10n/zh_CN.GB2312.php
View file

@ -27,6 +27,7 @@
"Size" => "大小",
"Modified" => "修改日期",
"seconds ago" => "秒前",
"1 minute ago" => "1 分钟前",
"today" => "今天",
"yesterday" => "昨天",
"last month" => "上个月",
@ -44,7 +45,6 @@
"New" => "新建",
"Text file" => "文本文档",
"Folder" => "文件夹",
"From url" => "从URL:",
"Upload" => "上传",
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",

1
apps/files/l10n/zh_CN.php
View file

@ -58,7 +58,6 @@
"New" => "新建",
"Text file" => "文本文件",
"Folder" => "文件夹",
"From url" => "来自地址",
"Upload" => "上传",
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",

12
apps/files/l10n/zh_TW.php
View file

@ -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,10 +36,10 @@
"Enable ZIP-download" => "啟用 Zip 下載",
"0 is unlimited" => "0代表沒有限制",
"Maximum input size for ZIP files" => "針對ZIP檔案最大輸入大小",
"Save" => "儲存",
"New" => "新增",
"Text file" => "文字檔",
"Folder" => "資料夾",
"From url" => "由 url ",
"Upload" => "上傳",
"Cancel upload" => "取消上傳",
"Nothing in here. Upload something!" => "沒有任何東西。請上傳內容!",

3
apps/files/templates/admin.php
View file

@ -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">
@ -11,6 +11,7 @@
<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> />
<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/>
</fieldset>
</form>

2
apps/files/templates/index.php
View file

@ -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 url');?></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">

2
apps/files/templates/part.breadcrumb.php
View file

@ -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;?>

8
apps/files/templates/part.list.php
View file

@ -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 } ?>

4
apps/files_encryption/appinfo/app.php
View file

@ -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();

10
apps/files_encryption/lib/crypt.php
View file

@ -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_FilesystemView('/');
if(!$view->file_exists('/'.$login)) {
$view->mkdir('/'.$login);
@ -80,7 +80,7 @@ class OC_Crypt {
}
}
public static function createkey($username,$passcode) {
public static function createkey($username, $passcode) {
// generate a random key
$key=mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999);
@ -195,7 +195,7 @@ class OC_Crypt {
public static function blockEncrypt($data, $key='') {
$result='';
while(strlen($data)) {
$result.=self::encrypt(substr($data, 0, 8192),$key);
$result.=self::encrypt(substr($data, 0, 8192), $key);
$data=substr($data, 8192);
}
return $result;
@ -204,10 +204,10 @@ class OC_Crypt {
/**
* decrypt data in 8192b sized blocks
*/
public static function blockDecrypt($data, $key='',$maxLength=0) {
public static function blockDecrypt($data, $key='', $maxLength=0) {
$result='';
while(strlen($data)) {
$result.=self::decrypt(substr($data, 0, 8192),$key);
$result.=self::decrypt(substr($data, 0, 8192), $key);
$data=substr($data, 8192);
}
if($maxLength>0) {

8
apps/files_encryption/lib/cryptstream.php
View file

@ -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);

34
apps/files_encryption/lib/proxy.php
View file

@ -36,7 +36,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
*/
private static function shouldEncrypt($path) {
if(is_null(self::$enableEncryption)) {
self::$enableEncryption=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
}
if(!self::$enableEncryption) {
return false;
@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
* @return bool
*/
private static function isEncrypted($path) {
$metadata=OC_FileCache_Cached::get($path,'');
$metadata=OC_FileCache_Cached::get($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_FileCache::put($path, array('encrypted'=>true,'size'=>$size),'');
OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size), '');
}
}
}
public function postFile_get_contents($path,$data) {
public function postFile_get_contents($path, $data) {
if(self::isEncrypted($path)) {
$cached=OC_FileCache_Cached::get($path,'');
$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
$cached=OC_FileCache_Cached::get($path, '');
$data=OC_Crypt::blockDecrypt($data, '', $cached['size']);
}
return $data;
}
@ -88,40 +88,40 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
$meta=stream_get_meta_data($result);
if(self::isEncrypted($path)) {
fclose($result);
$result=fopen('crypt://'.$path,$meta['mode']);
$result=fopen('crypt://'.$path, $meta['mode']);
}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
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');
OCP\Files::streamCopy($result,$tmp);
OCP\Files::streamCopy($result, $tmp);
fclose($result);
OC_Filesystem::file_put_contents($path,$tmp);
OC_Filesystem::file_put_contents($path, $tmp);
fclose($tmp);
}
$result=fopen('crypt://'.$path,$meta['mode']);
$result=fopen('crypt://'.$path, $meta['mode']);
}
return $result;
}
public function postGetMimeType($path,$mime) {
public function postGetMimeType($path, $mime) {
if(self::isEncrypted($path)) {
$mime=OCP\Files::getMimeType('crypt://'.$path,'w');
$mime=OCP\Files::getMimeType('crypt://'.$path, 'w');
}
return $mime;
}
public function postStat($path,$data) {
public function postStat($path, $data) {
if(self::isEncrypted($path)) {
$cached=OC_FileCache_Cached::get($path,'');
$cached=OC_FileCache_Cached::get($path, '');
$data['size']=$cached['size'];
}
return $data;
}
public function postFileSize($path,$size) {
public function postFileSize($path, $size) {
if(self::isEncrypted($path)) {
$cached=OC_FileCache_Cached::get($path,'');
$cached=OC_FileCache_Cached::get($path, '');
return $cached['size'];
}else{
return $size;

10
apps/files_encryption/settings.php
View file

@ -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();

60
apps/files_encryption/tests/encryption.php
View file

@ -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);
}
}

32
apps/files_encryption/tests/proxy.php
View file

@ -13,8 +13,8 @@ class Test_CryptProxy extends UnitTestCase {
public function setUp() {
$user=OC_User::getUser();
$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
OCP\Config::setAppValue('files_encryption','enable_encryption','true');
$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true');
OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true');
$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
@ -30,7 +30,7 @@ class Test_CryptProxy extends UnitTestCase {
//set up temporary storage
OC_Filesystem::clearMounts();
OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/');
OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/');
OC_Filesystem::init('/'.$user.'/files');
@ -41,7 +41,7 @@ class Test_CryptProxy extends UnitTestCase {
}
public function tearDown() {
OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig);
if(!is_null($this->oldKey)) {
$_SESSION['enckey']=$this->oldKey;
}
@ -51,16 +51,16 @@ class Test_CryptProxy extends UnitTestCase {
$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
$original=file_get_contents($file);
OC_Filesystem::file_put_contents('/file',$original);
OC_Filesystem::file_put_contents('/file', $original);
OC_FileProxy::$enabled=false;
$stored=OC_Filesystem::file_get_contents('/file');
OC_FileProxy::$enabled=true;
$fromFile=OC_Filesystem::file_get_contents('/file');
$this->assertNotEqual($original,$stored);
$this->assertNotEqual($original, $stored);
$this->assertEqual(strlen($original), strlen($fromFile));
$this->assertEqual($original,$fromFile);
$this->assertEqual($original, $fromFile);
}
@ -72,46 +72,46 @@ class Test_CryptProxy extends UnitTestCase {
$view=new OC_FilesystemView('/'.OC_User::getUser());
$userDir='/'.OC_User::getUser().'/files';
$rootView->file_put_contents($userDir.'/file',$original);
$rootView->file_put_contents($userDir.'/file', $original);
OC_FileProxy::$enabled=false;
$stored=$rootView->file_get_contents($userDir.'/file');
OC_FileProxy::$enabled=true;
$this->assertNotEqual($original,$stored);
$this->assertNotEqual($original, $stored);
$fromFile=$rootView->file_get_contents($userDir.'/file');
$this->assertEqual($original,$fromFile);
$this->assertEqual($original, $fromFile);
$fromFile=$view->file_get_contents('files/file');
$this->assertEqual($original,$fromFile);
$this->assertEqual($original, $fromFile);
}
public function testBinary() {
$file=__DIR__.'/binary';
$original=file_get_contents($file);
OC_Filesystem::file_put_contents('/file',$original);
OC_Filesystem::file_put_contents('/file', $original);
OC_FileProxy::$enabled=false;
$stored=OC_Filesystem::file_get_contents('/file');
OC_FileProxy::$enabled=true;
$fromFile=OC_Filesystem::file_get_contents('/file');
$this->assertNotEqual($original,$stored);
$this->assertNotEqual($original, $stored);
$this->assertEqual(strlen($original), strlen($fromFile));
$this->assertEqual($original,$fromFile);
$this->assertEqual($original, $fromFile);
$file=__DIR__.'/zeros';
$original=file_get_contents($file);
OC_Filesystem::file_put_contents('/file',$original);
OC_Filesystem::file_put_contents('/file', $original);
OC_FileProxy::$enabled=false;
$stored=OC_Filesystem::file_get_contents('/file');
OC_FileProxy::$enabled=true;
$fromFile=OC_Filesystem::file_get_contents('/file');
$this->assertNotEqual($original,$stored);
$this->assertNotEqual($original, $stored);
$this->assertEqual(strlen($original), strlen($fromFile));
}
}

44
apps/files_encryption/tests/stream.php
View file

@ -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);
}
}

2
apps/files_external/l10n/cs_CZ.php
View file

@ -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é",

2
apps/files_external/lib/config.php
View file

@ -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";

14
apps/files_external/lib/ftp.php
View file

@ -43,7 +43,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
$url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
return $url;
}
public function fopen($path,$mode) {
public function fopen($path, $mode) {
switch($mode) {
case 'r':
case 'rb':
@ -53,7 +53,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
case 'ab':
//these are supported by the wrapper
$context = stream_context_create(array('ftp' => array('overwrite' => true)));
return fopen($this->constructUrl($path),$mode, false,$context);
return fopen($this->constructUrl($path), $mode, false, $context);
case 'r+':
case 'w+':
case 'wb+':
@ -63,18 +63,18 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
case 'c':
case 'c+':
//emulate these
if(strrpos($path,'.')!==false) {
$ext=substr($path, strrpos($path,'.'));
if(strrpos($path, '.')!==false) {
$ext=substr($path, strrpos($path, '.'));
}else{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
if($this->file_exists($path)) {
$this->getFile($path,$tmpFile);
$this->getFile($path, $tmpFile);
}
self::$tempFiles[$tmpFile]=$path;
return fopen('close://'.$tmpFile,$mode);
return fopen('close://'.$tmpFile, $mode);
}
}

4
apps/files_external/lib/google.php
View file

@ -394,8 +394,8 @@ class OC_Filestorage_Google extends OC_Filestorage_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 = '';
}

10
apps/files_external/lib/smb.php
View file

@ -24,14 +24,14 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
if(!$this->root || $this->root[0]!='/') {
$this->root='/'.$this->root;
}
if(substr($this->root,-1,1)!='/') {
if(substr($this->root,-1, 1)!='/') {
$this->root.='/';
}
if(!$this->share || $this->share[0]!='/') {
$this->share='/'.$this->share;
}
if(substr($this->share,-1,1)=='/') {
$this->share=substr($this->share,0,-1);
if(substr($this->share, -1, 1)=='/') {
$this->share=substr($this->share, 0, -1);
}
//create the root folder if necesary
@ -42,7 +42,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
public function constructUrl($path) {
if(substr($path,-1)=='/') {
$path=substr($path,0,-1);
$path=substr($path, 0, -1);
}
return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path;
}
@ -67,7 +67,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
* @param int $time
* @return bool
*/
public function hasUpdated($path,$time) {
public function hasUpdated($path, $time) {
if(!$path and $this->root=='/') {
//mtime doesn't work for shares, but giving the nature of the backend, doing a full update is still just fast enough
return true;

22
apps/files_external/lib/streamwrapper.php
View file

@ -50,34 +50,34 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{
return $succes;
}
public function fopen($path,$mode) {
return fopen($this->constructUrl($path),$mode);
public function fopen($path, $mode) {
return fopen($this->constructUrl($path), $mode);
}
public function free_space($path) {
return 0;
}
public function touch($path,$mtime=null) {
public function touch($path, $mtime=null) {
if(is_null($mtime)) {
$fh=$this->fopen($path,'a');
fwrite($fh,'');
$fh=$this->fopen($path, 'a');
fwrite($fh, '');
fclose($fh);
}else{
return false;//not supported
}
}
public function getFile($path,$target) {
return copy($this->constructUrl($path),$target);
public function getFile($path, $target) {
return copy($this->constructUrl($path), $target);
}
public function uploadFile($path,$target) {
return copy($path,$this->constructUrl($target));
public function uploadFile($path, $target) {
return copy($path, $this->constructUrl($target));
}
public function rename($path1,$path2) {
return rename($this->constructUrl($path1),$this->constructUrl($path2));
public function rename($path1, $path2) {
return rename($this->constructUrl($path1), $this->constructUrl($path2));
}
public function stat($path) {

44
apps/files_external/lib/swift.php
View file

@ -39,8 +39,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
* @return string
*/
private function getContainerName($path) {
$path=trim(trim($this->root,'/')."/".$path,'/.');
return str_replace('/','\\',$path);
$path=trim(trim($this->root, '/')."/".$path, '/.');
return str_replace('/', '\\', $path);
}
/**
@ -189,7 +189,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
* @param string name
* @return bool
*/
private function addSubContainer($container,$name) {
private function addSubContainer($container, $name) {
if(!$name) {
return false;
}
@ -201,16 +201,16 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
foreach($containers as &$sub) {
$sub=trim($sub);
}
if(array_search($name,$containers)!==false) {
if(array_search($name, $containers)!==false) {
unlink($tmpFile);
return false;
}else{
$fh=fopen($tmpFile,'a');
fwrite($fh,$name."\n");
$fh=fopen($tmpFile, 'a');
fwrite($fh, $name."\n");
}
}catch(Exception $e) {
$containers=array();
file_put_contents($tmpFile,$name."\n");
file_put_contents($tmpFile, $name."\n");
}
$obj->load_from_filename($tmpFile);
@ -224,7 +224,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
* @param string name
* @return bool
*/
private function removeSubContainer($container,$name) {
private function removeSubContainer($container, $name) {
if(!$name) {
return false;
}
@ -239,13 +239,13 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
foreach($containers as &$sub) {
$sub=trim($sub);
}
$i=array_search($name,$containers);
$i=array_search($name, $containers);
if($i===false) {
unlink($tmpFile);
return false;
}else{
unset($containers[$i]);
file_put_contents($tmpFile, implode("\n",$containers)."\n");
file_put_contents($tmpFile, implode("\n", $containers)."\n");
}
$obj->load_from_filename($tmpFile);
@ -337,12 +337,12 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
public function opendir($path) {
$container=$this->getContainer($path);
$files=$this->getObjects($container);
$i=array_search(self::SUBCONTAINER_FILE,$files);
$i=array_search(self::SUBCONTAINER_FILE, $files);
if($i!==false) {
unset($files[$i]);
}
$subContainers=$this->getSubContainers($container);
$files=array_merge($files,$subContainers);
$files=array_merge($files, $subContainers);
$id=$this->getContainerName($path);
OC_FakeDirStream::$dirs[$id]=$files;
return opendir('fakedir://'.$id);
@ -380,7 +380,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
return $obj->read();
}
public function file_put_contents($path,$content) {
public function file_put_contents($path, $content) {
$obj=$this->getObject($path);
if(is_null($obj)) {
$container=$this->getContainer(dirname($path));
@ -406,7 +406,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
}
}
public function fopen($path,$mode) {
public function fopen($path, $mode) {
switch($mode) {
case 'r':
case 'rb':
@ -432,9 +432,9 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
case 'c':
case 'c+':
$tmpFile=$this->getTmpFile($path);
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
self::$tempFiles[$tmpFile]=$path;
return fopen('close://'.$tmpFile,$mode);
return fopen('close://'.$tmpFile, $mode);
}
}
@ -449,7 +449,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
return 1024*1024*1024*8;
}
public function touch($path,$mtime=null) {
public function touch($path, $mtime=null) {
$obj=$this->getObject($path);
if(is_null($obj)) {
return false;
@ -463,10 +463,10 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
$obj->sync_metadata();
}
public function rename($path1,$path2) {
public function rename($path1, $path2) {
$sourceContainer=$this->getContainer(dirname($path1));
$targetContainer=$this->getContainer(dirname($path2));
$result=$sourceContainer->move_object_to(basename($path1),$targetContainer, basename($path2));
$result=$sourceContainer->move_object_to(basename($path1), $targetContainer, basename($path2));
unset($this->objects[$path1]);
if($result) {
$targetObj=$this->getObject($path2);
@ -475,10 +475,10 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
return $result;
}
public function copy($path1,$path2) {
public function copy($path1, $path2) {
$sourceContainer=$this->getContainer(dirname($path1));
$targetContainer=$this->getContainer(dirname($path2));
$result=$sourceContainer->copy_object_to(basename($path1),$targetContainer, basename($path2));
$result=$sourceContainer->copy_object_to(basename($path1), $targetContainer, basename($path2));
if($result) {
$targetObj=$this->getObject($path2);
$this->resetMTime($targetObj);
@ -525,7 +525,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
}
}
private function fromTmpFile($tmpFile,$path) {
private function fromTmpFile($tmpFile, $path) {
$obj=$this->getObject($path);
if(is_null($obj)) {
$obj=$this->createObject($path);

18
apps/files_external/lib/webdav.php
View file

@ -126,7 +126,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
return $this->simpleResponse('DELETE', $path, null, 204);
}
public function fopen($path,$mode) {
public function fopen($path, $mode) {
$path=$this->cleanPath($path);
switch($mode) {
case 'r':
@ -194,7 +194,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
}
}
public function touch($path,$mtime=null) {
public function touch($path, $mtime=null) {
if(is_null($mtime)) {
$mtime=time();
}
@ -202,12 +202,12 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
$this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime));
}
public function getFile($path,$target) {
public function getFile($path, $target) {
$source=$this->fopen($path, 'r');
file_put_contents($target, $source);
}
public function uploadFile($path,$target) {
public function uploadFile($path, $target) {
$source=fopen($path, 'r');
$curl = curl_init();
@ -221,7 +221,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
curl_close ($curl);
}
public function rename($path1,$path2) {
public function rename($path1, $path2) {
$path1=$this->cleanPath($path1);
$path2=$this->root.$this->cleanPath($path2);
try{
@ -235,7 +235,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
}
}
public function copy($path1,$path2) {
public function copy($path1, $path2) {
$path1=$this->cleanPath($path1);
$path2=$this->root.$this->cleanPath($path2);
try{
@ -252,7 +252,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
public function stat($path) {
$path=$this->cleanPath($path);
try{
$response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength'));
$response=$this->client->propfind($path, array('{DAV:}getlastmodified', '{DAV:}getcontentlength'));
return array(
'mtime'=>strtotime($response['{DAV:}getlastmodified']),
'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
@ -266,7 +266,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
public function getMimeType($path) {
$path=$this->cleanPath($path);
try{
$response=$this->client->propfind($path, array('{DAV:}getcontenttype','{DAV:}resourcetype'));
$response=$this->client->propfind($path, array('{DAV:}getcontenttype', '{DAV:}resourcetype'));
$responseType=$response["{DAV:}resourcetype"]->resourceType;
$type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
if($type=='dir') {
@ -289,7 +289,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
}
}
private function simpleResponse($method,$path,$body,$expected) {
private function simpleResponse($method, $path, $body, $expected) {
$path=$this->cleanPath($path);
try{
$response=$this->client->request($method, $path, $body);

2
apps/files_sharing/lib/sharedstorage.php
View file

@ -451,7 +451,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
* @param int $time
* @return bool
*/
public function hasUpdated($path,$time) {
public function hasUpdated($path, $time) {
//TODO
return false;
}

2
apps/files_versions/appinfo/app.php
View file

@ -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');

2
apps/files_versions/history.php
View file

@ -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'] ) ) {

2
apps/files_versions/lib/hooks.php
View file

@ -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']);

8
apps/files_versions/lib/versions.php
View file

@ -73,7 +73,7 @@ class Storage {
}
// check filetype blacklist
$blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));
$blacklist=explode(' ', \OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));
foreach($blacklist as $bl) {
$parts=explode('.', $filename);
$ext=end($parts);
@ -99,7 +99,7 @@ class Storage {
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
$matches=glob($versionsName.'.v*');
sort($matches);
$parts=explode('.v',end($matches));
$parts=explode('.v', end($matches));
if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) {
return false;
}
@ -109,7 +109,7 @@ class Storage {
// create all parent folders
$info=pathinfo($filename);
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
mkdir($versionsFolderName.'/'.$info['dirname'],0750,true);
mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
}
// store a new version of a file
@ -124,7 +124,7 @@ class Storage {
/**
* rollback to an old version of a file.
*/
public static function rollback($filename,$revision) {
public static function rollback($filename, $revision) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);

2
apps/files_versions/settings-personal.php
View file

@ -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();

2
apps/user_ldap/group_ldap.php
View file

@ -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);

18
apps/user_ldap/lib/connection.php
View file

@ -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);
}

2
apps/user_ldap/settings.php
View file

@ -59,7 +59,7 @@ if ($_POST) {
// 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);
}

4
apps/user_ldap/tests/group_ldap.php
View file

@ -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()));

2
apps/user_webdavauth/appinfo/app.php
View file

@ -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" );

1
apps/user_webdavauth/settings.php
View file

@ -21,7 +21,6 @@
*
*/
print_r($_POST);
if($_POST) {
if(isset($_POST['webdav_url'])) {

6
apps/user_webdavauth/user_webdavauth.php
View file

@ -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;
}

40
core/ajax/requesttoken.php
View file

@ -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() ) );
?>

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