Template modification

Split of the french language file


git-svn-id: http://piwigo.org/svn/trunk@351 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 46 insertions, 18 deletions

diff --git a/include/page_header.php b/include/page_header.php
index 68bb17993..45382e4e1 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -1,30 +1,58 @@
 <?php
+/***************************************************************************
+ *                                page_header.php                                *
+ *                            ------------------                           *
+ *   application   : PhpWebGallery 1.4 <http://phpwebgallery.net>          *
+ *   author        : Pierrick LE GALL <pierrick@z0rglub.com>               *
+ *                                                                         *
+ *   $Id$
+ *                                                                         *
+ ***************************************************************************/
 
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation;                                         *
+ *                                                                         *
+ ***************************************************************************/
+ 
 //
 // Start output of page
 //
-$vtp = new VTemplate;
-$handle = $vtp->Open( './template/'.$user['template'].'/header.vtp' );
-$vtp->setGlobalVar( $handle, 'charset', $lang['charset'] );
-$vtp->setGlobalVar( $handle, 'style', './template/'.$user['template'].'/'.$user['template'].'.css');
+$template->set_filenames(array('header'=>'header.tpl'));
 
-  // refresh
-  if ( isset( $refresh ) && $refresh >0 && isset($url_link))
+$template->assign_vars(array(
+	'S_CONTENT_ENCODING' => $lang['charset'],
+	'T_STYLE' =>  './template/'.$user['template'].'/'.$user['template'].'.css', 
+	'PAGE_TITLE' => $title)
+	);
+
+// refresh
+if ( isset( $refresh ) && $refresh >0 && isset($url_link))
   {
-    $vtp->addSession( $handle, 'refresh' );
-    $vtp->setVar( $handle, 'refresh.time', $refresh );
     $url = $url_link.'&amp;slideshow='.$refresh;
-    $vtp->setVar( $handle, 'refresh.url', add_session_id( $url ) );
-    $vtp->closeSession( $handle, 'refresh' );
+	$template->assign_vars(array(
+	'S_REFRESH_TIME' => $refresh,
+	'U_REFRESH' => add_session_id( $url )
+	)
+	);
+  	$template->assign_block_vars('refresh', array());
   }
-  
-$vtp->setGlobalVar( $handle, 'title', $title );
-$vtp->setVarF( $handle, 'header', './template/'.$user['template'].'/header.htm' );
 
-//
-// Generate the page
-//
+// Work around for "current" Apache 2 + PHP module which seems to not
+// cope with private cache control setting
+if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2'))
+{
+	header ('Cache-Control: no-cache, pre-check=0, post-check=0, max-age=0');
+}
+else
+{
+	header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
+}
+header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-$code = $vtp->Display( $handle, 0 );
-echo $code;
+$template->pparse('header');
+$vtp=new VTemplate;
 ?>
\ No newline at end of file