Changeset 1508 for trunk/include

Timestamp:

Jul 27, 2006, 8:51:54 PM (18 years ago)

Author:

nikrou

Message:

Feature 492: first step
Simple redirect.tpl in template-common
Simplification of function redirect()

Location:

trunk/include

Files:

• functions.inc.php (modified) (2 diffs)
• page_header.php (modified) (1 diff)

trunk/include/functions.inc.php

@@ -557 +557 @@
  * @return void
  */
-function redirect( $url , $msg = '', $refreh_time = 0)
-{
-  global $user, $template, $lang_info, $conf, $lang, $t2, $page, $debug;
-
-  unset($template);
-  $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
-  if (!isset($page['body_id'])) 
-  {
-    $page['body_id'] = 'adminPage';
-  }
-
-  // $redirect_msg, $refresh, $url_link and $title are required for creating an automated
-  // refresh page in header.tpl
-  if (!isset($msg) or ($msg == ''))
+function redirect( $url , $msg = '', $refresh_time = 0)
+{
+  global $lang_info;
+
+  if (!isset($lang_info)) {
+    include_once(get_language_filepath('common.lang.php'));
+  }
+
+  $template = new Template(PHPWG_ROOT_PATH.'template-common');
+  $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
+  if (empty($msg))
   {
     $redirect_msg = l10n('redirect_msg');
@@ -579 +576 @@
   }
   $redirect_msg = nl2br($redirect_msg);
-  $refresh = $refreh_time;
-  $url_link = $url;
-  $title = 'redirection';
-
-  include( PHPWG_ROOT_PATH.'include/page_header.php' );
-
-  $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
+
+  $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->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();
 }

trunk/include/page_header.php

@@ -53 +53 @@
     ));
 
-// 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');