From 778b8543c1e76e5f0cc969eb8fe96b6d31825071 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 19 Aug 2011 20:04:35 -0400 Subject: [PATCH 01/84] Remove no longer needed functions in OC_Filestorage_Shared --- apps/files_sharing/sharedstorage.php | 44 ---------------------------- 1 file changed, 44 deletions(-) diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index 695fe3160a..6e9990fb30 100644 --- a/apps/files_sharing/sharedstorage.php +++ b/apps/files_sharing/sharedstorage.php @@ -510,50 +510,6 @@ class OC_Filestorage_Shared extends OC_Filestorage { } } - public function delTree($path) { - $target = $this->datadir.$path; - if (OC_Share::getPermissions($target) & OC_Share::DELETE) { - $source = $this->getSource($path); - if ($source) { - $storage = OC_Filesystem::getStorage($source); - return $storage->delTree($this->getInternalPath($source)); - } - } else { - // Check if the folder is inside a shared folder - if (OC_Share::getParentFolders($target)) { - // If entry for folder already exists - if (OC_Share::getItem($target)) { - OC_Share::setTarget($target, "/"); - } else { - OC_Share::pullOutOfFolder($target, "/"); - // Call setTarget in case there are any database entries for items inside this folder - OC_Share::setTarget($target, "/"); - } - // Delete the database entry - } else { - OC_Share::unshareFromMySelf($target); - } - $this->clearFolderSizeCache($this->getInternalPath($target)); - return true; - } - } - - public function find($path) { - $source = $this->getSource($path); - if ($source) { - $storage = OC_Filesystem::getStorage($source); - return $storage->find($this->getInternalPath($source)); - } - } - - public function getTree($path) { - $source = $this->getSource($path); - if ($source) { - $storage = OC_Filesystem::getStorage($source); - return $storage->getTree($this->getInternalPath($source)); - } - } - public function hash($type, $path, $raw) { $source = $this->getSource($path); if ($source) { From c2f0fe51c427374e918b72c28c521df27e614cae Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 19 Aug 2011 20:05:57 -0400 Subject: [PATCH 02/84] Add getLocalFile() to OC_Filestorage_Shared --- apps/files_sharing/sharedstorage.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index 6e9990fb30..b890d9ac9f 100644 --- a/apps/files_sharing/sharedstorage.php +++ b/apps/files_sharing/sharedstorage.php @@ -530,6 +530,14 @@ class OC_Filestorage_Shared extends OC_Filestorage { public function search($query) { } + + public function getLocalFile($path) { + $source = $this->getSource($path); + if ($source) { + $storage = OC_Filesystem::getStorage($source); + return $storage->getLocalFile($this->getInternalPath($source)); + } + } } From d9aae20003eb670b7bf86708016473969088066a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sat, 20 Aug 2011 05:07:58 +0200 Subject: [PATCH 03/84] more valid HTML, alt attributes, refactored pagenavi etc. --- apps/contacts/templates/part.details.php | 4 +- apps/media/templates/music.php | 30 +++++++------- core/css/styles.css | 5 ++- core/templates/layout.user.php | 4 +- core/templates/part.pagenavi.php | 53 ++++++++++-------------- files/css/files.css | 2 +- files/index.php | 1 + files/templates/index.php | 12 +++--- files/templates/part.list.php | 1 - lib/template.php | 4 +- settings/js/users.js | 6 +-- settings/templates/apps.php | 2 +- settings/templates/help.php | 6 +-- settings/templates/users.php | 13 +++--- 14 files changed, 71 insertions(+), 72 deletions(-) diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php index 5048349abc..81b32f2ff5 100644 --- a/apps/contacts/templates/part.details.php +++ b/apps/contacts/templates/part.details.php @@ -30,6 +30,6 @@
- - + <?php echo $l->t('Delete');?> + <?php echo $l->t('Download');?>
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php index 3cbb1c50a9..cbfab0dff4 100644 --- a/apps/media/templates/music.php +++ b/apps/media/templates/music.php @@ -1,11 +1,11 @@