diff --git a/.gitignore b/.gitignore index 7c0df64b864..819347f540f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,9 @@ nbproject # WebFinger .well-known /.buildpath + +#tests - autogenerated filed +data-autotest +/tests/coverage* +/tests/autoconfig* +/tests/autotest* diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 57c8c15c197..6532b76df21 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -10,7 +10,7 @@ OCP\JSON::callCheck(); $dir = stripslashes($_POST["dir"]); $files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]); -$files = explode(';', $files); +$files = json_decode($files); $filesWithError = ''; $success = true; //Now delete diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php deleted file mode 100644 index b547d162b3e..00000000000 --- a/apps/files/ajax/timezone.php +++ /dev/null @@ -1,2 +0,0 @@ -a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; } +#new>a { padding:.5em 1.2em .3em; } #new>ul { - display:none; position:fixed; min-width:7em; z-index:-1; - padding:.5em; margin-top:0.075em; margin-left:-.5em; + display:none; position:fixed; min-width:7em; z-index:10; + padding:.5em; padding-bottom:0; margin-top:.075em; margin-left:-.5em; text-align:left; - background:#f8f8f8; border:1px solid #ddd; + background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0; + box-shadow:0 2px 7px rgba(170,170,170,.4); } #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em; background-repeat:no-repeat; cursor:pointer; } #new>ul>li>p { cursor:pointer; } #new>ul>li>input { padding:0.3em; margin:-0.3em; } -#new .popup { border-top-left-radius:0; z-index:10; } #upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; - color:#fff; text-shadow:0 1px 0 #51a351; - border-color:#51a351 #419341 #387038; - box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; - background-color:#5bb75b; } #upload a { position:relative; display:block; width:100%; height:27px; cursor:pointer; z-index:1000; - background-image:url('%webroot%/core/img/actions/upload-white.svg'); + background-image:url('%webroot%/core/img/actions/upload.svg'); background-repeat:no-repeat; background-position:7px 6px; } @@ -74,11 +64,17 @@ tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Op table tr.mouseOver td { background-color:#eee; } table th { height:2em; padding:0 .5em; color:#999; } table th .name { float:left; margin-left:.5em; } -table th.multiselect { background:#ddd; color:#000; font-weight:bold; } table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; } table td { border-bottom:1px solid #eee; font-style:normal; background-position:1em .5em; background-repeat:no-repeat; } -table th#headerSize, table td.filesize { width:3em; padding:0 1em; text-align:right; } -table th#headerDate, table td.date { width:11em; padding:0 .1em 0 1em; text-align:left; } +table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ } +table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; } +table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; } + +/* Multiselect bar */ +table.multiselect { top:63px; } +table.multiselect thead { position:fixed; top:82px; z-index:1; } +table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; } + table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; } table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; } @@ -89,15 +85,28 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0 table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; } table td.filename .uploadtext { font-weight:normal; margin-left:.5em; } table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } -table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; } -table thead.fixed { height:2em; } #fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; } #fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } #fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } -#fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; position:relative; } +#fileList tr td.filename { + position:relative; width:100%; + -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; +} #select_all { float:left; margin:.3em 0.6em 0 .5em; } #uploadsize-message,#delete-confirm { display:none; } -.fileactions { position:relative; top:.3em; font-size:.8em; float:right; } + +/* File actions */ +.fileactions { + position:absolute; top:.6em; right:0; + font-size:.8em; +} +#fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ } +#fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */ + background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9); +} +#fileList tr.selected:hover .fileactions { /* slightly darker color for selected rows */ + background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9); +} #fileList .fileactions a.action img { position:relative; top:.2em; } #fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; } a.action.delete { float:right; } diff --git a/apps/files/download.php b/apps/files/download.php index 6475afb56e0..e2149cd4135 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -40,7 +40,12 @@ if(!OC_Filesystem::file_exists($filename)) { $ftype=OC_Filesystem::getMimeType( $filename ); header('Content-Type:'.$ftype); -header('Content-Disposition: attachment; filename="'.basename($filename).'"'); +if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) { + header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' ); +} else { + header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) ) + . '; filename="' . rawurlencode( basename($filename) ) . '"' ); +} OCP\Response::disableCaching(); header('Content-Length: '.OC_Filesystem::filesize($filename)); diff --git a/apps/files/index.php b/apps/files/index.php index c45fe60e4f7..b64bde44cc0 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -1,114 +1,111 @@ . -* -*/ + * ownCloud - ajax frontend + * + * @author Robin Appelman + * @copyright 2010 Robin Appelman icewind1991@gmail.com + * + * 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 . + * + */ // Check if we are a user OCP\User::checkLoggedIn(); // Load the files we need -OCP\Util::addStyle( 'files', 'files' ); -OCP\Util::addscript( 'files', 'jquery.iframe-transport' ); -OCP\Util::addscript( 'files', 'jquery.fileupload' ); -OCP\Util::addscript( 'files', 'files' ); -OCP\Util::addscript( 'files', 'filelist' ); -OCP\Util::addscript( 'files', 'fileactions' ); -OCP\Util::addscript( 'files', 'keyboardshortcuts' ); -if(!isset($_SESSION['timezone'])) { - OCP\Util::addscript( 'files', 'timezone' ); -} -OCP\App::setActiveNavigationEntry( 'files_index' ); +OCP\Util::addStyle('files', 'files'); +OCP\Util::addscript('files', 'jquery.iframe-transport'); +OCP\Util::addscript('files', 'jquery.fileupload'); +OCP\Util::addscript('files', 'files'); +OCP\Util::addscript('files', 'filelist'); +OCP\Util::addscript('files', 'fileactions'); +OCP\Util::addscript('files', 'keyboardshortcuts'); + +OCP\App::setActiveNavigationEntry('files_index'); // Load the files -$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : ''; +$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; // Redirect if directory does not exist -if(!OC_Filesystem::is_dir($dir.'/')) { - header('Location: '.$_SERVER['SCRIPT_NAME'].''); - exit(); +if (!OC_Filesystem::is_dir($dir . '/')) { + header('Location: ' . $_SERVER['SCRIPT_NAME'] . ''); + exit(); } $files = array(); -foreach( OC_Files::getdirectorycontent( $dir ) as $i ) { - $i['date'] = OCP\Util::formatDate($i['mtime'] ); - if($i['type']=='file') { - $fileinfo=pathinfo($i['name']); - $i['basename']=$fileinfo['filename']; - if (!empty($fileinfo['extension'])) { - $i['extension']='.' . $fileinfo['extension']; - } - else { - $i['extension']=''; - } - } - if($i['directory']=='/') { - $i['directory']=''; - } - $files[] = $i; +foreach (OC_Files::getdirectorycontent($dir) as $i) { + $i['date'] = OCP\Util::formatDate($i['mtime']); + if ($i['type'] == 'file') { + $fileinfo = pathinfo($i['name']); + $i['basename'] = $fileinfo['filename']; + if (!empty($fileinfo['extension'])) { + $i['extension'] = '.' . $fileinfo['extension']; + } else { + $i['extension'] = ''; + } + } + if ($i['directory'] == '/') { + $i['directory'] = ''; + } + $files[] = $i; } // Make breadcrumb $breadcrumb = array(); $pathtohere = ''; -foreach( explode( '/', $dir ) as $i ) { - if( $i != '' ) { - $pathtohere .= '/'.$i; - $breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i ); - } +foreach (explode('/', $dir) as $i) { + if ($i != '') { + $pathtohere .= '/' . $i; + $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i); + } } // make breadcrumb und filelist markup -$list = new OCP\Template( 'files', 'part.list', '' ); -$list->assign( 'files', $files, false ); -$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false); -$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=', false); -$breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' ); -$breadcrumbNav->assign( 'breadcrumb', $breadcrumb, false ); -$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false); +$list = new OCP\Template('files', 'part.list', ''); +$list->assign('files', $files, false); +$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false); +$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false); +$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); +$breadcrumbNav->assign('breadcrumb', $breadcrumb, false); +$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false); $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $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 = OC_Filesystem::free_space($dir); +$freeSpace = max($freeSpace, 0); $maxUploadFilesize = min($maxUploadFilesize, $freeSpace); $permissions = OCP\PERMISSION_READ; -if (OC_Filesystem::isUpdatable($dir.'/')) { - $permissions |= OCP\PERMISSION_UPDATE; +if (OC_Filesystem::isUpdatable($dir . '/')) { + $permissions |= OCP\PERMISSION_UPDATE; } -if (OC_Filesystem::isDeletable($dir.'/')) { - $permissions |= OCP\PERMISSION_DELETE; +if (OC_Filesystem::isDeletable($dir . '/')) { + $permissions |= OCP\PERMISSION_DELETE; } -if (OC_Filesystem::isSharable($dir.'/')) { - $permissions |= OCP\PERMISSION_SHARE; +if (OC_Filesystem::isSharable($dir . '/')) { + $permissions |= OCP\PERMISSION_SHARE; } -$tmpl = new OCP\Template( 'files', 'index', 'user' ); -$tmpl->assign( 'fileList', $list->fetchPage(), false ); -$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false ); -$tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir)); -$tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/')); +$tmpl = new OCP\Template('files', 'index', 'user'); +$tmpl->assign('fileList', $list->fetchPage(), false); +$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); +$tmpl->assign('dir', OC_Filesystem::normalizePath($dir)); +$tmpl->assign('isCreatable', OC_Filesystem::isCreatable($dir . '/')); $tmpl->assign('permissions', $permissions); -$tmpl->assign( 'files', $files ); -$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); -$tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); -$tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); +$tmpl->assign('files', $files); +$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); +$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); +$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); $tmpl->printPage(); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9f0bafafbdf..96dd0323d29 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -288,7 +288,7 @@ var FileList={ }, finishDelete:function(ready,sync){ if(!FileList.deleteCanceled && FileList.deleteFiles){ - var fileNames=FileList.deleteFiles.join(';'); + var fileNames=JSON.stringify(FileList.deleteFiles); $.ajax({ url: OC.filePath('files', 'ajax', 'delete.php'), async:!sync, diff --git a/apps/files/js/files.js b/apps/files/js/files.js index ece0b29ae16..6a37d9e7f53 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -203,6 +203,9 @@ $(document).ready(function() { var files = data.files; var totalSize=0; if(files){ + if (FileList.lastAction) { + FileList.lastAction(); + } for(var i=0;ispan.name').text(t('files','Name')); $('#headerSize').text(t('files','Size')); $('#modified').text(t('files','Modified')); - $('th').removeClass('multiselect'); + $('table').removeClass('multiselect'); $('.selectedActions').hide(); - $('thead').removeClass('fixed'); - $('#headerName').css('width','auto'); - $('#headerSize').css('width','auto'); - $('#headerDate').css('width','auto'); - $('table').css('padding-top','0'); - }else{ - var width={name:$('#headerName').css('width'),size:$('#headerSize').css('width'),date:$('#headerDate').css('width')}; - $('#headerName').css('width',width.name); - $('#headerSize').css('width',width.size); - $('#headerDate').css('width',width.date); + } + else { $('.selectedActions').show(); var totalSize=0; for(var i=0;ispan.name').text(selection); $('#modified').text(''); - $('th').addClass('multiselect'); + $('table').addClass('multiselect'); } } @@ -853,7 +851,7 @@ function getMimeIcon(mime, ready){ if(getMimeIcon.cache[mime]){ ready(getMimeIcon.cache[mime]); }else{ - $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){ + $.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path){ getMimeIcon.cache[mime]=path; ready(getMimeIcon.cache[mime]); }); diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index 562755f55b7..cc2b5d42139 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -127,6 +127,9 @@ var Files = Files || {}; } Files.bindKeyboardShortcuts = function(document, $) { $(document).keydown(function(event) { //check for modifier keys + if(!$(event.target).is('body')) { + return; + } var preventDefault = false; if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode); if ( diff --git a/apps/files/js/timezone.js b/apps/files/js/timezone.js deleted file mode 100644 index 4749417199d..00000000000 --- a/apps/files/js/timezone.js +++ /dev/null @@ -1,12 +0,0 @@ -//send the clients time zone to the server -$(document).ready(function() { - var visitortimezone = (-new Date().getTimezoneOffset()/60); - $.ajax({ - type: "GET", - url: OC.filePath('files', 'ajax', 'timezone.php'), - data: 'time='+ visitortimezone, - success: function(){ - location.reload(); - } - }); -}); \ No newline at end of file diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index 24652622c61..05404d27af7 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -1,5 +1,6 @@ "Der er ingen fejl, filen blev uploadet med success", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen", "The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet", "No file was uploaded" => "Ingen fil blev uploadet", @@ -18,6 +19,7 @@ "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}", "unshared {files}" => "ikke delte {files}", "deleted {files}" => "slettede {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.", "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.", "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom", "Upload Error" => "Fejl ved upload", @@ -27,6 +29,7 @@ "{count} files uploading" => "{count} filer uploades", "Upload cancelled." => "Upload afbrudt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud", "{count} files scanned" => "{count} filer skannet", "error while scanning" => "fejl under scanning", "Name" => "Navn", @@ -47,6 +50,7 @@ "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", +"From link" => "Fra link", "Upload" => "Upload", "Cancel upload" => "Fortryd upload", "Nothing in here. Upload something!" => "Her er tomt. Upload noget!", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index ddbea421241..fce7a07c948 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -28,7 +28,7 @@ "1 file uploading" => "1 αρχείο ανεβαίνει", "{count} files uploading" => "{count} αρχεία ανεβαίνουν", "Upload cancelled." => "Η αποστολή ακυρώθηκε.", -"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud", "{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν", "error while scanning" => "σφάλμα κατά την ανίχνευση", @@ -56,7 +56,7 @@ "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!", "Download" => "Λήψη", "Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν το διακομιστή.", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε", "Current scanning" => "Τρέχουσα αναζήτηση " ); diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 1f1ea6da50b..0b223b93d8c 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -1,5 +1,6 @@ "Ez da arazorik izan, fitxategia ongi igo da", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da", "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo", "No file was uploaded" => "Ez da fitxategirik igo", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 083d5a391e1..f797c67b986 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -1,42 +1,62 @@ "Nincs hiba, a fájl sikeresen feltöltve.", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a HTML form-ban.", -"The uploaded file was only partially uploaded" => "Az eredeti fájl csak részlegesen van feltöltve.", -"No file was uploaded" => "Nem lett fájl feltöltve.", -"Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár", -"Failed to write to disk" => "Nem írható lemezre", +"There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra.", +"The uploaded file was only partially uploaded" => "Az eredeti fájlt csak részben sikerült feltölteni.", +"No file was uploaded" => "Nem töltődött fel semmi", +"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa", +"Failed to write to disk" => "Nem sikerült a lemezre történő írás", "Files" => "Fájlok", -"Unshare" => "Nem oszt meg", +"Unshare" => "Megosztás visszavonása", "Delete" => "Törlés", -"replace" => "cserél", +"Rename" => "Átnevezés", +"{new_name} already exists" => "{new_name} már létezik", +"replace" => "írjuk fölül", +"suggest name" => "legyen más neve", "cancel" => "mégse", -"undo" => "visszavon", +"replaced {new_name}" => "a(z) {new_name} állományt kicseréltük", +"undo" => "visszavonás", +"replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}", +"unshared {files}" => "{files} fájl megosztása visszavonva", +"deleted {files}" => "{files} fájl törölve", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'", "generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű", "Upload Error" => "Feltöltési hiba", -"Close" => "Bezár", +"Close" => "Bezárás", "Pending" => "Folyamatban", -"Upload cancelled." => "Feltöltés megszakítva", +"1 file uploading" => "1 fájl töltődik föl", +"{count} files uploading" => "{count} fájl töltődik föl", +"Upload cancelled." => "A feltöltést megszakítottuk.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Érvénytelen mappanév. A \"Shared\" elnevezést az Owncloud rendszer használja.", +"{count} files scanned" => "{count} fájlt találtunk", +"error while scanning" => "Hiba a fájllista-ellenőrzés során", "Name" => "Név", "Size" => "Méret", "Modified" => "Módosítva", +"1 folder" => "1 mappa", +"{count} folders" => "{count} mappa", +"1 file" => "1 fájl", +"{count} files" => "{count} fájl", "File handling" => "Fájlkezelés", "Maximum upload size" => "Maximális feltölthető fájlméret", -"max. possible: " => "max. lehetséges", -"Needed for multi-file and folder downloads." => "Kötegelt file- vagy mappaletöltéshez szükséges", -"Enable ZIP-download" => "ZIP-letöltés engedélyezése", +"max. possible: " => "max. lehetséges: ", +"Needed for multi-file and folder downloads." => "Kötegelt fájl- vagy mappaletöltéshez szükséges", +"Enable ZIP-download" => "A 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", +"Maximum input size for ZIP files" => "ZIP-fájlok maximális kiindulási mérete", "Save" => "Mentés", "New" => "Új", "Text file" => "Szövegfájl", "Folder" => "Mappa", +"From link" => "Feltöltés linkrő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.", +"Cancel upload" => "A feltöltés megszakítása", +"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!", "Download" => "Letöltés", -"Upload too large" => "Feltöltés túl nagy", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.", -"Files are being scanned, please wait." => "File-ok vizsgálata, kis türelmet", -"Current scanning" => "Aktuális vizsgálat" +"Upload too large" => "A feltöltés túl nagy", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", +"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!", +"Current scanning" => "Ellenőrzés alatt" ); diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php new file mode 100644 index 00000000000..bca878873ac --- /dev/null +++ b/apps/files/l10n/is.php @@ -0,0 +1,62 @@ + "Engin villa, innsending heppnaðist", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu.", +"The uploaded file was only partially uploaded" => "Einungis hluti af innsendri skrá skilaði sér", +"No file was uploaded" => "Engin skrá skilaði sér", +"Missing a temporary folder" => "Vantar bráðabirgðamöppu", +"Failed to write to disk" => "Tókst ekki að skrifa á disk", +"Files" => "Skrár", +"Unshare" => "Hætta deilingu", +"Delete" => "Eyða", +"Rename" => "Endurskýra", +"{new_name} already exists" => "{new_name} er þegar til", +"replace" => "yfirskrifa", +"suggest name" => "stinga upp á nafni", +"cancel" => "hætta við", +"replaced {new_name}" => "endurskýrði {new_name}", +"undo" => "afturkalla", +"replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}", +"unshared {files}" => "Hætti við deilingu á {files}", +"deleted {files}" => "eyddi {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.", +"generating ZIP-file, it may take some time." => "bý til ZIP skrá, það gæti tekið smá stund.", +"Unable to upload your file as it is a directory or has 0 bytes" => "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti.", +"Upload Error" => "Villa við innsendingu", +"Close" => "Loka", +"Pending" => "Bíður", +"1 file uploading" => "1 skrá innsend", +"{count} files uploading" => "{count} skrár innsendar", +"Upload cancelled." => "Hætt við innsendingu.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ógilt nafn á möppu. Nafnið \"Shared\" er frátekið fyrir ownCloud.", +"{count} files scanned" => "{count} skrár skimaðar", +"error while scanning" => "villa við skimun", +"Name" => "Nafn", +"Size" => "Stærð", +"Modified" => "Breytt", +"1 folder" => "1 mappa", +"{count} folders" => "{count} möppur", +"1 file" => "1 skrá", +"{count} files" => "{count} skrár", +"File handling" => "Meðhöndlun skrár", +"Maximum upload size" => "Hámarks stærð innsendingar", +"max. possible: " => "hámark mögulegt: ", +"Needed for multi-file and folder downloads." => "Nauðsynlegt til að sækja margar skrár og möppur í einu.", +"Enable ZIP-download" => "Virkja ZIP niðurhal.", +"0 is unlimited" => "0 er ótakmarkað", +"Maximum input size for ZIP files" => "Hámarks inntaksstærð fyrir ZIP skrár", +"Save" => "Vista", +"New" => "Nýtt", +"Text file" => "Texta skrá", +"Folder" => "Mappa", +"From link" => "Af tengli", +"Upload" => "Senda inn", +"Cancel upload" => "Hætta við innsendingu", +"Nothing in here. Upload something!" => "Ekkert hér. Sendu eitthvað inn!", +"Download" => "Niðurhal", +"Upload too large" => "Innsend skrá of stór", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.", +"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.", +"Current scanning" => "Er að skima" +); diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index c47fdbdbf4f..1d22746156e 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -1,21 +1,44 @@ "Нема грешка, датотеката беше подигната успешно", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата", "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.", "No file was uploaded" => "Не беше подигната датотека", "Missing a temporary folder" => "Не постои привремена папка", "Failed to write to disk" => "Неуспеав да запишам на диск", "Files" => "Датотеки", +"Unshare" => "Не споделувај", "Delete" => "Избриши", +"Rename" => "Преименувај", +"{new_name} already exists" => "{new_name} веќе постои", +"replace" => "замени", +"suggest name" => "предложи име", +"cancel" => "откажи", +"replaced {new_name}" => "земенета {new_name}", +"undo" => "врати", +"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}", +"unshared {files}" => "без споделување {files}", +"deleted {files}" => "избришани {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.", "generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.", "Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти", "Upload Error" => "Грешка при преземање", "Close" => "Затвои", "Pending" => "Чека", +"1 file uploading" => "1 датотека се подига", +"{count} files uploading" => "{count} датотеки се подигаат", "Upload cancelled." => "Преземањето е прекинато.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud", +"{count} files scanned" => "{count} датотеки скенирани", +"error while scanning" => "грешка при скенирање", "Name" => "Име", "Size" => "Големина", "Modified" => "Променето", +"1 folder" => "1 папка", +"{count} folders" => "{count} папки", +"1 file" => "1 датотека", +"{count} files" => "{count} датотеки", "File handling" => "Ракување со датотеки", "Maximum upload size" => "Максимална големина за подигање", "max. possible: " => "макс. можно:", @@ -27,6 +50,7 @@ "New" => "Ново", "Text file" => "Текстуална датотека", "Folder" => "Папка", +"From link" => "Од врска", "Upload" => "Подигни", "Cancel upload" => "Откажи прикачување", "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index e5615a1c29b..db54660ab1e 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -17,6 +17,7 @@ "undo" => "angre", "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}", "deleted {files}" => "slettet {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.", "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid", "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes", "Upload Error" => "Opplasting feilet", @@ -26,6 +27,7 @@ "{count} files uploading" => "{count} filer laster opp", "Upload cancelled." => "Opplasting avbrutt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.", "{count} files scanned" => "{count} filer lest inn", "error while scanning" => "feil under skanning", "Name" => "Navn", @@ -46,6 +48,7 @@ "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", +"From link" => "Fra link", "Upload" => "Last opp", "Cancel upload" => "Avbryt opplasting", "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 34e8dc8a50e..7244a6677a3 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -1,5 +1,6 @@ "Nicio eroare, fișierul a fost încărcat cu succes", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML", "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial", "No file was uploaded" => "Niciun fișier încărcat", @@ -9,22 +10,35 @@ "Unshare" => "Anulează partajarea", "Delete" => "Șterge", "Rename" => "Redenumire", +"{new_name} already exists" => "{new_name} deja exista", "replace" => "înlocuire", "suggest name" => "sugerează nume", "cancel" => "anulare", +"replaced {new_name}" => "inlocuit {new_name}", "undo" => "Anulează ultima acțiune", +"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}", +"unshared {files}" => "nedistribuit {files}", +"deleted {files}" => "Sterse {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", "generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.", "Upload Error" => "Eroare la încărcare", "Close" => "Închide", "Pending" => "În așteptare", "1 file uploading" => "un fișier se încarcă", +"{count} files uploading" => "{count} fisiere incarcate", "Upload cancelled." => "Încărcare anulată.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nume de folder invalid. Numele este rezervat pentru OwnCloud", +"{count} files scanned" => "{count} fisiere scanate", "error while scanning" => "eroare la scanarea", "Name" => "Nume", "Size" => "Dimensiune", "Modified" => "Modificat", +"1 folder" => "1 folder", +"{count} folders" => "{count} foldare", +"1 file" => "1 fisier", +"{count} files" => "{count} fisiere", "File handling" => "Manipulare fișiere", "Maximum upload size" => "Dimensiune maximă admisă la încărcare", "max. possible: " => "max. posibil:", @@ -36,6 +50,7 @@ "New" => "Nou", "Text file" => "Fișier text", "Folder" => "Dosar", +"From link" => "de la adresa", "Upload" => "Încarcă", "Cancel upload" => "Anulează încărcarea", "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 5a8f448dc36..4b6d0a8b151 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -1,5 +1,6 @@ "Файл успешно загружен", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файл превышает размер установленный upload_max_filesize в php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме", "The uploaded file was only partially uploaded" => "Файл был загружен не полностью", "No file was uploaded" => "Файл не был загружен", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php index 5a6c032ed96..bb701aac002 100644 --- a/apps/files/l10n/ru_RU.php +++ b/apps/files/l10n/ru_RU.php @@ -1,5 +1,6 @@ "Ошибка отсутствует, файл загружен успешно.", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного", "The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично", "No file was uploaded" => "Файл не был загружен", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index 343138ba126..bad817ab006 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -1,5 +1,6 @@ "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML", "The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์", "No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 061ed1f3ae2..7cd3a82cd71 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -1,5 +1,6 @@ "Bir hata yok, dosya başarıyla yüklendi", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor", "The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi", "No file was uploaded" => "Hiç dosya yüklenmedi", @@ -15,20 +16,29 @@ "cancel" => "iptal", "replaced {new_name}" => "değiştirilen {new_name}", "undo" => "geri al", +"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi", "unshared {files}" => "paylaşılmamış {files}", "deleted {files}" => "silinen {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.", "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.", "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi", "Upload Error" => "Yükleme hatası", "Close" => "Kapat", "Pending" => "Bekliyor", "1 file uploading" => "1 dosya yüklendi", +"{count} files uploading" => "{count} dosya yükleniyor", "Upload cancelled." => "Yükleme iptal edildi.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Geçersiz dizin ismi. \"Shared\" dizini OwnCloud tarafından kullanılmaktadır.", +"{count} files scanned" => "{count} dosya tarandı", "error while scanning" => "tararamada hata oluşdu", "Name" => "Ad", "Size" => "Boyut", "Modified" => "Değiştirilme", +"1 folder" => "1 dizin", +"{count} folders" => "{count} dizin", +"1 file" => "1 dosya", +"{count} files" => "{count} dosya", "File handling" => "Dosya taşıma", "Maximum upload size" => "Maksimum yükleme boyutu", "max. possible: " => "mümkün olan en fazla: ", @@ -40,6 +50,7 @@ "New" => "Yeni", "Text file" => "Metin dosyası", "Folder" => "Klasör", +"From link" => "Bağlantıdan", "Upload" => "Yükle", "Cancel upload" => "Yüklemeyi iptal et", "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!", diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 66fec4cd536..0de12edcba5 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -15,11 +15,11 @@ ' title="t( '0 is unlimited' ); ?>" - disabled="disabled" /> -
+ disabled="disabled" />
+ t( 'Maximum input size for ZIP files' ); ?>
- \ No newline at end of file + diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index bd34c9a76d9..edf048c7e13 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -5,7 +5,7 @@
t('New');?> -
+

+ + + + diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d02bcdd7ea5..35eb0ef5e9a 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -8,26 +8,29 @@

t('You have used %s of the available %s', array($_['usage'], $_['total_space']));?>

-
- t('Desktop and Mobile Syncing Clients');?> - t('Download');?> -
+
+ t('Clients');?> + t('Download Desktop Clients');?> + t('Download Android Client');?> + t('Download iOS Client');?> +
+ t('Password');?>
t('Your password was changed');?>
t('Unable to change your password');?>
- +
- + t('Email');?>
t('Fill in an email address to enable password recovery');?>
@@ -35,7 +38,7 @@
- + t('Language');?>
- t('Default Quota');?>: + t('Default Storage');?>
+ + + - + @@ -138,7 +153,7 @@ var isadmin = ; t('Other');?> ... - +
@@ -151,4 +166,4 @@ var isadmin = ; - \ No newline at end of file + diff --git a/settings/users.php b/settings/users.php index 93a259f1cd8..07a7620d3c0 100644 --- a/settings/users.php +++ b/settings/users.php @@ -29,11 +29,27 @@ if($isadmin) { $subadmins = false; } +// load preset quotas +$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'); +$quotaPreset=explode(',', $quotaPreset); +foreach($quotaPreset as &$preset) { + $preset=trim($preset); +} +$quotaPreset=array_diff($quotaPreset, array('default', 'none')); + +$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none'); +$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false; + +// load users and quota foreach($accessibleusers as $i) { + $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default'); + $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false; + $users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/), - 'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'), + 'quota'=>$quota, + 'isQuotaUserDefined'=>$isQuotaUserDefined, 'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i))); } @@ -41,20 +57,14 @@ foreach( $accessiblegroups as $i ) { // Do some more work here soon $groups[] = array( "name" => $i ); } -$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB'); -$quotaPreset=explode(',', $quotaPreset); -foreach($quotaPreset as &$preset) { - $preset=trim($preset); -} - -$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none'); $tmpl = new OC_Template( "settings", "users", "user" ); -$tmpl->assign( "users", $users ); -$tmpl->assign( "groups", $groups ); +$tmpl->assign( 'users', $users ); +$tmpl->assign( 'groups', $groups ); $tmpl->assign( 'isadmin', (int) $isadmin); $tmpl->assign( 'subadmins', $subadmins); $tmpl->assign( 'numofgroups', count($accessiblegroups)); $tmpl->assign( 'quota_preset', $quotaPreset); $tmpl->assign( 'default_quota', $defaultQuota); +$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined); $tmpl->printPage();