prevent the remaining ob_clean related errors

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 {

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.');
 			}

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 {
 

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;
 

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;

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();
+@ob_clean();
 if(isset($arguments['action'])){
 	OC_Log::write('media','ampache '.$arguments['action'].' request', OC_Log::DEBUG);
 	switch($arguments['action']){

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();
+@ob_end_clean();
 OC_Filesystem::readfile( $filename );
 ?>

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;

ocs/v1.php

@@ -22,7 +22,7 @@
 */
 
 require_once('../lib/base.php');
-ob_clean();
+@ob_clean();
 OC_OCS::handle();
 
 ?>

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();
+@ob_end_clean();
 $testResults=array();
 foreach($testCases as $testCaseClass){
 	$testCase=new $testCaseClass();

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(){