Correct unknown breadcrumb add '/' permanantly in it and DRY code for last breadcrumb

This commit is contained in:
Brice Maron 2011-10-21 23:30:12 +02:00
parent 61660c068a
commit 8c7fc03296
2 changed files with 5 additions and 9 deletions

View File

@ -41,7 +41,7 @@ if(!isset($_SESSION['timezone'])){
}
OC_App::setActiveNavigationEntry( "files_index" );
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
$dir = isset( $_GET['dir'] ) && $_GET['dir'] != '/' ? $_GET['dir'] : '';
$files = array();
foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
@ -63,7 +63,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
}
// Make breadcrumb
$breadcrumb = array();
$breadcrumb = array('/');
$pathtohere = "";
foreach( explode( "/", $dir ) as $i ){
if( $i != "" ){

View File

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