Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6987/admin
Modified Files:
Tag: phpBB-2_0_0
admin_board.php admin_db_utilities.php admin_disallow.php
admin_forum_prune.php admin_forumauth.php admin_forums.php
admin_groups.php admin_mass_email.php admin_ranks.php
admin_smilies.php admin_styles.php admin_ug_auth.php
admin_user_ban.php admin_users.php admin_words.php index.php
page_header_admin.php pagestart.php
Log Message:
Loads of bug fixes and updates
Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -C2 -r1.51 -r1.51.2.1
*** admin_board.php 22 Mar 2002 17:00:32 -0000 1.51
--- admin_board.php 12 May 2002 00:47:39 -0000 1.51.2.1
***************
*** 24,30 ****
// Let's set the root dir for phpBB
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
--- 24,30 ----
// Let's set the root dir for phpBB
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
***************
*** 312,316 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
?>
--- 312,316 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -C2 -r1.42.2.1 -r1.42.2.2
*** admin_db_utilities.php 22 Apr 2002 13:34:32 -0000 1.42.2.1
--- admin_db_utilities.php 12 May 2002 00:47:40 -0000 1.42.2.2
***************
*** 43,46 ****
--- 43,47 ----
$file_uploads = @get_cfg_var('file_uploads');
}
+
if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
{
***************
*** 55,61 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
--- 56,62 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
***************
*** 696,700 ****
}
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 697,701 ----
}
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 741,745 ****
if( !isset($HTTP_POST_VARS['backupstart']) && !isset($HTTP_GET_VARS['backupstart']))
{
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 742,746 ----
if( !isset($HTTP_POST_VARS['backupstart']) && !isset($HTTP_GET_VARS['backupstart']))
{
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 783,791 ****
);
! include('page_header_admin.'.$phpEx);
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
}
--- 784,792 ----
);
! include('./page_header_admin.'.$phpEx);
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
}
***************
*** 874,878 ****
// Define Template files...
//
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 875,879 ----
// Define Template files...
//
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 908,912 ****
if($backup_file_tmpname == "" || $backup_file_name == "")
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']);
}
--- 909,912 ----
***************
*** 944,948 ****
else
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']);
}
--- 944,947 ----
***************
*** 959,963 ****
else
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name");
}
--- 958,961 ----
***************
*** 965,969 ****
else
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']);
}
--- 963,966 ----
***************
*** 992,997 ****
if(!$result && ( !(SQL_LAYER == 'postgresql' && eregi("drop table", $sql) ) ) )
{
- //include('page_header_admin.'.$phpEx);
- // echo "~~$sql~~";
message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
}
--- 989,992 ----
***************
*** 1000,1004 ****
}
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 995,999 ----
}
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 1020,1024 ****
}
! include('page_footer_admin.'.$phpEx);
?>
--- 1015,1019 ----
}
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** admin_disallow.php 22 Mar 2002 17:00:32 -0000 1.9
--- admin_disallow.php 12 May 2002 00:47:40 -0000 1.9.2.1
***************
*** 34,40 ****
// Include required files, get $phpEx and check permissions
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_POST_VARS['add_name']) )
--- 34,40 ----
// Include required files, get $phpEx and check permissions
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
if( isset($HTTP_POST_VARS['add_name']) )
***************
*** 43,47 ****
$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
- $disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
if( !validate_username($disallowed_user) )
--- 43,46 ----
***************
*** 111,116 ****
for( $i = 0; $i < count($disallowed); $i++ )
{
- $disallowed[$i]['disallow_username'] = preg_replace('/%/', '*', $disallowed[$i]['disallow_username']);
-
$disallow_select .= '<option value="' . $disallowed[$i]['disallow_id'] . '">' . $disallowed[$i]['disallow_username'] . '</option>';
}
--- 110,113 ----
***************
*** 140,143 ****
--- 137,142 ----
$template->pparse("body");
+
+ include('./page_footer_admin.'.$phpEx);
?>
Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** admin_forum_prune.php 2 Apr 2002 14:53:44 -0000 1.22
--- admin_forum_prune.php 12 May 2002 00:47:40 -0000 1.22.2.1
***************
*** 33,39 ****
// Load default header
//
! $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
require($phpbb_root_path . 'includes/prune.'.$phpEx);
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
--- 33,39 ----
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
require($phpbb_root_path . 'includes/prune.'.$phpEx);
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
***************
*** 194,198 ****
$template->pparse('body');
! include('page_footer_admin.'.$phpEx);
?>
--- 194,198 ----
$template->pparse('body');
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** admin_forumauth.php 22 Mar 2002 17:00:32 -0000 1.23
--- admin_forumauth.php 12 May 2002 00:47:40 -0000 1.23.2.1
***************
*** 35,41 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
--- 35,41 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
//
***************
*** 343,351 ****
}
! include('page_header_admin.'.$phpEx);
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
?>
--- 343,351 ----
}
! include('./page_header_admin.'.$phpEx);
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C2 -r1.40 -r1.40.2.1
*** admin_forums.php 22 Mar 2002 17:00:32 -0000 1.40
--- admin_forums.php 12 May 2002 00:47:40 -0000 1.40.2.1
***************
*** 33,39 ****
// Load default header
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
--- 33,39 ----
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
***************
*** 827,831 ****
if ($show_index != TRUE)
{
! include('page_footer_admin.'.$phpEx);
exit;
}
--- 827,831 ----
if ($show_index != TRUE)
{
! include('./page_footer_admin.'.$phpEx);
exit;
}
***************
*** 932,936 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
?>
--- 932,936 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** admin_groups.php 22 Mar 2002 17:00:32 -0000 1.25
--- admin_groups.php 12 May 2002 00:47:40 -0000 1.25.2.1
***************
*** 34,40 ****
// Load default header
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
--- 34,40 ----
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
***************
*** 355,359 ****
}
! include('page_footer_admin.'.$phpEx);
?>
--- 355,359 ----
}
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** admin_mass_email.php 7 Apr 2002 00:51:47 -0000 1.15.2.1
--- admin_mass_email.php 12 May 2002 00:47:40 -0000 1.15.2.2
***************
*** 34,40 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
--- 34,40 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
//
***************
*** 175,179 ****
// Generate page
//
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 175,179 ----
// Generate page
//
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 200,204 ****
$template->pparse('body');
! include('page_footer_admin.'.$phpEx);
?>
--- 200,204 ----
$template->pparse('body');
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** admin_ranks.php 22 Mar 2002 17:00:32 -0000 1.13
--- admin_ranks.php 12 May 2002 00:47:40 -0000 1.13.2.1
***************
*** 33,39 ****
// Let's set the root dir for phpBB
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
--- 33,39 ----
// Let's set the root dir for phpBB
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
***************
*** 361,365 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
?>
--- 361,365 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** admin_smilies.php 24 Mar 2002 00:15:36 -0000 1.22
--- admin_smilies.php 12 May 2002 00:47:40 -0000 1.22.2.1
***************
*** 48,54 ****
}
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
--- 48,54 ----
}
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
//
***************
*** 537,541 ****
// Page Footer
//
! include('page_footer_admin.'.$phpEx);
?>
--- 537,541 ----
// Page Footer
//
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -r1.27.2.1 -r1.27.2.2
*** admin_styles.php 29 Apr 2002 17:55:17 -0000 1.27.2.1
--- admin_styles.php 12 May 2002 00:47:40 -0000 1.27.2.2
***************
*** 39,43 ****
// Check if the user has cancled a confirmation message.
//
! $phpbb_root_path = "../";
$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
--- 39,43 ----
// Check if the user has cancled a confirmation message.
//
! $phpbb_root_path = "./../";
$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
***************
*** 48,52 ****
$no_page_header = ( $cancel ) ? TRUE : FALSE;
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
}
--- 48,52 ----
$no_page_header = ( $cancel ) ? TRUE : FALSE;
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
}
***************
*** 933,937 ****
if( !$HTTP_POST_VARS['send_file'] )
{
! include('page_footer_admin.'.$phpEx);
}
--- 933,937 ----
if( !$HTTP_POST_VARS['send_file'] )
{
! include('./page_footer_admin.'.$phpEx);
}
Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** admin_ug_auth.php 2 Apr 2002 21:13:47 -0000 1.13
--- admin_ug_auth.php 12 May 2002 00:47:40 -0000 1.13.2.1
***************
*** 37,43 ****
$no_page_header = TRUE;
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
$params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');
--- 37,43 ----
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
$params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');
***************
*** 788,792 ****
for($i = 0; $i < count($ug_info); $i++)
{
! $t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode&" . POST_GROUPS_URL . "=" . $id[$i]) . '">' . $name[$i] . '</a>';
}
}
--- 788,794 ----
for($i = 0; $i < count($ug_info); $i++)
{
! $ug = ( $mode == 'user' ) ? 'group&' . POST_GROUPS_URL : 'user&' . POST_USERS_URL;
!
! $t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$ug=" . $id[$i]) . '">' . $name[$i] . '</a>';
}
}
***************
*** 820,824 ****
// Dump in the page header ...
//
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 822,826 ----
// Dump in the page header ...
//
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 879,883 ****
// Select a user/group
//
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 881,885 ----
// Select a user/group
//
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 937,941 ****
$template->pparse('body');
! include('page_footer_admin.'.$phpEx);
! ?>
--- 939,943 ----
$template->pparse('body');
! include('./page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** admin_user_ban.php 22 Mar 2002 17:00:32 -0000 1.21
--- admin_user_ban.php 12 May 2002 00:47:40 -0000 1.21.2.1
***************
*** 34,40 ****
// Load default header
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
//
--- 34,40 ----
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
//
***************
*** 481,485 ****
$template->pparse('body');
! include('page_footer_admin.'.$phpEx);
?>
--- 481,485 ----
$template->pparse('body');
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -C2 -r1.57 -r1.57.2.1
*** admin_users.php 27 Mar 2002 19:15:39 -0000 1.57
--- admin_users.php 12 May 2002 00:47:40 -0000 1.57.2.1
***************
*** 31,37 ****
}
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
require($phpbb_root_path . 'includes/bbcode.'.$phpEx);
require($phpbb_root_path . 'includes/functions_post.'.$phpEx);
--- 31,37 ----
}
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
require($phpbb_root_path . 'includes/bbcode.'.$phpEx);
require($phpbb_root_path . 'includes/functions_post.'.$phpEx);
***************
*** 1069,1073 ****
}
! include('page_footer_admin.'.$phpEx);
?>
--- 1069,1073 ----
}
! include('./page_footer_admin.'.$phpEx);
?>
Index: admin_words.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_words.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** admin_words.php 22 Mar 2002 17:00:33 -0000 1.10
--- admin_words.php 12 May 2002 00:47:40 -0000 1.10.2.1
***************
*** 33,39 ****
// Load default header
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
--- 33,39 ----
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
***************
*** 110,114 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
}
else if( $mode == "save" )
--- 110,114 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
}
else if( $mode == "save" )
***************
*** 231,235 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
?>
--- 231,235 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
?>
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C2 -r1.40 -r1.40.2.1
*** index.php 25 Mar 2002 20:37:14 -0000 1.40
--- index.php 12 May 2002 00:47:40 -0000 1.40.2.1
***************
*** 27,33 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
// ---------------
--- 27,33 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
! require('./pagestart.' . $phpEx);
// ---------------
***************
*** 69,73 ****
unset($setmodules);
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 69,73 ----
unset($setmodules);
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 117,126 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
}
elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
{
! include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
--- 117,126 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
}
elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
{
! include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
***************
*** 562,566 ****
$template->pparse("body");
! include('page_footer_admin.'.$phpEx);
}
--- 562,566 ----
$template->pparse("body");
! include('./page_footer_admin.'.$phpEx);
}
Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_header_admin.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** page_header_admin.php 22 Mar 2002 17:00:33 -0000 1.12
--- page_header_admin.php 12 May 2002 00:47:40 -0000 1.12.2.1
***************
*** 75,79 ****
'L_USERNAME' => $lang['Username'],
'L_PASSWORD' => $lang['Password'],
! 'L_INDEX' => $lang['Forum_Index'],
'L_REGISTER' => $lang['Register'],
'L_PROFILE' => $lang['Profile'],
--- 75,79 ----
'L_USERNAME' => $lang['Username'],
'L_PASSWORD' => $lang['Password'],
! 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
'L_REGISTER' => $lang['Register'],
'L_PROFILE' => $lang['Profile'],
Index: pagestart.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/pagestart.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** pagestart.php 22 Mar 2002 13:48:43 -0000 1.1
--- pagestart.php 12 May 2002 00:47:40 -0000 1.1.2.1
***************
*** 51,55 ****
// Not including the pageheader can be neccesarry if META tags are
// needed in the calling script.
! include('page_header_admin.'.$phpEx);
}
--- 51,55 ----
// Not including the pageheader can be neccesarry if META tags are
// needed in the calling script.
! include('./page_header_admin.'.$phpEx);
}
|