From 582dca4d91186723a142c29a344be5c6d060061e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 16 Aug 2011 20:21:18 -0400
Subject: Initial merging of files_sharing and files_publiclink

---
 apps/files_sharing/js/share.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'apps/files_sharing/js/share.js')

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index d9d64d96a0b..18d8da85403 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -136,23 +136,29 @@ $(document).ready(function() {
 	
 	$('#makelink').live('change', function() {
 		if (this.checked) {
-			var data = 'path='+$('#dropdown').data('file')+'&expire=0';
+			var source = $('#dropdown').data('file');
+			var uid_shared_with = "public";
+			var permissions = 0;
+			var data = 'sources='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions);
 			$.ajax({
-				type: 'GET',
-				url: OC.linkTo('files_publiclink','ajax/makelink.php'),
+				type: 'POST',
+				url: OC.linkTo('files_sharing','ajax/share.php'),
 				cache: false,
 				data: data,
-				success: function(token) {
-					if (token) {
+				success: function(result) {
+					if (result !== 'false') {
+						var token = 1234;
 						showPublicLink(token);
 					}
 				}
 			});
 		} else {
-			var data = 'token='+$('#link').data('token');
+			var source = $('#dropdown').data('file');
+			var uid_shared_with = "public";
+			var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
 			$.ajax({
 				type: 'GET',
-				url: OC.linkTo('files_publiclink','ajax/deletelink.php'),
+				url: OC.linkTo('files_sharing','ajax/unshare.php'),
 				cache: false,
 				data: data,
 				success: function(){
@@ -207,11 +213,11 @@ function createDropdown(filename, files) {
 			});
 		}
 	});
-	$.getJSON(OC.linkTo('files_publiclink', 'ajax/getlink.php'), { path: files }, function(token) {
-		if (token) {
-			showPublicLink(token);
-		}
-	});
+// 	$.getJSON(OC.linkTo('files_publiclink', 'ajax/getlink.php'), { path: files }, function(token) {
+// 		if (token) {
+// 			showPublicLink(token);
+// 		}
+// 	});
 	$('#dropdown').show('blind');
 	$('#share_with').chosen();
 }
-- 
cgit v1.2.3