[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.0debian-3-9-gd503901

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit c95413e8ae80dd8941b4d558549c2939b2946e8d
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 5 00:34:06 2012 +0200

    Remove unused patched

diff --git a/debian/patches/04_fix_odfviewer.diff b/debian/patches/04_fix_odfviewer.diff
deleted file mode 100644
index dbbacc7..0000000
--- a/debian/patches/04_fix_odfviewer.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Remove closing PHP tag
-  This closing PHP tag causes multiple issues, e.g. thumbnail are not loaded.
-  This patch was taken from upstream.
-Author: Thomas Mueller <thomas.mueller at tmit.eu>
-Origin: upstream, https://gitorious.org/owncloud/apps/commit/07d7f438ca1da5d8488618bb26c57287360abc32c
-Forwarded: not-needed
-
---- a/apps/files_odfviewer/appinfo/app.php
-+++ b/apps/files_odfviewer/appinfo/app.php
-@@ -3,5 +3,3 @@
- OCP\Util::addStyle( 'files_odfviewer', 'odfviewer' );
- OCP\Util::addScript('files_odfviewer', 'viewer' );
- OCP\Util::addScript('files_odfviewer', 'webodf');
--?>
--
diff --git a/debian/patches/06_add_head_support_for_download.diff b/debian/patches/06_add_head_support_for_download.diff
deleted file mode 100644
index ac700a7..0000000
--- a/debian/patches/06_add_head_support_for_download.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Add HEAD request management for files ajax/download.php
- Needed by files_odfviewer, which performs HEAD request to get the file size
-Author: Thomas Mueller <thomas.mueller at tmit.eu>
-Origin: upstream, https://gitorious.org/owncloud/owncloud/commit/2774ff1ad8fac22a0bededeb641fa4c2e3f15186
-Forwarded: not-needed
-
---- a/apps/files/ajax/download.php
-+++ b/apps/files/ajax/download.php
-@@ -33,5 +33,5 @@
- $files = $_GET["files"];
- $dir = $_GET["dir"];
- 
--OC_Files::get($dir,$files);
-+OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
- ?>
---- a/lib/files.php
-+++ b/lib/files.php
-@@ -52,8 +52,9 @@
- 	*
- 	* @param dir  $dir
- 	* @param file $file ; seperated list of files to download
-+	* @param boolean $only_header ; boolean to only send header of the request
- 	*/
--	public static function get($dir,$files){
-+	public static function get($dir,$files, $only_header = false){
- 		if(strpos($files,';')){
- 			$files=explode(';',$files);
- 		}
-@@ -118,6 +119,11 @@
- 		}else{
- 			header("HTTP/1.0 403 Forbidden");
- 			die('403 Forbidden');
-+		}
-+		if($only_header){
-+			if(!$zip)
-+				header("Content-Length: ".OC_Filesystem::filesize($filename));
-+			return ;
- 		}
- 		if($zip){
- 			$handle=fopen($filename,'r');

-- 
owncloud.git