makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Redirect path changes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3647 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-03-13 12:18:52 +00:00
parent 8bb5de9861
commit 461ae0f7e0
7 changed files with 289 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/admin_forums.php
View file

@ -222,7 +222,7 @@ switch ($mode)
$forum_id = $db->sql_nextid(); $forum_id = $db->sql_nextid();
// Redirect to permissions // Redirect to permissions
redirect('admin/admin_permissions.' . $phpEx . $SID . '&mode=forums&f=' . $forum_id); redirect('adm/admin_permissions.' . $phpEx . $SID . '&mode=forums&f=' . $forum_id);
break; break;

2
phpBB/adm/index.php
View file

@ -1,6 +1,6 @@
<?php <?php
/*************************************************************************** /***************************************************************************
* index.php [ admin/ ] * index.php [ adm/ ]
* ------------------- * -------------------
* begin : Saturday, Feb 13, 2001 * begin : Saturday, Feb 13, 2001
* copyright : (C) 2001 The phpBB Group * copyright : (C) 2001 The phpBB Group

8
phpBB/includes/functions.php
View file

@ -868,11 +868,11 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
$db->sql_close(); $db->sql_close();
} }
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'admin/subSilver.css" type="text/css"><style type="text/css">' . "\n"; echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n";
echo 'th { background-image: url(\'' . $phpbb_root_path . 'admin/images/cellpic3.gif\') }' . "\n"; echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n";
echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'admin/images/cellpic1.gif\') }' . "\n"; echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n";
echo '</style><title>' . $msg_title . '</title></head><body>'; echo '</style><title>' . $msg_title . '</title></head><body>';
echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><img src="' . $phpbb_root_path . 'admin/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td><td width="100%" background="' . $phpbb_root_path . 'admin/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">General Error</span> &nbsp; &nbsp; &nbsp;</td></tr></table><br clear="all" /><table width="85%" cellspacing="0" cellpadding="0" border="0" align="center"><tr><td><br clear="all" />' . $msg_text . '<hr />Please notify the board administrator or webmaster : <a href="mailto:' . $config['board_email'] . '">' . $config['board_email'] . '</a></td></tr></table><br clear="all" /></body></html>'; echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">General Error</span> &nbsp; &nbsp; &nbsp;</td></tr></table><br clear="all" /><table width="85%" cellspacing="0" cellpadding="0" border="0" align="center"><tr><td><br clear="all" />' . $msg_text . '<hr />Please notify the board administrator or webmaster : <a href="mailto:' . $config['board_email'] . '">' . $config['board_email'] . '</a></td></tr></table><br clear="all" /></body></html>';
exit; exit;
break; break;

2
phpBB/includes/page_tail.php
View file

@ -53,7 +53,7 @@ if (defined('DEBUG'))
$template->assign_vars(array( $template->assign_vars(array(
'PHPBB_VERSION' => $config['version'], 'PHPBB_VERSION' => $config['version'],
'ADMIN_LINK' => ($auth->acl_get('a_')) ? sprintf($user->lang['ACP'], '<a href="' . "admin/index.$phpEx?sid=" . $user->data['session_id'] . '">', '</a>') . '<br /><br />' : '', 'ADMIN_LINK' => ($auth->acl_get('a_')) ? sprintf($user->lang['ACP'], '<a href="' . "adm/index.$phpEx?sid=" . $user->data['session_id'] . '">', '</a>') . '<br /><br />' : '',
'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '' 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : ''
)); ));

14
phpBB/install/install.php
View file

@ -341,7 +341,7 @@ else if( !empty($_POST['ftp_file']) && !defined("PHPBB_INSTALLED") )
// //
$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />'; $s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />'; $s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/index.php" />'; $s_hidden_fields .= '<input type="hidden" name="redirect" value="adm/index.php" />';
$s_hidden_fields .= '<input type="hidden" name="submit" value="' . $lang['Login'] . '" />'; $s_hidden_fields .= '<input type="hidden" name="submit" value="' . $lang['Login'] . '" />';
page_header($lang['Inst_Step_2'], "../login.$phpEx"); page_header($lang['Inst_Step_2'], "../login.$phpEx");
@ -859,7 +859,7 @@ else
{ {
$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />'; $s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />'; $s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/index.php" />'; $s_hidden_fields .= '<input type="hidden" name="redirect" value="adm/index.php" />';
$s_hidden_fields .= '<input type="hidden" name="login" value="true" />'; $s_hidden_fields .= '<input type="hidden" name="login" value="true" />';
} }
else else
@ -897,11 +897,11 @@ function page_header($l_instructions, $s_action)
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html> <html>
<head> <head>
<link rel="stylesheet" href="../admin/subSilver.css" type="text/css"> <link rel="stylesheet" href="../adm/subSilver.css" type="text/css">
<style type="text/css"> <style type="text/css">
<!-- <!--
th { background-image: url('../admin/images/cellpic3.gif') } th { background-image: url('../adm/images/cellpic3.gif') }
td.cat { background-image: url('../admin/images/cellpic1.gif') } td.cat { background-image: url('../adm/images/cellpic1.gif') }
//--> //-->
</style> </style>
<title><?php echo $lang['Welcome_install']; ?></title> <title><?php echo $lang['Welcome_install']; ?></title>
@ -910,8 +910,8 @@ td.cat { background-image: url('../admin/images/cellpic1.gif') }
<table width="100%" cellspacing="0" cellpadding="0" border="0"> <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td><img src="../admin/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td> <td><img src="../adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td>
<td width="100%" background="../admin/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Welcome_install']; ?></span> &nbsp; &nbsp; &nbsp;</td> <td width="100%" background="../adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Welcome_install']; ?></span> &nbsp; &nbsp; &nbsp;</td>
</tr> </tr>
</table> </table>

46
phpBB/install/update_script.php
View file

@ -20,7 +20,7 @@ $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
// //
// Updates to this version ... // Updates to this version ...
// //
$version = '2.1.0 [20020820]'; $version = '2.1.1 [20030221]';
// ---------------- // ----------------
// BEGIN VARS DEFNS // BEGIN VARS DEFNS
@ -188,7 +188,7 @@ switch ( $this_version )
<h1>Updating current schema</h1> <h1>Updating current schema</h1>
<?php <?php
/*
// //
// Get schema // Get schema
// //
@ -307,7 +307,7 @@ foreach ( $field_def as $table => $table_def )
gen_str_ok(); gen_str_ok();
} }
*/
?> ?>
<h1>Updating table data</h1> <h1>Updating table data</h1>
@ -546,9 +546,7 @@ switch ( $this_version )
gen_str_ok(); gen_str_ok();
gen_str_init('* Updating <b>permissions</b>'); gen_str_init('* Updating <b>permissions</b>');
//
// Grab user id of first user with user_level of ADMIN // Grab user id of first user with user_level of ADMIN
//
$sql = "SELECT user_id $sql = "SELECT user_id
FROM " . $table_prefix . "users FROM " . $table_prefix . "users
WHERE user_level = 1 WHERE user_level = 1
@ -867,7 +865,7 @@ switch ( $this_version )
gen_str_ok(); gen_str_ok();
case '2.1.0 [20020816]': case '2.1.1 [20030221]':
$sql_ary = array(); $sql_ary = array();
@ -884,6 +882,20 @@ switch ( $this_version )
gen_str_ok(); gen_str_ok();
gen_str_init('* Updating <b>forum post info</b>'); gen_str_init('* Updating <b>forum post info</b>');
$sql = "SELECT topic_id, MIN(post_id) AS first_post_id, MAX(post_id) AS last_post_id, COUNT(post_id) AS total_posts
FROM {$table_prefix}posts
GROUP BY topic_id";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$sql = "UPDATE {$table_prefix}topics
SET topic_first_post_id = " . $row['first_post_id'] . ", topic_last_post_id = " . $row['last_post_id'] . ", topic_replies = " . ($row['total_posts'] - 1) . "
WHERE topic_id = " . $row['topic_id'];
$db->sql_query($sql);
}
$db->sql_freeresult($result);
switch (SQL_LAYER) switch (SQL_LAYER)
{ {
case 'oracle': case 'oracle':
@ -908,7 +920,7 @@ switch ( $this_version )
$forum_id = $row['forum_id']; $forum_id = $row['forum_id'];
$sql_ary[] = "UPDATE " . $table_prefix . "forums $sql_ary[] = "UPDATE " . $table_prefix . "forums
SET forum_last_poster_id = " . ( ( $row['user_id'] ) ? $row['user_id'] : ANONYMOUS ) . ", forum_last_poster_name = '" . addslashes($row['post_username']) . "', forum_last_post_time = " . $row['post_time'] . " SET forum_last_poster_id = " . (($row['user_id'] != ANONYMOUS) ? $row['user_id'] : ANONYMOUS) . ", forum_last_poster_name = '" . (($row['user_id'] != ANONYMOUS) ? addslashes($row['username']) : addslashes($row['post_username'])) . "', forum_last_post_time = " . $row['post_time'] . "
WHERE forum_id = $forum_id"; WHERE forum_id = $forum_id";
$sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time
@ -923,7 +935,7 @@ switch ( $this_version )
while ($row2 = $db->sql_fetchrow($result2)) while ($row2 = $db->sql_fetchrow($result2))
{ {
$sql_ary[] = "UPDATE " . $table_prefix . "topics $sql_ary[] = "UPDATE " . $table_prefix . "topics
SET topic_first_poster_name = '" . addslashes($row2['post_username']) . "', topic_last_poster_id = " . ( ( $row2['id2'] ) ? $row2['id2'] : ANONYMOUS ) . ", topic_last_post_time = " . $row2['post_time'] . ", topic_last_poster_name = '" . addslashes($row2['post_username2']) . "' SET topic_poster = " . $row['user_id'] . ", topic_first_poster_name = '" . (($row2['user_id'] != ANONYMOUS && $row2['user_id']) ? addslashes($row2['username']) : addslashes($row2['post_username'])) . "', topic_last_poster_id = " . (($row2['id2'] != ANONYMOUS && $row2['id2']) ? $row2['id2'] : ANONYMOUS) . ", topic_last_post_time = " . $row2['post_time'] . ", topic_last_poster_name = '" . (($row2['id2'] != ANONYMOUS && $row2['id2']) ? addslashes($row2['user2']) : addslashes($row2['post_username2'])) . "'
WHERE topic_id = " . $row2['topic_id']; WHERE topic_id = " . $row2['topic_id'];
} }
$db->sql_freeresult($result2); $db->sql_freeresult($result2);
@ -934,6 +946,7 @@ switch ( $this_version )
foreach ($sql_ary as $sql) foreach ($sql_ary as $sql)
{ {
echo $sql . "<br />";
$db->sql_query($sql); $db->sql_query($sql);
} }
@ -941,9 +954,10 @@ switch ( $this_version )
case '2.1.0 [20020817]': case '2.1.0 [20020817]':
$sql = "INSERT INTO phpbb_config (config_name, config_value) // $sql = "INSERT INTO phpbb_config (config_name, config_value)
VALUES ('ip_check', '4')"; // VALUES ('ip_check', '4')";
$db->sql_query($sql); // $db->sql_query($sql);
break;
default; default;
print "<span class=\"updtext\">* No updates needed</span><br />\n"; print "<span class=\"updtext\">* No updates needed</span><br />\n";
@ -996,11 +1010,11 @@ function page_header()
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
<meta http-equiv="Content-Style-Type" content="text/css"> <meta http-equiv="Content-Style-Type" content="text/css">
<link rel="stylesheet" href="../admin/subSilver.css" type="text/css"> <link rel="stylesheet" href="../adm/subSilver.css" type="text/css">
<style type="text/css"> <style type="text/css">
<!-- <!--
th { background-image: url('../admin/images/cellpic3.gif') } th { background-image: url('../adm/images/cellpic3.gif') }
td.cat { background-image: url('../admin/images/cellpic1.gif') } td.cat { background-image: url('../adm/images/cellpic1.gif') }
h1 { margin-left:15px } h1 { margin-left:15px }
@ -1018,8 +1032,8 @@ h1 { margin-left:15px }
<table width="100%" cellspacing="0" cellpadding="0" border="0"> <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td><img src="../admin/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td> <td><img src="../adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td>
<td width="100%" background="../admin/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">Update Script</span> &nbsp; &nbsp; &nbsp;</td> <td width="100%" background="../adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">Update Script</span> &nbsp; &nbsp; &nbsp;</td>
</tr> </tr>
</table> </table>

2
phpBB/install/upgrade.php
View file

@ -1500,7 +1500,7 @@ if ( !empty($next) )
} }
query($alter_sql, "Couldn't alter table $table"); query($alter_sql, "Couldn't alter table $table");
print "<span class=\"ok\"><b>OK</b></span><br />\n";
flush(); flush();
} }