fix whitespace, check selected files before starting upload

6 files changed, 614 insertions, 315 deletions

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index dde5d3c50af..8d183bd1f9c 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -98,23 +98,46 @@ $result = array();
 if (strpos($dir, '..') === false) {
 	$fileCount = count($files['name']);
 	for ($i = 0; $i < $fileCount; $i++) {
-		$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
 		// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
-		$target = \OC\Files\Filesystem::normalizePath($target);
-		if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+		if (isset($_POST['new_name'])) {
+			$newName = $_POST['new_name'];
+		} else {
+			$newName = $files['name'][$i];
+		}
+		if (isset($_POST['replace']) && $_POST['replace'] == true) {
+			$replace = true;
+		} else {
+			$replace = false;
+		}
+		$target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).$newName);
+		if ( ! $replace && \OC\Files\Filesystem::file_exists($target)) {
 			$meta = \OC\Files\Filesystem::getFileInfo($target);
-			// updated max file size after upload
-			$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
-
-			$result[] = array('status' => 'success',
+			$result[] = array('status' => 'existserror',
 				'mime' => $meta['mimetype'],
 				'size' => $meta['size'],
 				'id' => $meta['fileid'],
 				'name' => basename($target),
-				'originalname' => $files['name'][$i],
+				'originalname' => $newName,
 				'uploadMaxFilesize' => $maxUploadFileSize,
 				'maxHumanFilesize' => $maxHumanFileSize
 			);
+		} else {
+			//$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
+			if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+				$meta = \OC\Files\Filesystem::getFileInfo($target);
+				// updated max file size after upload
+				$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+
+				$result[] = array('status' => 'success',
+					'mime' => $meta['mimetype'],
+					'size' => $meta['size'],
+					'id' => $meta['fileid'],
+					'name' => basename($target),
+					'originalname' => $newName,
+					'uploadMaxFilesize' => $maxUploadFileSize,
+					'maxHumanFilesize' => $maxHumanFileSize
+				);
+			}
 		}
 	}
 	OCP\JSON::encodedPrint($result);
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 86fb0dc6046..acee8471aff 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -189,3 +189,44 @@ table.dragshadow td.size {
 	text-align: center;
 	margin-left: -200px;
 }
+
+.oc-dialog .fileexists .original .icon {
+	width: 64px;
+	height: 64px;
+	margin: 5px 5px 5px 0px;
+	background-repeat: no-repeat;
+	background-size: 64px 64px;
+	float: left;
+}
+
+.oc-dialog .fileexists .replacement {
+	margin-top: 20px;
+}
+
+.oc-dialog .fileexists .replacement .icon {
+	width: 64px;
+	height: 64px;
+	margin: 5px 5px 5px 0px;
+	background-repeat: no-repeat;
+	background-size: 64px 64px;
+	float: left;
+	clear: both;
+}
+
+.oc-dialog .fileexists label[for="new-name"] {
+	margin-top: 20px;
+	display: block;
+}
+.oc-dialog .fileexists h3 {
+	font-weight: bold;
+}
+
+
+.oc-dialog .oc-dialog-buttonrow {
+	width:100%;
+	text-align:right;
+}
+
+.oc-dialog .oc-dialog-buttonrow .cancel {
+	float:left;
+}
\ No newline at end of file
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 942a07dfccc..71034a0b3f4 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1,343 +1,445 @@
-$(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();
+OC.upload = {
+	_isProcessing:false,
+	isProcessing:function(){
+		return this._isProcessing;
+	},
+	_uploadQueue:[],
+	addUpload:function(data){
+		this._uploadQueue.push(data);
 
-	  // 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] = {};
+		if ( ! OC.upload.isProcessing() ) {
+			OC.upload.startUpload();
 		}
-		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();
+	startUpload:function(){
+		if (this._uploadQueue.length > 0) {
+			this._isProcessing = true;
+			this.nextUpload();
+			return true;
+		} else {
+			return false;
+		}
 	},
-	fail: function(e, data) {
-	  if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
-		if (data.textStatus === 'abort') {
-	  $('#notification').text(t('files', 'Upload cancelled.'));
+	nextUpload:function(){
+		if (this._uploadQueue.length > 0) {
+			var data = this._uploadQueue.pop();
+			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;
+			}
 		} else {
-	  // HTTP connection problem
-	  $('#notification').text(data.errorThrown);
+			//queue is empty, we are done
+			this._isProcessing = false;
 		}
-		$('#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
+	onCancel:function(data){
+		//TODO cancel all uploads
+		Files.cancelUploads();
+		this._uploadQueue = [];
+		this._isProcessing = false;
+	},
+	onSkip:function(data){
+		this.nextUpload();
 	},
-	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);
+	onReplace:function(data){
+		//TODO overwrite file
+		data.data.append('replace', true);
+		data.submit();
 	},
-	/**
-	 * 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);
+	onRename:function(data, newName){
+		//TODO rename file in filelist, stop spinner
+		data.data.append('new_name', newName);
+		data.submit();
+	}
+};
 
-	  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);
-	  }
+$(document).ready(function() {
 
-	  var filename = result[0].originalname;
+	var 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) {
+			var that = $(this);
 
-	  // 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];
-	  }
+			if (typeof data.originalFiles.checked === 'undefined') {
+				
+				var totalSize = 0;
+				$.each(data.originalFiles, function(i, file) {
+					totalSize += file.size;
 
-	},
-	/**
-	 * called after last upload
-	 * @param e
-	 * @param data
-	 */
-	stop: function(e, data) {
-	  if(data.dataType !== 'iframe') {
-		$('#uploadprogresswrapper input.stop').hide();
-	  }
+					if (file.type === '' && file.size === 4096) {
+						data.textStatus = 'dirorzero';
+						data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes',
+							{filename: file.name}
+						);
+						return false;
+					}
+				});
 
-	  //IE < 10 does not fire the necessary events for the progress bar.
-	  if($('html.lte9').length > 0) {
-		return;
-	  }
+				if (totalSize > $('#max_upload').val()) {
+					data.textStatus = 'notenoughspace';
+					data.errorThrown = t('files', 'Not enough space available');
+				}
 
-	  $('#uploadprogressbar').progressbar('value',100);
-	  $('#uploadprogressbar').fadeOut();
-	}
-  }
-  var file_upload_handler = function() {
-	$('#file_upload_start').fileupload(file_upload_param);
-  };
+				if (data.errorThrown) {
+					//don't upload anything
+					var fu = that.data('blueimp-fileupload') || that.data('fileupload');
+					fu._trigger('fail', e, data);
+					return false;
+				}
+				
+				data.originalFiles.checked = true; // this will skip the checks on subsequent adds
+			}
+			
+			//TODO check filename already exists
+			/*
+			if ($('tr[data-file="'+data.files[0].name+'"][data-id]').length > 0) {
+				data.textStatus = 'alreadyexists';
+				data.errorThrown = t('files', '{filename} already exists',
+					{filename: data.files[0].name}
+				);
+				//TODO show "file already exists" dialog
+				var fu = that.data('blueimp-fileupload') || that.data('fileupload');
+				fu._trigger('fail', e, data);
+				return false;
+			}
+			*/
 
+			//add files to queue
+			OC.upload.addUpload(data);
+			
+			//TODO refactor away:
+			//show cancel button
+			if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
+				$('#uploadprogresswrapper input.stop').show();
+			}
+			return true;
+		},
+		/**
+		 * 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 true;
+			}
+			$('#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') {
+				OC.upload.nextUpload();
+			} else {
+				if (result[0].status === 'existserror') {
+					//TODO open dialog and retry with other name?
+					// get jqXHR reference
+					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+						var dirName = data.context.data('file');
+						var jqXHR = uploadingFiles[dirName][filename];
+					} else {
+						var jqXHR = uploadingFiles[filename];
+					}
+					//filenames can only be changed on the server side
+					//TODO show "file already exists" dialog
+					//options: abort | skip | replace / rename
+							//TODO reset all-files flag? when done with selection?
+					var original = result[0];
+					var replacement = data.files[0];
+					OC.dialogs.fileexists(data, original, replacement, OC.upload);
+				} 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);
+				}
+			}
 
-  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;
-  };
+			var filename = result[0].originalname;
 
-  // 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.');
-  });
+			// 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();
+			}
 
-  //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')
-  }
+			//IE < 10 does not fire the necessary events for the progress bar.
+			if($('html.lte9').length > 0) {
+				return;
+			}
 
-  //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);
-  }
+			$('#uploadprogressbar').progressbar('value', 100);
+			$('#uploadprogressbar').fadeOut();
+		}
+	};
+	
+	var file_upload_handler = function() {
+		$('#file_upload_start').fileupload(file_upload_param);
+	};
 
-  $(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>');
-	  }
+	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.');
+		}
 	});
-  });
-  $('#new li').click(function(){
-	if($(this).children('p').length==0){
-	  return;
+
+	//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>');
-	  }
+	$('#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);
+	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>');
+	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)
+	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(localName.indexOf('/')){//use last part of url
-		  localName=localName.split('/').pop();
-		} else { //or the domain
-		  localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+		if (FileList.lastAction) {
+			FileList.lastAction();
 		}
-		localName = getUniqueName(localName);
-		//IE < 10 does not fire the necessary events for the progress bar.
-		if($('html.lte9').length > 0) {
+		var name = getUniqueName(newname);
+		if (newname !== name) {
+			FileList.checkName(name, newname, true);
+			var hidden = true;
 		} else {
-		  $('#uploadprogressbar').progressbar({value:0});
-		  $('#uploadprogressbar').fadeIn();
+			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);
+				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();
 		});
-		break;
-	  }
-	  var li=form.parent();
-	  form.remove();
-	  li.append('<p>'+li.data('text')+'</p>');
-	  $('#new>a').click();
+		
 	});
-  });
+	
 });
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b858e2580ee..bcc77e68ce6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -308,7 +308,7 @@ var FileList={
 			html.attr('data-oldName', oldName);
 			html.attr('data-newName', newName);
 			html.attr('data-isNewFile', isNewFile);
-            OC.Notification.showHtml(html);
+			OC.Notification.showHtml(html);
 			return true;
 		} else {
 			return false;
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 7413927e3b2..52ff5633f9a 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -101,6 +101,9 @@
 					}
 					$.each(value, function(idx, val) {
 						var $button = $('<button>').text(val.text);
+						if (val.classes) {
+							$button.addClass(val.classes);
+						}
 						if(val.defaultButton) {
 							$button.addClass('primary');
 							self.$defaultButton = $button;
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f4bc174b5eb..cf77f5018a6 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -197,7 +197,121 @@ var OCdialogs = {
 			OCdialogs.dialogs_counter++;
 		})
 		.fail(function() {
-			alert(t('core', 'Error loading file picker template'));
+			alert(t('core', 'Error loading message template'));
+		});
+	},
+	/**
+	 * Displays file exists dialog
+	 * @param {object} original a file with name, size and mtime
+	 * @param {object} replacement a file with name, size and mtime
+	 * @param {object} controller a controller with onCancel, onSkip, onReplace and onRename methods
+	*/
+	fileexists:function(data, original, replacement, controller) {
+		if (typeof controller !== 'object') {
+			controller = {};
+		}
+		var self = this;
+		$.when(this._getFileExistsTemplate()).then(function($tmpl) {
+			var dialog_name = 'oc-dialog-fileexists-' + OCdialogs.dialogs_counter + '-content';
+			var dialog_id = '#' + dialog_name;
+			var title = t('files','Replace »{filename}«?',{filename: original.name});
+			var $dlg = $tmpl.octemplate({
+				dialog_name: dialog_name,
+				title: title,
+				type: 'fileexists',
+				
+				why: t('files','Another file with the same name already exists in "{dir}".',{dir:'somedir'}),
+				what: t('files','Replacing it will overwrite it\'s contents.'),
+				original_heading: t('files','Original file'),
+				original_size: t('files','Size: {size}',{size: original.size}),
+				original_mtime: t('files','Last changed: {mtime}',{mtime: original.mtime}),
+
+				replacement_heading: t('files','Replace with'),
+				replacement_size: t('files','Size: {size}',{size: replacement.size}),
+				replacement_mtime: t('files','Last changed: {mtime}',{mtime: replacement.mtime}),
+
+				new_name_label: t('files','Choose a new name for the target.'),
+				all_files_label: t('files','Use this action for all files.')
+			});
+			$('body').append($dlg);
+			
+			$(dialog_id + ' .original .icon').css('background-image','url('+OC.imagePath('core', 'filetypes/file.png')+')');
+			$(dialog_id + ' .replacement .icon').css('background-image','url('+OC.imagePath('core', 'filetypes/file.png')+')');
+			$(dialog_id + ' #new-name').val(original.name);
+			
+			
+			$(dialog_id + ' #new-name').on('keyup', function(e){
+				if ($(dialog_id + ' #new-name').val() === original.name) {
+					
+					$(dialog_id + ' + div .rename').removeClass('primary').hide();
+					$(dialog_id + ' + div .replace').addClass('primary').show();
+				} else {
+					$(dialog_id + ' + div .rename').addClass('primary').show();
+					$(dialog_id + ' + div .replace').removeClass('primary').hide();
+				}
+			});
+
+			buttonlist = [{
+					text: t('core', 'Cancel'),
+					classes: 'cancel',
+					click: function(){
+						if ( typeof controller.onCancel !== 'undefined') {
+							controller.onCancel(data);
+						}
+						$(dialog_id).ocdialog('close');
+					}
+				},
+				{
+					text: t('core', 'Skip'),
+					classes: 'skip',
+					click: function(){
+						if ( typeof controller.onSkip !== 'undefined') {
+							controller.onSkip(data);
+						}
+						$(dialog_id).ocdialog('close');
+					}
+				},
+				{
+					text: t('core', 'Replace'),
+					classes: 'replace',
+					click: function(){
+						if ( typeof controller.onReplace !== 'undefined') {
+							controller.onReplace(data);
+						}
+						$(dialog_id).ocdialog('close');
+					},
+					defaultButton: true
+				},
+				{
+					text: t('core', 'Rename'),
+					classes: 'rename',
+					click: function(){
+						if ( typeof controller.onRename !== 'undefined') {
+							controller.onRename(data, $(dialog_id + ' #new-name').val());
+						}
+						$(dialog_id).ocdialog('close');
+					}
+				}];
+
+			$(dialog_id).ocdialog({
+				closeOnEscape: true,
+				modal: true,
+				buttons: buttonlist,
+				close: function(event, ui) {
+					try {
+						$(this).ocdialog('destroy').remove();
+					} catch(e) {
+						alert (e);
+					}
+					self.$ = null;
+				}
+			});
+			OCdialogs.dialogs_counter++;
+			
+			$(dialog_id + ' + div .rename').hide();
+		})
+		.fail(function() {
+			alert(t('core', 'Error loading file exists template'));
 		});
 	},
 	_getFilePickerTemplate: function() {
@@ -233,6 +347,22 @@ var OCdialogs = {
 		}
 		return defer.promise();
 	},
+	_getFileExistsTemplate: function () {
+		var defer = $.Deferred();
+		if (!this.$fileexistsTemplate) {
+			var self = this;
+			$.get(OC.filePath('files', 'templates', 'fileexists.html'), function (tmpl) {
+				self.$fileexistsTemplate = $(tmpl);
+				defer.resolve(self.$fileexistsTemplate);
+			})
+			.fail(function () {
+				defer.reject();
+			});
+		} else {
+			defer.resolve(this.$fileexistsTemplate);
+		}
+		return defer.promise();
+	},
 	_getFileList: function(dir, mimeType) {
 		return $.getJSON(
 			OC.filePath('files', 'ajax', 'rawlist.php'),
@@ -287,7 +417,7 @@ var OCdialogs = {
 	*/
 	_fillSlug: function() {
 		this.$dirTree.empty();
-		var self = this
+		var self = this;
 		var path = this.$filePicker.data('path');
 		var $template = $('<span data-dir="{dir}">{name}</span>');
 		if(path) {