"
+// $(html).insertBefore($('#newlink_row'));
+// $('#expire').val('');
+// $('#expire_time').val('');
+// $('#path').val('');
+// }
+// }
+ });
+ });
+});
\ No newline at end of file
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 83e5486ddf..5b685ea390 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -36,6 +36,7 @@ class OC_SHARE {
*/
public function __construct($source, $uid_shared_with, $permissions, $public = false) {
if ($source && OC_FILESYSTEM::file_exists($source) && OC_FILESYSTEM::is_readable($source)) {
+ $source = "/".$_SESSION['user_id']."/files".$source;
$uid_owner = $_SESSION['user_id'];
if ($public) {
// TODO create token for public file
@@ -43,18 +44,19 @@ class OC_SHARE {
} else {
$query = OC_DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
foreach ($uid_shared_with as $uid) {
- $target = "/".$uid."/files/Share".$source;
- $check = OC_DB::prepare("SELECT COUNT(target) FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ?");
- $result = $check->execute(array($target, $uid))->fetchAll();
- $counter = 1;
- while (count($result > 0)) {
- if ($pos = strrpos($target, ".")) {
- $target = substr($target, 0, $pos)."_".$counter.substr($target, $pos);
- } else {
- $target .= $counter;
- }
- $result = $check->execute(array($target, $uid))->fetchAll();
- }
+ $target = "/".$uid."/files/Share/".basename($source);
+ // TODO Fix check if target already exists
+// $check = OC_DB::prepare("SELECT target FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ?");
+// $result = $check->execute(array($target, $uid))->fetchAll();
+// $counter = 1;
+// while (count($result > 0)) {
+// if ($pos = strrpos($target, ".")) {
+// $target = substr($target, 0, $pos)."_".$counter.substr($target, $pos);
+// } else {
+// $target .= $counter;
+// }
+// $result = $check->execute(array($target, $uid))->fetchAll();
+// }
$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
}
}
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
new file mode 100644
index 0000000000..6c27899369
--- /dev/null
+++ b/apps/files_sharing/list.php
@@ -0,0 +1,40 @@
+.
+ *
+ */
+
+require_once('../../lib/base.php');
+require_once('lib_share.php');
+require('template.php');
+
+if (!OC_USER::isLoggedIn()){
+ header( "Location: ".OC_HELPER::linkTo( "index.php" ));
+ exit();
+}
+
+OC_APP::setActiveNavigationEntry("files_sharing_list");
+
+OC_UTIL::addScript("files_sharing", "list");
+
+$tmpl = new OC_TEMPLATE("files_sharing", "list", "user");
+$tmpl->assign("shared_items", OC_SHARE::getMySharedItems());
+$tmpl->printPage();
+
+?>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/admin.php b/apps/files_sharing/templates/admin.php
deleted file mode 100644
index 827b64143c..0000000000
--- a/apps/files_sharing/templates/admin.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
Item
-
Shared With
-
Permissions
-
-
-
-
-
'>
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
new file mode 100644
index 0000000000..244cd9992c
--- /dev/null
+++ b/apps/files_sharing/templates/list.php
@@ -0,0 +1,32 @@
+