don't reload the whole page after file upload

1 files changed, 26 insertions, 11 deletions

diff --git a/files/ajax/list.php b/files/ajax/list.php
index 4694f842832..ef43e72fcae 100644
--- a/files/ajax/list.php
+++ b/files/ajax/list.php
@@ -2,6 +2,7 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
+require_once('../../lib/template.php');
 
 // We send json data
 header( "Content-Type: application/jsonrequest" );
@@ -14,23 +15,37 @@ if( !OC_USER::isLoggedIn()){
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
+$data = array();
 
+// Make breadcrumb
+if($doBreadcrumb){
+	$breadcrumb = array();
+	$pathtohere = "/";
+	foreach( explode( "/", $dir ) as $i ){
+		if( $i != "" ){
+			$pathtohere .= "$i/";
+			$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
+		}
+	}
+	
+	$breadcrumbNav = new OC_TEMPLATE( "files", "part.breadcrumb", "" );
+	$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
+	
+	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
+}
+
+// make filelist
 $files = array();
 foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
-	$i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] );
+	$i["date"] = OC_UTIL::formatDate($i["mtime"] );
 	$files[] = $i;
 }
 
-// Make breadcrumb
-$breadcrumb = array();
-$pathtohere = "/";
-foreach( explode( "/", $dir ) as $i ){
-	if( $i != "" ){
-		$pathtohere .= "$i/";
-		$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
-	}
-}
+$list = new OC_TEMPLATE( "files", "part.list", "" );
+$list->assign( "files", $files );
+$data = array('files' => $list->fetchPage());
 
-echo json_encode( array( "status" => "success", "data" => array( "files" => $files, "breadcrumb" => $breadcrumb )));
+echo json_encode( array( "status" => "success", "data" => $data));
 
 ?>