aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/functions.inc.php28
-rw-r--r--include/page_header.php47
-rw-r--r--include/user.inc.php5
3 files changed, 47 insertions, 33 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 4cf4a2337..bef133253 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -24,6 +24,7 @@
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
+
include_once( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
@@ -462,4 +463,31 @@ function pwg_debug( $string )
$debug.= "\n";
}
+/**
+ * Redirects to the given URL
+ *
+ * Note : once this function called, the execution doesn't go further
+ * (presence of an exit() instruction.
+ *
+ * @param string $url
+ * @return void
+ */
+function redirect( $url )
+{
+ global $user, $template, $lang_info, $conf, $lang, $t2;
+
+ // $refresh, $url_link and $title are required for creating an automated
+ // refresh page in header.tpl
+ $refresh = 5;
+ $url_link = $url;
+ $title = 'redirection';
+ include( PHPWG_ROOT_PATH.'include/page_header.php' );
+
+ $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
+ $template->pparse('redirect');
+
+ include( PHPWG_ROOT_PATH.'include/page_tail.php' );
+
+ exit();
+}
?> \ No newline at end of file
diff --git a/include/page_header.php b/include/page_header.php
index 08572804d..405648d0d 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -30,40 +30,29 @@
//
$template->set_filenames(array('header'=>'header.tpl'));
-$css = PHPWG_ROOT_PATH.'template/'.$user['template'].'/'.$user['template'].'.css';
-$template->assign_vars(array(
- 'CONTENT_ENCODING' => $lang_info['charset'],
- 'PAGE_TITLE' => $title,
- 'LANG'=>$lang_info['code'],
- 'DIR'=>$lang_info['direction'],
-
- 'T_STYLE' => $css
- ));
+$css = PHPWG_ROOT_PATH.'template/'.$user['template'];
+$css.= '/'.$user['template'].'.css';
+
+$template->assign_vars(
+ array(
+ 'CONTENT_ENCODING' => $lang_info['charset'],
+ 'PAGE_TITLE' => $title,
+ 'LANG'=>$lang_info['code'],
+ 'DIR'=>$lang_info['direction'],
+
+ 'T_STYLE' => $css
+ ));
// refresh
-if ( isset( $refresh ) && $refresh >0 && isset($url_link))
+if ( isset( $refresh ) and $refresh > 0 and isset( $url_link ) )
{
- $url = $url_link.'&slideshow='.$refresh;
- $template->assign_vars(array(
- 'REFRESH_TIME' => $refresh,
- 'U_REFRESH' => add_session_id( $url )
- ));
+ $template->assign_vars(
+ array(
+ 'REFRESH_TIME' => $refresh,
+ 'U_REFRESH' => add_session_id( $url_link )
+ ));
$template->assign_block_vars('refresh', array());
}
-// Work around for "current" Apache 2 + PHP module which seems to not
-// cope with private cache control setting
-if (!empty( $_SERVER['SERVER_SOFTWARE'] )
- and strstr( $_SERVER['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' );
-
$template->pparse('header');
?>
diff --git a/include/user.inc.php b/include/user.inc.php
index e4cad9346..a02c50785 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -45,10 +45,7 @@ if ( !$conf['authorize_cookies'] and isset( $_COOKIE['id'] ) )
{
setcookie( 'id', '', 0, cookie_path() );
$url = 'category.php';
- header( 'Request-URI: '.$url );
- header( 'Content-Location: '.$url );
- header( 'Location: '.$url );
- exit();
+ redirect( $url );
}
$user['has_cookie'] = false;