diff options
Diffstat (limited to 'phpBB/admin')
| -rw-r--r-- | phpBB/admin/admin_search.php | 21 | ||||
| -rw-r--r-- | phpBB/admin/index.php | 6 | ||||
| -rw-r--r-- | phpBB/admin/pagestart.php | 4 |
3 files changed, 25 insertions, 6 deletions
diff --git a/phpBB/admin/admin_search.php b/phpBB/admin/admin_search.php index 5ca5f871ad..f33a774572 100644 --- a/phpBB/admin/admin_search.php +++ b/phpBB/admin/admin_search.php @@ -27,7 +27,7 @@ if ( !empty($setmodules) ) } $filename = basename(__FILE__); - $module['DB']['Search_indexing'] = $filename; + $module['DB']['Search_indexing'] = $filename . $SID; return; } @@ -273,7 +273,16 @@ if ( isset($HTTP_POST_VARS['start']) || isset($HTTP_GET_VARS['batchstart']) ) page_header($lang['DB']); +?> + +<h1><?php echo $lang['Search_indexing']; ?></h1> + +<p><?php echo $lang['Search_indexing_complete']; ?></p> + +<?php + page_footer(); + } exit; @@ -281,7 +290,17 @@ if ( isset($HTTP_POST_VARS['start']) || isset($HTTP_GET_VARS['batchstart']) ) } else if ( isset($HTTP_POST_VARS['cancel']) ) { + page_header($lang['DB']); +?> + +<h1><?php echo $lang['Search_indexing']; ?></h1> + +<p><?php echo $lang['Search_indexing_cancel']; ?></p> + +<?php + + page_footer(); } else diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php index df10e1dea9..74d3ad829a 100644 --- a/phpBB/admin/index.php +++ b/phpBB/admin/index.php @@ -53,7 +53,7 @@ if ( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'top' ) <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td><a href="index.<?php echo $phpEx; ?>?pane=right" target="main"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td> + <td><a href="index.<?php echo $phpEx . $SID; ?>&pane=right" target="main"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td> <td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Admin_title']; ?></span> </td> </tr> </table> @@ -98,10 +98,10 @@ else if ( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' ) <th class="menu" height="25">» <?php echo $lang['Return_to']; ?></th> </tr> <tr> - <td class="row1"><a class="genmed" href="index.<?php echo $phpEx; ?>?pane=right" target="main"><?php echo $lang['Admin_Index']; ?></a></td> + <td class="row1"><a class="genmed" href="index.<?php echo $phpEx . $SID; ?>&pane=right" target="main"><?php echo $lang['Admin_Index']; ?></a></td> </tr> <tr> - <td class="row2"><a class="genmed" href="../" target="_top"><?php echo $lang['Forum_index']; ?></a></td> + <td class="row2"><a class="genmed" href="../index.<?php echo $phpEx . $SID; ?>" target="_top"><?php echo $lang['Forum_index']; ?></a></td> </tr> <?php diff --git a/phpBB/admin/pagestart.php b/phpBB/admin/pagestart.php index c834d78649..b187a90294 100644 --- a/phpBB/admin/pagestart.php +++ b/phpBB/admin/pagestart.php @@ -84,7 +84,7 @@ function page_footer($ignore_copyright = false) function page_message($title, $message, $show_header) { - global $lang; + global $phpEx, $SID, $lang; if ( $show_header ) { @@ -92,7 +92,7 @@ function page_message($title, $message, $show_header) <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td><a href="../"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td> + <td><a href="../index.<?php echo $phpEx . $SID; ?>"><img src="images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td> <td width="100%" background="images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Admin_title']; ?></span> </td> </tr> </table> |