merge conflicts ...

4 files changed, 421 insertions, 160 deletions

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
new file mode 100644
index 00000000000..942a07dfccc
--- /dev/null
+++ b/apps/files/js/file-upload.js
@@ -0,0 +1,343 @@
+$(document).ready(function() {
+
+  file_upload_param = {
+	dropZone: $('#content'), // restrict dropZone to content div
+	//singleFileUploads is on by default, so the data.files array will always have length 1
+	add: function(e, data) {
+
+	  if(data.files[0].type === '' && data.files[0].size == 4096)
+	  {
+		data.textStatus = 'dirorzero';
+		data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
+		var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+		fu._trigger('fail', e, data);
+		return true; //don't upload this file but go on with next in queue
+	  }
+
+	  var totalSize=0;
+	  $.each(data.originalFiles, function(i,file){
+		totalSize+=file.size;
+	  });
+
+	  if(totalSize>$('#max_upload').val()){
+		data.textStatus = 'notenoughspace';
+		data.errorThrown = t('files','Not enough space available');
+		var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+		fu._trigger('fail', e, data);
+		return false; //don't upload anything
+	  }
+
+	  // start the actual file upload
+	  var jqXHR = data.submit();
+
+	  // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
+	  if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+		var dirName = data.context.data('file');
+		if(typeof uploadingFiles[dirName] === 'undefined') {
+	  uploadingFiles[dirName] = {};
+		}
+		uploadingFiles[dirName][data.files[0].name] = jqXHR;
+	  } else {
+		uploadingFiles[data.files[0].name] = jqXHR;
+	  }
+
+	  //show cancel button
+	  if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
+		$('#uploadprogresswrapper input.stop').show();
+	  }
+	},
+	/**
+	 * called after the first add, does NOT have the data param
+	 * @param e
+	 */
+	start: function(e) {
+	  //IE < 10 does not fire the necessary events for the progress bar.
+	  if($('html.lte9').length > 0) {
+		return;
+	  }
+	  $('#uploadprogressbar').progressbar({value:0});
+	  $('#uploadprogressbar').fadeIn();
+	},
+	fail: function(e, data) {
+	  if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+		if (data.textStatus === 'abort') {
+	  $('#notification').text(t('files', 'Upload cancelled.'));
+		} else {
+	  // HTTP connection problem
+	  $('#notification').text(data.errorThrown);
+		}
+		$('#notification').fadeIn();
+		//hide notification after 5 sec
+		setTimeout(function() {
+	  $('#notification').fadeOut();
+		}, 5000);
+	  }
+	  delete uploadingFiles[data.files[0].name];
+	},
+	progress: function(e, data) {
+	  // TODO: show nice progress bar in file row
+	},
+	progressall: function(e, data) {
+	  //IE < 10 does not fire the necessary events for the progress bar.
+	  if($('html.lte9').length > 0) {
+		return;
+	  }
+	  var progress = (data.loaded/data.total)*100;
+	  $('#uploadprogressbar').progressbar('value',progress);
+	},
+	/**
+	 * called for every successful upload
+	 * @param e
+	 * @param data
+	 */
+	done:function(e, data) {
+	  // handle different responses (json or body from iframe for ie)
+	  var response;
+	  if (typeof data.result === 'string') {
+		response = data.result;
+	  } else {
+		//fetch response from iframe
+		response = data.result[0].body.innerText;
+	  }
+	  var result=$.parseJSON(response);
+
+	  if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+		var file = result[0];
+	  } else {
+		data.textStatus = 'servererror';
+		data.errorThrown = t('files', result.data.message);
+		var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+		fu._trigger('fail', e, data);
+	  }
+
+	  var filename = result[0].originalname;
+
+	  // delete jqXHR reference
+	  if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+		var dirName = data.context.data('file');
+		delete uploadingFiles[dirName][filename];
+		if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+	  delete uploadingFiles[dirName];
+		}
+	  } else {
+		delete uploadingFiles[filename];
+	  }
+
+	},
+	/**
+	 * called after last upload
+	 * @param e
+	 * @param data
+	 */
+	stop: function(e, data) {
+	  if(data.dataType !== 'iframe') {
+		$('#uploadprogresswrapper input.stop').hide();
+	  }
+
+	  //IE < 10 does not fire the necessary events for the progress bar.
+	  if($('html.lte9').length > 0) {
+		return;
+	  }
+
+	  $('#uploadprogressbar').progressbar('value',100);
+	  $('#uploadprogressbar').fadeOut();
+	}
+  }
+  var file_upload_handler = function() {
+	$('#file_upload_start').fileupload(file_upload_param);
+  };
+
+
+
+  if ( document.getElementById('data-upload-form') ) {
+	$(file_upload_handler);
+  }
+  $.assocArraySize = function(obj) {
+	// http://stackoverflow.com/a/6700/11236
+	var size = 0, key;
+	for (key in obj) {
+	  if (obj.hasOwnProperty(key)) size++;
+	}
+	return size;
+  };
+
+  // warn user not to leave the page while upload is in progress
+  $(window).bind('beforeunload', function(e) {
+	if ($.assocArraySize(uploadingFiles) > 0)
+	  return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+  });
+
+  //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+  if(navigator.userAgent.search(/konqueror/i)==-1){
+	$('#file_upload_start').attr('multiple','multiple')
+  }
+
+  //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
+  var crumb=$('div.crumb').first();
+  while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
+	crumb.children('a').text('...');
+	crumb=crumb.next('div.crumb');
+  }
+  //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
+  var crumb=$('div.crumb').first();
+  var next=crumb.next('div.crumb');
+  while($('div.controls').height()>40 && next.next('div.crumb').length>0){
+	crumb.remove();
+	crumb=next;
+	next=crumb.next('div.crumb');
+  }
+  //still not enough, start shorting down the current folder name
+  var crumb=$('div.crumb>a').last();
+  while($('div.controls').height()>40 && crumb.text().length>6){
+	var text=crumb.text()
+	text=text.substr(0,text.length-6)+'...';
+	crumb.text(text);
+  }
+
+  $(document).click(function(){
+	$('#new>ul').hide();
+	$('#new').removeClass('active');
+	$('#new li').each(function(i,element){
+	  if($(element).children('p').length==0){
+		$(element).children('form').remove();
+		$(element).append('<p>'+$(element).data('text')+'</p>');
+	  }
+	});
+  });
+  $('#new li').click(function(){
+	if($(this).children('p').length==0){
+	  return;
+	}
+
+	$('#new li').each(function(i,element){
+	  if($(element).children('p').length==0){
+		$(element).children('form').remove();
+		$(element).append('<p>'+$(element).data('text')+'</p>');
+	  }
+	});
+
+	var type=$(this).data('type');
+	var text=$(this).children('p').text();
+	$(this).data('text',text);
+	$(this).children('p').remove();
+	var form=$('<form></form>');
+	var input=$('<input>');
+	form.append(input);
+	$(this).append(form);
+	input.focus();
+	form.submit(function(event){
+	  event.stopPropagation();
+	  event.preventDefault();
+	  var newname=input.val();
+	  if(type == 'web' && newname.length == 0) {
+		OC.Notification.show(t('files', 'URL cannot be empty.'));
+		return false;
+	  } else if (type != 'web' && !Files.isFileNameValid(newname)) {
+		return false;
+	  } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
+		OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
+		return false;
+	  }
+	  if (FileList.lastAction) {
+		FileList.lastAction();
+	  }
+	  var name = getUniqueName(newname);
+	  if (newname != name) {
+		FileList.checkName(name, newname, true);
+		var hidden = true;
+	  } else {
+		var hidden = false;
+	  }
+	  switch(type){
+	  case 'file':
+		$.post(
+		  OC.filePath('files','ajax','newfile.php'),
+		  {dir:$('#dir').val(),filename:name},
+		  function(result){
+			if (result.status == 'success') {
+			  var date=new Date();
+			  FileList.addFile(name,0,date,false,hidden);
+			  var tr=$('tr').filterAttr('data-file',name);
+			  tr.attr('data-mime',result.data.mime);
+			  tr.attr('data-id', result.data.id);
+			  getMimeIcon(result.data.mime,function(path){
+			tr.find('td.filename').attr('style','background-image:url('+path+')');
+			  });
+			} else {
+			  OC.dialogs.alert(result.data.message, t('core', 'Error'));
+			}
+		  }
+		);
+		break;
+	  case 'folder':
+		$.post(
+		  OC.filePath('files','ajax','newfolder.php'),
+		  {dir:$('#dir').val(),foldername:name},
+		  function(result){
+			if (result.status == 'success') {
+			  var date=new Date();
+			  FileList.addDir(name,0,date,hidden);
+			  var tr=$('tr').filterAttr('data-file',name);
+			  tr.attr('data-id', result.data.id);
+			} else {
+			  OC.dialogs.alert(result.data.message, t('core', 'Error'));
+			}
+		  }
+		);
+		break;
+	  case 'web':
+		if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
+		  name='http://'+name;
+		}
+		var localName=name;
+		if(localName.substr(localName.length-1,1)=='/'){//strip /
+		  localName=localName.substr(0,localName.length-1)
+		}
+		if(localName.indexOf('/')){//use last part of url
+		  localName=localName.split('/').pop();
+		} else { //or the domain
+		  localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+		}
+		localName = getUniqueName(localName);
+		//IE < 10 does not fire the necessary events for the progress bar.
+		if($('html.lte9').length > 0) {
+		} else {
+		  $('#uploadprogressbar').progressbar({value:0});
+		  $('#uploadprogressbar').fadeIn();
+		}
+
+		var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+		eventSource.listen('progress',function(progress){
+		  //IE < 10 does not fire the necessary events for the progress bar.
+		  if($('html.lte9').length > 0) {
+		  } else {
+			$('#uploadprogressbar').progressbar('value',progress);
+		  }
+		});
+		eventSource.listen('success',function(data){
+		  var mime=data.mime;
+		  var size=data.size;
+		  var id=data.id;
+		  $('#uploadprogressbar').fadeOut();
+		  var date=new Date();
+		  FileList.addFile(localName,size,date,false,hidden);
+		  var tr=$('tr').filterAttr('data-file',localName);
+		  tr.data('mime',mime).data('id',id);
+		  tr.attr('data-id', id);
+		  getMimeIcon(mime,function(path){
+			tr.find('td.filename').attr('style','background-image:url('+path+')');
+		  });
+		});
+		eventSource.listen('error',function(error){
+		  $('#uploadprogressbar').fadeOut();
+		  alert(error);
+		});
+		break;
+	  }
+	  var li=form.parent();
+	  form.remove();
+	  li.append('<p>'+li.data('text')+'</p>');
+	  $('#new>a').click();
+	});
+  });
+});
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 14fca6f1482..aa66a57a7b5 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -200,7 +200,11 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
 
 
 FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename);
+	var dir = $('#dir').val()
+	if (dir !== '/') {
+		dir = dir + '/';
+	}
+	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename);
 });
 
 FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 11bf028d93a..036d4bd6f07 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -71,8 +71,20 @@ var FileList={
 		tr.append(td);
 		return tr;
 	},
-	addFile:function(name,size,lastModified,loading,hidden){
+	addFile:function(name,size,lastModified,loading,hidden,param){
 		var imgurl;
+
+		if (!param) {
+			param = {};
+		}
+
+		var download_url = null;
+		if (!param.download_url) {
+			download_url = OC.Router.generate('download', { file: $('#dir').val()+'/'+name });
+		} else {
+			download_url = param.download_url;
+		}
+
 		if (loading) {
 			imgurl = OC.imagePath('core', 'loading.gif');
 		} else {
@@ -82,7 +94,7 @@ var FileList={
 			'file',
 			name,
 			imgurl,
-			OC.Router.generate('download', { file: $('#dir').val()+'/'+name }),
+			download_url,
 			size,
 			lastModified,
 			$('#permissions').val()
@@ -198,7 +210,7 @@ var FileList={
 			len = input.val().length;
 		}
 		input.selectRange(0,len);
-		
+
 		form.submit(function(event){
 			event.stopPropagation();
 			event.preventDefault();
@@ -209,13 +221,44 @@ var FileList={
 				if (FileList.checkName(name, newname, false)) {
 					newname = name;
 				} else {
-					$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
-						if (!result || result.status == 'error') {
-							OC.dialogs.alert(result.data.message, 'Error moving file');
-							newname = name;
+					// save background image, because it's replaced by a spinner while async request
+					var oldBackgroundImage = td.css('background-image');
+					// mark as loading
+					td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+					$.ajax({
+						url: OC.filePath('files','ajax','rename.php'),
+						data: {
+							dir : $('#dir').val(),
+							newname: newname,
+							file: name
+						},
+						success: function(result) {
+							if (!result || result.status === 'error') {
+								OC.Notification.show(result.data.message);
+								newname = name;
+								// revert changes
+								tr.attr('data-file', newname);
+								var path = td.children('a.name').attr('href');
+								td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+								if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+									var basename=newname.substr(0,newname.lastIndexOf('.'));
+								} else {
+									var basename=newname;
+								}
+								td.find('a.name span.nametext').text(basename);
+								if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+									if (td.find('a.name span.extension').length === 0 ) {
+										td.find('a.name span.nametext').append('<span class="extension"></span>');
+									}
+									td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
+								}
+								tr.find('.fileactions').effect('highlight', {}, 5000);
+								tr.effect('highlight', {}, 5000);
+							}
+							// remove loading mark and recover old image
+							td.css('background-image', oldBackgroundImage);
 						}
 					});
-
 				}
 			}
 			tr.data('renaming',false);
@@ -424,8 +467,12 @@ $(document).ready(function(){
 					size=data.files[0].size;
 				}
 				var date=new Date();
+				var param = {};
+				if ($('#publicUploadRequestToken').length) {
+					param.download_url = document.location.href + '&download&path=/' + $('#dir').val() + '/' + uniqueName;
+				}
 				// create new file context
-				data.context = FileList.addFile(uniqueName,size,date,true,false);
+				data.context = FileList.addFile(uniqueName,size,date,true,false,param);
 
 			}
 		}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 06d193bf8f3..6eb3a7b1e72 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -251,153 +251,6 @@ $(document).ready(function() {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
 	});
 
-	if ( document.getElementById('data-upload-form') ) {
-		$(function() {
-			$('#file_upload_start').fileupload({
-				dropZone: $('#content'), // restrict dropZone to content div
-				//singleFileUploads is on by default, so the data.files array will always have length 1
-				add: function(e, data) {
-
-					if(data.files[0].type === '' && data.files[0].size == 4096)
-					{
-						data.textStatus = 'dirorzero';
-						data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-						fu._trigger('fail', e, data);
-						return true; //don't upload this file but go on with next in queue
-					}
-
-					var totalSize=0;
-					$.each(data.originalFiles, function(i,file){
-						totalSize+=file.size;
-					});
-
-					if(totalSize>$('#max_upload').val()){
-						data.textStatus = 'notenoughspace';
-						data.errorThrown = t('files','Not enough space available');
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-						fu._trigger('fail', e, data);
-						return false; //don't upload anything
-					}
-
-					// start the actual file upload
-					var jqXHR = data.submit();
-
-					// remember jqXHR to show warning to user when he navigates away but an upload is still in progress
-					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-						var dirName = data.context.data('file');
-						if(typeof uploadingFiles[dirName] === 'undefined') {
-							uploadingFiles[dirName] = {};
-						}
-						uploadingFiles[dirName][data.files[0].name] = jqXHR;
-					} else {
-						uploadingFiles[data.files[0].name] = jqXHR;
-					}
-
-					//show cancel button
-					if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
-						$('#uploadprogresswrapper input.stop').show();
-					}
-				},
-				/**
-				 * called after the first add, does NOT have the data param
-				 * @param e
-				 */
-				start: function(e) {
-					//IE < 10 does not fire the necessary events for the progress bar.
-					if($('html.lte9').length > 0) {
-						return;
-					}
-					$('#uploadprogressbar').progressbar({value:0});
-					$('#uploadprogressbar').fadeIn();
-				},
-				fail: function(e, data) {
-					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
-						if (data.textStatus === 'abort') {
-							$('#notification').text(t('files', 'Upload cancelled.'));
-						} else {
-							// HTTP connection problem
-							$('#notification').text(data.errorThrown);
-						}
-						$('#notification').fadeIn();
-						//hide notification after 5 sec
-						setTimeout(function() {
-							$('#notification').fadeOut();
-						}, 5000);
-					}
-					delete uploadingFiles[data.files[0].name];
-				},
-				progress: function(e, data) {
-					// TODO: show nice progress bar in file row
-				},
-				progressall: function(e, data) {
-					//IE < 10 does not fire the necessary events for the progress bar.
-					if($('html.lte9').length > 0) {
-						return;
-					}
-					var progress = (data.loaded/data.total)*100;
-					$('#uploadprogressbar').progressbar('value',progress);
-				},
-				/**
-				 * called for every successful upload
-				 * @param e
-				 * @param data
-				 */
-				done:function(e, data) {
-					// handle different responses (json or body from iframe for ie)
-					var response;
-					if (typeof data.result === 'string') {
-						response = data.result;
-					} else {
-						//fetch response from iframe
-						response = data.result[0].body.innerText;
-					}
-					var result=$.parseJSON(response);
-
-					if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
-						var file = result[0];
-					} else {
-						data.textStatus = 'servererror';
-						data.errorThrown = t('files', result.data.message);
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-						fu._trigger('fail', e, data);
-					}
-
-					var filename = result[0].originalname;
-
-					// delete jqXHR reference
-					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-						var dirName = data.context.data('file');
-						delete uploadingFiles[dirName][filename];
-						if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
-							delete uploadingFiles[dirName];
-						}
-					} else {
-						delete uploadingFiles[filename];
-					}
-
-				},
-				/**
-				 * called after last upload
-				 * @param e
-				 * @param data
-				 */
-				stop: function(e, data) {
-					if(data.dataType !== 'iframe') {
-						$('#uploadprogresswrapper input.stop').hide();
-					}
-
-					//IE < 10 does not fire the necessary events for the progress bar.
-					if($('html.lte9').length > 0) {
-						return;
-					}
-
-					$('#uploadprogressbar').progressbar('value',100);
-					$('#uploadprogressbar').fadeOut();
-				}
-			})
-		});
-	}
 	$.assocArraySize = function(obj) {
 		// http://stackoverflow.com/a/6700/11236
 		var size = 0, key;
@@ -697,7 +550,7 @@ $(document).ready(function() {
 	}
 });
 
-function scanFiles(force, dir){
+function scanFiles(force, dir, users){
 	if (!OC.currentUser) {
 		return;
 	}
@@ -707,7 +560,18 @@ function scanFiles(force, dir){
 	}
 	force = !!force; //cast to bool
 	scanFiles.scanning = true;
-	var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
+	var scannerEventSource;
+	if (users) {
+		var usersString;
+		if (users === 'all') {
+			usersString = users;
+		} else {
+			usersString = JSON.stringify(users);
+		}
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString});
+	} else {
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir});
+	}
 	scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('count',function(count){
 		console.log(count + ' files scanned')
@@ -719,6 +583,9 @@ function scanFiles(force, dir){
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
 	});
+	scannerEventSource.listen('user',function(user){
+		console.log('scanning files for ' + user);
+	});
 }
 scanFiles.scanning=false;
 
@@ -793,7 +660,7 @@ var dragOptions={
 // sane browsers support using the distance option
 if ( $('html.ie').length === 0) {
 	dragOptions['distance'] = 20;
-} 
+}
 
 var folderDropOptions={
 	drop: function( event, ui ) {