[Pkg-owncloud-commits] [owncloud] 23/75: prevent the remaining ob_clean related errors
David Prévot
taffit at alioth.debian.org
Fri Nov 8 23:08:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v3.0.1
in repository owncloud.
commit a466c9be3ed946af60b9731d9ed7368b6b135e32
Author: Robin Appelman <icewind1991 at gmail.com>
Date: Mon Oct 17 01:18:02 2011 +0200
prevent the remaining ob_clean related errors
---
apps/admin_export/settings.php | 2 +-
apps/media/getID3/getid3/extension.cache.dbm.php | 2 +-
apps/media/getID3/getid3/module.graphic.jpg.php | 2 +-
apps/media/getID3/getid3/write.id3v2.php | 8 ++++----
apps/media/getID3/getid3/write.real.php | 4 ++--
apps/media/server/xml.server.php | 2 +-
files/download.php | 2 +-
lib/template.php | 4 ++--
ocs/v1.php | 2 +-
tests/index.php | 2 +-
tests/lib/filesystem.php | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php
index 8308a2b..fb06903 100644
--- a/apps/admin_export/settings.php
+++ b/apps/admin_export/settings.php
@@ -63,7 +63,7 @@ if (isset($_POST['admin_export'])) {
header("Content-Type: application/zip");
header("Content-Disposition: attachment; filename=" . basename($filename));
header("Content-Length: " . filesize($filename));
- ob_end_clean();
+ @ob_end_clean();
readfile($filename);
unlink($filename);
} else {
diff --git a/apps/media/getID3/getid3/extension.cache.dbm.php b/apps/media/getID3/getid3/extension.cache.dbm.php
index 051bb1f..c18b52d 100644
--- a/apps/media/getID3/getid3/extension.cache.dbm.php
+++ b/apps/media/getID3/getid3/extension.cache.dbm.php
@@ -90,7 +90,7 @@ class getID3_cached_dbm extends getID3
ob_start(); // nasty, buy the only way to check...
phpinfo();
$contents = ob_get_contents();
- ob_end_clean();
+ @ob_end_clean();
if (!strstr($contents, $cache_type)) {
die('PHP is not compiled --with '.$cache_type.' support, required to use DBM style cache.');
}
diff --git a/apps/media/getID3/getid3/module.graphic.jpg.php b/apps/media/getID3/getid3/module.graphic.jpg.php
index 0c2db92..cd5e986 100644
--- a/apps/media/getID3/getid3/module.graphic.jpg.php
+++ b/apps/media/getID3/getid3/module.graphic.jpg.php
@@ -62,7 +62,7 @@ class getid3_jpg
$ThisFileInfo['warning'][] = strip_tags($errors);
unset($ThisFileInfo['jpg']['exif']);
}
- ob_end_clean();
+ @ob_end_clean();
} else {
diff --git a/apps/media/getID3/getid3/write.id3v2.php b/apps/media/getID3/getid3/write.id3v2.php
index 9447486..32546d1 100644
--- a/apps/media/getID3/getid3/write.id3v2.php
+++ b/apps/media/getID3/getid3/write.id3v2.php
@@ -68,7 +68,7 @@ class getid3_write_id3v2
} else {
$this->errors[] = 'Could not open '.$this->filename.' mode "r+b" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
} else {
@@ -80,7 +80,7 @@ class getid3_write_id3v2
} else {
$this->errors[] = 'Could not open '.$this->filename.' mode "wb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
@@ -106,7 +106,7 @@ class getid3_write_id3v2
fclose($fp_source);
copy($tempfilename, $this->filename);
unlink($tempfilename);
- ob_end_clean();
+ @ob_end_clean();
return true;
} else {
@@ -121,7 +121,7 @@ class getid3_write_id3v2
$this->errors[] = 'Could not open '.$this->filename.' mode "rb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
return false;
diff --git a/apps/media/getID3/getid3/write.real.php b/apps/media/getID3/getid3/write.real.php
index 1e0240c..14e7758 100644
--- a/apps/media/getID3/getid3/write.real.php
+++ b/apps/media/getID3/getid3/write.real.php
@@ -118,7 +118,7 @@ class getid3_write_real
$this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
fclose($fp_source);
return false;
@@ -275,7 +275,7 @@ class getid3_write_real
$this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
fclose($fp_source);
return false;
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index 44a1679..6974dbc 100644
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -35,7 +35,7 @@ if(!isset($_POST['action']) and isset($_GET['action'])){
foreach($arguments as &$argument){
$argument=stripslashes($argument);
}
-ob_clean();
+ at ob_clean();
if(isset($arguments['action'])){
if(defined("DEBUG") && DEBUG) {error_log($arguments['action']);}
switch($arguments['action']){
diff --git a/files/download.php b/files/download.php
index c8a2692..71f91d3 100644
--- a/files/download.php
+++ b/files/download.php
@@ -46,6 +46,6 @@ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
header('Content-Length: '.OC_Filesystem::filesize($filename));
-ob_end_clean();
+ at ob_end_clean();
OC_Filesystem::readfile( $filename );
?>
diff --git a/lib/template.php b/lib/template.php
index a293e63..440b620 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -293,7 +293,7 @@ class OC_Template{
ob_start();
include( $this->template ); // <-- we have to use include because we pass $_!
$data = ob_get_contents();
- ob_end_clean();
+ @ob_end_clean();
// return the data
return $data;
@@ -319,7 +319,7 @@ class OC_Template{
ob_start();
include( $this->path.$file.'.php' );
$data = ob_get_contents();
- ob_end_clean();
+ @ob_end_clean();
// Daten zurückgeben
return $data;
diff --git a/ocs/v1.php b/ocs/v1.php
index b5eb460..f5ff6cb 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -22,7 +22,7 @@
*/
require_once('../lib/base.php');
-ob_clean();
+ at ob_clean();
OC_OCS::handle();
?>
diff --git a/tests/index.php b/tests/index.php
index 08e53f1..34e1d41 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -29,7 +29,7 @@ require_once('../lib/base.php');
OC_Util::checkAdminUser();
$testCases=loadFiles(__DIR__,array('index.php','templates'));
-ob_end_clean();
+ at ob_end_clean();
$testResults=array();
foreach($testCases as $testCaseClass){
$testCase=new $testCaseClass();
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 4bfa238..43cf2e5 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -87,7 +87,7 @@ class OC_FILEYSYSTEM_Test extends OC_TestCase
ob_start();
OC_Filesystem::readfile('/dummy');
$this->assertEquals('foo', ob_get_contents(),'Unexpected output of readfile');
- ob_end_clean();
+ @ob_end_clean();
}
public function isReadable(){
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list