From 5121c262e2c900de743637d206b18c2aeb43c25d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:31:01 -0400
Subject: [PATCH 1/6] Revert "bugfix for #1098 (assigning a group to a user,
 the group appears incrementally many times the more you assign it)"

This reverts commit 265d7e50f55978a3bebfa077aa8552d5ea1b0c59.
---
 settings/js/users.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 6ee7fb04f07..b0ca3ad0e1a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -213,6 +213,5 @@ $(document).ready(function(){
 				}
 			}
 		);
-	    location.reload();
 	});
 });

From 949cab7ea17ed7e12b27886d46f45e541b138850 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 16:29:58 -0400
Subject: [PATCH 2/6] Add new group to other user's group select forms

---
 core/js/multiselect.js | 5 +++--
 settings/js/users.js   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index db5afa637c9..ba89c1bb563 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -35,6 +35,7 @@
 		}
 
 		button.click(function(event){
+			
 			var button=$(this);
 			if(button.parent().children('ul').length>0){
 				button.parent().children('ul').slideUp(400,function(){
@@ -136,11 +137,11 @@
 							var option=$('<option selected="selected"/>');
 							option.attr('value',$(this).val());
 							option.text($(this).val());
-							select.append(options);
+							select.append(option);
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
 							if(settings.createCallback){
-								settings.createCallback();
+								settings.createCallback($(this).val());
 							}
 						}
 					});
diff --git a/settings/js/users.js b/settings/js/users.js
index b0ca3ad0e1a..020aff885e3 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -40,7 +40,13 @@ $(document).ready(function(){
 		}else{
 			checkHandeler=false;
 		}
+		var addGroup = function(group) {
+			$('select[multiple]').each(function(index, element) {
+				$(element).append('<option value="'+group+'">'+group+'</option>');
+			})
+		};
 		element.multiSelect({
+			createCallback:addGroup,
 			createText:'add group',
 			checked:checked,
 			oncheck:checkHandeler,

From dd7d34a40eca404240da6923115d375d041b1bd1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 16:44:08 -0400
Subject: [PATCH 3/6] Prevent adding a duplicate to a multiselect

---
 core/js/multiselect.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index ba89c1bb563..c4fd74b0475 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -129,13 +129,24 @@
 						if(event.keyCode == 13) {
 							event.preventDefault();
 							event.stopPropagation();
+							var value = $(this).val();
+							var exists = false;
+							$.each(options,function(index, item) {
+								if ($(item).val() == value) {
+									exists = true;
+									return false;
+								}
+							});
+							if (exists) {
+								return false;
+							}
 							var li=$(this).parent();
 							$(this).remove();
 							li.text('+ '+settings.createText);
 							li.before(createItem(this));
 							var select=button.parent().next();
 							var option=$('<option selected="selected"/>');
-							option.attr('value',$(this).val());
+							option.attr('value',value);
 							option.text($(this).val());
 							select.append(option);
 							li.prev().children('input').trigger('click');

From ffadbfcef31da78f824161652c9c18aeb57f502d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 17:52:24 -0400
Subject: [PATCH 4/6] Prevent duplicate group showing in multiselect that added
 the group

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

diff --git a/settings/js/users.js b/settings/js/users.js
index 020aff885e3..784f8b888cb 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -42,7 +42,9 @@ $(document).ready(function(){
 		}
 		var addGroup = function(group) {
 			$('select[multiple]').each(function(index, element) {
-				$(element).append('<option value="'+group+'">'+group+'</option>');
+				if ($(element).find('option[value="'+group +'"]').length == 0) {
+					$(element).append('<option value="'+group+'">'+group+'</option>');
+				}
 			})
 		};
 		element.multiSelect({

From bf93dd4661445560a62281284132e23cd48e9839 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:53:29 -0400
Subject: [PATCH 5/6] Don't reload the page after sending private link to email
 address

---
 apps/files_sharing/js/share.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 96c9017dbf9..afe31a75d0b 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -360,7 +360,8 @@ $(document).ready(function() {
 		$(this).select();
 	});
 
-	$('#emailPrivateLink').live('submit', function() {
+	$('#emailPrivateLink').live('submit', function(event) {
+		event.preventDefault();
 		OC.Share.emailPrivateLink();
 	});
 });
\ No newline at end of file

From 8b5cae3c6c9ac7c949ab2cec5c2c4f32e35c944f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 21:50:53 +0200
Subject: [PATCH 6/6] fix a small PHP fail

---
 lib/l10n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index c0ecdbd1b70..868f8881ec2 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -94,7 +94,7 @@ class OC_L10N{
 			// (Just no need to define date/time format etc. twice)
 			if(file_exists($i18ndir.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
-				include($i18ndir.$lang.'.php');
+				include(strip_tags($i18ndir).strip_tags($lang).'.php');
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
 					$this->translations = $TRANSLATIONS;
 				}