diff options
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/admin.php | 2 | ||||
| -rw-r--r-- | apps/files/ajax/list.php | 4 | ||||
| -rw-r--r-- | apps/files/ajax/newfile.php | 2 | ||||
| -rw-r--r-- | apps/files/ajax/rawlist.php | 2 | ||||
| -rw-r--r-- | apps/files/ajax/scan.php | 9 | ||||
| -rw-r--r-- | apps/files/ajax/timezone.php | 1 | ||||
| -rw-r--r-- | apps/files/appinfo/update.php | 2 | ||||
| -rw-r--r-- | apps/files/download.php | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 6 | ||||
| -rw-r--r-- | apps/files/settings.php | 2 | ||||
| -rw-r--r-- | apps/files/templates/admin.php | 3 |
11 files changed, 14 insertions, 21 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php index d05eb7267b7..b49c0f61a0c 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -23,7 +23,7 @@ // Init owncloud - + OCP\User::checkAdminUser(); diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 94ddf0364be..2254526231e 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -23,10 +23,10 @@ if($doBreadcrumb) { $breadcrumb[] = array( "dir" => $pathtohere, "name" => $i ); } } - + $breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" ); $breadcrumbNav->assign( "breadcrumb", $breadcrumb ); - + $data['breadcrumb'] = $breadcrumbNav->fetchPage(); } diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 6ae9c445425..4619315ce09 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -39,7 +39,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes case STREAM_NOTIFY_FILE_SIZE_IS: $filesize = $bytes_max; break; - + case STREAM_NOTIFY_PROGRESS: if ($bytes_transferred > 0) { if (!isset($filesize)) { diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php index 20094563b17..e0aa0bdac52 100644 --- a/apps/files/ajax/rawlist.php +++ b/apps/files/ajax/rawlist.php @@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn(); // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; -$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : ''; +$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : ''; // make filelist $files = array(); diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php index 23d7da44f8d..d2ec1ab5161 100644 --- a/apps/files/ajax/scan.php +++ b/apps/files/ajax/scan.php @@ -16,13 +16,12 @@ session_write_close(); if($force or !OC_FileCache::inCache('')) { if(!$checkOnly) { OCP\DB::beginTransaction(); - + if(OC_Cache::isFast()) { - //make sure the old fileid's don't mess things up - OC_Cache::clear('fileid/'); + OC_Cache::clear('fileid/'); //make sure the old fileid's don't mess things up } - - OC_FileCache::scan($dir, $eventSource); + + OC_FileCache::scan($dir,$eventSource); OC_FileCache::clean(); OCP\DB::commit(); $eventSource->send('success', true); diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php index 0be441a36a2..b71fa3940cb 100644 --- a/apps/files/ajax/timezone.php +++ b/apps/files/ajax/timezone.php @@ -3,4 +3,3 @@ // see lib/base.php for an example //session_start(); $_SESSION['timezone'] = $_GET['time']; -
\ No newline at end of file diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index b2480a58f5e..32ac89f0061 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -41,5 +41,3 @@ foreach($filesToRemove as $file) { break; } } - - diff --git a/apps/files/download.php b/apps/files/download.php index 4e2478d1ad7..44a328e25db 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -22,7 +22,7 @@ */ // Init owncloud - + // Check if we are a user OCP\User::checkLoggedIn(); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 049afea4f61..b57e75c9004 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -379,7 +379,7 @@ $(document).ready(function() { stop: function(e, data) { if(data.dataType != 'iframe ') { $('#upload input.stop').hide(); - } + } $('#uploadprogressbar').progressbar('value',100); $('#uploadprogressbar').fadeOut(); } @@ -542,7 +542,7 @@ $(document).ready(function() { scanFiles(); } }, "json"); - + var lastWidth = 0; var breadcrumbs = []; var breadcrumbsWidth = $('#navigation').get(0).offsetWidth; @@ -603,7 +603,7 @@ $(document).ready(function() { $(window).resize(function() { resizeBreadcrumbs(false); }); - + resizeBreadcrumbs(true); }); diff --git a/apps/files/settings.php b/apps/files/settings.php index cd6dd8c1616..b02c3738c6e 100644 --- a/apps/files/settings.php +++ b/apps/files/settings.php @@ -23,7 +23,7 @@ // Init owncloud - + // Check if we are a user OCP\User::checkLoggedIn(); diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 23021ec6647..3ad0629750b 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -14,6 +14,3 @@ <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/> </fieldset> </form> - - - |