From 64c9fdcc28333c7310df8d9efb9040dbe3b4f8c8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 1 Jun 2013 16:38:35 +0200
Subject: Speed up octemplate rendering.

---
 core/js/octemplate.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'core/js')

diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index e032506c0b1..352a23c4dc7 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -60,11 +60,9 @@
 			var self = this;
 
 			if(typeof this.options.escapeFunction === 'function') {
-				$.each(this.vars, function(key, val) {
-					if(typeof val === 'string') {
-						self.vars[key] = self.options.escapeFunction(val);
-					}
-				});
+				for (var key = 0; key < this.vars.length; key++) {
+					this.vars[key] = self.options.escapeFunction(this.vars[key]);
+				}
 			}
 
 			var _html = this._build(this.vars);
-- 
cgit v1.2.3


From bfcf113ce7e4293c955fd76e51e4515f29232b94 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 1 Jun 2013 16:47:34 +0200
Subject: Forgot typeof condition

---
 core/js/octemplate.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/js')

diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index 352a23c4dc7..e69c6cc56e0 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -61,7 +61,9 @@
 
 			if(typeof this.options.escapeFunction === 'function') {
 				for (var key = 0; key < this.vars.length; key++) {
-					this.vars[key] = self.options.escapeFunction(this.vars[key]);
+					if(typeof this.vars[key] === 'string') {
+						this.vars[key] = self.options.escapeFunction(this.vars[key]);
+					}
 				}
 			}
 
-- 
cgit v1.2.3


From 3fe46706aff12995a49f5b69d0ea3645dae6de7c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 2 Jun 2013 19:53:18 +0200
Subject: Update to jquery.multiselect 1.13

---
 core/js/jquery.multiselect.js | 153 +++++++++++++++++++++++++++---------------
 1 file changed, 100 insertions(+), 53 deletions(-)

(limited to 'core/js')

diff --git a/core/js/jquery.multiselect.js b/core/js/jquery.multiselect.js
index 46aab7ebf01..16ae4264177 100644
--- a/core/js/jquery.multiselect.js
+++ b/core/js/jquery.multiselect.js
@@ -1,6 +1,7 @@
+/* jshint forin:true, noarg:true, noempty:true, eqeqeq:true, boss:true, undef:true, curly:true, browser:true, jquery:true */
 /*
- * jQuery MultiSelect UI Widget 1.11
- * Copyright (c) 2011 Eric Hynds
+ * jQuery MultiSelect UI Widget 1.13
+ * Copyright (c) 2012 Eric Hynds
  *
  * http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/
  *
@@ -34,8 +35,8 @@ $.widget("ech.multiselect", {
 		noneSelectedText: 'Select options',
 		selectedText: '# selected',
 		selectedList: 0,
-		show: '',
-		hide: '',
+		show: null,
+		hide: null,
 		autoOpen: false,
 		multiple: true,
 		position: {}
@@ -62,7 +63,7 @@ $.widget("ech.multiselect", {
 			menu = (this.menu = $('<div />'))
 				.addClass('ui-multiselect-menu ui-widget ui-widget-content ui-corner-all')
 				.addClass( o.classes )
-				.insertAfter( button ),
+				.appendTo( document.body ),
 
 			header = (this.header = $('<div />'))
 				.addClass('ui-widget-header ui-corner-all ui-multiselect-header ui-helper-clearfix')
@@ -119,70 +120,72 @@ $.widget("ech.multiselect", {
 			menu = this.menu,
 			checkboxContainer = this.checkboxContainer,
 			optgroups = [],
-			html = [],
+			html = "",
 			id = el.attr('id') || multiselectID++; // unique ID for the label & option tags
 
 		// build items
-		this.element.find('option').each(function( i ){
+		el.find('option').each(function( i ){
 			var $this = $(this),
 				parent = this.parentNode,
 				title = this.innerHTML,
 				description = this.title,
 				value = this.value,
-				inputID = this.id || 'ui-multiselect-'+id+'-option-'+i,
+				inputID = 'ui-multiselect-' + (this.id || id + '-option-' + i),
 				isDisabled = this.disabled,
 				isSelected = this.selected,
-				labelClasses = ['ui-corner-all'],
+				labelClasses = [ 'ui-corner-all' ],
+				liClasses = (isDisabled ? 'ui-multiselect-disabled ' : ' ') + this.className,
 				optLabel;
 
 			// is this an optgroup?
-			if( parent.tagName.toLowerCase() === 'optgroup' ){
-				optLabel = parent.getAttribute('label');
+			if( parent.tagName === 'OPTGROUP' ){
+				optLabel = parent.getAttribute( 'label' );
 
 				// has this optgroup been added already?
 				if( $.inArray(optLabel, optgroups) === -1 ){
-					html.push('<li class="ui-multiselect-optgroup-label"><a href="#">' + optLabel + '</a></li>');
+					html += '<li class="ui-multiselect-optgroup-label ' + parent.className + '"><a href="#">' + optLabel + '</a></li>';
 					optgroups.push( optLabel );
 				}
 			}
 
 			if( isDisabled ){
-				labelClasses.push('ui-state-disabled');
+				labelClasses.push( 'ui-state-disabled' );
 			}
 
 			// browsers automatically select the first option
 			// by default with single selects
 			if( isSelected && !o.multiple ){
-				labelClasses.push('ui-state-active');
+				labelClasses.push( 'ui-state-active' );
 			}
 
-			html.push('<li class="' + (isDisabled ? 'ui-multiselect-disabled' : '') + '">');
+			html += '<li class="' + liClasses + '">';
 
 			// create the label
-			html.push('<label for="'+inputID+'" title="'+description+'" class="'+labelClasses.join(' ')+ '">');
-			html.push('<input id="'+inputID+'" name="multiselect_'+id+'" type="'+(o.multiple ? "checkbox" : "radio")+'" value="'+value+'" title="'+title+'"');
+			html += '<label for="' + inputID + '" title="' + description + '" class="' + labelClasses.join(' ') + '">';
+			html += '<input id="' + inputID + '" name="multiselect_' + id + '" type="' + (o.multiple ? "checkbox" : "radio") + '" value="' + value + '" title="' + title + '"';
 
 			// pre-selected?
 			if( isSelected ){
-				html.push(' checked="checked"');
-				html.push(' aria-selected="true"');
+				html += ' checked="checked"';
+				html += ' aria-selected="true"';
 			}
 
 			// disabled?
 			if( isDisabled ){
-				html.push(' disabled="disabled"');
-				html.push(' aria-disabled="true"');
+				html += ' disabled="disabled"';
+				html += ' aria-disabled="true"';
 			}
 
 			// add the title and close everything off
-			html.push(' /><span>' + title + '</span></label></li>');
+			html += ' /><span>' + title + '</span></label></li>';
 		});
 
 		// insert into the DOM
-		checkboxContainer.html( html.join('') );
+		checkboxContainer.html( html );
 
 		// cache some moar useful elements
 		this.labels = menu.find('label');
+		this.inputs = this.labels.children('input');
 
 		// set widths
 		this._setButtonWidth();
@@ -197,10 +200,10 @@ $.widget("ech.multiselect", {
 		}
 	},
 
-	// updates the button text.  call refresh() to rebuild
+	// updates the button text. call refresh() to rebuild
 	update: function(){
 		var o = this.options,
-			$inputs = this.labels.find('input'),
+			$inputs = this.inputs,
 			$checked = $inputs.filter(':checked'),
 			numChecked = $checked.length,
 			value;
@@ -211,7 +214,7 @@ $.widget("ech.multiselect", {
 			if($.isFunction( o.selectedText )){
 				value = o.selectedText.call(this, numChecked, $inputs.length, $checked.get());
 			} else if( /\d/.test(o.selectedList) && o.selectedList > 0 && numChecked <= o.selectedList){
-				value = $checked.map(function(){ return this.title; }).get().join(', ');
+				value = $checked.map(function(){ return $(this).next().html(); }).get().join(', ');
 			} else {
 				value = o.selectedText.replace('#', numChecked).replace('#', $inputs.length);
 			}
@@ -291,8 +294,8 @@ $.widget("ech.multiselect", {
 
 				var $this = $(this),
 					$inputs = $this.parent().nextUntil('li.ui-multiselect-optgroup-label').find('input:visible:not(:disabled)'),
-				    nodes = $inputs.get(),
-				    label = $this.parent().text();
+					nodes = $inputs.get(),
+					label = $this.parent().text();
 
 				// trigger event and bail if the return is false
 				if( self._trigger('beforeoptgrouptoggle', e, { inputs:nodes, label:label }) === false ){
@@ -343,11 +346,15 @@ $.widget("ech.multiselect", {
 					tags = self.element.find('option');
 
 				// bail if this input is disabled or the event is cancelled
-				if( this.disabled || self._trigger('click', e, { value:val, text:this.title, checked:checked }) === false ){
+				if( this.disabled || self._trigger('click', e, { value: val, text: this.title, checked: checked }) === false ){
 					e.preventDefault();
 					return;
 				}
 
+				// make sure the input has focus. otherwise, the esc key
+				// won't close the menu after clicking an item.
+				$this.focus();
+
 				// toggle aria state
 				$this.attr('aria-selected', checked);
 
@@ -389,7 +396,7 @@ $.widget("ech.multiselect", {
 		// handler fires before the form is actually reset.  delaying it a bit
 		// gives the form inputs time to clear.
 		$(this.element[0].form).bind('reset.multiselect', function(){
-			setTimeout(function(){ self.update(); }, 10);
+			setTimeout($.proxy(self.refresh, self), 10);
 		});
 	},
 
@@ -428,7 +435,7 @@ $.widget("ech.multiselect", {
 
 		// if at the first/last element
 		if( !$next.length ){
-			var $container = this.menu.find('ul:last');
+			var $container = this.menu.find('ul').last();
 
 			// move to the first/last
 			this.menu.find('label')[ moveToLast ? 'last' : 'first' ]().trigger('mouseover');
@@ -445,27 +452,29 @@ $.widget("ech.multiselect", {
 	// other related attributes of a checkbox.
 	//
 	// The context of this function should be a checkbox; do not proxy it.
-	_toggleCheckbox: function( prop, flag ){
+	_toggleState: function( prop, flag ){
 		return function(){
-			!this.disabled && (this[ prop ] = flag);
+			if( !this.disabled ) {
+				this[ prop ] = flag;
+			}
 
 			if( flag ){
 				this.setAttribute('aria-selected', true);
 			} else {
 				this.removeAttribute('aria-selected');
 			}
-		}
+		};
 	},
 
 	_toggleChecked: function( flag, group ){
-		var $inputs = (group && group.length) ?
-			group :
-			this.labels.find('input'),
-
+		var $inputs = (group && group.length) ?  group : this.inputs,
 			self = this;
 
 		// toggle state on inputs
-		$inputs.each(this._toggleCheckbox('checked', flag));
+		$inputs.each(this._toggleState('checked', flag));
+
+		// give the first input focus
+		$inputs.eq(0).focus();
 
 		// update button text
 		this.update();
@@ -480,7 +489,7 @@ $.widget("ech.multiselect", {
 			.find('option')
 			.each(function(){
 				if( !this.disabled && $.inArray(this.value, values) > -1 ){
-					self._toggleCheckbox('selected', flag).call( this );
+					self._toggleState('selected', flag).call( this );
 				}
 			});
 
@@ -494,9 +503,22 @@ $.widget("ech.multiselect", {
 		this.button
 			.attr({ 'disabled':flag, 'aria-disabled':flag })[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
 
-		this.menu
-			.find('input')
-			.attr({ 'disabled':flag, 'aria-disabled':flag })
+		var inputs = this.menu.find('input');
+		var key = "ech-multiselect-disabled";
+
+		if(flag) {
+			// remember which elements this widget disabled (not pre-disabled)
+			// elements, so that they can be restored if the widget is re-enabled.
+			inputs = inputs.filter(':enabled')
+				.data(key, true)
+		} else {
+			inputs = inputs.filter(function() {
+				return $.data(this, key) === true;
+			}).removeData(key);
+		}
+
+		inputs
+			.attr({ 'disabled':flag, 'arial-disabled':flag })
 			.parent()[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
 
 		this.element
@@ -509,16 +531,17 @@ $.widget("ech.multiselect", {
 			button = this.button,
 			menu = this.menu,
 			speed = this.speed,
-			o = this.options;
+			o = this.options,
+			args = [];
 
 		// bail if the multiselectopen event returns false, this widget is disabled, or is already open
 		if( this._trigger('beforeopen') === false || button.hasClass('ui-state-disabled') || this._isOpen ){
 			return;
 		}
 
-		var $container = menu.find('ul:last'),
+		var $container = menu.find('ul').last(),
 			effect = o.show,
-			pos = button.position();
+			pos = button.offset();
 
 		// figure out opening effects/speeds
 		if( $.isArray(o.show) ){
@@ -526,6 +549,12 @@ $.widget("ech.multiselect", {
 			speed = o.show[1] || self.speed;
 		}
 
+		// if there's an effect, assume jQuery UI is in use
+		// build the arguments to pass to show()
+		if( effect ) {
+      args = [ effect, speed ];
+		}
+
 		// set the scroll of the checkbox container
 		$container.scrollTop(0).height(o.height);
 
@@ -536,17 +565,19 @@ $.widget("ech.multiselect", {
 			menu
 				.show()
 				.position( o.position )
-				.hide()
-				.show( effect, speed );
+				.hide();
 
 		// if position utility is not available...
 		} else {
 			menu.css({
-				top: pos.top+button.outerHeight(),
+				top: pos.top + button.outerHeight(),
 				left: pos.left
-			}).show( effect, speed );
+			});
 		}
 
+		// show the menu, maybe with a speed/effect combo
+		$.fn.show.apply(menu, args);
+
 		// select the first option
 		// triggering both mouseover and mouseover because 1.4.2+ has a bug where triggering mouseover
 		// will actually trigger mouseenter.  the mouseenter trigger is there for when it's eventually fixed
@@ -563,7 +594,10 @@ $.widget("ech.multiselect", {
 			return;
 		}
 
-		var o = this.options, effect = o.hide, speed = this.speed;
+		var o = this.options,
+		    effect = o.hide,
+		    speed = this.speed,
+		    args = [];
 
 		// figure out opening effects/speeds
 		if( $.isArray(o.hide) ){
@@ -571,7 +605,11 @@ $.widget("ech.multiselect", {
 			speed = o.hide[1] || this.speed;
 		}
 
-		this.menu.hide(effect, speed);
+    if( effect ) {
+      args = [ effect, speed ];
+    }
+
+    $.fn.hide.apply(this.menu, args);
 		this.button.removeClass('ui-state-active').trigger('blur').trigger('mouseleave');
 		this._isOpen = false;
 		this._trigger('close');
@@ -618,6 +656,10 @@ $.widget("ech.multiselect", {
 		return this.menu;
 	},
 
+	getButton: function(){
+	  return this.button;
+  },
+
 	// react to option changes after initialization
 	_setOption: function( key, value ){
 		var menu = this.menu;
@@ -633,7 +675,7 @@ $.widget("ech.multiselect", {
 				menu.find('a.ui-multiselect-none span').eq(-1).text(value);
 				break;
 			case 'height':
-				menu.find('ul:last').height( parseInt(value,10) );
+				menu.find('ul').last().height( parseInt(value,10) );
 				break;
 			case 'minWidth':
 				this.options[ key ] = parseInt(value,10);
@@ -649,6 +691,11 @@ $.widget("ech.multiselect", {
 			case 'classes':
 				menu.add(this.button).removeClass(this.options.classes).addClass(value);
 				break;
+			case 'multiple':
+				menu.toggleClass('ui-multiselect-single', !value);
+				this.options.multiple = value;
+				this.element[0].multiple = value;
+				this.refresh();
 		}
 
 		$.Widget.prototype._setOption.apply( this, arguments );
-- 
cgit v1.2.3


From 901b1150ffcdb3f541d6843221ba4ee3fb617751 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 2 Jun 2013 21:52:59 +0200
Subject: Replacement for jquery.dialog to fit better with ownCloud design.

---
 core/css/jquery.ocdialog.css |  49 ++++++++++
 core/css/styles.css          |   6 +-
 core/js/jquery.ocdialog.js   | 217 +++++++++++++++++++++++++++++++++++++++++++
 core/js/oc-dialogs.js        |  18 ++--
 lib/base.php                 |   2 +
 5 files changed, 282 insertions(+), 10 deletions(-)
 create mode 100644 core/css/jquery.ocdialog.css
 create mode 100644 core/js/jquery.ocdialog.js

(limited to 'core/js')

diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
new file mode 100644
index 00000000000..6342780aa95
--- /dev/null
+++ b/core/css/jquery.ocdialog.css
@@ -0,0 +1,49 @@
+.oc-dialog {
+	background: white;
+	color: #333333;
+	border-radius: 3px; box-shadow: 0 0 7px #888888;
+	padding: 15px;
+	z-index: 1000;
+	font-size: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	min-width: 200px;
+}
+.oc-dialog-title {
+	background: white;
+	font-weight: bold;
+	font-size: 110%;
+	margin-bottom: 10px;
+}
+.oc-dialog-content {
+	z-index: 1000;
+	background: white;
+	overflow-y: auto;
+}
+.oc-dialog-separator {
+}
+.oc-dialog-buttonrow {
+	background: white;
+	float: right;
+	position: relative;
+	bottom: 0;
+	display: block;
+	margin-top: 10px;
+}
+
+.oc-dialog-close {
+	position:absolute;
+	top:7px; right:7px;
+	height:20px; width:20px;
+	background:url('../img/actions/delete.svg') no-repeat center;
+}
+
+.oc-dialog-dim {
+	background-color: #000;
+	opacity: .20;filter:Alpha(Opacity=20);
+	z-index: 999;
+	position: absolute;
+	top: 0; left: 0;
+	width: 100%; height: 100%;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 70a840d6890..08a277a4ea8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -391,7 +391,11 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 #oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
 #oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
 #oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
-#oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
+#oc-dialog-filepicker-content .filelist {
+	overflow-y:auto;
+	background-color:white;
+	width:100%;
+}
 #oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
 #oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
 #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
new file mode 100644
index 00000000000..7413927e3b2
--- /dev/null
+++ b/core/js/jquery.ocdialog.js
@@ -0,0 +1,217 @@
+(function($) {
+	$.widget('oc.ocdialog', {
+		options: {
+			width: 'auto',
+			height: 'auto',
+			closeButton: true,
+			closeOnEscape: true,
+			modal: false
+		},
+		_create: function() {
+			var self = this;
+
+			this.originalCss = {
+				display: this.element[0].style.display,
+				width: this.element[0].style.width,
+				height: this.element[0].style.height,
+			};
+
+			this.originalTitle = this.element.attr('title');
+			this.options.title = this.options.title || this.originalTitle;
+
+			this.$dialog = $('<div class="oc-dialog" />')
+				.attr({
+					// Setting tabIndex makes the div focusable
+					tabIndex: -1,
+					role: 'dialog'
+				})
+				.insertBefore(this.element);
+			this.$dialog.append(this.element.detach());
+			this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog);
+
+			this.$dialog.css({
+				display: 'inline-block',
+				position: 'fixed'
+			});
+
+			$(document).on('keydown keyup', function(event) {
+				if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
+					return;
+				}
+				// Escape
+				if(event.keyCode === 27 && self.options.closeOnEscape) {
+					self.close();
+					return false;
+				}
+				// Enter
+				if(event.keyCode === 13) {
+					event.stopImmediatePropagation();
+					if(event.type === 'keyup') {
+						event.preventDefault();
+						return false;
+					}
+					// If no button is selected we trigger the primary
+					if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) {
+						var $button = self.$buttonrow.find('button.primary');
+						if($button) {
+							$button.trigger('click');
+						}
+					} else if(self.$buttonrow) {
+						$(event.target).trigger('click');
+					}
+					return false;
+				}
+			});
+			$(window).resize(function() {
+				self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
+				var pos = self.parent.position();
+				self.$dialog.css({
+					left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
+					top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+				});
+			});
+
+			this._setOptions(this.options);
+			$(window).trigger('resize');
+			this._createOverlay();
+		},
+		_init: function() {
+			this.$dialog.focus();
+			this._trigger('open');
+		},
+		_setOption: function(key, value) {
+			var self = this;
+			switch(key) {
+				case 'title':
+					var $title = $('<h3 class="oc-dialog-title">' + this.options.title
+						+ '</h3>'); //<hr class="oc-dialog-separator" />');
+					if(this.$title) {
+						this.$title.replaceWith($title);
+					} else {
+						this.$title = $title.prependTo(this.$dialog);
+					}
+					this._setSizes();
+					break;
+				case 'buttons':
+					var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
+					if(this.$buttonrow) {
+						this.$buttonrow.replaceWith($buttonrow);
+					} else {
+						this.$buttonrow = $buttonrow.appendTo(this.$dialog);
+					}
+					$.each(value, function(idx, val) {
+						var $button = $('<button>').text(val.text);
+						if(val.defaultButton) {
+							$button.addClass('primary');
+							self.$defaultButton = $button;
+						}
+						self.$buttonrow.append($button);
+						$button.click(function() {
+							val.click.apply(self.element[0], arguments);
+						});
+					});
+					this.$buttonrow.find('button')
+						.on('focus', function(event) {
+							self.$buttonrow.find('button').removeClass('primary');
+							$(this).addClass('primary');
+						});
+					this._setSizes();
+					break;
+				case 'closeButton':
+					if(value) {
+						var $closeButton = $('<a class="oc-dialog-close svg"></a>');
+						this.$dialog.prepend($closeButton);
+						$closeButton.on('click', function() {
+							self.close();
+						});
+					}
+					break;
+				case 'width':
+					this.$dialog.css('width', value);
+					break;
+				case 'height':
+					this.$dialog.css('height', value);
+					break;
+				case 'close':
+					this.closeCB = value;
+					break;
+			}
+			//this._super(key, value);
+			$.Widget.prototype._setOption.apply(this, arguments );
+		},
+		_setOptions: function(options) {
+			//this._super(options);
+			$.Widget.prototype._setOptions.apply(this, arguments);
+		},
+		_setSizes: function() {
+			var content_height = this.$dialog.height();
+			if(this.$title) {
+				content_height -= this.$title.outerHeight(true);
+			}
+			if(this.$buttonrow) {
+				content_height -= this.$buttonrow.outerHeight(true);
+			}
+			this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
+			content_height = Math.min(content_height, this.parent.height()-20)
+			this.element.css({
+				height: content_height + 'px',
+				width: this.$dialog.innerWidth()-20 + 'px'
+			});
+		},
+		_createOverlay: function() {
+			if(!this.options.modal) {
+				return;
+			}
+
+			var self = this;
+			this.overlay = $('<div>')
+				.addClass('oc-dialog-dim')
+				.appendTo($('#content'));
+			this.overlay.on('click keydown keyup', function(event) {
+				if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
+					event.preventDefault();
+					event.stopPropagation();
+					return;
+				}
+			});
+		},
+		_destroyOverlay: function() {
+			if (!this.options.modal) {
+				return;
+			}
+
+			if (this.overlay) {
+				this.overlay.off('click keydown keyup');
+				this.overlay.remove();
+				this.overlay = null;
+			}
+		},
+		widget: function() {
+			return this.$dialog
+		},
+		close: function() {
+			this._destroyOverlay();
+			var self = this;
+			// Ugly hack to catch remaining keyup events.
+			setTimeout(function() {
+				self._trigger('close', self);
+				self.$dialog.hide();
+			}, 200);
+		},
+		destroy: function() {
+			if(this.$title) {
+				this.$title.remove()
+			}
+			if(this.$buttonrow) {
+				this.$buttonrow.remove()
+			}
+
+			if(this.originalTitle) {
+				this.element.attr('title', this.originalTitle);
+			}
+			this.element.removeClass('oc-dialog-content')
+					.css(this.originalCss).detach().insertBefore(this.$dialog);
+			this.$dialog.remove();
+		}
+	});
+}(jQuery));
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index e1d3657724e..a6a9e7e57e2 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -72,7 +72,7 @@ var OCdialogs = {
 			var dialog_name = 'oc-dialog-filepicker-content';
 			var dialog_id = '#' + dialog_name;
 			if(self.$filePicker) {
-				self.$filePicker.dialog('close');
+				self.$filePicker.ocdialog('close');
 			}
 			self.$filePicker = $tmpl.octemplate({
 				dialog_name: dialog_name,
@@ -110,7 +110,7 @@ var OCdialogs = {
 						datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text();
 					}
 					callback(datapath);
-					self.$filePicker.dialog('close');
+					self.$filePicker.ocdialog('close');
 				}
 			};
 			var buttonlist = [{
@@ -119,17 +119,17 @@ var OCdialogs = {
 				},
 				{
 				text: t('core', 'Cancel'),
-				click: function(){self.$filePicker.dialog('close'); }
+				click: function(){self.$filePicker.ocdialog('close'); }
 			}];
 
-			self.$filePicker.dialog({
+			self.$filePicker.ocdialog({
 				closeOnEscape: true,
 				width: (4/9)*$(document).width(),
 				height: 420,
 				modal: modal,
 				buttons: buttonlist,
 				close: function(event, ui) {
-					self.$filePicker.dialog('destroy').remove();
+					self.$filePicker.ocdialog('destroy').remove();
 					self.$filePicker = null;
 				}
 			});
@@ -161,20 +161,20 @@ var OCdialogs = {
 						text: t('core', 'Yes'),
 						click: function(){
 							if (callback !== undefined) { callback(true) };
-							$(dialog_id).dialog('close');
+							$(dialog_id).ocdialog('close');
 						}
 					},
 					{
 						text: t('core', 'No'),
 						click: function(){
 							if (callback !== undefined) { callback(false) };
-							$(dialog_id).dialog('close');
+							$(dialog_id).ocdialog('close');
 						}
 					}];
 				break;
 				case OCdialogs.OK_BUTTON:
 					var functionToCall = function() {
-						$(dialog_id).dialog('close');
+						$(dialog_id).ocdialog('close');
 						if(callback !== undefined) { callback() };
 					};
 					buttonlist[0] = {
@@ -184,7 +184,7 @@ var OCdialogs = {
 				break;
 			};
 
-			$(dialog_id).dialog({
+			$(dialog_id).ocdialog({
 				closeOnEscape: true,
 				modal: modal,
 				buttons: buttonlist
diff --git a/lib/base.php b/lib/base.php
index 9d1d4b5e058..ece29f83207 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -265,6 +265,7 @@ class OC {
 		OC_Util::addScript("jquery.infieldlabel");
 		OC_Util::addScript("jquery-tipsy");
 		OC_Util::addScript("compatibility");
+		OC_Util::addScript("jquery.ocdialog");
 		OC_Util::addScript("oc-dialogs");
 		OC_Util::addScript("octemplate");
 		OC_Util::addScript("js");
@@ -278,6 +279,7 @@ class OC {
 		OC_Util::addStyle("multiselect");
 		OC_Util::addStyle("jquery-ui-1.10.0.custom");
 		OC_Util::addStyle("jquery-tipsy");
+		OC_Util::addStyle("jquery.ocdialog");
 		OC_Util::addScript("oc-requesttoken");
 	}
 
-- 
cgit v1.2.3


From 5f1cbc6a1ad9d7bb67b1c64418f5d5ac0ab8695d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 3 Jun 2013 03:19:35 +0200
Subject: Catch double destroy on escape.

---
 core/js/oc-dialogs.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/js')

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index a6a9e7e57e2..456cc34ed4e 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -129,7 +129,9 @@ var OCdialogs = {
 				modal: modal,
 				buttons: buttonlist,
 				close: function(event, ui) {
-					self.$filePicker.ocdialog('destroy').remove();
+					try {
+						$(this).ocdialog('destroy').remove();
+					} catch(e) {}
 					self.$filePicker = null;
 				}
 			});
-- 
cgit v1.2.3


From 46d4886709a7ce41a988ef69954252e4f11ebb93 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 3 Jun 2013 03:31:33 +0200
Subject: Set default button in oc-dialogs

---
 core/js/oc-dialogs.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'core/js')

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 456cc34ed4e..f4bc174b5eb 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -115,7 +115,8 @@ var OCdialogs = {
 			};
 			var buttonlist = [{
 				text: t('core', 'Choose'),
-				click: functionToCall
+				click: functionToCall,
+				defaultButton: true
 				},
 				{
 				text: t('core', 'Cancel'),
@@ -164,7 +165,8 @@ var OCdialogs = {
 						click: function(){
 							if (callback !== undefined) { callback(true) };
 							$(dialog_id).ocdialog('close');
-						}
+						},
+						defaultButton: true
 					},
 					{
 						text: t('core', 'No'),
@@ -181,7 +183,8 @@ var OCdialogs = {
 					};
 					buttonlist[0] = {
 						text: t('core', 'Ok'),
-						click: functionToCall
+						click: functionToCall,
+						defaultButton: true
 					};
 				break;
 			};
-- 
cgit v1.2.3


From 0bcb04398d731ff75d74497f4a203279b6990351 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 11 Jun 2013 18:21:13 +0200
Subject: multiselect: fixed 'add group' interface a bit

---
 core/css/multiselect.css | 12 ++++++++++--
 core/js/multiselect.js   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'core/js')

diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 23aec23437f..afdf27681a1 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -89,9 +89,17 @@ div.multiselect>span:last-child {
 }
 
 ul.multiselectoptions input.new {
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
 	padding-bottom: .2em;
 	padding-top: .2em;
 	margin: 0;
 }
+
+ul.multiselectoptions > li.creator {
+	padding: 10px;
+	font-weight: bold;
+}
+ul.multiselectoptions > li.creator > input {
+	width: 95% !important; /* do not constrain size of text input */
+	padding: 5px;
+	margin: -5px;
+}
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 463c397d8cd..48d521e1856 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -176,10 +176,10 @@
 			});
 			button.parent().data('preventHide',false);
 			if(settings.createText){
-				var li=$('<li class="creator">+ <em>'+settings.createText+'<em></li>');
+				var li=$('<li class="creator">+ '+settings.createText+'</li>');
 				li.click(function(event){
 					li.empty();
-					var input=$('<input class="new">');
+					var input=$('<input type="text" class="new">');
 					li.append(input);
 					input.focus();
 					input.css('width',button.innerWidth());
-- 
cgit v1.2.3


From e0547a25ab9c5a3d9454611f72e00e3bc667e2d2 Mon Sep 17 00:00:00 2001
From: Morris Jobke <morris.jobke@gmail.com>
Date: Fri, 3 May 2013 00:15:28 +0200
Subject: if rename of file fails, the rename is undone in the view - #fix 2820

Changes:
 * OC.dialog -> OC.Notification
 * Added test
 * Fixed OC.Notification.show() issue for queued items
 * Highlight failed item and show notification
---
 apps/files/js/filelist.js        | 41 +++++++++++++++++++++++++++++++++++-----
 apps/files/lib/app.php           |  2 +-
 apps/files/tests/ajax_rename.php |  2 +-
 core/js/js.js                    |  4 ++--
 4 files changed, 40 insertions(+), 9 deletions(-)

(limited to 'core/js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e19a35bbc5b..c6663836fd7 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -208,13 +208,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);
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index c2a4b9c2675..f7052ef80b0 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -70,7 +70,7 @@ class App {
 		} else {
 			// rename failed
 			$result['data'] = array(
-				'message'	=> $this->l10n->t('Unable to rename file')
+				'message'	=> $this->l10n->t('%s could not be renamed', array($oldname))
 			);
 		}
 		return $result;
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 23e5761ddda..2b90a11743d 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -50,7 +50,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 		$result = $this->files->rename($dir, $oldname, $newname);
 		$expected = array(
 			'success'	=> false,
-			'data'		=> array('message' => 'Unable to rename file')
+			'data'		=> array('message' => '%s could not be renamed')
 		);
 
 		$this->assertEquals($expected, $result);
diff --git a/core/js/js.js b/core/js/js.js
index 3cb4d3dd151..55db625a339 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -349,10 +349,10 @@ OC.Notification={
 	},
 	show: function(text) {
 		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
-			$('#notification').html(text);
+			$('#notification').text(text);
 			$('#notification').fadeIn().css("display","inline");
 		}else{
-			OC.Notification.queuedNotifications.push($(text).html());
+			OC.Notification.queuedNotifications.push($('<div/>').text(text).html());
 		}
 	},
 	isHidden: function() {
-- 
cgit v1.2.3


From ddb0ff346d3d8063f88fdba8749e098a81b92d54 Mon Sep 17 00:00:00 2001
From: Roman Geber <rgeber@owncloudapps.com>
Date: Tue, 25 Jun 2013 12:24:14 +0200
Subject: Public upload feature

---
 apps/files/ajax/upload.php              |  48 ++++++++--
 apps/files/index.php                    |   3 +-
 apps/files/js/filelist.js               |  24 ++++-
 apps/files/js/files.js                  | 149 +-------------------------------
 apps/files/templates/index.php          |   2 +-
 apps/files_sharing/css/public.css       |  61 ++++++++++++-
 apps/files_sharing/js/public.js         |  19 +++-
 apps/files_sharing/public.php           |  18 +++-
 apps/files_sharing/templates/public.php |  42 ++++++++-
 core/js/share.js                        |  43 ++++++++-
 lib/files/view.php                      |   2 +-
 11 files changed, 242 insertions(+), 169 deletions(-)

(limited to 'core/js')

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index e1263744e1b..12db682c1e2 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -1,17 +1,53 @@
 <?php
 
-// Init owncloud
-
-
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
+// If a directory token is sent along check if public upload is permitted.
+// If not, check the login.
+// If no token is sent along, rely on login only
+
 $l = OC_L10N::get('files');
+if (!$_POST['dirToken']) {
+  // The standard case, files are uploaded through logged in users :)
+  OCP\JSON::checkLoggedIn();
+  $dir = isset($_POST['dir']) ? $_POST['dir'] : "";
+  if (!$dir || empty($dir) || $dir === false) {
+    OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+    die();
+  }
+} else {
+  $linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
+
+  if ($linkItem === false) {
+    OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
+    die();
+  }
+
+  if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
+    OCP\JSON::checkLoggedIn();
+  } else {
+
+    // The token defines the target directory (security reasons)
+    $dir = sprintf(
+      "/%s/%s",
+      $linkItem['file_target'],
+      isset($_POST['subdir']) ? $_POST['subdir'] : ''
+    );
+
+    if (!$dir || empty($dir) || $dir === false) {
+      OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+      die();
+    }
+    // Setup FS with owner
+    OC_Util::setupFS($linkItem['uid_owner']);
+  }
+}
+
+
+OCP\JSON::callCheck();
 
 
-$dir = $_POST['dir'];
 // get array with current storage stats (e.g. max file size)
 $storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
 
diff --git a/apps/files/index.php b/apps/files/index.php
index 20fbf7f93be..640c28c0075 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -26,6 +26,7 @@ OCP\User::checkLoggedIn();
 
 // Load the files we need
 OCP\Util::addStyle('files', 'files');
+OCP\Util::addscript('files', 'file-upload');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
 OCP\Util::addscript('files', 'jquery-visibility');
@@ -137,4 +138,4 @@ if ($needUpgrade) {
 	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 	$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 	$tmpl->printPage();
-}
\ No newline at end of file
+}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e19a35bbc5b..f4ca098eed1 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()
@@ -197,7 +209,7 @@ var FileList={
 			len = input.val().length;
 		}
 		input.selectRange(0,len);
-		
+
 		form.submit(function(event){
 			event.stopPropagation();
 			event.preventDefault();
@@ -423,8 +435,12 @@ $(document).ready(function(){
 					size=data.files[0].size;
 				}
 				var date=new Date();
+				var param = {};
+				if ($('#publicUploadRequestToken')) {
+					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 3438c1c30a1..51b3f31fb96 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;
@@ -804,7 +657,7 @@ var dragOptions={
 // sane browsers support using the distance option
 if ( $('html.ie').length === 0) {
 	dragOptions['distance'] = 20;
-} 
+}
 
 var folderDropOptions={
 	drop: function( event, ui ) {
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index b576253f4f0..b9119f2cb62 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -50,7 +50,7 @@
 			</div>
 		</div>
 		<div id="file_action_panel"></div>
-	<?php else:?>
+	<?php elseif( !$_['isPublic'] ):?>
 		<div class="actions"><input type="button" disabled value="<?php p($l->t('You don’t have write permissions here.'))?>"></div>
 		<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 	<?php endif;?>
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 13298f113f8..68549d14fe1 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -15,15 +15,26 @@ body {
 	padding:.5em;
 }
 
-#details {
+#header #details {
 	color:#fff;
+		float: left;
 }
 
+#header #public_upload,
 #header #download {
 	font-weight:700;
-	margin-left:2em;
+	margin: 0 0.4em 0 2em;
+	padding: 0 5px;
+	height: 27px;
+	float: left;
+
+}
+
+#header #public_upload {
+	margin-left: 0.3em;
 }
 
+#header #public_upload img,
 #header #download img {
 	padding-left:.1em;
 	padding-right:.3em;
@@ -73,3 +84,49 @@ thead{
 	background-color: white;
 	padding-left:0 !important; /* fixes multiselect bar offset on shared page */
 }
+
+#data-upload-form {
+	position: relative;
+	right: 0;
+	height: 27px;
+	overflow: hidden;
+	padding: 0;
+	float: right;
+	display: inline;
+	margin: 0;
+}
+
+#file_upload_start {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	z-index: 20;
+	position: absolute !important;
+	top: 0;
+	left: 0;
+	width: 100% !important;
+}
+
+.header-right #download span {
+	position: relative;
+	bottom: 3px;
+}
+
+#publicUploadButtonMock {
+	position:relative;
+	display:block;
+	width:100%;
+	height:27px;
+	cursor:pointer;
+	z-index:10;
+	background-image:url('%webroot%/core/img/actions/upload.svg');
+	background-repeat:no-repeat;
+	background-position:7px 6px;
+}
+
+#publicUploadButtonMock span {
+	margin: 0 5px 0 28px;
+	position: relative;
+	top: -2px;
+	color: #555;
+}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 916e35419c1..0244f392a0e 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -7,6 +7,8 @@ function fileDownloadPath(dir, file) {
 	return url;
 }
 
+var form_data;
+
 $(document).ready(function() {
 
 	if (typeof FileActions !== 'undefined') {
@@ -46,4 +48,19 @@ $(document).ready(function() {
 		});
 	}
 
-});
\ No newline at end of file
+  // Add some form data to the upload handler
+  file_upload_param.formData = {
+    MAX_FILE_SIZE: $('#uploadMaxFilesize').val(),
+    requesttoken: $('#publicUploadRequestToken').val(),
+    dirToken: $('#dirToken').val(),
+    appname: 'files_sharing',
+    subdir: $('input#dir').val()
+  };
+
+  // Add Uploadprogress Wrapper to controls bar
+  $('#controls').append($('#additional_controls div#uploadprogresswrapper'));
+
+  // Cancel upload trigger
+  $('#cancel_upload_button').click(Files.cancelUploads);
+
+});
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 98d2a84fb66..fa8c25fc98d 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -132,15 +132,25 @@ if (isset($path)) {
 		}
 		exit();
 	} else {
+		OCP\Util::addScript('files', 'file-upload');
 		OCP\Util::addStyle('files_sharing', 'public');
 		OCP\Util::addScript('files_sharing', 'public');
 		OCP\Util::addScript('files', 'fileactions');
+		OCP\Util::addScript('files', 'jquery.iframe-transport');
+		OCP\Util::addScript('files', 'jquery.fileupload');
+		$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
 		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
 		$tmpl->assign('uidOwner', $shareOwner);
 		$tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner));
 		$tmpl->assign('filename', $file);
+		$tmpl->assign('directory_path', $linkItem['file_target']);
 		$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
 		$tmpl->assign('fileTarget', basename($linkItem['file_target']));
+		$tmpl->assign('dirToken', $linkItem['token']);
+		$tmpl->assign('allowPublicUploadEnabled', (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false ));
+		$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+		$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+
 		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
 							.(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
 							.(isset($_GET['file'])?'&file='.$_GET['file']:'');
@@ -191,15 +201,17 @@ if (isset($path)) {
 			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 			$breadcrumbNav->assign('breadcrumb', $breadcrumb);
 			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
+			$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
 			$folder = new OCP\Template('files', 'index', '');
 			$folder->assign('fileList', $list->fetchPage());
 			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage());
 			$folder->assign('dir', $getPath);
 			$folder->assign('isCreatable', false);
-			$folder->assign('permissions', 0);
+			$folder->assign('permissions', OCP\PERMISSION_READ);
+			$folder->assign('isPublic',true);
 			$folder->assign('files', $files);
-			$folder->assign('uploadMaxFilesize', 0);
-			$folder->assign('uploadMaxHumanFilesize', 0);
+			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
+			$folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 			$folder->assign('usedSpacePercent', 0);
 			$tmpl->assign('folder', $folder->fetchPage());
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index adf3c3e9cc8..3a1c370b4c0 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,3 +1,7 @@
+<div id="notification-container">
+  <div id="notification" style="display: none;"></div>
+</div>
+
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
@@ -13,13 +17,49 @@
 		<span id="details"><?php p($l->t('%s shared the file %s with you',
 			array($_['displayName'], $_['fileTarget']))) ?></span>
 	<?php endif; ?>
+
+
 		<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
 			<a href="<?php p($_['downloadURL']); ?>" class="button" id="download"><img
 				class="svg" alt="Download" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
-				/><?php p($l->t('Download'))?></a>
+				/><span><?php p($l->t('Download'))?></span></a>
 		<?php endif; ?>
+
+        <?php if ($_['allowPublicUploadEnabled']):?>
+
+
+          <input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+          <input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+          <input type="hidden" id="uploadMaxFilesize" name="uploadMaxFilesize" value="<?php p($_['uploadMaxFilesize']) ?>" />
+          <input type="hidden" id="uploadMaxHumanFilesize" name="uploadMaxHumanFilesize" value="<?php p($_['uploadMaxHumanFilesize']) ?>" />
+          <input type="hidden" id="directory_path" name="directory_path" value="<?php p($_['directory_path']) ?>" />
+
+
+          <div id="data-upload-form" class="button">
+            <input id="file_upload_start" type="file" name="files[]" data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" multiple>
+            <a href="#" id="publicUploadButtonMock" class="svg">
+              <span><?php p($l->t('Upload'))?></span>
+            </a>
+          </div>
+
+        </div>
+
+        <div id="additional_controls" style="display:none">
+          <div id="uploadprogresswrapper">
+	    <div id="uploadprogressbar"></div>
+	    <input id="cancel_upload_button" type="button" class="stop" style="display:none"
+		   value="<?php p($l->t('Cancel upload'));?>"
+		   />
+	  </div>
+
+
+
+
+        <?php endif; ?>
+
 	</div>
 </div></header>
+<div id="content">
 <div id="preview">
 	<?php if (isset($_['folder'])): ?>
 		<?php print_unescaped($_['folder']); ?>
diff --git a/core/js/share.js b/core/js/share.js
index 36e4babedf9..cb37dd70366 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -156,6 +156,19 @@ OC.Share={
 			html += '<br />';
 		}
 		if (possiblePermissions & OC.PERMISSION_SHARE) {
+			// Determine the Allow Public Upload status.
+			// Used later on to determine if the
+			// respective checkbox should be checked or
+			// not.
+
+			var allowPublicUploadStatus = false;
+			$.each(data.shares, function(key, value) {
+			  if (allowPublicUploadStatus) {
+                            return true;
+                          }
+			  allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+			});
+
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
@@ -168,12 +181,16 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-				html += '</div>';
+				html += '<div id="allowPublicUploadWrapper" style="display:none;">';
+				html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
+				html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
+				html += '</div></div>';
 				html += '<form id="emailPrivateLink" >';
 				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
 				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
 				html += '</form>';
 			}
+
 			html += '<div id="expiration">';
 			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
 			html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
@@ -370,6 +387,7 @@ OC.Share={
 		$('#expiration').show();
 		$('#emailPrivateLink #email').show();
 		$('#emailPrivateLink #emailButton').show();
+		$('#allowPublicUploadWrapper').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
@@ -378,6 +396,7 @@ OC.Share={
 		$('#linkPass').hide();
 		$('#emailPrivateLink #email').hide();
 		$('#emailPrivateLink #emailButton').hide();
+		$('#allowPublicUploadWrapper').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -543,6 +562,28 @@ $(document).ready(function() {
 		$(this).select();
 	});
 
+	// Handle the Allow Public Upload Checkbox
+	$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
+
+		// Gather data
+		var allowPublicUpload = $(this).is(':checked');
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		var permissions = 0;
+
+		// Calculate permissions
+		if (allowPublicUpload) {
+			permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+		} else {
+			permissions = OC.PERMISSION_READ;
+		}
+
+		// Update the share information
+		OC.Share.share(itemType, itemSource,	OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
+			return;
+		});
+	});
+
 	$(document).on('click', '#dropdown #showPassword', function() {
 		$('#linkPass').toggle('blind');
 		if (!$('#showPassword').is(':checked') ) {
diff --git a/lib/files/view.php b/lib/files/view.php
index 25071709fbe..d8d99698023 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -754,7 +754,7 @@ class View {
 						if ($subStorage) {
 							$subCache = $subStorage->getCache('');
 							$rootEntry = $subCache->get('');
-							$data['size'] += $rootEntry['size'];
+							$data['size'] += isset($rootEntry['size']) ? $rootEntry['size'] : 0;
 						}
 					}
 				}
-- 
cgit v1.2.3


From e6c1db7a3f6d7ec35a1d55e5575e3e09d24bbbf8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 26 Jun 2013 11:23:21 +0200
Subject: move javascript variables 'oc_current_user' and 'oc_requesttoken' to
 js.js - fixes #3853

---
 core/js/config.php | 2 --
 core/js/js.js      | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'core/js')

diff --git a/core/js/config.php b/core/js/config.php
index 53a8fb96388..dd46f7889d1 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,6 @@ $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
-	"oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
 	"dayNames" =>  json_encode(
 		array(
diff --git a/core/js/js.js b/core/js/js.js
index 3cb4d3dd151..08b429a555b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -7,7 +7,10 @@
  */
 var oc_debug;
 var oc_webroot;
-var oc_requesttoken;
+
+var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user');
+var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken');
+
 if (typeof oc_webroot === "undefined") {
 	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
 }
-- 
cgit v1.2.3


From 0217315a24d5d06f6fc3f0304460eeb9a0bbf143 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 29 Jun 2013 13:24:05 +0200
Subject: Escape dropdown

Fixes #3241
---
 core/js/share.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/js')

diff --git a/core/js/share.js b/core/js/share.js
index cb37dd70366..588202d2273 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -149,9 +149,9 @@ OC.Share={
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
 		if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
 			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
-				html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.displayname_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: escapeHTML(data.reshare.share_with), owner: escapeHTML(data.reshare.displayname_owner)})+'</span>';
 			} else {
-				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: escapeHTML(data.reshare.displayname_owner)})+'</span>';
 			}
 			html += '<br />';
 		}
-- 
cgit v1.2.3


From 16e5a1b10025c84465caf93458c40efb8a6aa87d Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 2 Jul 2013 18:44:10 +0300
Subject: Fix lazy styles loading in IE8

---
 core/js/js.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/js')

diff --git a/core/js/js.js b/core/js/js.js
index 3904787c4e5..5158b66d73a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -226,8 +226,12 @@ var OC={
 		var path=OC.filePath(app,'css',style+'.css');
 		if(OC.addStyle.loaded.indexOf(path)===-1){
 			OC.addStyle.loaded.push(path);
-			style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
-			$('head').append(style);
+			if (document.createStyleSheet) {
+				document.createStyleSheet(path);
+			} else {
+				style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
+				$('head').append(style);
+			}
 		}
 	},
 	basename: function(path) {
-- 
cgit v1.2.3


From 13991be5ce6e318670b84458c2cdaa6878ad63cc Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 5 Jul 2013 10:53:59 +0200
Subject: no anonymous upload on files only folders

---
 apps/files_sharing/public.php |  3 +++
 core/js/share.js              | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'core/js')

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index fb18bc26248..96fe12fc86a 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -151,6 +151,9 @@ if (isset($path)) {
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$allowPublicUploadEnabled = false;
 		}
+		if (isset($file)) {
+			$allowPublicUploadEnabled = false;
+		}
 		$tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled);
 		$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 		$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
diff --git a/core/js/share.js b/core/js/share.js
index 588202d2273..778a9f8e201 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -181,11 +181,13 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-				html += '<div id="allowPublicUploadWrapper" style="display:none;">';
-				html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
-				html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
-				html += '</div></div>';
-				html += '<form id="emailPrivateLink" >';
+                if (itemType == 'folder') {
+                    html += '<div id="allowPublicUploadWrapper" style="display:none;">';
+                    html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
+                    html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
+                    html += '</div>';
+                }
+				html += '</div><form id="emailPrivateLink" >';
 				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
 				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
 				html += '</form>';
-- 
cgit v1.2.3


From 27c0cc7fda6c722a201ac8a549b855663cf9c68a Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 5 Jul 2013 11:23:08 +0200
Subject: no anonymous upload on read-only folders

---
 core/js/share.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'core/js')

diff --git a/core/js/share.js b/core/js/share.js
index 588202d2273..9494637c3dc 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -163,10 +163,10 @@ OC.Share={
 
 			var allowPublicUploadStatus = false;
 			$.each(data.shares, function(key, value) {
-			  if (allowPublicUploadStatus) {
-                            return true;
-                          }
-			  allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+				if (allowPublicUploadStatus) {
+					return true;
+				}
+				allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
 			});
 
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
@@ -181,11 +181,13 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-				html += '<div id="allowPublicUploadWrapper" style="display:none;">';
-				html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
-				html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
-				html += '</div></div>';
-				html += '<form id="emailPrivateLink" >';
+				if (possiblePermissions & OC.PERMISSION_CREATE) {
+					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
+					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
+					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
+					html += '</div>';
+				}
+                html += '</div><form id="emailPrivateLink" >';
 				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
 				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
 				html += '</form>';
-- 
cgit v1.2.3


From 18b11f76b1e1a4e77ccf5e618f5312538db93532 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 5 Jul 2013 15:27:14 +0200
Subject: fixing === and ident

---
 core/js/share.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/js')

diff --git a/core/js/share.js b/core/js/share.js
index ced1e0aa8ca..21e352ee1c6 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -181,12 +181,12 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-                if (itemType == 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
-                    html += '<div id="allowPublicUploadWrapper" style="display:none;">';
-                    html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
-                    html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
-                    html += '</div>';
-                }
+				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
+					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
+					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
+					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
+					html += '</div>';
+				}
 				html += '</div><form id="emailPrivateLink" >';
 				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
 				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
-- 
cgit v1.2.3


From d18bd17eb7d13010e3daef5351d7f7ec64480fd7 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 11 Jul 2013 00:00:01 +0200
Subject: - eventsource.php: in case of potential CSRF attack we send an error
 message from the EventSource to the browser - eventsource.js: handle
 undefined data on event - update.js: in case of error we close the event
 source - advise the user to reload the page - update.php: EventSource
 initialization is now done before we enter the maintenance mode in order to
 allow browser reload in case of possible CSRF attack

---
 core/js/eventsource.js | 6 +++++-
 core/js/update.js      | 5 ++++-
 lib/eventsource.php    | 9 +++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'core/js')

diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index ce8c8387c8e..536b180bc8f 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -110,7 +110,11 @@ OC.EventSource.prototype={
 					this.listeners[type].push(callback);
 				}else{
 					this.source.addEventListener(type,function(e){
-						callback(JSON.parse(e.data));
+						if (typeof e.data != 'undefined') {
+							callback(JSON.parse(e.data));
+						} else {
+							callback('');
+						}
 					},false);
 				}
 			}else{
diff --git a/core/js/update.js b/core/js/update.js
index 8ab02bbf935..2c28e72f7cd 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -5,6 +5,9 @@ $(document).ready(function () {
 	});
 	updateEventSource.listen('error', function(message) {
 		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		message = 'Please reload the page.';
+		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		updateEventSource.close();
 	});
 	updateEventSource.listen('failure', function(message) {
 		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
@@ -20,4 +23,4 @@ $(document).ready(function () {
 			window.location.href = OC.webroot;
 		}, 3000);
 	});
-});
\ No newline at end of file
+});
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 63f19792529..31d6edc1874 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -25,7 +25,7 @@
  * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
  * includes a fallback for older browsers and IE
  *
- * use server side events with causion, to many open requests can hang the server
+ * use server side events with caution, to many open requests can hang the server
  */
 class OC_EventSource{
 	private $fallback;
@@ -43,6 +43,7 @@ class OC_EventSource{
 			header("Content-Type: text/event-stream");
 		}
 		if( !OC_Util::isCallRegistered()) {
+			$this->send('error', 'Possible CSRF attack. Connection will be closed.');
 			exit();
 		}
 		flush();
@@ -51,10 +52,10 @@ class OC_EventSource{
 
 	/**
 	 * send a message to the client
-	 * @param string type
-	 * @param object data
+	 * @param string $type
+	 * @param object $data
 	 *
-	 * if only one paramater is given, a typeless message will be send with that paramater as data
+	 * if only one parameter is given, a typeless message will be send with that parameter as data
 	 */
 	public function send($type, $data=null) {
 		if(is_null($data)) {
-- 
cgit v1.2.3