iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Feature 492: first step

Browse Source 
Simple redirect.tpl in template-common
Simplification of function redirect()


git-svn-id: http://piwigo.org/svn/trunk@1508 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2006-07-27 18:51:54 +00:00
parent eb6d08ead2
commit bc65a0d6cd
4 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/functions.inc.php
View File

@@ -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();
}

12
include/page_header.php
View File

@@ -52,18 +52,6 @@ $template->assign_vars(
'TAG_INPUT_ENABLED' => ((is_adviser()) ? 'disabled onclick="return false;"' : '')
));
// refresh
if ( isset( $refresh ) and intval($refresh) >= 0 and isset( $url_link ) and isset( $redirect_msg ) )
{
$template->assign_vars(
array(
'U_REDIRECT_MSG' => $redirect_msg,
'REFRESH_TIME' => $refresh,
'U_REFRESH' => $url_link
));
$template->assign_block_vars('refresh', array());
}
header('Content-Type: text/html; charset='.$lang_info['charset']);
$template->parse('header');
?>

17
template-common/redirect.tpl Normal file
View File

@@ -0,0 +1,17 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="{LANG}" dir="{DIR}">
<head>
<title>{U_REDIRECT_MSG}</title>
<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
<!-- BEGIN refresh -->
<meta http-equiv="refresh" content="{REFRESH_TIME};url={U_REFRESH}">
<!-- END refresh -->
</head>
<body>
<div id="the_page">
<p>{U_REDIRECT_MSG}</p>
<p><a href="{U_REFRESH}">{lang:click_to_redirect}</a></p>
</div>
</body>
</html>

2
template/yoga/redirect.tpl
View File

@@ -1,2 +0,0 @@
<p>{U_REDIRECT_MSG}</p>
<p><a href="{U_REFRESH}">{lang:click_to_redirect}</a></p>