aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions.inc.php
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2006-07-27 18:51:54 +0000
committernikrou <nikrou@piwigo.org>2006-07-27 18:51:54 +0000
commitbc65a0d6cd718ecbaa70ea699c6ec482a3e3af65 (patch)
treee9e799267e61c437b7ffda598c477e94bcdfb9e0 /include/functions.inc.php
parenteb6d08ead24523ef1bf237508e3f2798af96c3b9 (diff)
Feature 492: first step
Simple redirect.tpl in template-common Simplification of function redirect() git-svn-id: http://piwigo.org/svn/trunk@1508 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions.inc.php')
-rw-r--r--include/functions.inc.php43
1 files changed, 25 insertions, 18 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index dae437a0d..9d8ea914f 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -556,20 +556,17 @@ function pwg_debug( $string )
* @param integer $refreh_time
* @return void
*/
-function redirect( $url , $msg = '', $refreh_time = 0)
+function redirect( $url , $msg = '', $refresh_time = 0)
{
- global $user, $template, $lang_info, $conf, $lang, $t2, $page, $debug;
+ global $lang_info;
- unset($template);
- $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
- if (!isset($page['body_id']))
- {
- $page['body_id'] = 'adminPage';
+ if (!isset($lang_info)) {
+ include_once(get_language_filepath('common.lang.php'));
}
- // $redirect_msg, $refresh, $url_link and $title are required for creating an automated
- // refresh page in header.tpl
- if (!isset($msg) or ($msg == ''))
+ $template = new Template(PHPWG_ROOT_PATH.'template-common');
+ $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
+ if (empty($msg))
{
$redirect_msg = l10n('redirect_msg');
}
@@ -578,17 +575,27 @@ function redirect( $url , $msg = '', $refreh_time = 0)
$redirect_msg = $msg;
}
$redirect_msg = nl2br($redirect_msg);
- $refresh = $refreh_time;
- $url_link = $url;
- $title = 'redirection';
- include( PHPWG_ROOT_PATH.'include/page_header.php' );
+ $template->assign_vars(
+ array(
+ 'CONTENT_ENCODING' => $lang_info['charset'],
+ 'LANG'=>$lang_info['code'],
+ 'DIR'=>$lang_info['direction'],
+ 'CONTENT' => print_r($user,true),
+ 'LANG_INFO' => print_r($lang_info,true)
+ )
+ );
- $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
+ $template->assign_vars(
+ array(
+ 'U_REDIRECT_MSG' => $redirect_msg,
+ 'REFRESH_TIME' => $refresh_time,
+ 'U_REFRESH' => $url
+ )
+ );
+ $template->assign_block_vars('refresh', array());
$template->parse('redirect');
-
- include( PHPWG_ROOT_PATH.'include/page_tail.php' );
-
+ $template->p();
exit();
}