From c814a7a8411d709efd56b884f0219a18c544fcc0 Mon Sep 17 00:00:00 2001
From: scambra <sergio@entrecables.com>
Date: Wed, 26 Sep 2012 07:46:04 +0200
Subject: use interpolation for some translations in js

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 7968edebb7a..de50e53a441 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -127,9 +127,9 @@ OC.Share={
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
 		if (data.reshare) {
 			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
-				html += '<span class="reshare">'+t('core', 'Shared with you and the group')+' '+data.reshare.share_with+' '+t('core', 'by')+' '+data.reshare.uid_owner+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.uid_owner})+'</span>';
 			} else {
-				html += '<span class="reshare">'+t('core', 'Shared with you by')+' '+data.reshare.uid_owner+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.uid_owner})+'</span>';
 			}
 			html += '<br />';
 		}
@@ -247,7 +247,7 @@ OC.Share={
 			if (collectionList.length > 0) {
 				$(collectionList).append(', '+shareWith);
 			} else {
-				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in')+' '+item+' '+t('core', 'with')+' '+shareWith+'</li>';
+				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWith})+'</li>';
 				$('#shareWithList').prepend(html);
 			}
 		} else {
-- 
cgit v1.2.3


From a24d8db4b25e99f92ebb2cb65a97672f39a2f85f Mon Sep 17 00:00:00 2001
From: scambra <sergio@entrecables.com>
Date: Fri, 21 Sep 2012 08:11:11 +0200
Subject: translate datepicker

---
 core/js/share.js               | 8 ++++++++
 core/l10n/l10n-de.php          | 3 ++-
 core/l10n/l10n-en.php          | 3 ++-
 core/l10n/l10n-es.php          | 3 ++-
 core/templates/layout.user.php | 3 +++
 lib/l10n.php                   | 5 ++++-
 6 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index de50e53a441..1bc8f555680 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -343,6 +343,14 @@ OC.Share={
 }
 
 $(document).ready(function() {
+	$.datepicker.setDefaults({
+		monthNames: monthNames,
+		monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
+		dayNames: dayNames,
+		dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
+		dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
+		firstDay: firstDay
+	});
 
 	$('a.share').live('click', function(event) {
 		event.stopPropagation();
diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php
index 976f8ce3c51..d80c3beb2ba 100644
--- a/core/l10n/l10n-de.php
+++ b/core/l10n/l10n-de.php
@@ -2,4 +2,5 @@
 $LOCALIZATIONS = array(
 	'date' => '%d.%m.%Y',
 	'datetime' => '%d.%m.%Y %H:%M:%S',
-	'time' => '%H:%M:%S' );
+	'time' => '%H:%M:%S',
+	'firstday' => 0 );
diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php
index 3a050d477ce..6268214b503 100644
--- a/core/l10n/l10n-en.php
+++ b/core/l10n/l10n-en.php
@@ -2,4 +2,5 @@
 $LOCALIZATIONS = array(
 	'date' => '%B %e, %Y',
 	'datetime' => '%B %e, %Y %H:%M',
-	'time' => '%H:%M:%S' );
+	'time' => '%H:%M:%S',
+	'firstday' => 0 );
diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php
index b81464b491a..8798b24d62f 100644
--- a/core/l10n/l10n-es.php
+++ b/core/l10n/l10n-es.php
@@ -2,4 +2,5 @@
 $LOCALIZATIONS = array(
 	'date' => '%e de %B de %Y',
 	'datetime' => '%e de %B de %Y %H:%M',
-	'time' => '%H:%M:%S' );
+	'time' => '%H:%M:%S',
+	'firstday' => 1 );
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b6d8a7604a2..92d47cc51f8 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -13,6 +13,9 @@
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
 			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
+			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
+			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
+			var firstDay = <?php echo json_encode($l->l('firstday')) ?>;
 		</script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/lib/l10n.php b/lib/l10n.php
index 26611537175..72ac9e353d8 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -60,7 +60,8 @@ class OC_L10N{
 	private $localizations = array(
 		'date' => '%d.%m.%Y',
 		'datetime' => '%d.%m.%Y %H:%M:%S',
-		'time' => '%H:%M:%S');
+		'time' => '%H:%M:%S',
+		'firstday' => 0);
 
 	/**
 	 * get an L10N instance
@@ -221,6 +222,8 @@ class OC_L10N{
 				setlocale(LC_TIME, $locales);
 				return strftime($this->localizations[$type], $data);
 				break;
+			case 'firstday':
+				return $this->localizations[$type];
 			default:
 				return false;
 		}
-- 
cgit v1.2.3


From b1150f6a7fe32714eba4155e3bee4498eef446a0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 23 Oct 2012 17:55:49 +0200
Subject: Urlencode the share URL

Fixes #63
---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 1bc8f555680..7d8799edf51 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -313,7 +313,7 @@ OC.Share={
 			var file = $('#dir').val() + '/' + filename;
 		}
 		file = '/'+OC.currentUser+'/files'+file;
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+file;
+		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#showPassword').show();
-- 
cgit v1.2.3


From a4a1dad8312db8060009be0dd315cd7b5b1e4fc5 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Sun, 28 Oct 2012 13:47:29 +0100
Subject: set password if user leaves password field (issue #57)

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 7d8799edf51..8d359dd3fcb 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -483,15 +483,13 @@ $(document).ready(function() {
 		$('#linkPass').toggle('blind');
 	});
 
-	$('#linkPassText').live('keyup', function(event) {
-		if (event.keyCode == 13) {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
-				$('#linkPassText').val('');
-				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
-			});
-		}
+	$('#linkPassText').live('focusout', function(event) {
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+			$('#linkPassText').val('');
+			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+		});
 	});
 
 	$('#expirationCheckbox').live('click', function() {
-- 
cgit v1.2.3


From f2f2b8ba3b315365591784dcc1c172625768f241 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Sun, 28 Oct 2012 14:57:36 +0100
Subject: added some visual feedback is password was set

---
 core/js/share.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 8d359dd3fcb..00e5ef3eed6 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -490,6 +490,7 @@ $(document).ready(function() {
 			$('#linkPassText').val('');
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		});
+		$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 	});
 
 	$('#expirationCheckbox').live('click', function() {
-- 
cgit v1.2.3


From 60e5054ae8bd5e85e6116e52a3de311c71b8b453 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 28 Oct 2012 16:01:50 -0400
Subject: Fix shared status icons

---
 apps/files/js/fileactions.js   |  2 +-
 apps/files_sharing/js/share.js | 34 ++++------------------------------
 core/js/share.js               | 40 +++++++++++++++++++++++++++++++++-------
 3 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'core/js/share.js')

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 901c685ecb2..82d990bf780 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -80,7 +80,7 @@ var FileActions = {
 				if (img.call) {
 					img = img(file);
 				}
-				var html = '<a href="#" class="action">';
+				var html = '<a href="#" class="action" data-action="'+name+'">';
 				if (img) {
 					html += '<img class ="svg" src="' + img + '"/> ';
 				}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 72663c068c9..7eb086712f4 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,36 +1,8 @@
 $(document).ready(function() {
 
 	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !publicListView) {
-		OC.Share.loadIcons('file');
-		FileActions.register('all', 'Share', OC.PERMISSION_READ, function(filename) {
-			// Return the correct sharing icon
-			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
-			if ($('#dir').val() == '/') {
-				var item = $('#dir').val() + filename;
-			} else {
-				var item = $('#dir').val() + '/' + filename;
-			}
-			// Check if status is in cache
-			if (OC.Share.statuses[item] === true) {
-				return OC.imagePath('core', 'actions/public');
-			} else if (OC.Share.statuses[item] === false) {
-				return OC.imagePath('core', 'actions/shared');
-			} else {
-				var last = '';
-				var path = OC.Share.dirname(item);
-				// Search for possible parent folders that are shared
-				while (path != last) {
-					if (OC.Share.statuses[path] === true) {
-						return OC.imagePath('core', 'actions/public');
-					} else if (OC.Share.statuses[path] === false) {
-						return OC.imagePath('core', 'actions/shared');
-					}
-					last = path;
-					path = OC.Share.dirname(path);
-				}
-				return OC.imagePath('core', 'actions/share');
-			}
-		}, function(filename) {
+		
+		FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
 			if ($('#dir').val() == '/') {
 				var item = $('#dir').val() + filename;
 			} else {
@@ -59,6 +31,8 @@ $(document).ready(function() {
 				OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
 			}
 		});
+		OC.Share.loadIcons('file');
 	}
+	
 
 });
\ No newline at end of file
diff --git a/core/js/share.js b/core/js/share.js
index 00e5ef3eed6..c9b3a4288ac 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,17 +10,43 @@ OC.Share={
 		// Load all share icons
 		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
 			if (result && result.status === 'success') {
-				$.each(result.data, function(item, hasPrivateLink) {
-					// Private links override shared in terms of icon display
+				$.each(result.data, function(item, hasLink) {
+					OC.Share.statuses[item] = hasLink;
+					// Links override shared in terms of icon display
+					if (hasLink) {
+						var image = OC.imagePath('core', 'actions/public');
+					} else {
+						var image = OC.imagePath('core', 'actions/shared');
+					}
 					if (itemType != 'file' && itemType != 'folder') {
-						if (hasPrivateLink) {
-							var image = OC.imagePath('core', 'actions/public');
+						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
+					} else {
+						var dir = $('#dir').val();
+						if ($('#dir').val().length > 1) {
+							console.log(item);
+							var last = '';
+							var path = dir;
+							// Search for possible parent folders that are shared
+							while (path != last) {
+								if (path == item) {
+									var img = $('.fileactions .action').filterAttr('data-action', 'Share').find('img');
+									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+										img.attr('src', image);
+									}
+								}
+								last = path;
+								path = OC.Share.dirname(path);
+							}
 						} else {
-							var image = OC.imagePath('core', 'actions/shared');
+							var file = $('tr').filterAttr('data-file', OC.basename(item));
+							if (file.length > 0) {
+								var img = $(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img');
+								if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+									img.attr('src', image);
+								}
+							}
 						}
-						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 					}
-					OC.Share.statuses[item] = hasPrivateLink;
 				});
 			}
 		});
-- 
cgit v1.2.3


From e5a74903e453e0628a1544ddc37ee05454a38462 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 28 Oct 2012 16:36:17 -0400
Subject: Try to fix shared status icons again

---
 core/js/share.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index c9b3a4288ac..73c74a7cb6d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -21,9 +21,12 @@ OC.Share={
 					if (itemType != 'file' && itemType != 'folder') {
 						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 					} else {
+						var file = $('tr').filterAttr('data-file', OC.basename(item));
+						if (file.length > 0) {
+							$(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img').attr('src', image);
+						}
 						var dir = $('#dir').val();
-						if ($('#dir').val().length > 1) {
-							console.log(item);
+						if (dir.length > 1) {
 							var last = '';
 							var path = dir;
 							// Search for possible parent folders that are shared
@@ -37,14 +40,6 @@ OC.Share={
 								last = path;
 								path = OC.Share.dirname(path);
 							}
-						} else {
-							var file = $('tr').filterAttr('data-file', OC.basename(item));
-							if (file.length > 0) {
-								var img = $(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img');
-								if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
-									img.attr('src', image);
-								}
-							}
 						}
 					}
 				});
-- 
cgit v1.2.3


From 493ae19bca2cd4127471d3ac12db93a571efd76b Mon Sep 17 00:00:00 2001
From: libasys <sebastian.doell@libasys.de>
Date: Wed, 14 Nov 2012 16:47:52 +0100
Subject: If you using the sharing by link the array monthNames don't exist and
 causes errors in all browsers! so we check if the type of the variable isn't
 undefined!

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 73c74a7cb6d..8fcea84af88 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -364,6 +364,8 @@ OC.Share={
 }
 
 $(document).ready(function() {
+	
+	if(typeof monthNames != 'undefined'){
 	$.datepicker.setDefaults({
 		monthNames: monthNames,
 		monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
@@ -372,7 +374,7 @@ $(document).ready(function() {
 		dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
 		firstDay: firstDay
 	});
-
+  }
 	$('a.share').live('click', function(event) {
 		event.stopPropagation();
 		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
-- 
cgit v1.2.3


From d8a171df26a33710ad162b6acc9f46d00976b986 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Mon, 12 Nov 2012 14:44:00 +0100
Subject: implement share via link token

---
 apps/files_sharing/public.php | 208 +++++++++++++++++++++---------------------
 core/ajax/share.php           |  14 ++-
 core/js/share.js              |  18 +---
 db_structure.xml              |  15 +++
 lib/helper.php                |   1 -
 lib/public/share.php          |  66 ++++++++++----
 lib/util.php                  |   2 +-
 7 files changed, 183 insertions(+), 141 deletions(-)

(limited to 'core/js/share.js')

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 1fc41b42756..d680a87fa7a 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -21,73 +21,81 @@ if (isset($_GET['token'])) {
 }
 // Enf of backward compatibility
 
-function getID($path) {
-	// use the share table from the db to find the item source if the file was reshared because shared files
-	//are not stored in the file cache.
-	if (substr(OC_Filesystem::getMountPoint($path), -7, 6) == "Shared") {
-		$path_parts = explode('/', $path, 5);
-		$user = $path_parts[1];
-		$intPath = '/'.$path_parts[4];
-		$query = \OC_DB::prepare('SELECT item_source FROM *PREFIX*share WHERE uid_owner = ? AND file_target = ? ');
-		$result = $query->execute(array($user, $intPath));
-		$row = $result->fetchRow();
-		$fileSource = $row['item_source'];
-	} else {
-		$fileSource = OC_Filecache::getId($path, '');
-	}
-
-	return $fileSource;
+/**
+ * lookup file path and owner by fetching it from the fscache
+ * needed becaus OC_FileCache::getPath($id, $user) already requires the user
+ * @param int $id
+ * @return array
+ */
+function getPathAndUser($id) {
+	$query = \OC_DB::prepare('SELECT `user`, `path` FROM `*PREFIX*fscache` WHERE `id` = ?');
+	$result = $query->execute(array($id));
+	$row = $result->fetchRow();
+	return $row;
 }
 
-if (isset($_GET['file']) || isset($_GET['dir'])) {
-	if (isset($_GET['dir'])) {
-		$type = 'folder';
-		$path = $_GET['dir'];
-		if(strlen($path)>1 and substr($path, -1, 1)==='/') {
-			$path=substr($path, 0, -1);
-		}
-		$baseDir = $path;
-		$dir = $baseDir;
-	} else {
-		$type = 'file';
-		$path = $_GET['file'];
-		if(strlen($path)>1 and substr($path, -1, 1)==='/') {
-			$path=substr($path, 0, -1);
-		}
-	}
-	$uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
-	if (OCP\User::userExists($uidOwner)) {
-		OC_Util::setupFS($uidOwner);
-		$fileSource = getId($path);
-		if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) {
-			// TODO Fix in the getItems
-			if (!isset($linkItem['item_type']) || $linkItem['item_type'] != $type) {
+if (isset($_GET['t'])) {
+	$token = $_GET['t'];
+	$linkItem = OCP\Share::getShareByToken($token);
+	if (is_array($linkItem) && isset($linkItem['uid_owner'])) {
+		// seems to be a valid share
+		$type = $linkItem['item_type'];
+		$fileSource = $linkItem['file_source'];
+		$shareOwner = $linkItem['uid_owner'];
+		
+		if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
+			
+			$pathAndUser = getPathAndUser($linkItem['file_source']);
+			$fileOwner = $pathAndUser['user'];
+			
+			//if this is a reshare check the file owner also exists
+			if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
+					OCP\Util::writeLog('share', 'original file owner '.$fileOwner.' does not exist for share '.$linkItem['id'], \OCP\Util::ERROR);
+					header('HTTP/1.0 404 Not Found');
+					$tmpl = new OCP\Template('', '404', 'guest');
+					$tmpl->printPage();
+					exit();
+			}
+			
+			//mount filesystem of file owner
+			OC_Util::setupFS($fileOwner);
+			if (!isset($linkItem['item_type'])) {
+				OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR);
 				header('HTTP/1.0 404 Not Found');
 				$tmpl = new OCP\Template('', '404', 'guest');
 				$tmpl->printPage();
 				exit();
 			}
 			if (isset($linkItem['share_with'])) {
-				// Check password
+				// Authenticate share_with
+				$url = OCP\Util::linkToPublic('files').'&t='.$token;
 				if (isset($_GET['file'])) {
-					$url = OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']);
-				} else {
-					$url = OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']);
+					$url .= '&file='.urlencode($_GET['file']);
+				} else if (isset($_GET['dir'])) {
+					$url .= '&dir='.urlencode($_GET['dir']);
 				}
 				if (isset($_POST['password'])) {
 					$password = $_POST['password'];
-					$storedHash = $linkItem['share_with'];
-					$forcePortable = (CRYPT_BLOWFISH != 1);
-					$hasher = new PasswordHash(8, $forcePortable);
-					if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) {
-						$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
-						$tmpl->assign('URL', $url);
-						$tmpl->assign('error', true);
+					if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) {
+						// Check Password
+						$forcePortable = (CRYPT_BLOWFISH != 1);
+						$hasher = new PasswordHash(8, $forcePortable);
+						if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) {
+							$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+							$tmpl->assign('URL', $url);
+							$tmpl->assign('error', true);
+							$tmpl->printPage();
+							exit();
+						} else {
+							// Save item id in session for future requests
+							$_SESSION['public_link_authenticated'] = $linkItem['id'];
+						}
+					} else {
+						OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR);
+						header('HTTP/1.0 404 Not Found');
+						$tmpl = new OCP\Template('', '404', 'guest');
 						$tmpl->printPage();
 						exit();
-					} else {
-						// Save item id in session for future requests
-						$_SESSION['public_link_authenticated'] = $linkItem['id'];
 					}
 				// Check if item id is set in session
 				} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
@@ -98,29 +106,32 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 					exit();
 				}
 			}
-			$path = $linkItem['path'];
+			$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
+			$path = $basePath;
 			if (isset($_GET['path'])) {
 				$path .= $_GET['path'];
-				$dir .= $_GET['path'];
-				if (!OC_Filesystem::file_exists($path)) {
-					header('HTTP/1.0 404 Not Found');
-					$tmpl = new OCP\Template('', '404', 'guest');
-					$tmpl->printPage();
-					exit();
-				}
 			}
+			if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) {
+				OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR);
+				header('HTTP/1.0 404 Not Found');
+				$tmpl = new OCP\Template('', '404', 'guest');
+				$tmpl->printPage();
+				exit();
+			}
+			$dir = dirname($path);
+			$file = basename($path);
 			// Download the file
 			if (isset($_GET['download'])) {
-				if (isset($_GET['dir'])) {
+				if (isset($_GET['path']) && $_GET['path'] !== '' ) {
 					if ( isset($_GET['files']) ) { // download selected files
 						OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					} else 	if (isset($_GET['path']) &&  $_GET['path'] != '' ) { // download a file from a shared directory
-						OC_Files::get('', $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+					} else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory
+						OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 					} else { // download the whole shared directory
-						OC_Files::get($path, '', $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+						OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 					}
 				} else { // download a single shared file
-					OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+					OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 				}
 
 			} else {
@@ -128,14 +139,22 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 				OCP\Util::addScript('files_sharing', 'public');
 				OCP\Util::addScript('files', 'fileactions');
 				$tmpl = new OCP\Template('files_sharing', 'public', 'base');
-				$tmpl->assign('owner', $uidOwner);
+				$tmpl->assign('uidOwner', $shareOwner);
+				$tmpl->assign('dir', $dir);
+				$tmpl->assign('filename', $file);
+				$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+				if (isset($_GET['path'])) {
+					$getPath = $_GET['path'];
+				} else {
+					$getPath = '';
+				}
 				// Show file list
 				if (OC_Filesystem::is_dir($path)) {
 					OCP\Util::addStyle('files', 'files');
 					OCP\Util::addScript('files', 'files');
 					OCP\Util::addScript('files', 'filelist');
 					$files = array();
-					$rootLength = strlen($baseDir) + 1;
+					$rootLength = strlen($basePath) + 1;
 					foreach (OC_Files::getDirectoryContent($path) as $i) {
 						$i['date'] = OCP\Util::formatDate($i['mtime']);
 						if ($i['type'] == 'file') {
@@ -143,7 +162,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 							$i['basename'] = $fileinfo['filename'];
 							$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
 						}
-						$i['directory'] = '/'.substr('/'.$uidOwner.'/files'.$i['directory'], $rootLength);
+						$i['directory'] = '/'.substr($i['directory'], $rootLength);
 						if ($i['directory'] == '/') {
 							$i['directory'] = '';
 						}
@@ -153,30 +172,29 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 					// Make breadcrumb
 					$breadcrumb = array();
 					$pathtohere = '';
-					$count = 1;
-					foreach (explode('/', $dir) as $i) {
+					
+					//add base breadcrumb
+					$breadcrumb[] = array('dir' => '/', 'name' => basename($basePath));
+					
+					//add subdir breadcrumbs
+					foreach (explode('/', urldecode($_GET['path'])) as $i) {
 						if ($i != '') {
-							if ($i != $baseDir) {
-								$pathtohere .= '/'.$i;
-							}
-							if ( strlen($pathtohere) <  strlen($_GET['dir'])) {
-								continue;
-							}
-							$breadcrumb[] = array('dir' => str_replace($_GET['dir'], "", $pathtohere, $count), 'name' => $i);
+							$pathtohere .= '/'.$i;
+							$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
 						}
 					}
+					
 					$list = new OCP\Template('files', 'part.list', '');
 					$list->assign('files', $files, false);
 					$list->assign('publicListView', true);
-					$list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false);
-					$list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path=', false);
+					$list->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false);
+					$list->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path=', false);
 					$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
 					$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-					$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false);
+					$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false);
 					$folder = new OCP\Template('files', 'index', '');
 					$folder->assign('fileList', $list->fetchPage(), false);
 					$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
-					$folder->assign('dir', basename($dir));
 					$folder->assign('isCreatable', false);
 					$folder->assign('permissions', 0);
 					$folder->assign('files', $files);
@@ -184,32 +202,14 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 					$folder->assign('uploadMaxHumanFilesize', 0);
 					$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 					$tmpl->assign('folder', $folder->fetchPage(), false);
-					$tmpl->assign('uidOwner', $uidOwner);
-					$tmpl->assign('dir', basename($dir));
-					$tmpl->assign('filename', basename($path));
-					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
 					$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-					if (isset($_GET['path'])) {
-						$getPath = $_GET['path'];
-					} else {
-						$getPath = '';
-					}
-					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false);
+					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath));
 				} else {
 					// Show file preview if viewer is available
-					$tmpl->assign('uidOwner', $uidOwner);
-					$tmpl->assign('dir', dirname($path));
-					$tmpl->assign('filename', basename($path));
-					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
 					if ($type == 'file') {
-						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']).'&download', false);
+						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download');
 					} else {
-						if (isset($_GET['path'])) {
-							$getPath = $_GET['path'];
-						} else {
-							$getPath = '';
-						}
-						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false);
+						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath));
 					}
 				}
 				$tmpl->printPage();
@@ -217,6 +217,8 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 			exit();
 		}
 	}
+} else {
+	OCP\Util::writeLog('share', 'Missing token', \OCP\Util::DEBUG);
 }
 header('HTTP/1.0 404 Not Found');
 $tmpl = new OCP\Template('', '404', 'guest');
diff --git a/core/ajax/share.php b/core/ajax/share.php
index efe01dff886..41832a3c659 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -28,13 +28,19 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') {
+					$shareType = (int)$_POST['shareType'];
+					$shareWith = $_POST['shareWith'];
+					if ($shareType === OCP\Share::SHARE_TYPE_LINK && $shareWith == '') {
 						$shareWith = null;
+					}
+					
+					$token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']);
+					
+					if (is_string($token)) {
+						OC_JSON::success(array('data' => array('token' => $token)));
 					} else {
-						$shareWith = $_POST['shareWith'];
+						OC_JSON::success();
 					}
-					OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $shareWith, $_POST['permissions']);
-					OC_JSON::success();
 				} catch (Exception $exception) {
 					OC_JSON::error(array('data' => array('message' => $exception->getMessage())));
 				}
diff --git a/core/js/share.js b/core/js/share.js
index 8fcea84af88..879befd95ba 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -179,7 +179,7 @@ OC.Share={
 			if (data.shares) {
 				$.each(data.shares, function(index, share) {
 					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
-						OC.Share.showLink(itemSource, share.share_with);
+						OC.Share.showLink(share.token, share.share_with);
 					} else {
 						if (share.collection) {
 							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
@@ -323,18 +323,10 @@ OC.Share={
 			$('#expiration').show();
 		}
 	},
-	showLink:function(itemSource, password) {
+	showLink:function(token, password) {
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
-		var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-		var type = $('tr').filterAttr('data-id', String(itemSource)).data('type');
-		if ($('#dir').val() == '/') {
-			var file = $('#dir').val() + filename;
-		} else {
-			var file = $('#dir').val() + '/' + filename;
-		}
-		file = '/'+OC.currentUser+'/files'+file;
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
+		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token;
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#showPassword').show();
@@ -480,8 +472,8 @@ $(document).ready(function() {
 		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
 			// Create a link
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() {
-				OC.Share.showLink(itemSource);
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function(data) {
+				OC.Share.showLink(data.token);
 				OC.Share.updateIcon(itemType, itemSource);
 			});
 		} else {
diff --git a/db_structure.xml b/db_structure.xml
index 851c8aa998d..8ddb67a3d80 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -581,6 +581,21 @@
 				<notnull>false</notnull>
 			</field>
 
+			<field>
+				<name>token</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>32</length>
+			</field>
+
+			<index>
+				<name>token_index</name>
+				<field>
+					<name>token</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
 		</declaration>
 
 	</table>
diff --git a/lib/helper.php b/lib/helper.php
index 27ebd24f6e5..5dec7fadfb4 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -758,5 +758,4 @@ class OC_Helper {
 		}
 		return $str;
 	}
-
 }
diff --git a/lib/public/share.php b/lib/public/share.php
index dcb1b5c278e..2ded31a42e4 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -53,6 +53,8 @@ class Share {
 	const FORMAT_STATUSES = -2;
 	const FORMAT_SOURCES = -3;
 
+	const TOKEN_LENGTH = 32; // see db_structure.xml
+
 	private static $shareTypeUserAndGroups = -1;
 	private static $shareTypeGroupUserUnique = 2;
 	private static $backends = array();
@@ -139,6 +141,20 @@ class Share {
 		return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1);
 	}
 
+	/**
+	 * @brief Get the item shared by a token
+	 * @param string token
+	 * @return Item
+	 */
+	public static function getShareByToken($token) {
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?',1);
+		$result = $query->execute(array($token));
+		if (\OC_DB::isError($result)) {
+			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
+		}
+		return $result->fetchRow();
+	}
+
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
@@ -168,7 +184,7 @@ class Share {
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
-	* @return bool Returns true on success or false on failure
+	* @return bool|string Returns true on success or false on failure, Returns token on success for links
 	*/
 	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		$uidOwner = \OC_User::getUser();
@@ -230,23 +246,33 @@ class Share {
 			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 		} else if ($shareType === self::SHARE_TYPE_LINK) {
 			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
+				// when updating a link share
 				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1)) {
-					// If password is set delete the old link
-					if (isset($shareWith)) {
-						self::delete($checkExists['id']);
-					} else {
-						$message = 'Sharing '.$itemSource.' failed, because this item is already shared with a link';
-						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-						throw new \Exception($message);
-					}
+					// remember old token
+					$oldToken = $checkExists['token'];
+					//delete the old share
+					self::delete($checkExists['id']);
 				}
+				
 				// Generate hash of password - same method as user passwords
 				if (isset($shareWith)) {
 					$forcePortable = (CRYPT_BLOWFISH != 1);
 					$hasher = new \PasswordHash(8, $forcePortable);
 					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
 				}
-				return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
+				
+				// Generate token
+				if (isset($oldToken)) {
+					$token = $oldToken;
+				} else {
+					$token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH);
+				}
+				$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token);
+				if ($result) {
+					return $token;
+				} else {
+					return false;
+				}
 			}
 			$message = 'Sharing '.$itemSource.' failed, because sharing with links is not allowed';
 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
@@ -654,9 +680,9 @@ class Share {
 		} else {
 			if (isset($uidOwner)) {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`';
+					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`, `token`';
 				} else {
-					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`';
+					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`, `token`';
 				}
 			} else {
 				if ($fileDependent) {
@@ -835,7 +861,7 @@ class Share {
 	* @param bool|array Parent folder target (optional)
 	* @return bool Returns true on success or false on failure
 	*/
-	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) {
+	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null, $token = null) {
 		$backend = self::getBackend($itemType);
 		// Check if this is a reshare
 		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
@@ -892,7 +918,7 @@ class Share {
 				$fileSource = null;
 			}
 		}
-		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`, `token`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
 		// Share with a group
 		if ($shareType == self::SHARE_TYPE_GROUP) {
 			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'], $uidOwner, $suggestedItemTarget);
@@ -913,7 +939,7 @@ class Share {
 			} else {
 				$groupFileTarget = null;
 			}
-			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget));
+			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
 			// Save this id, any extra rows for this group share will need to reference it
 			$parent = \OC_DB::insertid('*PREFIX*share');
 			// Loop through all users of this group in case we need to add an extra row
@@ -947,11 +973,12 @@ class Share {
 					'permissions' => $permissions,
 					'fileSource' => $fileSource,
 					'fileTarget' => $fileTarget,
-					'id' => $parent
+					'id' => $parent,
+					'token' => $token
 				));
 				// Insert an extra row for the group share if the item or file target is unique for this user
 				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token));
 					$id = \OC_DB::insertid('*PREFIX*share');
 				}
 			}
@@ -976,7 +1003,7 @@ class Share {
 			} else {
 				$fileTarget = null;
 			}
-			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token));
 			$id = \OC_DB::insertid('*PREFIX*share');
 			\OC_Hook::emit('OCP\Share', 'post_shared', array(
 				'itemType' => $itemType,
@@ -989,7 +1016,8 @@ class Share {
 				'permissions' => $permissions,
 				'fileSource' => $fileSource,
 				'fileTarget' => $fileTarget,
-				'id' => $id
+				'id' => $id,
+				'token' => $token
 			));
 			if ($parentFolder === true) {
 				$parentFolders['id'] = $id;
diff --git a/lib/util.php b/lib/util.php
index e7ba3dd3dfe..adec69248d5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -95,7 +95,7 @@ class OC_Util {
 	 */
 	public static function getVersion() {
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user
-		return array(4, 91, 01);
+		return array(4, 91, 02);
 	}
 
 	/**
-- 
cgit v1.2.3


From 995b5c073922afd5d4fae00cad7e1bfc87c0ac73 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Fri, 23 Nov 2012 15:51:57 +0100
Subject: readd fallback code for pre token links

---
 apps/files_sharing/public.php | 340 ++++++++++++++++++++++++------------------
 core/js/share.js              |  22 ++-
 lib/public/share.php          |   2 +-
 3 files changed, 216 insertions(+), 148 deletions(-)

(limited to 'core/js/share.js')

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index d680a87fa7a..ac247368738 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -19,6 +19,24 @@ if (isset($_GET['token'])) {
 		\OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0. Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.', \OCP\Util::WARN);
 	}
 }
+
+function getID($path) {
+	// use the share table from the db to find the item source if the file was reshared because shared files
+	//are not stored in the file cache.
+	if (substr(OC_Filesystem::getMountPoint($path), -7, 6) == "Shared") {
+		$path_parts = explode('/', $path, 5);
+		$user = $path_parts[1];
+		$intPath = '/'.$path_parts[4];
+		$query = \OC_DB::prepare('SELECT `item_source` FROM `*PREFIX*share` WHERE `uid_owner` = ? AND `file_target` = ? ');
+		$result = $query->execute(array($user, $intPath));
+		$row = $result->fetchRow();
+		$fileSource = $row['item_source'];
+	} else {
+		$fileSource = OC_Filecache::getId($path, '');
+	}
+
+	return $fileSource;
+}
 // Enf of backward compatibility
 
 /**
@@ -34,6 +52,7 @@ function getPathAndUser($id) {
 	return $row;
 }
 
+
 if (isset($_GET['t'])) {
 	$token = $_GET['t'];
 	$linkItem = OCP\Share::getShareByToken($token);
@@ -59,166 +78,201 @@ if (isset($_GET['t'])) {
 			
 			//mount filesystem of file owner
 			OC_Util::setupFS($fileOwner);
-			if (!isset($linkItem['item_type'])) {
-				OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR);
-				header('HTTP/1.0 404 Not Found');
-				$tmpl = new OCP\Template('', '404', 'guest');
-				$tmpl->printPage();
-				exit();
-			}
-			if (isset($linkItem['share_with'])) {
-				// Authenticate share_with
-				$url = OCP\Util::linkToPublic('files').'&t='.$token;
-				if (isset($_GET['file'])) {
-					$url .= '&file='.urlencode($_GET['file']);
-				} else if (isset($_GET['dir'])) {
-					$url .= '&dir='.urlencode($_GET['dir']);
-				}
-				if (isset($_POST['password'])) {
-					$password = $_POST['password'];
-					if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) {
-						// Check Password
-						$forcePortable = (CRYPT_BLOWFISH != 1);
-						$hasher = new PasswordHash(8, $forcePortable);
-						if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) {
-							$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
-							$tmpl->assign('URL', $url);
-							$tmpl->assign('error', true);
-							$tmpl->printPage();
-							exit();
-						} else {
-							// Save item id in session for future requests
-							$_SESSION['public_link_authenticated'] = $linkItem['id'];
-						}
-					} else {
-						OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR);
-						header('HTTP/1.0 404 Not Found');
-						$tmpl = new OCP\Template('', '404', 'guest');
-						$tmpl->printPage();
-						exit();
-					}
-				// Check if item id is set in session
-				} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
-					// Prompt for password
+		}
+	}
+} else if (isset($_GET['file']) || isset($_GET['dir'])) {
+	OCP\Util::writeLog('share', 'Missing token, trying fallback file/dir links', \OCP\Util::DEBUG);
+	if (isset($_GET['dir'])) {
+		$type = 'folder';
+		$path = $_GET['dir'];
+		if(strlen($path)>1 and substr($path, -1, 1)==='/') {
+			$path=substr($path, 0, -1);
+		}
+		$baseDir = $path;
+		$dir = $baseDir;
+	} else {
+		$type = 'file';
+		$path = $_GET['file'];
+		if(strlen($path)>1 and substr($path, -1, 1)==='/') {
+			$path=substr($path, 0, -1);
+		}
+	}
+	$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
+	
+	if (OCP\User::userExists($shareOwner)) {
+		OC_Util::setupFS($shareOwner);
+		$fileSource = getId($path);
+		if ($fileSource != -1 ) {
+			$linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $shareOwner);
+			$pathAndUser['path'] = $path;
+			$path_parts = explode('/', $path, 5);
+			$pathAndUser['user'] = $path_parts[1];
+			$fileOwner = $path_parts[1];
+		}
+	}
+}
+
+if ($linkItem) {
+	if (!isset($linkItem['item_type'])) {
+		OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR);
+		header('HTTP/1.0 404 Not Found');
+		$tmpl = new OCP\Template('', '404', 'guest');
+		$tmpl->printPage();
+		exit();
+	}
+	if (isset($linkItem['share_with'])) {
+		// Authenticate share_with
+		$url = OCP\Util::linkToPublic('files').'&t='.$token;
+		if (isset($_GET['file'])) {
+			$url .= '&file='.urlencode($_GET['file']);
+		} else if (isset($_GET['dir'])) {
+			$url .= '&dir='.urlencode($_GET['dir']);
+		}
+		if (isset($_POST['password'])) {
+			$password = $_POST['password'];
+			if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) {
+				// Check Password
+				$forcePortable = (CRYPT_BLOWFISH != 1);
+				$hasher = new PasswordHash(8, $forcePortable);
+				if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) {
 					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
 					$tmpl->assign('URL', $url);
+					$tmpl->assign('error', true);
 					$tmpl->printPage();
 					exit();
+				} else {
+					// Save item id in session for future requests
+					$_SESSION['public_link_authenticated'] = $linkItem['id'];
 				}
-			}
-			$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
-			$path = $basePath;
-			if (isset($_GET['path'])) {
-				$path .= $_GET['path'];
-			}
-			if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) {
-				OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR);
+			} else {
+				OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR);
 				header('HTTP/1.0 404 Not Found');
 				$tmpl = new OCP\Template('', '404', 'guest');
 				$tmpl->printPage();
 				exit();
 			}
-			$dir = dirname($path);
-			$file = basename($path);
-			// Download the file
-			if (isset($_GET['download'])) {
-				if (isset($_GET['path']) && $_GET['path'] !== '' ) {
-					if ( isset($_GET['files']) ) { // download selected files
-						OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					} else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory
-						OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					} else { // download the whole shared directory
-						OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					}
-				} else { // download a single shared file
-					OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-				}
+		// Check if item id is set in session
+		} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
+			// Prompt for password
+			$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+			$tmpl->assign('URL', $url);
+			$tmpl->printPage();
+			exit();
+		}
+	}
+	$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
+	$path = $basePath;
+	if (isset($_GET['path'])) {
+		$path .= $_GET['path'];
+	}
+	if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) {
+		OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR);
+		header('HTTP/1.0 404 Not Found');
+		$tmpl = new OCP\Template('', '404', 'guest');
+		$tmpl->printPage();
+		exit();
+	}
+	$dir = dirname($path);
+	$file = basename($path);
+	// Download the file
+	if (isset($_GET['download'])) {
+		if (isset($_GET['path']) && $_GET['path'] !== '' ) {
+			if ( isset($_GET['files']) ) { // download selected files
+				OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			} else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory
+				OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			} else { // download the whole shared directory
+				OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			}
+		} else { // download a single shared file
+			OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+		}
 
-			} else {
-				OCP\Util::addStyle('files_sharing', 'public');
-				OCP\Util::addScript('files_sharing', 'public');
-				OCP\Util::addScript('files', 'fileactions');
-				$tmpl = new OCP\Template('files_sharing', 'public', 'base');
-				$tmpl->assign('uidOwner', $shareOwner);
-				$tmpl->assign('dir', $dir);
-				$tmpl->assign('filename', $file);
-				$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
-				if (isset($_GET['path'])) {
-					$getPath = $_GET['path'];
-				} else {
-					$getPath = '';
+	} else {
+		OCP\Util::addStyle('files_sharing', 'public');
+		OCP\Util::addScript('files_sharing', 'public');
+		OCP\Util::addScript('files', 'fileactions');
+		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
+		$tmpl->assign('uidOwner', $shareOwner);
+		$tmpl->assign('dir', $dir);
+		$tmpl->assign('filename', $file);
+		$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+		if (isset($_GET['path'])) {
+			$getPath = $_GET['path'];
+		} else {
+			$getPath = '';
+		}
+		//
+		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'').(isset($_GET['dir'])?'&dir='.$_GET['dir']:'').(isset($_GET['file'])?'&file='.$_GET['file']:'');
+		// Show file list
+		if (OC_Filesystem::is_dir($path)) {
+			OCP\Util::addStyle('files', 'files');
+			OCP\Util::addScript('files', 'files');
+			OCP\Util::addScript('files', 'filelist');
+			$files = array();
+			$rootLength = strlen($basePath) + 1;
+			foreach (OC_Files::getDirectoryContent($path) as $i) {
+				$i['date'] = OCP\Util::formatDate($i['mtime']);
+				if ($i['type'] == 'file') {
+					$fileinfo = pathinfo($i['name']);
+					$i['basename'] = $fileinfo['filename'];
+					$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
 				}
-				// Show file list
-				if (OC_Filesystem::is_dir($path)) {
-					OCP\Util::addStyle('files', 'files');
-					OCP\Util::addScript('files', 'files');
-					OCP\Util::addScript('files', 'filelist');
-					$files = array();
-					$rootLength = strlen($basePath) + 1;
-					foreach (OC_Files::getDirectoryContent($path) as $i) {
-						$i['date'] = OCP\Util::formatDate($i['mtime']);
-						if ($i['type'] == 'file') {
-							$fileinfo = pathinfo($i['name']);
-							$i['basename'] = $fileinfo['filename'];
-							$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
-						}
-						$i['directory'] = '/'.substr($i['directory'], $rootLength);
-						if ($i['directory'] == '/') {
-							$i['directory'] = '';
-						}
-						$i['permissions'] = OCP\PERMISSION_READ;
-						$files[] = $i;
-					}
-					// Make breadcrumb
-					$breadcrumb = array();
-					$pathtohere = '';
-					
-					//add base breadcrumb
-					$breadcrumb[] = array('dir' => '/', 'name' => basename($basePath));
-					
-					//add subdir breadcrumbs
-					foreach (explode('/', urldecode($_GET['path'])) as $i) {
-						if ($i != '') {
-							$pathtohere .= '/'.$i;
-							$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
-						}
-					}
-					
-					$list = new OCP\Template('files', 'part.list', '');
-					$list->assign('files', $files, false);
-					$list->assign('publicListView', true);
-					$list->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false);
-					$list->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path=', false);
-					$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
-					$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-					$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false);
-					$folder = new OCP\Template('files', 'index', '');
-					$folder->assign('fileList', $list->fetchPage(), false);
-					$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
-					$folder->assign('isCreatable', false);
-					$folder->assign('permissions', 0);
-					$folder->assign('files', $files);
-					$folder->assign('uploadMaxFilesize', 0);
-					$folder->assign('uploadMaxHumanFilesize', 0);
-					$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-					$tmpl->assign('folder', $folder->fetchPage(), false);
-					$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath));
-				} else {
-					// Show file preview if viewer is available
-					if ($type == 'file') {
-						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download');
-					} else {
-						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath));
-					}
+				$i['directory'] = '/'.substr($i['directory'], $rootLength);
+				if ($i['directory'] == '/') {
+					$i['directory'] = '';
 				}
-				$tmpl->printPage();
+				$i['permissions'] = OCP\PERMISSION_READ;
+				$files[] = $i;
+			}
+			// Make breadcrumb
+			$breadcrumb = array();
+			$pathtohere = '';
+
+			//add base breadcrumb
+			$breadcrumb[] = array('dir' => '/', 'name' => basename($basePath));
+
+			//add subdir breadcrumbs
+			foreach (explode('/', urldecode($_GET['path'])) as $i) {
+				if ($i != '') {
+					$pathtohere .= '/'.$i;
+					$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+				}
+			}
+
+			$list = new OCP\Template('files', 'part.list', '');
+			$list->assign('files', $files, false);
+			$list->assign('publicListView', true);
+			$list->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false);
+			$list->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path=', false);
+			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
+			$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false);
+			$folder = new OCP\Template('files', 'index', '');
+			$folder->assign('fileList', $list->fetchPage(), false);
+			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+			$folder->assign('isCreatable', false);
+			$folder->assign('permissions', 0);
+			$folder->assign('files', $files);
+			$folder->assign('uploadMaxFilesize', 0);
+			$folder->assign('uploadMaxHumanFilesize', 0);
+			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+			$tmpl->assign('folder', $folder->fetchPage(), false);
+			$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+			$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path='.urlencode($getPath));
+		} else {
+			// Show file preview if viewer is available
+			if ($type == 'file') {
+				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download');
+			} else {
+				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path='.urlencode($getPath));
 			}
-			exit();
 		}
+		$tmpl->printPage();
 	}
+	exit();
 } else {
-	OCP\Util::writeLog('share', 'Missing token', \OCP\Util::DEBUG);
+	OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
 }
 header('HTTP/1.0 404 Not Found');
 $tmpl = new OCP\Template('', '404', 'guest');
diff --git a/core/js/share.js b/core/js/share.js
index 879befd95ba..0f71ae22419 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -179,7 +179,7 @@ OC.Share={
 			if (data.shares) {
 				$.each(data.shares, function(index, share) {
 					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
-						OC.Share.showLink(share.token, share.share_with);
+						OC.Share.showLink(share.token, share.share_with, itemSource);
 					} else {
 						if (share.collection) {
 							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
@@ -323,10 +323,24 @@ OC.Share={
 			$('#expiration').show();
 		}
 	},
-	showLink:function(token, password) {
+	showLink:function(token, password, itemSource) {
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token;
+		if (! token) {
+			//fallback to pre token link
+			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+			var type = $('tr').filterAttr('data-id', String(itemSource)).data('type');
+			if ($('#dir').val() == '/') {
+				var file = $('#dir').val() + filename;
+			} else {
+				var file = $('#dir').val() + '/' + filename;
+			}
+			file = '/'+OC.currentUser+'/files'+file;
+			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
+		} else {
+			//TODO add path param when showing a link to file in a subfolder of a public link share
+			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token;
+		}
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#showPassword').show();
@@ -473,7 +487,7 @@ $(document).ready(function() {
 		if (this.checked) {
 			// Create a link
 			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function(data) {
-				OC.Share.showLink(data.token);
+				OC.Share.showLink(data.token, null, itemSource);
 				OC.Share.updateIcon(itemType, itemSource);
 			});
 		} else {
diff --git a/lib/public/share.php b/lib/public/share.php
index 2ded31a42e4..653ea64fa60 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -689,7 +689,7 @@ class Share {
 					if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {
 						$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`';
 					} else {
-						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`';
+						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';
 					}
 				} else {
 					$select = '*';
-- 
cgit v1.2.3


From 5c9faf396a1afc1a35f2c922e2afb98e219f3abd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 27 Nov 2012 23:01:26 +0100
Subject: Sharing: Fix false positived v. 2

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 0f71ae22419..475abb58bff 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -146,7 +146,7 @@ OC.Share={
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions) {
 		var data = OC.Share.loadItem(itemType, itemSource);
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
-		if (data.reshare) {
+		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.uid_owner})+'</span>';
 			} else {
-- 
cgit v1.2.3


From 45074d5023d408f4f81bc45380ce68b1008f9414 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 10 Dec 2012 18:41:08 +0100
Subject: restoring feature to send sharing link via email

---
 apps/files_sharing/ajax/email.php | 39 +++++++++++++++++++++++++++++++++++++++
 apps/files_sharing/js/share.js    | 24 +++++++++++++++++++++++-
 core/css/share.css                | 14 ++++++++++----
 core/js/share.js                  | 12 ++++++++++--
 4 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 apps/files_sharing/ajax/email.php

(limited to 'core/js/share.js')

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
new file mode 100644
index 00000000000..4ed4eef723a
--- /dev/null
+++ b/apps/files_sharing/ajax/email.php
@@ -0,0 +1,39 @@
+<?php
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+OCP\JSON::checkAppEnabled('files_sharing');
+
+// read post variables
+$user = OCP\USER::getUser();
+$type = $_POST['type'];
+$link = $_POST['link'];
+$file = $_POST['file'];
+$to_address = $_POST['toaddress'];
+
+// enable l10n support
+$l = OC_L10N::get('files_sharing');
+
+// setup the email
+$subject = (string)$l->t('User %s shared a file with you', $user);
+if ($type === 'dir')
+	$subject = (string)$l->t('User %s shared a folder with you', $user);
+
+$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
+if ($type === 'dir')
+	$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
+
+// handle localhost installations
+$server_host = OCP\Util::getServerHost();
+if ($server_host === 'localhost')
+	$server_host = "example.com";
+
+$default_from = 'sharing-noreply@' . $server_host;
+$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
+
+// send it out now
+try {
+	OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
+	OCP\JSON::success();
+} catch (Exception $exception) {
+	OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 7eb086712f4..a83252867a9 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -33,6 +33,28 @@ $(document).ready(function() {
 		});
 		OC.Share.loadIcons('file');
 	}
-	
+
+    $('#emailPrivateLink').live('submit', function(event) {
+        event.preventDefault();
+        var link = $('#linkText').val();
+        var itemType = $('#dropdown').data('item-type');
+        var itemSource = $('#dropdown').data('item-source');
+
+        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+        var email = $('#email').val();
+        if (email != '') {
+            $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, type: itemType, file: file }, function(result) {
+                if (result && result.status == 'success') {
+                    $('#email').css('font-weight', 'bold');
+                    $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+                        $(this).val('');
+                    }).val('Email sent');
+                } else {
+                    OC.dialogs.alert(result.data.message, 'Error while sharing');
+                }
+            });
+        }
+    });
+
 
 });
\ No newline at end of file
diff --git a/core/css/share.css b/core/css/share.css
index 5aca731356a..e806d25982e 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -50,11 +50,17 @@
  	padding-top:.5em;
  }
 
- #dropdown input[type="text"],#dropdown input[type="password"] {
- 	width:90%;
- }
+#dropdown input[type="text"],#dropdown input[type="password"] {
+    width:90%;
+}
+
+#dropdown form {
+    font-size: 100%;
+    margin-left: 0;
+    margin-right: 0;
+}
 
- #linkText,#linkPass,#expiration {
+#linkText,#linkPass,#expiration {
  	display:none;
  }
 
diff --git a/core/js/share.js b/core/js/share.js
index 475abb58bff..962983e2f35 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -168,6 +168,10 @@ OC.Share={
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
 				html += '</div>';
+                html += '<form id="emailPrivateLink" >';
+                html += '<input id="email" style="display:none; width:65%;" 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>';
@@ -349,13 +353,17 @@ OC.Share={
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
+        $('#emailPrivateLink #email').show();
+        $('#emailPrivateLink #emailButton').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
 		$('#linkPass').hide();
-	},
-	dirname:function(path) {
+        $('#emailPrivateLink #email').hide();
+        $('#emailPrivateLink #emailButton').hide();
+    },
+ 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
 	showExpirationDate:function(date) {
-- 
cgit v1.2.3


From 162a2c0fba6f7d7be3aa2372554e4a77a70a3e00 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 10 Dec 2012 23:22:42 +0100
Subject: moving sharing email code to core

---
 apps/files_sharing/ajax/email.php | 39 ---------------------------------------
 apps/files_sharing/js/share.js    | 26 +-------------------------
 core/ajax/share.php               | 36 ++++++++++++++++++++++++++++++++++++
 core/js/share.js                  | 23 +++++++++++++++++++++++
 4 files changed, 60 insertions(+), 64 deletions(-)
 delete mode 100644 apps/files_sharing/ajax/email.php

(limited to 'core/js/share.js')

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
deleted file mode 100644
index 4ed4eef723a..00000000000
--- a/apps/files_sharing/ajax/email.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-OCP\JSON::checkAppEnabled('files_sharing');
-
-// read post variables
-$user = OCP\USER::getUser();
-$type = $_POST['type'];
-$link = $_POST['link'];
-$file = $_POST['file'];
-$to_address = $_POST['toaddress'];
-
-// enable l10n support
-$l = OC_L10N::get('files_sharing');
-
-// setup the email
-$subject = (string)$l->t('User %s shared a file with you', $user);
-if ($type === 'dir')
-	$subject = (string)$l->t('User %s shared a folder with you', $user);
-
-$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
-if ($type === 'dir')
-	$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
-
-// handle localhost installations
-$server_host = OCP\Util::getServerHost();
-if ($server_host === 'localhost')
-	$server_host = "example.com";
-
-$default_from = 'sharing-noreply@' . $server_host;
-$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
-
-// send it out now
-try {
-	OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
-	OCP\JSON::success();
-} catch (Exception $exception) {
-	OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
-}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index a83252867a9..8a546d62163 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -33,28 +33,4 @@ $(document).ready(function() {
 		});
 		OC.Share.loadIcons('file');
 	}
-
-    $('#emailPrivateLink').live('submit', function(event) {
-        event.preventDefault();
-        var link = $('#linkText').val();
-        var itemType = $('#dropdown').data('item-type');
-        var itemSource = $('#dropdown').data('item-source');
-
-        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-        var email = $('#email').val();
-        if (email != '') {
-            $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, type: itemType, file: file }, function(result) {
-                if (result && result.status == 'success') {
-                    $('#email').css('font-weight', 'bold');
-                    $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-                        $(this).val('');
-                    }).val('Email sent');
-                } else {
-                    OC.dialogs.alert(result.data.message, 'Error while sharing');
-                }
-            });
-        }
-    });
-
-
-});
\ No newline at end of file
+});
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 41832a3c659..12206e0fd79 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -69,6 +69,42 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
+		case 'email':
+			// read post variables
+			$user = OCP\USER::getUser();
+			$type = $_POST['itemType'];
+			$link = $_POST['link'];
+			$file = $_POST['file'];
+			$to_address = $_POST['toaddress'];
+
+			// enable l10n support
+			$l = OC_L10N::get('core');
+
+			// setup the email
+			$subject = (string)$l->t('User %s shared a file with you', $user);
+			if ($type === 'dir')
+				$subject = (string)$l->t('User %s shared a folder with you', $user);
+
+			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
+			if ($type === 'dir')
+				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
+
+			// handle localhost installations
+			$server_host = OCP\Util::getServerHost();
+			if ($server_host === 'localhost')
+				$server_host = "example.com";
+
+			$default_from = 'sharing-noreply@' . $server_host;
+			$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
+
+			// send it out now
+			try {
+				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
+				OCP\JSON::success();
+			} catch (Exception $exception) {
+				OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+			}
+			break;
 	}
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
diff --git a/core/js/share.js b/core/js/share.js
index 962983e2f35..9f71f1bb66b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -555,4 +555,27 @@ $(document).ready(function() {
 		});
 	});
 
+
+    $('#emailPrivateLink').live('submit', function(event) {
+        event.preventDefault();
+        var link = $('#linkText').val();
+        var itemType = $('#dropdown').data('item-type');
+        var itemSource = $('#dropdown').data('item-source');
+        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+        var email = $('#email').val();
+        if (email != '') {
+            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file}, function(result) {
+                if (result && result.status == 'success') {
+                    $('#email').css('font-weight', 'bold');
+                    $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+                        $(this).val('');
+                    }).val(t('core','Email sent'));
+                } else {
+                    OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+                }
+            });
+        }
+    });
+
+
 });
-- 
cgit v1.2.3


From c938a4f791182d86045a45bcffda37c1b6e651f8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 12 Dec 2012 12:34:28 +0100
Subject: feedback to the user while request is being processed

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 9f71f1bb66b..df5ebf008b4 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -170,7 +170,7 @@ OC.Share={
 				html += '</div>';
                 html += '<form id="emailPrivateLink" >';
                 html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-                html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
+                html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
                 html += '</form>';
 			}
 			html += '<div id="expiration">';
@@ -564,7 +564,14 @@ $(document).ready(function() {
         var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
         var email = $('#email').val();
         if (email != '') {
-            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file}, function(result) {
+            $('#email').attr('disabled', "disabled");
+            $('#email').val(t('core', 'Sending ...'));
+            $('#emailButton').attr('disabled', "disabled");
+
+            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file},
+                function(result) {
+                    $('#email').attr('disabled', "false");
+                    $('#emailButton').attr('disabled', "false");
                 if (result && result.status == 'success') {
                     $('#email').css('font-weight', 'bold');
                     $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-- 
cgit v1.2.3


From 1dd79cc8e16f2972b8a8fea03f4e8ecfc1db5ac9 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Tue, 4 Dec 2012 14:06:44 +0100
Subject: set password for shared links when the user press enter and when he
 leaves the password field

---
 core/js/share.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index df5ebf008b4..984fce047b8 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -520,16 +520,26 @@ $(document).ready(function() {
 		$('#linkPass').toggle('blind');
 	});
 
-	$('#linkPassText').live('focusout', function(event) {
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
-			$('#linkPassText').val('');
-			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
-		});
-		$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+	$('#linkPassText').live('focusout keyup', function(event) {
+		if ( event.type == 'focusout' || event.keyCode == 13 ) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			if ( $('#linkPassText').attr('passwordChanged') == 'true' ) {
+				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+					$('#linkPassText').val('');
+					$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+					$('#linkPassText').attr('passwordChanged', 'false');
+				});
+			}
+		}
 	});
 
+	$('#linkPassText').live('focusout keyup', function(event) {
+		if ( event.keyCode != 13 ) {
+			$('#linkPassText').attr('passwordChanged', 'true');	
+		}
+	});
+	
 	$('#expirationCheckbox').live('click', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
-- 
cgit v1.2.3


From c457e15b201632bec5f0ad0030f7e0259485b0e0 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 5 Dec 2012 14:17:21 +0100
Subject: some more usability improvements:

merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
---
 core/js/share.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 984fce047b8..c218c2c1233 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -161,9 +161,9 @@ OC.Share={
 			if (link) {
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
-				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
 				html += '<br />';
 				html += '<input id="linkText" type="text" readonly="readonly" />';
+				html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
@@ -347,9 +347,12 @@ OC.Share={
 		}
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
+		$('#linkText').css('display','block');
 		$('#showPassword').show();
+		$('#showPassword+label').show();
 		if (password != null) {
 			$('#linkPass').show('blind');
+			$('#showPassword').attr('checked', true);
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
@@ -359,6 +362,7 @@ OC.Share={
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
+		$('#showPassword+label').hide();
 		$('#linkPass').hide();
         $('#emailPrivateLink #email').hide();
         $('#emailPrivateLink #emailButton').hide();
@@ -518,6 +522,11 @@ $(document).ready(function() {
 
 	$('#showPassword').live('click', function() {
 		$('#linkPass').toggle('blind');
+		if (!$('#showPassword').is(':checked') ) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+		}
 	});
 
 	$('#linkPassText').live('focusout keyup', function(event) {
-- 
cgit v1.2.3


From d873f0da3500e1f9eef89d4b73ec635f9c927636 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Fri, 14 Dec 2012 13:13:01 +0100
Subject: autofocus to password input after clicking the checkbox; code
 restructured; debug output added

---
 core/js/share.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index c218c2c1233..98ceceb3a49 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -526,29 +526,23 @@ $(document).ready(function() {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
 			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+		} else {
+			$('#linkPassText').focus();
 		}
 	});
 
 	$('#linkPassText').live('focusout keyup', function(event) {
-		if ( event.type == 'focusout' || event.keyCode == 13 ) {
+		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
-			if ( $('#linkPassText').attr('passwordChanged') == 'true' ) {
-				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
-					$('#linkPassText').val('');
-					$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
-					$('#linkPassText').attr('passwordChanged', 'false');
-				});
-			}
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+				console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
+				$('#linkPassText').val('');
+				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+			});
 		}
 	});
 
-	$('#linkPassText').live('focusout keyup', function(event) {
-		if ( event.keyCode != 13 ) {
-			$('#linkPassText').attr('passwordChanged', 'true');	
-		}
-	});
-	
 	$('#expirationCheckbox').live('click', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
-- 
cgit v1.2.3


From 3adfb91ad895dc9371834c0e42cfd3605fdd7054 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Fri, 14 Dec 2012 13:25:57 +0100
Subject: call the password input field by name

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 98ceceb3a49..bb3ec010ff5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -535,7 +535,7 @@ $(document).ready(function() {
 		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
 				console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
 				$('#linkPassText').val('');
 				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
-- 
cgit v1.2.3


From a606e8d944f7c2754f00e9c50804b8c2beedc986 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Fri, 25 Jan 2013 17:40:23 +0100
Subject: use display name to show share_width and owner information

---
 core/js/share.js     | 18 +++++++++---------
 lib/public/share.php |  9 +++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index bb3ec010ff5..1486d7f1773 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -148,9 +148,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.uid_owner})+'</span>';
+				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>';
 			} else {
-				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.uid_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner})+'</span>';
 			}
 			html += '<br />';
 		}
@@ -186,9 +186,9 @@ OC.Share={
 						OC.Share.showLink(share.token, share.share_with, itemSource);
 					} else {
 						if (share.collection) {
-							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
+							OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.collection);
 						} else {
-							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false);
+							OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname,  share.permissions, possiblePermissions, false);
 						}
 					}
 					if (share.expiration != null) {
@@ -228,7 +228,7 @@ OC.Share={
 				// Default permissions are Read and Share
 				var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
 				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
-					OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
+					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
 					$('#shareWith').val('');
 					OC.Share.updateIcon(itemType, itemSource);
 				});
@@ -257,7 +257,7 @@ OC.Share={
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, permissions, possiblePermissions, collection) {
+	addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, collection) {
 		if (!OC.Share.itemShares[shareType]) {
 			OC.Share.itemShares[shareType] = [];
 		}
@@ -272,7 +272,7 @@ OC.Share={
 			if (collectionList.length > 0) {
 				$(collectionList).append(', '+shareWith);
 			} else {
-				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWith})+'</li>';
+				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+'</li>';
 				$('#shareWithList').prepend(html);
 			}
 		} else {
@@ -295,9 +295,9 @@ OC.Share={
 			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'" title="' + shareWith + '">';
 			html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
 			if(shareWith.length > 14){
-				html += shareWith.substr(0,11) + '...';
+				html += shareWithDisplayName.substr(0,11) + '...';
 			}else{
-				html += shareWith;
+				html += shareWithDisplayName;
 			}
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				if (editChecked == '') {
diff --git a/lib/public/share.php b/lib/public/share.php
index cda583aa073..e1d77e652d5 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -946,6 +946,15 @@ class Share {
 					continue;
 				}
 			}
+
+			// Add display names to result
+			if ( isset($row['share_with']) && $row['share_with'] != '') {
+				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
+			}
+			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
+				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
+			}
+			
 			$items[$row['id']] = $row;
 		}
 		if (!empty($items)) {
-- 
cgit v1.2.3


From 31ebea0f6a9f6e26068b819d7d5989bf42a518af Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 26 Jan 2013 13:25:15 -0500
Subject: Permanently display shared status icons

---
 core/css/styles.css |  4 ++--
 core/js/share.js    | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index 022acab4d8a..7fb800f79e2 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -195,8 +195,8 @@ fieldset.warning legend { color:#b94a48 !important; }
 #notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 #notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
-tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
-tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
+tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
+tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
 tr .action { width:16px; height:16px; }
 .header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
 tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
diff --git a/core/js/share.js b/core/js/share.js
index bb3ec010ff5..d404b910e48 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -23,7 +23,9 @@ OC.Share={
 					} else {
 						var file = $('tr').filterAttr('data-file', OC.basename(item));
 						if (file.length > 0) {
-							$(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img').attr('src', image);
+							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+							action.find('img').attr('src', image);
+							action.addClass('permanent');
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -32,9 +34,11 @@ OC.Share={
 							// Search for possible parent folders that are shared
 							while (path != last) {
 								if (path == item) {
-									var img = $('.fileactions .action').filterAttr('data-action', 'Share').find('img');
+									var action = $('.fileactions .action').filterAttr('data-action', 'Share');
+									var img = action.find('img');
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
+										action.addClass('permanent');
 									}
 								}
 								last = path;
@@ -48,7 +52,8 @@ OC.Share={
 	},
 	updateIcon:function(itemType, itemSource) {
 		if (itemType == 'file' || itemType == 'folder') {
-			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+			var file = $('tr').filterAttr('data-id', String(itemSource));
+			var filename = file.data('file');
 			if ($('#dir').val() == '/') {
 				itemSource = $('#dir').val() + filename;
 			} else {
@@ -75,6 +80,14 @@ OC.Share={
 		});
 		if (itemType != 'file' && itemType != 'folder') {
 			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
+		} else {
+			var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+			action.find('img').attr('src', image);
+			if (shares) {
+				action.addClass('permanent');
+			} else {
+				action.removeClass('permanent');
+			}
 		}
 		if (shares) {
 			OC.Share.statuses[itemSource] = link;
-- 
cgit v1.2.3


From ede7fccb004ed5e8fba95fb0ca90b8ba773aa56f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 28 Jan 2013 23:13:38 -0500
Subject: Change file action text to 'Shared'

---
 core/js/share.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index d404b910e48..1e3a34b7452 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -26,6 +26,7 @@ OC.Share={
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
 							action.find('img').attr('src', image);
 							action.addClass('permanent');
+							action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -85,8 +86,10 @@ OC.Share={
 			action.find('img').attr('src', image);
 			if (shares) {
 				action.addClass('permanent');
+				action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
 			} else {
 				action.removeClass('permanent');
+				action.html(action.html().replace(t('core', 'Shared'), t('core', 'Share')));
 			}
 		}
 		if (shares) {
-- 
cgit v1.2.3


From ed2ee8c411cdae7679944a8b6aac05425a51faed Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 28 Jan 2013 23:16:29 -0500
Subject: Change file action text for files inside shared folders as well

---
 core/js/share.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 1e3a34b7452..b9b7201dd8b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -40,6 +40,7 @@ OC.Share={
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										action.addClass('permanent');
+										action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
 									}
 								}
 								last = path;
-- 
cgit v1.2.3


From 22812c5f0dc57b1598912cf51fd1e5b721519f2d Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Fri, 18 Jan 2013 22:38:44 +0100
Subject: replace live() with on() in core js

---
 apps/files/js/filelist.js          |  8 ++++----
 apps/files/js/files.js             |  6 +++---
 apps/files_external/js/dropbox.js  |  4 ++--
 apps/files_external/js/google.js   |  6 +++---
 apps/files_external/js/settings.js |  6 +++---
 core/js/oc-vcategories.js          |  4 ++--
 core/js/share.js                   | 26 +++++++++++++-------------
 settings/js/users.js               | 16 ++++++++--------
 8 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'core/js/share.js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 04b7d92e2c3..57c281f2fdc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -335,7 +335,7 @@ var FileList={
 
 $(document).ready(function(){
 	$('#notification').hide();
-	$('#notification .undo').live('click', function(){
+	$('#notification').on('click', '.undo', function(){
 		if (FileList.deleteFiles) {
 			$.each(FileList.deleteFiles,function(index,file){
 				$('tr').filterAttr('data-file',file).show();
@@ -361,16 +361,16 @@ $(document).ready(function(){
 		FileList.lastAction = null;
         OC.Notification.hide();
 	});
-	$('#notification .replace').live('click', function() {
+	$('#notification').on('click', '.replace', function() {
         OC.Notification.hide(function() {
             FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
         });
 	});
-	$('#notification .suggest').live('click', function() {
+	$('#notification').on('click', '.suggest', function() {
 		$('tr').filterAttr('data-file', $('#notification').data('oldName')).show();
         OC.Notification.hide();
 	});
-	$('#notification .cancel').live('click', function() {
+	$('#notification').on('click', '.cancel', function() {
 		if ($('#notification').data('isNewFile')) {
 			FileList.deleteCanceled = false;
 			FileList.deleteFiles = [$('#notification').data('oldName')];
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c817d8431e2..9fd9b73a947 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -110,7 +110,7 @@ $(document).ready(function() {
 	}
 
 	// Triggers invisible file input
-	$('#upload a').live('click', function() {
+	$('#upload a').on('click', function() {
 		$(this).parent().children('#file_upload_start').trigger('click');
 		return false;
 	});
@@ -118,7 +118,7 @@ $(document).ready(function() {
 	var lastChecked;
 
 	// Sets the file link behaviour :
-	$('td.filename a').live('click',function(event) {
+	$('td.filename').on('click','a',function(event) {
 		if (event.ctrlKey || event.shiftKey) {
 			event.preventDefault();
 			if (event.shiftKey) {
@@ -184,7 +184,7 @@ $(document).ready(function() {
 		procesSelection();
 	});
 
-	$('td.filename input:checkbox').live('change',function(event) {
+	$('#fileList').on('change', 'td.filename input:checkbox',function(event) {
 		if (event.shiftKey) {
 			var last = $(lastChecked).parent().parent().prevAll().length;
 			var first = $(this).parent().parent().prevAll().length;
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index c1e38640708..930d786c543 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -36,7 +36,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage tbody tr input').live('keyup', function() {
+	$('#externalStorage tbody').on('keyup', 'tr input', function() {
 		var tr = $(this).parent().parent();
 		if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') {
 			var config = $(tr).find('.configuration');
@@ -52,7 +52,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('.dropbox').live('click', function(event) {
+	$('.dropbox').on('click', function(event) {
 		event.preventDefault();
 		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
 		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 0b3c314eb5d..d26dc7f0014 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -33,7 +33,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage tbody tr').live('change', function() {
+	$('#externalStorage tbody').on('change', 'tr', function() {
 		if ($(this).hasClass('OC_Filestorage_Google') && $(this).find('[data-parameter="configured"]').val() != 'true') {
 			if ($(this).find('.mountPoint input').val() != '') {
 				if ($(this).find('.google').length == 0) {
@@ -43,7 +43,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage tbody tr .mountPoint input').live('keyup', function() {
+	$('#externalStorage tbody').on('keyup', 'tr .mountPoint input', function() {
 		var tr = $(this).parent().parent();
 		if ($(tr).hasClass('OC_Filestorage_Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) {
 			if ($(this).val() != '') {
@@ -54,7 +54,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('.google').live('click', function(event) {
+	$('.google').on('click', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var configured = $(this).parent().find('[data-parameter="configured"]');
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 0dc983ca8ad..75604ca4530 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -71,7 +71,7 @@ OC.MountConfig={
 $(document).ready(function() {
 	$('.chzn-select').chosen();
 
-	$('#selectBackend').live('change', function() {
+	$('#selectBackend').on('change', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
 		$('#externalStorage tbody tr').last().find('.mountPoint input').val('');
@@ -135,11 +135,11 @@ $(document).ready(function() {
 		return defaultMountPoint+append;
 	}
 
-	$('#externalStorage td').live('change', function() {
+	$('#externalStorage').on('change', 'td', function() {
 		OC.MountConfig.saveStorage($(this).parent());
 	});
 
-	$('td.remove>img').live('click', function() {
+	$('td.remove>img').on('click', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if ( ! mountPoint) {
diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
index 609703f2cc9..3e75767c49c 100644
--- a/core/js/oc-vcategories.js
+++ b/core/js/oc-vcategories.js
@@ -50,7 +50,7 @@ var OCCategories= {
 							$('#category_dialog').remove();
 						},
 						open : function(event, ui) {
-							$('#category_addinput').live('input',function() {
+							$('#category_addinput').on('input',function() {
 								if($(this).val().length > 0) {
 									$('#category_addbutton').removeAttr('disabled');
 								}
@@ -61,7 +61,7 @@ var OCCategories= {
 								$('#category_addbutton').attr('disabled', 'disabled');
 								return false;
 							});
-							$('#category_addbutton').live('click',function(e) {
+							$('#category_addbutton').on('click',function(e) {
 								e.preventDefault();
 								if($('#category_addinput').val().length > 0) {
 									OCCategories.add($('#category_addinput').val());
diff --git a/core/js/share.js b/core/js/share.js
index 0c45765bd8b..f42124d0e00 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -410,7 +410,7 @@ $(document).ready(function() {
 		firstDay: firstDay
 	});
   }
-	$('a.share').live('click', function(event) {
+	$('a.share').on('click', function(event) {
 		event.stopPropagation();
 		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
 			var itemType = $(this).data('item-type');
@@ -444,12 +444,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#shareWithList li').live('mouseenter', function(event) {
+	$('#shareWithList').on('mouseenter', 'li', function(event) {
 		// Show permissions and unshare button
 		$(':hidden', this).filter(':not(.cruds)').show();
 	});
 
-	$('#shareWithList li').live('mouseleave', function(event) {
+	$('#shareWithList').on('mouseleave', 'li', function(event) {
 		// Hide permissions and unshare button
 		if (!$('.cruds', this).is(':visible')) {
 			$('a', this).hide();
@@ -462,11 +462,11 @@ $(document).ready(function() {
 		}
 	});
 
-	$('.showCruds').live('click', function() {
+	$('.showCruds').on('click', function() {
 		$(this).parent().find('.cruds').toggle();
 	});
 
-	$('.unshare').live('click', function() {
+	$('.unshare').on('click', function() {
 		var li = $(this).parent();
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
@@ -483,7 +483,7 @@ $(document).ready(function() {
 		});
 	});
 
-	$('.permissions').live('change', function() {
+	$('.permissions').on('change', function() {
 		if ($(this).attr('name') == 'edit') {
 			var li = $(this).parent().parent()
 			var checkboxes = $('.permissions', li);
@@ -510,7 +510,7 @@ $(document).ready(function() {
 		OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions);
 	});
 
-	$('#linkCheckbox').live('change', function() {
+	$('#linkCheckbox').on('change', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
@@ -532,12 +532,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#linkText').live('click', function() {
+	$('#linkText').on('click', function() {
 		$(this).focus();
 		$(this).select();
 	});
 
-	$('#showPassword').live('click', function() {
+	$('#showPassword').on('click', function() {
 		$('#linkPass').toggle('blind');
 		if (!$('#showPassword').is(':checked') ) {
 			var itemType = $('#dropdown').data('item-type');
@@ -548,7 +548,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#linkPassText').live('focusout keyup', function(event) {
+	$('#linkPassText').on('focusout keyup', function(event) {
 		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
@@ -560,7 +560,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#expirationCheckbox').live('click', function() {
+	$('#expirationCheckbox').on('click', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
 		} else {
@@ -575,7 +575,7 @@ $(document).ready(function() {
 		}
 	});
 	
-	$('#expirationDate').live('change', function() {
+	$('#expirationDate').on('change', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
@@ -586,7 +586,7 @@ $(document).ready(function() {
 	});
 
 
-    $('#emailPrivateLink').live('submit', function(event) {
+    $('#emailPrivateLink').on('submit', function(event) {
         event.preventDefault();
         var link = $('#linkText').val();
         var itemType = $('#dropdown').data('item-type');
diff --git a/settings/js/users.js b/settings/js/users.js
index 424d00b51a7..0ee813f4cb3 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -262,7 +262,7 @@ $(document).ready(function () {
         UserList.applyMultiplySelect($(element));
     });
 
-    $('td.remove>a').live('click', function (event) {
+    $('table').on('click', 'td.remove>a', function (event) {
         var row = $(this).parent().parent();
         var uid = $(row).attr('data-uid');
         $(row).hide();
@@ -270,7 +270,7 @@ $(document).ready(function () {
         UserList.do_delete(uid);
     });
 
-    $('td.password>img').live('click', function (event) {
+    $('table').on('click', 'td.password>img', function (event) {
         event.stopPropagation();
         var img = $(this);
         var uid = img.parent().parent().attr('data-uid');
@@ -298,11 +298,11 @@ $(document).ready(function () {
             img.css('display', '');
         });
     });
-    $('td.password').live('click', function (event) {
+    $('table').on('click', 'td.password', function (event) {
         $(this).children('img').click();
     });
     
-    $('td.displayName>img').live('click', function (event) {
+    $('table').on('click', 'td.displayName>img', function (event) {
         event.stopPropagation();
         var img = $(this);
         var uid = img.parent().parent().attr('data-uid');
@@ -336,7 +336,7 @@ $(document).ready(function () {
     });
     
 
-    $('select.quota, select.quota-user').live('change', function () {
+    $('select.quota, select.quota-user').on('change', function () {
         var select = $(this);
         var uid = $(this).parent().parent().parent().attr('data-uid');
         var quota = $(this).val();
@@ -355,7 +355,7 @@ $(document).ready(function () {
         $(select).data('previous', $(select).val());
     })
 
-    $('input.quota-other').live('change', function () {
+    $('input.quota-other').on('change', function () {
         var uid = $(this).parent().parent().parent().attr('data-uid');
         var quota = $(this).val();
         var select = $(this).prev();
@@ -391,7 +391,7 @@ $(document).ready(function () {
         }
     });
 
-    $('input.quota-other').live('blur', function () {
+    $('input.quota-other').on('blur', function () {
         $(this).change();
     })
 
@@ -438,7 +438,7 @@ $(document).ready(function () {
     });
     // Handle undo notifications
     OC.Notification.hide();
-    $('#notification .undo').live('click', function () {
+    $('#notification').on('click', '.undo', function () {
         if ($('#notification').data('deleteuser')) {
             $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
             UserList.deleteCanceled = true;
-- 
cgit v1.2.3


From d7823adb07072cfcfea746f2bb13ba4bdcc281f3 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Wed, 30 Jan 2013 17:46:33 +0100
Subject: attach to filelist which is present on .ready()

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index f42124d0e00..6ad4130690d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -410,7 +410,7 @@ $(document).ready(function() {
 		firstDay: firstDay
 	});
   }
-	$('a.share').on('click', function(event) {
+	$('#fileList').on('click', 'a.share', function(event) {
 		event.stopPropagation();
 		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
 			var itemType = $(this).data('item-type');
@@ -444,12 +444,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#shareWithList').on('mouseenter', 'li', function(event) {
+	$('#fileList').on('mouseenter', '#dropdown #shareWithList li', function(event) {
 		// Show permissions and unshare button
 		$(':hidden', this).filter(':not(.cruds)').show();
 	});
 
-	$('#shareWithList').on('mouseleave', 'li', function(event) {
+	$('#fileList').on('mouseleave', '#dropdown #shareWithList li', function(event) {
 		// Hide permissions and unshare button
 		if (!$('.cruds', this).is(':visible')) {
 			$('a', this).hide();
@@ -462,11 +462,11 @@ $(document).ready(function() {
 		}
 	});
 
-	$('.showCruds').on('click', function() {
+	$('#fileList').on('click', '#dropdown .showCruds', function() {
 		$(this).parent().find('.cruds').toggle();
 	});
 
-	$('.unshare').on('click', function() {
+	$('#fileList').on('click', '#dropdown .unshare', function() {
 		var li = $(this).parent();
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
@@ -483,7 +483,7 @@ $(document).ready(function() {
 		});
 	});
 
-	$('.permissions').on('change', function() {
+	$('#fileList').on('change', '#dropdown .permissions', function() {
 		if ($(this).attr('name') == 'edit') {
 			var li = $(this).parent().parent()
 			var checkboxes = $('.permissions', li);
@@ -510,7 +510,7 @@ $(document).ready(function() {
 		OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions);
 	});
 
-	$('#linkCheckbox').on('change', function() {
+	$('#fileList').on('change', '#dropdown #linkCheckbox', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
@@ -532,12 +532,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#linkText').on('click', function() {
+	$('#fileList').on('click', '#dropdown #linkText', function() {
 		$(this).focus();
 		$(this).select();
 	});
 
-	$('#showPassword').on('click', function() {
+	$('#fileList').on('click', '#dropdown #showPassword', function() {
 		$('#linkPass').toggle('blind');
 		if (!$('#showPassword').is(':checked') ) {
 			var itemType = $('#dropdown').data('item-type');
@@ -548,7 +548,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#linkPassText').on('focusout keyup', function(event) {
+	$('#fileList').on('focusout keyup', '#dropdown #linkPassText', function(event) {
 		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
@@ -560,7 +560,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#expirationCheckbox').on('click', function() {
+	$('#fileList').on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
 		} else {
@@ -575,7 +575,7 @@ $(document).ready(function() {
 		}
 	});
 	
-	$('#expirationDate').on('change', function() {
+	$('#fileList').on('change', '#dropdown #expirationDate', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
@@ -586,7 +586,7 @@ $(document).ready(function() {
 	});
 
 
-    $('#emailPrivateLink').on('submit', function(event) {
+    $('#fileList').on('submit', '#dropdown #emailPrivateLink', function(event) {
         event.preventDefault();
         var link = $('#linkText').val();
         var itemType = $('#dropdown').data('item-type');
-- 
cgit v1.2.3


From 43ffb5945ce6713a19a3548ec575251e3f9a5aee Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Fri, 8 Feb 2013 11:05:56 +0100
Subject: attach handlers to document instead of filelist, minor whitespace
 cleanups

---
 core/js/share.js | 131 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 71 insertions(+), 60 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 6ad4130690d..58cb787b6d1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -185,10 +185,10 @@ OC.Share={
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
 				html += '</div>';
-                html += '<form id="emailPrivateLink" >';
-                html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-                html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
-                html += '</form>';
+				html += '<form id="emailPrivateLink" >';
+				html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
+				html += '<input id="emailButton" style="display:none; float:right;" 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>';
@@ -373,18 +373,18 @@ OC.Share={
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
-        $('#emailPrivateLink #email').show();
-        $('#emailPrivateLink #emailButton').show();
+		$('#emailPrivateLink #email').show();
+		$('#emailPrivateLink #emailButton').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
 		$('#showPassword+label').hide();
 		$('#linkPass').hide();
-        $('#emailPrivateLink #email').hide();
-        $('#emailPrivateLink #emailButton').hide();
-    },
- 	dirname:function(path) {
+		$('#emailPrivateLink #email').hide();
+		$('#emailPrivateLink #emailButton').hide();
+	},
+	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
 	showExpirationDate:function(date) {
@@ -401,16 +401,16 @@ OC.Share={
 $(document).ready(function() {
 	
 	if(typeof monthNames != 'undefined'){
-	$.datepicker.setDefaults({
-		monthNames: monthNames,
-		monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
-		dayNames: dayNames,
-		dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
-		dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
-		firstDay: firstDay
-	});
-  }
-	$('#fileList').on('click', 'a.share', function(event) {
+		$.datepicker.setDefaults({
+			monthNames: monthNames,
+			monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
+			dayNames: dayNames,
+			dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
+			dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
+			firstDay: firstDay
+		});
+	}
+	$(document).on('click', 'a.share', function(event) {
 		event.stopPropagation();
 		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
 			var itemType = $(this).data('item-type');
@@ -444,12 +444,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('mouseenter', '#dropdown #shareWithList li', function(event) {
+	$(document).on('mouseenter', '#dropdown #shareWithList li', function(event) {
 		// Show permissions and unshare button
 		$(':hidden', this).filter(':not(.cruds)').show();
 	});
 
-	$('#fileList').on('mouseleave', '#dropdown #shareWithList li', function(event) {
+	$(document).on('mouseleave', '#dropdown #shareWithList li', function(event) {
 		// Hide permissions and unshare button
 		if (!$('.cruds', this).is(':visible')) {
 			$('a', this).hide();
@@ -462,11 +462,11 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('click', '#dropdown .showCruds', function() {
+	$(document).on('click', '#dropdown .showCruds', function() {
 		$(this).parent().find('.cruds').toggle();
 	});
 
-	$('#fileList').on('click', '#dropdown .unshare', function() {
+	$(document).on('click', '#dropdown .unshare', function() {
 		var li = $(this).parent();
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
@@ -483,7 +483,7 @@ $(document).ready(function() {
 		});
 	});
 
-	$('#fileList').on('change', '#dropdown .permissions', function() {
+	$(document).on('change', '#dropdown .permissions', function() {
 		if ($(this).attr('name') == 'edit') {
 			var li = $(this).parent().parent()
 			var checkboxes = $('.permissions', li);
@@ -496,10 +496,17 @@ $(document).ready(function() {
 			var li = $(this).parent().parent().parent();
 			var checkboxes = $('.permissions', li);
 			// Uncheck Edit if Create, Update, and Delete are not checked
-			if (!$(this).is(':checked') && !$(checkboxes).filter('input[name="create"]').is(':checked') && !$(checkboxes).filter('input[name="update"]').is(':checked') && !$(checkboxes).filter('input[name="delete"]').is(':checked')) {
+			if (!$(this).is(':checked')
+				&& !$(checkboxes).filter('input[name="create"]').is(':checked')
+				&& !$(checkboxes).filter('input[name="update"]').is(':checked')
+				&& !$(checkboxes).filter('input[name="delete"]').is(':checked'))
+			{
 				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
 			// Check Edit if Create, Update, or Delete is checked
-			} else if (($(this).attr('name') == 'create' || $(this).attr('name') == 'update' || $(this).attr('name') == 'delete')) {
+			} else if (($(this).attr('name') == 'create'
+					 || $(this).attr('name') == 'update'
+					 || $(this).attr('name') == 'delete'))
+			{
 				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
 			}
 		}
@@ -507,10 +514,14 @@ $(document).ready(function() {
 		$(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
 			permissions |= $(checkbox).data('permissions');
 		});
-		OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions);
+		OC.Share.setPermissions($('#dropdown').data('item-type'),
+			$('#dropdown').data('item-source'),
+			$(li).data('share-type'),
+			$(li).data('share-with'),
+			permissions);
 	});
 
-	$('#fileList').on('change', '#dropdown #linkCheckbox', function() {
+	$(document).on('change', '#dropdown #linkCheckbox', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
@@ -532,12 +543,12 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('click', '#dropdown #linkText', function() {
+	$(document).on('click', '#dropdown #linkText', function() {
 		$(this).focus();
 		$(this).select();
 	});
 
-	$('#fileList').on('click', '#dropdown #showPassword', function() {
+	$(document).on('click', '#dropdown #showPassword', function() {
 		$('#linkPass').toggle('blind');
 		if (!$('#showPassword').is(':checked') ) {
 			var itemType = $('#dropdown').data('item-type');
@@ -548,7 +559,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('focusout keyup', '#dropdown #linkPassText', function(event) {
+	$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
 		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
@@ -560,7 +571,7 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#fileList').on('click', '#dropdown #expirationCheckbox', function() {
+	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
 		} else {
@@ -575,7 +586,7 @@ $(document).ready(function() {
 		}
 	});
 	
-	$('#fileList').on('change', '#dropdown #expirationDate', function() {
+	$(document).on('change', '#dropdown #expirationDate', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
@@ -586,33 +597,33 @@ $(document).ready(function() {
 	});
 
 
-    $('#fileList').on('submit', '#dropdown #emailPrivateLink', function(event) {
-        event.preventDefault();
-        var link = $('#linkText').val();
-        var itemType = $('#dropdown').data('item-type');
-        var itemSource = $('#dropdown').data('item-source');
-        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-        var email = $('#email').val();
-        if (email != '') {
-            $('#email').attr('disabled', "disabled");
-            $('#email').val(t('core', 'Sending ...'));
-            $('#emailButton').attr('disabled', "disabled");
+	$(document).on('submit', '#dropdown #emailPrivateLink', function(event) {
+		event.preventDefault();
+		var link = $('#linkText').val();
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+		var email = $('#email').val();
+		if (email != '') {
+			$('#email').attr('disabled', "disabled");
+			$('#email').val(t('core', 'Sending ...'));
+			$('#emailButton').attr('disabled', "disabled");
 
-            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file},
-                function(result) {
-                    $('#email').attr('disabled', "false");
-                    $('#emailButton').attr('disabled', "false");
-                if (result && result.status == 'success') {
-                    $('#email').css('font-weight', 'bold');
-                    $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-                        $(this).val('');
-                    }).val(t('core','Email sent'));
-                } else {
-                    OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
-                }
-            });
-        }
-    });
+			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file},
+				function(result) {
+					$('#email').attr('disabled', "false");
+					$('#emailButton').attr('disabled', "false");
+				if (result && result.status == 'success') {
+					$('#email').css('font-weight', 'bold');
+					$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+						$(this).val('');
+					}).val(t('core','Email sent'));
+				} else {
+					OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+				}
+			});
+		}
+	});
 
 
 });
-- 
cgit v1.2.3


From 45ed0c601003b1f2ebd9e5bb301080b37d43080e Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Mon, 11 Feb 2013 15:37:01 +0100
Subject: if you add/remove more than one user from the share dialog replacing
 'Share' with 'Shared' will lead to a string with more and more trailing 'd's

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 58cb787b6d1..6d1c3954044 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -26,7 +26,7 @@ OC.Share={
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
 							action.find('img').attr('src', image);
 							action.addClass('permanent');
-							action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
+							action.html(t('core', 'Shared'));
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -40,7 +40,7 @@ OC.Share={
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										action.addClass('permanent');
-										action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
+										action.html(t('core', 'Shared'));
 									}
 								}
 								last = path;
@@ -87,10 +87,10 @@ OC.Share={
 			action.find('img').attr('src', image);
 			if (shares) {
 				action.addClass('permanent');
-				action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
+				action.html(t('core', 'Shared'));
 			} else {
 				action.removeClass('permanent');
-				action.html(action.html().replace(t('core', 'Shared'), t('core', 'Share')));
+				action.html(t('core', 'Share'));
 			}
 		}
 		if (shares) {
-- 
cgit v1.2.3


From d8e8dab0066439414f282fa15dd1d9d3b851c310 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 20 Feb 2013 21:37:23 +0530
Subject: Fixes the Email Button and the email input Width.

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 6d1c3954044..231d07cf3b9 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -186,8 +186,8 @@ OC.Share={
 				html += '</div>';
 				html += '</div>';
 				html += '<form id="emailPrivateLink" >';
-				html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-				html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
+				html += '<input id="email" style="display:none; width:72%;" 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">';
-- 
cgit v1.2.3


From 6ecc3d7ee1a7ae1a33b4906a0ffa1ecc3760c2e1 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 20 Feb 2013 23:08:21 +0530
Subject: Reduced email input width by 10% to increase space.

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 231d07cf3b9..dc62dd2e04c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -186,7 +186,7 @@ OC.Share={
 				html += '</div>';
 				html += '</div>';
 				html += '<form id="emailPrivateLink" >';
-				html += '<input id="email" style="display:none; width:72%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
+				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 aa2ea9e3de6002a8b58adf122a4562ed478c2a81 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Feb 2013 20:20:29 -0500
Subject: Fix adding share icons to share action

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 6d1c3954044..faa64103b7b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -24,9 +24,9 @@ OC.Share={
 						var file = $('tr').filterAttr('data-file', OC.basename(item));
 						if (file.length > 0) {
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-							action.find('img').attr('src', image);
+							var img = action.find('img').attr('src', image);
 							action.addClass('permanent');
-							action.html(t('core', 'Shared'));
+							action.html(t('core', ' Shared')).prepend(img);
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -40,7 +40,7 @@ OC.Share={
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										action.addClass('permanent');
-										action.html(t('core', 'Shared'));
+										action.html(t('core', ' Shared')).prepend(img);
 									}
 								}
 								last = path;
@@ -84,13 +84,13 @@ OC.Share={
 			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
 		} else {
 			var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-			action.find('img').attr('src', image);
+			var img = action.find('img').attr('src', image);
 			if (shares) {
 				action.addClass('permanent');
-				action.html(t('core', 'Shared'));
+				action.html(t('core', ' Shared')).prepend(img);
 			} else {
 				action.removeClass('permanent');
-				action.html(t('core', 'Share'));
+				action.html(t('core', ' Share')).prepend(img);
 			}
 		}
 		if (shares) {
-- 
cgit v1.2.3


From 5b732ac1eab641c02a376ec15ce7ada1aeb3e6b0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Feb 2013 20:52:01 -0500
Subject: Move space

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index faa64103b7b..f8a8e0ee35a 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -26,7 +26,7 @@ OC.Share={
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
 							var img = action.find('img').attr('src', image);
 							action.addClass('permanent');
-							action.html(t('core', ' Shared')).prepend(img);
+							action.html(' '+t('core', 'Shared')).prepend(img);
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -40,7 +40,7 @@ OC.Share={
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										action.addClass('permanent');
-										action.html(t('core', ' Shared')).prepend(img);
+										action.html(' '+t('core', 'Shared')).prepend(img);
 									}
 								}
 								last = path;
@@ -87,10 +87,10 @@ OC.Share={
 			var img = action.find('img').attr('src', image);
 			if (shares) {
 				action.addClass('permanent');
-				action.html(t('core', ' Shared')).prepend(img);
+				action.html(' '+t('core', 'Shared')).prepend(img);
 			} else {
 				action.removeClass('permanent');
-				action.html(t('core', ' Share')).prepend(img);
+				action.html(' '+t('core', 'Share')).prepend(img);
 			}
 		}
 		if (shares) {
-- 
cgit v1.2.3


From e01ab04d2bb335dd8086d6b892fa106d38a80996 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 27 Feb 2013 17:57:40 +0100
Subject: reduce minimum length for username suggestions in share dialog, fix
 #1666

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 328d57928ec..145c31a86c8 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -213,7 +213,7 @@ OC.Share={
 					}
 				});
 			}
-			$('#shareWith').autocomplete({minLength: 2, source: function(search, response) {
+			$('#shareWith').autocomplete({minLength: 1, source: function(search, response) {
 	// 			if (cache[search.term]) {
 	// 				response(cache[search.term]);
 	// 			} else {
-- 
cgit v1.2.3


From 577945bd338e3f9b1f30aa026c84247f2720ecb6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 4 Mar 2013 00:54:21 +0100
Subject: Sanitize shareWith

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

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 145c31a86c8..34f24da4df7 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -309,12 +309,12 @@ OC.Share={
 			if (permissions & OC.PERMISSION_SHARE) {
 				shareChecked = 'checked="checked"';
 			}
-			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'" title="' + shareWith + '">';
+			var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
 			html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
 			if(shareWith.length > 14){
-				html += shareWithDisplayName.substr(0,11) + '...';
+				html += escapeHTML(shareWithDisplayName.substr(0,11) + '...');
 			}else{
-				html += shareWithDisplayName;
+				html += escapeHTML(shareWithDisplayName);
 			}
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				if (editChecked == '') {
-- 
cgit v1.2.3


From 6e5e8c6b46f24027ee86284844f43e744a3f5f4c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 7 Mar 2013 22:30:12 -0500
Subject: Fix #2080 and fix #2141

---
 core/js/share.js     | 88 +++++++++++++++++++++-------------------------------
 lib/public/share.php | 25 +++++++++------
 2 files changed, 51 insertions(+), 62 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 34f24da4df7..0b6afda59c4 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,8 +10,9 @@ OC.Share={
 		// Load all share icons
 		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
 			if (result && result.status === 'success') {
-				$.each(result.data, function(item, hasLink) {
-					OC.Share.statuses[item] = hasLink;
+				$.each(result.data, function(item, data) {
+					OC.Share.statuses[item] = data;
+					var hasLink = data['link'];
 					// Links override shared in terms of icon display
 					if (hasLink) {
 						var image = OC.imagePath('core', 'actions/public');
@@ -21,30 +22,33 @@ OC.Share={
 					if (itemType != 'file' && itemType != 'folder') {
 						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 					} else {
-						var file = $('tr').filterAttr('data-file', OC.basename(item));
+						var file = $('tr').filterAttr('data-id', item);
 						if (file.length > 0) {
 							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
 							var img = action.find('img').attr('src', image);
 							action.addClass('permanent');
 							action.html(' '+t('core', 'Shared')).prepend(img);
-						}
-						var dir = $('#dir').val();
-						if (dir.length > 1) {
-							var last = '';
-							var path = dir;
-							// Search for possible parent folders that are shared
-							while (path != last) {
-								if (path == item) {
-									var action = $('.fileactions .action').filterAttr('data-action', 'Share');
-									var img = action.find('img');
-									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
-										img.attr('src', image);
-										action.addClass('permanent');
-										action.html(' '+t('core', 'Shared')).prepend(img);
+						} else {
+							var dir = $('#dir').val();
+							if (dir.length > 1) {
+								var last = '';
+								var path = dir;
+								// Search for possible parent folders that are shared
+								while (path != last) {
+									if (path == data['path']) {
+										var actions = $('.fileactions .action').filterAttr('data-action', 'Share');
+										$.each(actions, function(index, action) {
+											var img = $(action).find('img');
+											if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+												img.attr('src', image);
+												$(action).addClass('permanent');
+												$(action).html(' '+t('core', 'Shared')).prepend(img);
+											}
+										});
 									}
+									last = path;
+									path = OC.Share.dirname(path);
 								}
-								last = path;
-								path = OC.Share.dirname(path);
 							}
 						}
 					}
@@ -53,15 +57,6 @@ OC.Share={
 		});
 	},
 	updateIcon:function(itemType, itemSource) {
-		if (itemType == 'file' || itemType == 'folder') {
-			var file = $('tr').filterAttr('data-id', String(itemSource));
-			var filename = file.data('file');
-			if ($('#dir').val() == '/') {
-				itemSource = $('#dir').val() + filename;
-			} else {
-				itemSource = $('#dir').val() + '/' + filename;
-			}
-		}
 		var shares = false;
 		var link = false;
 		var image = OC.imagePath('core', 'actions/share');
@@ -83,18 +78,21 @@ OC.Share={
 		if (itemType != 'file' && itemType != 'folder') {
 			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
 		} else {
-			var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-			var img = action.find('img').attr('src', image);
-			if (shares) {
-				action.addClass('permanent');
-				action.html(' '+t('core', 'Shared')).prepend(img);
-			} else {
-				action.removeClass('permanent');
-				action.html(' '+t('core', 'Share')).prepend(img);
+			var file = $('tr').filterAttr('data-id', String(itemSource));
+			if (file.length > 0) {
+				var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+				var img = action.find('img').attr('src', image);
+				if (shares) {
+					action.addClass('permanent');
+					action.html(' '+t('core', 'Shared')).prepend(img);
+				} else {
+					action.removeClass('permanent');
+					action.html(' '+t('core', 'Share')).prepend(img);
+				}
 			}
 		}
 		if (shares) {
-			OC.Share.statuses[itemSource] = link;
+			OC.Share.statuses[itemSource]['link'] = link;
 		} else {
 			delete OC.Share.statuses[itemSource];
 		}
@@ -102,21 +100,7 @@ OC.Share={
 	loadItem:function(itemType, itemSource) {
 		var data = '';
 		var checkReshare = true;
-		// Switch file sources to path to check if status is set
-		if (itemType == 'file' || itemType == 'folder') {
-			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-			if ($('#dir').val() == '/') {
-				var item = $('#dir').val() + filename;
-			} else {
-				var item = $('#dir').val() + '/' + filename;
-			}
-			if (item.substring(0, 8) != '/Shared/') {
-				checkReshare = false;
-			}
-		} else {
-			var item = itemSource;
-		}
-		if (typeof OC.Share.statuses[item] === 'undefined') {
+		if (typeof OC.Share.statuses[itemSource] === 'undefined') {
 			// NOTE: Check does not always work and misses some shares, fix later
 			checkShares = true;
 		} else {
diff --git a/lib/public/share.php b/lib/public/share.php
index 59f41a9bfd6..d1ae0312bf6 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -759,7 +759,7 @@ class Share {
 		if ($format == self::FORMAT_STATUSES) {
 			if ($itemType == 'file' || $itemType == 'folder') {
 				$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
-					.' `share_type`, `file_source`, `path`, `expiration`';
+					.' `share_type`, `file_source`, `path`, `expiration`, `storage`';
 			} else {
 				$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`';
 			}
@@ -768,7 +768,7 @@ class Share {
 				if ($itemType == 'file' || $itemType == 'folder') {
 					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,'
 						.' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,'
-						.' `expiration`, `token`';
+						.' `expiration`, `token`, `storage`';
 				} else {
 					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,'
 						.' `stime`, `file_source`, `expiration`, `token`';
@@ -804,6 +804,7 @@ class Share {
 		$items = array();
 		$targets = array();
 		$switchedItems = array();
+		$mounts = array();
 		while ($row = $result->fetchRow()) {
 			// Filter out duplicate group shares for users with unique targets
 			if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) {
@@ -848,8 +849,13 @@ class Share {
 				if (isset($row['parent'])) {
 					$row['path'] = '/Shared/'.basename($row['path']);
 				} else {
-					// Strip 'files' from path
-					$row['path'] = substr($row['path'], 5);
+					if (!isset($mounts[$row['storage']])) {
+						$mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']);
+					}
+					if ($mounts[$row['storage']]) {
+						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
+						$row['path'] = substr($path, $root);
+					}
 				}
 			}
 			if (isset($row['expiration'])) {
@@ -957,15 +963,14 @@ class Share {
 				return $items;
 			} else if ($format == self::FORMAT_STATUSES) {
 				$statuses = array();
-				// Switch column to path for files and folders, used for determining statuses inside of folders
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$column = 'path';
-				}
 				foreach ($items as $item) {
 					if ($item['share_type'] == self::SHARE_TYPE_LINK) {
-						$statuses[$item[$column]] = true;
+						$statuses[$item[$column]]['link'] = true;
 					} else if (!isset($statuses[$item[$column]])) {
-						$statuses[$item[$column]] = false;
+						$statuses[$item[$column]]['link'] = false;
+					}
+					if ($itemType == 'file' || $itemType == 'folder') {
+						$statuses[$item[$column]]['path'] = $item['path'];
 					}
 				}
 				return $statuses;
-- 
cgit v1.2.3


From 9ad03b61a357fa1edb322ffd1aab4d62daa856e5 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Fri, 8 Mar 2013 17:29:05 +0100
Subject: Update share.js

Added HTML escaping
---
 core/js/share.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 0b6afda59c4..8e767663f12 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -84,10 +84,10 @@ OC.Share={
 				var img = action.find('img').attr('src', image);
 				if (shares) {
 					action.addClass('permanent');
-					action.html(' '+t('core', 'Shared')).prepend(img);
+					action.html(' '+ escapeHTML(t('core', 'Shared'))).prepend(img);
 				} else {
 					action.removeClass('permanent');
-					action.html(' '+t('core', 'Share')).prepend(img);
+					action.html(' '+ escapeHTML(t('core', 'Share'))).prepend(img);
 				}
 			}
 		}
-- 
cgit v1.2.3