From c35014d58e859482e11359b22861a6e2e0cdcf24 Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Wed, 16 Jan 2008 15:22:46 +0000
Subject: [PATCH] Change ob_clean by ob_end_clean to discard the buffer

---
 html/confirm_remove.php     | 4 ++--
 include/class_acc_bilan.php | 4 ++--
 include/dossier.inc.php     | 2 +-
 include/modele.inc.php      | 2 +-
 include/postgres.php        | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/html/confirm_remove.php b/html/confirm_remove.php
index 0781b0e07..91987c600 100644
--- a/html/confirm_remove.php
+++ b/html/confirm_remove.php
@@ -104,7 +104,7 @@ if  ( isset($_POST['remove']) )
 	  $sql="drop database ".domaine."mod".$_POST['ob_id'];
 	  ob_start();
 	  if ( pg_query($cn,$sql)==false) {
-		ob_clean();
+		ob_end_clean();
 
 		echo "<h2 class=\"error\"> 
                       Base de donnée ".domaine."mod".$_POST['ob_id']."  est accèdée, déconnectez-vous d'abord</h2>";
@@ -123,7 +123,7 @@ if  ( isset($_POST['remove']) )
 	  $sql="drop database ".domaine."dossier".$_POST['ob_id'];
 	  ob_start();
 	  if ( pg_query($cn,$sql)==false) {
-	  		ob_clean();
+	  		ob_end_clean();
 		
 		echo "<h2 class=\"error\"> 
                      Base de donnée ".domaine."mod".$_POST['ob_id']."  est accèdée, déconnectez-vous d'abord</h2>";
diff --git a/include/class_acc_bilan.php b/include/class_acc_bilan.php
index ef86f5387..6ba2b696e 100644
--- a/include/class_acc_bilan.php
+++ b/include/class_acc_bilan.php
@@ -560,7 +560,7 @@ class Acc_Bilan {
 	  }
 	  // repack
 	  system ('zip -r "'.$this->b_name.'.'.$this->b_type.'" *');
-	  ob_clean();
+	  ob_end_clean();
 	  fclose($p_file);
 	  echo_debug(__FILE__.':'.__LINE__.'- ','Send the file');
 	  $fdoc=fopen($dirname.DIRECTORY_SEPARATOR.$this->b_name.'.'.$this->b_type,'r');
@@ -592,7 +592,7 @@ class Acc_Bilan {
 	  $templ=$a->file_open_template();
 	  $r=$a->generate_odt($templ);
 	  fclose($templ);
-	  ob_clean();
+	  ob_end_clean();
 
 	  //	  echo_debug(__FILE__.':'.__LINE__,"resutl ",$r);
 	  $a->send($r);
diff --git a/include/dossier.inc.php b/include/dossier.inc.php
index df8c7e2c0..f8c481859 100644
--- a/include/dossier.inc.php
+++ b/include/dossier.inc.php
@@ -79,7 +79,7 @@ if ( isset ($_POST["DATABASE"]) ) {
 	    if ( pg_query($cn,$Sql)==false) {
 	      echo   "[".$Sql."]";
 
-	      ob_clean();
+	      ob_end_clean();
 	      ExecSql($cn,"delete from ac_dossier where dos_id=$l_id");
 	      echo "<h2 class=\"error\"> Base de donnée ".domaine."mod".$_POST['FMOD_ID']."  est accèdée, déconnectez-vous d'abord</h2>";
 	      exit;
diff --git a/include/modele.inc.php b/include/modele.inc.php
index c08d10c49..3324de91d 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -46,7 +46,7 @@ if ( isset ($_POST["FMOD_NAME"]) ) {
       $Sql=sprintf("CREATE DATABASE %sMOD%d encoding='ISO8859-1' TEMPLATE %sDOSSIER%s",domaine,$l_id,domaine,$_POST["FMOD_DBID"]);
       ob_start();
       if ( pg_query($cn,$Sql)==false) {
-	ob_clean();
+	ob_end_clean();
 	echo "<h2 class=\"error\"> Base de donn&eacute;e ".domaine."dossier".$_POST['FMOD_DBID']."  est accèd&eacute;e, d&eacute;connectez-vous en d'abord</h2>";
 	$Res=ExecSql($cn,"delete from modeledef where mod_id=".$l_id);
 
diff --git a/include/postgres.php b/include/postgres.php
index 5c1aa1430..8ddbd7228 100644
--- a/include/postgres.php
+++ b/include/postgres.php
@@ -104,7 +104,7 @@ password='$password' port=$port");
 
   if ( $a == false )
   {
-  	ob_clean();
+  	ob_end_clean();
 	echo '<h2 class="error">Impossible de se connecter &agrave; postgreSql !</h2>';
   	echo "Vos param&egrave;tres sont incorrectes : <br>";
   	echo "<br>";
@@ -117,7 +117,7 @@ password='$password' port=$port");
 de donn&eacute;es");
 	
   }
-  ob_clean();
+  ob_end_clean();
   echo_debug ('postgres.php',__LINE__,"connect to $p_db dbname $l_dossier");
   return $a;
 }
@@ -136,7 +136,7 @@ function ExecSql($p_connection, $p_string) {
   ob_start();
   $ret=pg_query($p_connection,$p_string);
   if ( ! $ret )   {
-    ob_clean();
+    ob_end_clean();
     throw new Exception (" SQL ERROR $p_string ",1);
   }
   ob_flush();
@@ -162,7 +162,7 @@ function ExecSqlParam($p_connection, $p_string,$p_array) {
   ob_start();
   $ret=pg_query_params($p_connection,$p_string,$p_array);
   if ( ! $ret )   {
-    ob_clean();
+    ob_end_clean();
       $r=$p_string."array ".var_export($p_array,TRUE);
       throw new Exception (" SQL ERROR $r",1);
   }