aboutsummaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
Diffstat (limited to 'files')
-rw-r--r--files/index.php4
-rw-r--r--files/js/filelist.js2
-rw-r--r--files/templates/part.breadcrumb.php10
3 files changed, 8 insertions, 8 deletions
diff --git a/files/index.php b/files/index.php
index bd37598289a..8bb5b618d87 100644
--- a/files/index.php
+++ b/files/index.php
@@ -42,6 +42,10 @@ if(!isset($_SESSION['timezone'])){
OC_App::setActiveNavigationEntry( "files_index" );
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+// Redirect if directory does not exist
+if(!OC_Filesystem::is_dir($dir)) {
+ header("Location: ".$_SERVER['PHP_SELF']."");
+}
$files = array();
foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 3e85a35f6ef..863a3385d15 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -38,7 +38,7 @@ FileList={
},
addDir:function(name,size,lastModified){
var html='<tr data-file="'+name+'" data-type="dir" data-size="'+size+'">';
- html+='<td class="filename" style="background-image:url('+OC.imagePath('core', 'places/folder')+')"><input type="checkbox" /><a class="name" href="index.php?dir='+$('#dir').val()+'/'+name+'">'+name+'</a></td>';
+ html+='<td class="filename" style="background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')"><input type="checkbox" /><a class="name" href="index.php?dir='+$('#dir').val()+'/'+name+'">'+name+'</a></td>';
if(size!='Pending'){
simpleSize=simpleFileSize(size);
}else{
diff --git a/files/templates/part.breadcrumb.php b/files/templates/part.breadcrumb.php
index b26f6097153..ab81cc5c039 100644
--- a/files/templates/part.breadcrumb.php
+++ b/files/templates/part.breadcrumb.php
@@ -1,10 +1,6 @@
- <?php for($i=0; $i<count($_["breadcrumb"])-1; $i++):
+ <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i]; ?>
- <div class="crumb svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
+ <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a>
</div>
- <?php endfor;
- $crumb = $_["breadcrumb"][count($_["breadcrumb"])-1] ?>
- <div class="crumb last svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
- <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a>
- </div> \ No newline at end of file
+ <?php endfor;?> \ No newline at end of file