|
From: Paul S. O. <ps...@us...> - 2002-03-18 13:35:47
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25701
Modified Files:
config.php faq.php groupcp.php index.php install.php login.php
memberlist.php modcp.php posting.php privmsg.php profile.php
search.php upgrade.php viewforum.php viewonline.php
viewtopic.php
Log Message:
Loads'a changes including fix for security issue, thanks to Matthijs for checking this out and confirming
Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** config.php 25 Feb 2002 01:04:51 -0000 1.45
--- config.php 18 Mar 2002 13:35:42 -0000 1.46
***************
*** 0 ****
--- 1,51 ----
+ <?php
+
+ //
+ // phpBB 2.x auto-generated config file
+ // Do not change anything in this file!
+ //
+
+ $dbms = "mysql4";
+ $dbhost = "localhost";
+ $dbname = "dev_starstreak_net";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ $dbhost = "localhost";
+ $dbname = "phpbb_com";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ /*
+ $dbhost = "localhost";
+ $dbname = "phpbb_test";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ $dbms = "mssql-odbc";
+
+ $dbhost = "mssql_phpbb_odbc";
+ $dbname = "";
+ $dbuser = "phpbb";
+ $dbpasswd = "efx2000";
+
+ $dbms = "msaccess";
+
+ $dbhost = "phpbb_test_msaccess_odbc";
+ $dbname = "";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ $dbms = "mssql";
+
+ $dbhost = "localhost";
+ $dbname = "phpbb";
+ $dbuser = "phpbb";
+ $dbpasswd = "efx2000";
+ */
+
+ $table_prefix = "phpbb_";
+
+ define('PHPBB_INSTALLED', true);
+
+ ?>
\ No newline at end of file
Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** faq.php 4 Mar 2002 01:47:14 -0000 1.12
--- faq.php 18 Mar 2002 13:35:42 -0000 1.13
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** groupcp.php 4 Mar 2002 12:28:51 -0000 1.52
--- groupcp.php 18 Mar 2002 13:35:42 -0000 1.53
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** index.php 16 Feb 2002 15:04:42 -0000 1.95
--- index.php 18 Mar 2002 13:35:42 -0000 1.96
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** install.php 11 Mar 2002 21:55:20 -0000 1.35
--- install.php 18 Mar 2002 13:35:42 -0000 1.36
***************
*** 23,28 ****
--- 23,30 ----
set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+ define('IN_PHPBB', true);
$phpbb_root_path='./';
include($phpbb_root_path.'extension.inc');
+ include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
$userdata = array();
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** login.php 15 Feb 2002 23:34:32 -0000 1.42
--- login.php 18 Mar 2002 13:35:42 -0000 1.43
***************
*** 27,30 ****
--- 27,31 ----
define("IN_LOGIN", true);
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: memberlist.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** memberlist.php 4 Mar 2002 01:47:14 -0000 1.34
--- memberlist.php 18 Mar 2002 13:35:42 -0000 1.35
***************
*** 20,23 ****
--- 20,24 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** modcp.php 4 Mar 2002 01:47:14 -0000 1.62
--- modcp.php 18 Mar 2002 13:35:42 -0000 1.63
***************
*** 30,38 ****
*/
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_path . 'includes/search.'.$phpEx);
//
--- 30,40 ----
*/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
! include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
//
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -r1.149 -r1.150
*** posting.php 3 Mar 2002 22:53:11 -0000 1.149
--- posting.php 18 Mar 2002 13:35:42 -0000 1.150
***************
*** 21,30 ****
***************************************************************************/
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
- include($phpbb_root_path . 'includes/post.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_path . 'includes/search.'.$phpEx);
//
[...1133 lines suppressed...]
--- 1079,1084 ----
topic_review($topic_id, true);
! $template->assign_block_vars('switch_inline_mode', array());
! $template->assign_var_from_handle('TOPIC_REVIEW_BOX', 'reviewbody');
}
***************
*** 1083,1087 ****
// Parse and print the body
//
! $template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
--- 1086,1090 ----
// Parse and print the body
//
! $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** privmsg.php 14 Mar 2002 13:08:26 -0000 1.88
--- privmsg.php 18 Mar 2002 13:35:43 -0000 1.89
***************
*** 21,29 ****
***************************************************************************/
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
- include($phpbb_root_path . 'includes/post.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
//
--- 21,30 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+ include($phpbb_root_path . 'includes/functions_post.'.$phpEx);
//
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.189
retrieving revision 1.190
diff -C2 -r1.189 -r1.190
*** profile.php 12 Mar 2002 21:14:58 -0000 1.189
--- profile.php 18 Mar 2002 13:35:43 -0000 1.190
***************
*** 21,29 ****
***************************************************************************/
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
- include($phpbb_root_path . 'includes/post.'.$phpEx);
- include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
//
--- 21,28 ----
[...2039 lines suppressed...]
}
else if ( $mode == 'activate' )
{
! include($phpbb_root_path . 'includes/usercp_activate.'.$phpEx);
! exit;
}
! else if ( $mode == 'email' )
{
! include($phpbb_root_path . 'includes/usercp_email.'.$phpEx);
! exit;
}
}
+ else
+ {
+ header("Location: " . append_sid("index.$phpEx", true));
+ exit;
+ }
! ?>
\ No newline at end of file
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** search.php 25 Feb 2002 01:00:47 -0000 1.63
--- search.php 18 Mar 2002 13:35:43 -0000 1.64
***************
*** 21,29 ****
***************************************************************************/
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_path . 'includes/search.'.$phpEx);
//
--- 21,30 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
//
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** upgrade.php 5 Mar 2002 14:15:39 -0000 1.22
--- upgrade.php 18 Mar 2002 13:35:43 -0000 1.23
***************
*** 20,23 ****
--- 20,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
+
if ( !defined('INSTALLING') )
{
***************
*** 48,52 ****
include('includes/db.'.$phpEx);
include('includes/bbcode.'.$phpEx);
! include('includes/search.'.$phpEx);
set_time_limit(0); // Unlimited execution time
--- 50,54 ----
include('includes/db.'.$phpEx);
include('includes/bbcode.'.$phpEx);
! include('includes/functions_search.'.$phpEx);
set_time_limit(0); // Unlimited execution time
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -r1.131 -r1.132
*** viewforum.php 19 Feb 2002 22:09:08 -0000 1.131
--- viewforum.php 18 Mar 2002 13:35:43 -0000 1.132
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** viewonline.php 1 Mar 2002 16:39:56 -0000 1.48
--- viewonline.php 18 Mar 2002 13:35:43 -0000 1.49
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -r1.179 -r1.180
*** viewtopic.php 12 Feb 2002 22:57:03 -0000 1.179
--- viewtopic.php 18 Mar 2002 13:35:43 -0000 1.180
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+ define('IN_PHPBB', true);
$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
|