append central HTML to $output, do not echo $code anymore

git-svn-id: http://piwigo.org/svn/branches/release-1_3@350 68402e56-0260-453c-a942-63ccdbb3a9ee

10 files changed, 19 insertions, 28 deletions

diff --git a/about.php b/about.php
index 3c34968e7..6008ed31f 100644
--- a/about.php
+++ b/about.php
@@ -36,7 +36,6 @@ $vtp->setVar( $handle, 'user_template', $user['template'] );
 $url = './category.php?'.$_SERVER['QUERY_STRING'];
 $vtp->setVar( $handle, 'back_url', add_session_id( $url ) );
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/category.php b/category.php
index e35155c87..813a2771f 100644
--- a/category.php
+++ b/category.php
@@ -492,8 +492,7 @@ if ( isset ( $page['cat'] ) )
 pwg_log( 'category', $page['title'] );
 mysql_close();
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/comments.php b/comments.php
index 46e8e7562..dd0ed7835 100644
--- a/comments.php
+++ b/comments.php
@@ -184,7 +184,6 @@ $query.= ';';
 $result = mysql_query( $query );
 display_pictures( $result, $maxtime, $user['restrictions'] );
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/identification.php b/identification.php
index 5dc193c83..9c098abd1 100644
--- a/identification.php
+++ b/identification.php
@@ -111,7 +111,6 @@ if ( $conf['access'] == 'free' )
   $vtp->closeSession( $handle, 'register' );
 }
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/index.php b/index.php
index 2bb4ec48d..abda852de 100644
--- a/index.php
+++ b/index.php
@@ -36,4 +36,4 @@ header( 'Request-URI: '.$url );
 header( 'Content-Location: '.$url );  
 header( 'Location: '.$url );
 exit();
-?>
\ No newline at end of file
+?>
diff --git a/picture.php b/picture.php
index aefb2a3fe..838adff1e 100644
--- a/picture.php
+++ b/picture.php
@@ -756,8 +756,7 @@ if ( $conf['show_comments'] )
 pwg_log( 'picture', $intitule_cat, $page['file'] );
 mysql_close();
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/profile.php b/profile.php
index 730404470..e873b9866 100644
--- a/profile.php
+++ b/profile.php
@@ -364,7 +364,6 @@ if ( $conf['authorize_cookies'] )
   $vtp->closeSession( $handle, 'cookie' );
 }
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/register.php b/register.php
index 5d32458b9..d785888bb 100644
--- a/register.php
+++ b/register.php
@@ -103,7 +103,6 @@ if (isset( $_POST['mail_address']))
 $vtp->closeSession( $handle, 'text' );
 $vtp->closeSession( $handle, 'line' );
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/search.php b/search.php
index 96ec244ab..6f688bb73 100644
--- a/search.php
+++ b/search.php
@@ -118,10 +118,9 @@ $vtp->closeSession( $handle, 'line' );
 //---------------------------------------------------- return to main page link
 $vtp->setGlobalVar( $handle, 'back_url', add_session_id( './category.php' ) );
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 //------------------------------------------------------------ log informations
 pwg_log( 'search', $title );
 mysql_close();
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>
diff --git a/upload.php b/upload.php
index a67c84902..68bfae66b 100644
--- a/upload.php
+++ b/upload.php
@@ -385,7 +385,6 @@ else
 $url = './category.php?cat='.$page['cat'].'&expand='.$_GET['expand'];
 $vtp->setGlobalVar( $handle, 'return_url', add_session_id( $url ) );
 //----------------------------------------------------------- html code display
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$output.= $vtp->Display( $handle, 0 );
 include('include/page_tail.php');
-?>
\ No newline at end of file
+?>