5 files changed, 23 insertions, 11 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 8c7572fa394..bc95c6a3dc5 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -83,9 +83,6 @@ $(document).ready(function(){
 	$('#allowLinks').change(function() {
 		$("#publicLinkSettings").toggleClass('hidden', !this.checked);
 	});
-	$('#allowResharing').change(function() {
-		$("#resharingSettings").toggleClass('hidden', !this.checked);
-	});
 
 	$('#security').change(function(){
 		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 95e56485a6a..4cd7520caa7 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -45,15 +45,30 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				page.find('span.userDocumentation').html("<a id='userDocumentation' href='" + app.documentation.user + "'>" + t('settings', 'User Documentation') + "</a>");
 				page.find('p.documentation').show();
 			}
+			else {
+				page.find('span.userDocumentation').empty();
+				userDocumentation = false;
+			}
 			if (typeof(app.documentation.admin) !== 'undefined') {
 				adminDocumentation = true;
 				page.find('span.adminDocumentation').html("<a id='adminDocumentation' href='" + app.documentation.admin + "'>" + t('settings', 'Admin Documentation') + "</a>");
 				page.find('p.documentation').show();
 			}
+			else {
+				page.find('span.adminDocumentation').empty();
+				adminDocumentation = false;
+			}
 
 			if(userDocumentation && adminDocumentation) {
-				page.find('span.userDocumentation').after(', ');
+				page.find('span.comma').remove();
+				page.find('span.userDocumentation').after('<span class="comma">, </span>');
 			}
+			else {
+				page.find('span.comma').remove();
+			}
+		}
+		else {
+			page.find('p.documentation').hide();
 		}
 
 		if (typeof(app.website) !== 'undefined') {
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 894744ba3e9..56355317f8d 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -93,8 +93,8 @@ DeleteHandler.prototype.showNotification = function() {
 			this.hideNotification();
 		}
 		$('#notification').data(this.notificationDataID, true);
-		var msg = this.notificationMessage.replace(this.notificationPlaceholder,
-											this.oidToDelete);
+		var msg = this.notificationMessage.replace(
+			this.notificationPlaceholder, escapeHTML(this.oidToDelete));
 		this.notifier.showHtml(msg);
 	}
 };
@@ -163,7 +163,7 @@ DeleteHandler.prototype.delete = function() {
 				dh.removeCallback(dh.oidToDelete);
 				dh.canceled = true;
 			} else {
-				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete ' + escapeHTML(dh.oidToDelete)));
+				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete {objName}', {objName: escapeHTML(dh.oidToDelete)}));
 				dh.undoCallback(dh.oidToDelete);
 			}
 		}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 0ff8bdd6384..dcaf593b886 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -202,8 +202,8 @@ GroupList = {
 
 		//configure undo
 		OC.Notification.hide();
-		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-			t('settings', 'undo') + '</span>';
+		var msg = escapeHTML(t('settings', 'deleted {groupName}', {groupName: '%oid'})) + '<span class="undo">' +
+			escapeHTML(t('settings', 'undo')) + '</span>';
 		GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
 			GroupList.show);
 
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 68098e03a50..a911225c5c5 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -251,8 +251,8 @@ var UserList = {
 
 		//configure undo
 		OC.Notification.hide();
-		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-			t('settings', 'undo') + '</span>';
+		var msg = escapeHTML(t('settings', 'deleted {userName}', {userName: '%oid'})) + '<span class="undo">' +
+			escapeHTML(t('settings', 'undo')) + '</span>';
 		UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg,
 										UserList.show);