Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:33:31
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv4376/language/lang_english
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
A number of additional changes
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -C2 -r1.35.2.1 -r1.35.2.2
*** lang_admin.php 12 May 2002 00:47:41 -0000 1.35.2.1
--- lang_admin.php 12 May 2002 15:33:28 -0000 1.35.2.2
***************
*** 462,465 ****
--- 462,466 ----
$lang['No_group_moderator'] = 'You must specify a moderator for this group';
$lang['No_group_mode'] = 'You must specify a mode for this group, open or closed';
+ $lang['No_group_action'] = 'No action was specified';
$lang['delete_group_moderator'] = 'Delete the old group moderator?';
$lang['delete_moderator_explain'] = 'If you\'re changing the group moderator, check this box to remove the old moderator from the group. Otherwise, do not check it, and the user will become a regular member of the group.';
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.85.2.1
retrieving revision 1.85.2.2
diff -C2 -r1.85.2.1 -r1.85.2.2
*** lang_main.php 12 May 2002 00:47:41 -0000 1.85.2.1
--- lang_main.php 12 May 2002 15:33:28 -0000 1.85.2.2
***************
*** 435,438 ****
--- 435,442 ----
$lang['You_no_new_pm'] = 'No new private messages are waiting for you';
+ $lang['Unread_message'] = 'Unread message';
+ $lang['Read_message'] = 'Read message';
+
+ $lang['Read_pm'] = 'Read message';
$lang['Post_new_pm'] = 'Post message';
$lang['Post_reply_pm'] = 'Reply to message';
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 01:36:11
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv24639
Modified Files:
Tag: phpBB-2_0_0
privmsg.php
Log Message:
Fix logout when cancelling a confirmation with URL based sid.
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.3
retrieving revision 1.96.2.4
diff -C2 -r1.96.2.3 -r1.96.2.4
*** privmsg.php 12 May 2002 00:47:40 -0000 1.96.2.3
--- privmsg.php 12 May 2002 01:36:08 -0000 1.96.2.4
***************
*** 70,73 ****
--- 70,82 ----
//
+ // Start session management
+ //
+ $userdata = session_pagestart($user_ip, PAGE_PRIVMSGS);
+ init_userprefs($userdata);
+ //
+ // End session management
+ //
+
+ //
// Cancel
//
***************
*** 78,90 ****
exit;
}
-
- //
- // Start session management
- //
- $userdata = session_pagestart($user_ip, PAGE_PRIVMSGS);
- init_userprefs($userdata);
- //
- // End session management
- //
//
--- 87,90 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 01:27:29
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv21814/db
Modified Files:
Tag: phpBB-2_0_0
mssql.php
Log Message:
Reset row and rowset arrays before returning them.
Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** mssql.php 5 Mar 2002 02:19:38 -0000 1.22
--- mssql.php 12 May 2002 01:27:26 -0000 1.22.2.1
***************
*** 292,295 ****
--- 292,296 ----
$row[$key] = stripslashes($value);
}
+ @reset($row);
return $row;
***************
*** 321,324 ****
--- 322,326 ----
$i++;
}
+ @reset($rowset);
return $rowset;
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 01:22:00
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19801
Modified Files:
Tag: phpBB-2_0_0
posting.php viewtopic.php
Log Message:
Signature issues
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159.2.2
retrieving revision 1.159.2.3
diff -C2 -r1.159.2.2 -r1.159.2.3
*** posting.php 7 Apr 2002 14:59:33 -0000 1.159.2.2
--- posting.php 12 May 2002 01:21:57 -0000 1.159.2.3
***************
*** 608,616 ****
if ( $mode == 'newtopic' || $mode == 'reply')
{
! $user_sig = ( $userdata['user_sig'] != '' ) ? $userdata['user_sig'] : '';
}
else if ( $mode == 'editpost' )
{
! $user_sig = ( $post_info['user_sig'] != '' ) ? $post_info['user_sig'] : '';
}
--- 608,616 ----
if ( $mode == 'newtopic' || $mode == 'reply')
{
! $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
}
else if ( $mode == 'editpost' )
{
! $user_sig = ( $post_info['user_sig'] != '' && $board_config['allow_sig'] ) ? $post_info['user_sig'] : '';
}
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186.2.2
retrieving revision 1.186.2.3
diff -C2 -r1.186.2.2 -r1.186.2.3
*** viewtopic.php 12 May 2002 00:47:40 -0000 1.186.2.2
--- viewtopic.php 12 May 2002 01:21:57 -0000 1.186.2.3
***************
*** 1047,1051 ****
}
! if ( $user_sig != '' && $board_config['allow_sig'] )
{
$user_sig = make_clickable($user_sig);
--- 1047,1051 ----
}
! if ( $user_sig != '' )
{
$user_sig = make_clickable($user_sig);
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 01:14:59
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv17475/templates/subSilver
Modified Files:
Tag: phpBB-2_0_0
login_body.tpl
Log Message:
Cause reload on submit into _top frame - 4bidden suggestion to fix multiple frames when redirected from login in admin
Index: login_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/login_body.tpl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** login_body.tpl 28 Feb 2002 14:08:01 -0000 1.7
--- login_body.tpl 12 May 2002 01:14:55 -0000 1.7.2.1
***************
*** 1,4 ****
! <form action="{S_LOGIN_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
--- 1,4 ----
! <form action="{S_LOGIN_ACTION}" method="post" target="_top">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:44
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6987/templates/subSilver/admin
Modified Files:
Tag: phpBB-2_0_0
index_frameset.tpl
Log Message:
Loads of bug fixes and updates
Index: index_frameset.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/index_frameset.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** index_frameset.tpl 21 Oct 2001 01:53:48 -0000 1.3
--- index_frameset.tpl 12 May 2002 00:47:41 -0000 1.3.2.1
***************
*** 2,11 ****
<head>
<title>phpBB Administration</title>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
! <frameset cols="170,*" rows="*" border="0" framespacing="0" frameborder="NO">
! <frame src="{S_FRAME_NAV}" name="nav" noresize marginwidth="3" marginheight="3" scrolling="AUTO">
! <frame src="{S_FRAME_MAIN}" name="main" marginwidth="10" marginheight="10" scrolling="AUTO">
</frameset>
--- 2,11 ----
<head>
<title>phpBB Administration</title>
! <meta http-equiv="Content-Type" content="text/html;">
</head>
! <frameset cols="170,*" rows="*" border="2" framespacing="0" frameborder="yes">
! <frame src="{S_FRAME_NAV}" name="nav" marginwidth="3" marginheight="3" scrolling="auto">
! <frame src="{S_FRAME_MAIN}" name="main" marginwidth="10" marginheight="10" scrolling="auto">
</frameset>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:44
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv6987/includes
Modified Files:
Tag: phpBB-2_0_0
bbcode.php functions.php page_header.php page_tail.php
usercp_activate.php usercp_avatar.php usercp_register.php
Log Message:
Loads of bug fixes and updates
Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -C2 -r1.36.2.4 -r1.36.2.5
*** bbcode.php 24 Apr 2002 14:42:15 -0000 1.36.2.4
--- bbcode.php 12 May 2002 00:47:40 -0000 1.36.2.5
***************
*** 607,611 ****
// xxxx can only be alpha characters.
// yyyy is anything up to the first space, newline, or comma.
! $ret = preg_replace("#([\n ])([a-z]+?)://([^,\t \n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
--- 607,611 ----
// xxxx can only be alpha characters.
// yyyy is anything up to the first space, newline, or comma.
! $ret = preg_replace("#([\n ])([a-z]+?)://([^,\t <\n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
***************
*** 615,619 ****
// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
! $ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^,\t \n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
// matches an email@domain type address at the start of a line, or after a space.
--- 615,619 ----
// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
! $ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^,\t <\n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
// matches an email@domain type address at the start of a line, or after a space.
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.133.2.1
retrieving revision 1.133.2.2
diff -C2 -r1.133.2.1 -r1.133.2.2
*** functions.php 15 Apr 2002 14:48:41 -0000 1.133.2.1
--- functions.php 12 May 2002 00:47:40 -0000 1.133.2.2
***************
*** 595,598 ****
--- 595,599 ----
$msg_title = $lang['General_Error'];
}
+ break;
case CRITICAL_ERROR:
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.106.2.2
retrieving revision 1.106.2.3
diff -C2 -r1.106.2.2 -r1.106.2.3
*** page_header.php 11 Apr 2002 17:53:41 -0000 1.106.2.2
--- page_header.php 12 May 2002 00:47:41 -0000 1.106.2.3
***************
*** 36,40 ****
$phpver = phpversion();
! if ( $phpver >= '4.0.4pl1' )
{
if ( extension_loaded('zlib') )
--- 36,40 ----
$phpver = phpversion();
! if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
{
if ( extension_loaded('zlib') )
Index: page_tail.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_tail.php,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -r1.27 -r1.27.2.1
*** page_tail.php 4 Apr 2002 11:53:13 -0000 1.27
--- page_tail.php 12 May 2002 00:47:41 -0000 1.27.2.1
***************
*** 65,69 ****
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo '\x1f\x8b\x08\x00\x00\x00\x00\x00';
echo $gzip_contents;
echo pack('V', $gzip_crc);
--- 65,69 ----
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
echo $gzip_contents;
echo pack('V', $gzip_crc);
Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** usercp_activate.php 3 Apr 2002 20:14:47 -0000 1.6
--- usercp_activate.php 12 May 2002 00:47:41 -0000 1.6.2.1
***************
*** 86,90 ****
else
{
! message_die(GENERAL_ERROR, $lang['Wrong_activation']); //wrongactiv
}
}
--- 86,90 ----
else
{
! message_die(GENERAL_MESSAGE, $lang['Wrong_activation']); //wrongactiv
}
}
Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
*** usercp_avatar.php 29 Apr 2002 14:45:07 -0000 1.8.2.2
--- usercp_avatar.php 12 May 2002 00:47:41 -0000 1.8.2.3
***************
*** 185,189 ****
if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $new_filename = ( $current_avatar != '' && $mode != 'register' ) ? $current_avatar : uniqid($user_ip) . $imgtype;
if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
--- 185,189 ----
if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $new_filename = ( ( $current_avatar != '' && $current_type == USER_AVATAR_UPLOAD ) && $mode != 'register' ) ? $current_avatar : uniqid($user_ip) . $imgtype;
if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
***************
*** 234,238 ****
}
! function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
{
global $board_config, $db, $template, $lang, $images, $theme;
--- 234,238 ----
}
! function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$new_password, &$cur_password, &$password_confirm, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
{
global $board_config, $db, $template, $lang, $images, $theme;
***************
*** 310,314 ****
}
! $params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
--- 310,314 ----
}
! $params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'cur_password', 'new_password', 'password_confirm', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -C2 -r1.20.2.6 -r1.20.2.7
*** usercp_register.php 3 May 2002 16:26:52 -0000 1.20.2.6
--- usercp_register.php 12 May 2002 00:47:41 -0000 1.20.2.7
***************
*** 101,105 ****
}
! $trim_var_list = array('password_current' => 'cur_password', 'password' => 'new_password', 'password_confirm' => 'password_confirm', 'signature' => 'signature');
while( list($var, $param) = @each($trim_var_list) )
--- 101,105 ----
}
! $trim_var_list = array('cur_password' => 'cur_password', 'new_password' => 'new_password', 'password_confirm' => 'password_confirm', 'signature' => 'signature');
while( list($var, $param) = @each($trim_var_list) )
***************
*** 179,184 ****
$username = stripslashes($username);
$email = stripslashes($email);
! $password = '';
! $password_confirm = '';
$icq = stripslashes($icq);
--- 179,185 ----
$username = stripslashes($username);
$email = stripslashes($email);
! $cur_password = stripslashes($cur_password);
! $new_password = stripslashes($new_password);
! $password_confirm = stripslashes($password_confirm);
$icq = stripslashes($icq);
***************
*** 222,226 ****
else if ( $mode == 'register' )
{
! if ( empty($username) || empty($password) || empty($password_confirm) || empty($email) )
{
$error = TRUE;
--- 223,227 ----
else if ( $mode == 'register' )
{
! if ( empty($username) || empty($new_password) || empty($password_confirm) || empty($email) )
{
$error = TRUE;
***************
*** 231,242 ****
$passwd_sql = '';
! if ( !empty($password) && !empty($password_confirm) )
{
! if ( $password != $password_confirm )
{
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
}
! else if ( strlen($password) > 32 )
{
$error = TRUE;
--- 232,243 ----
$passwd_sql = '';
! if ( !empty($new_password) && !empty($password_confirm) )
{
! if ( $new_password != $password_confirm )
{
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
}
! else if ( strlen($new_password) > 32 )
{
$error = TRUE;
***************
*** 257,261 ****
$row = $db->sql_fetchrow($result);
! if ( $row['user_password'] != md5($password_current) )
{
$error = TRUE;
--- 258,262 ----
$row = $db->sql_fetchrow($result);
! if ( $row['user_password'] != md5($cur_password) )
{
$error = TRUE;
***************
*** 266,275 ****
if ( !$error )
{
! $password = md5($password);
! $passwd_sql = "user_password = '$password', ";
}
}
}
! else if ( ( empty($password) && !empty($password_confirm) ) || ( !empty($password) && empty($password_confirm) ) )
{
$error = TRUE;
--- 267,276 ----
if ( !$error )
{
! $new_password = md5($new_password);
! $passwd_sql = "user_password = '$new_password', ";
}
}
}
! else if ( ( empty($new_password) && !empty($password_confirm) ) || ( !empty($new_password) && empty($password_confirm) ) )
{
$error = TRUE;
***************
*** 303,307 ****
$row = $db->sql_fetchrow($result);
! if ( $row['user_password'] != md5($password_current) )
{
$email = $userdata['user_email'];
--- 304,308 ----
$row = $db->sql_fetchrow($result);
! if ( $row['user_password'] != md5($cur_password) )
{
$email = $userdata['user_email'];
***************
*** 485,489 ****
//
$sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
{
--- 486,490 ----
//
$sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
! VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
{
***************
*** 621,625 ****
$username = stripslashes($username);
$email = stripslashes($email);
! $password = '';
$password_confirm = '';
--- 622,626 ----
$username = stripslashes($username);
$email = stripslashes($email);
! $new_password = '';
$password_confirm = '';
***************
*** 644,648 ****
$username = htmlspecialchars($userdata['username']);
$email = $userdata['user_email'];
! $password = '';
$password_confirm = '';
--- 645,649 ----
$username = htmlspecialchars($userdata['username']);
$email = $userdata['user_email'];
! $new_password = '';
$password_confirm = '';
***************
*** 657,661 ****
$interests = htmlspecialchars($userdata['user_interests']);
$signature_bbcode_uid = $userdata['user_sig_bbcode_uid'];
! $signature = ( $signature_bbcode_uid != '' ) ? preg_replace("/\:(([a-z0-9]:)?)$signature_bbcode_uid/si", '', $userdata['user_sig']) : $userdata['user_sig'];
$viewemail = $userdata['user_viewemail'];
--- 658,662 ----
$interests = htmlspecialchars($userdata['user_interests']);
$signature_bbcode_uid = $userdata['user_sig_bbcode_uid'];
! $signature = ( $signature_bbcode_uid != '' ) ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $userdata['user_sig']) : $userdata['user_sig'];
$viewemail = $userdata['user_viewemail'];
***************
*** 706,710 ****
$allowviewonline = !$allowviewonline;
! display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popuppm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat);
}
else
--- 707,711 ----
$allowviewonline = !$allowviewonline;
! display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, &$new_password, &$cur_password, $password_confirm, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popuppm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat);
}
else
***************
*** 722,727 ****
}
- $signature = preg_replace('/\:[0-9a-z\:]*?\]/si', ']', $signature);
-
$avatar_img = '';
if ( $user_avatar_type )
--- 723,726 ----
***************
*** 789,793 ****
$template->assign_vars(array(
! 'USERNAME' => $username,
'EMAIL' => $email,
'YIM' => $yim,
--- 788,795 ----
$template->assign_vars(array(
! 'USERNAME' => $username,
! 'CUR_PASSWORD' => $cur_password,
! 'NEW_PASSWORD' => $new_password,
! 'PASSWORD_CONFIRM' => $password_confirm,
'EMAIL' => $email,
'YIM' => $yim,
|
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);
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:44
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv6987/db/schemas
Modified Files:
Tag: phpBB-2_0_0
ms_access_primer.zip mssql_basic.sql mysql_basic.sql
postgres_basic.sql
Log Message:
Loads of bug fixes and updates
Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
Binary files /tmp/cvsS2yaVe and /tmp/cvsOQpKRi differ
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -r1.13.2.2 -r1.13.2.3
*** mssql_basic.sql 6 May 2002 13:46:32 -0000 1.13.2.2
--- mssql_basic.sql 12 May 2002 00:47:40 -0000 1.13.2.3
***************
*** 68,72 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.0');
/*
--- 68,72 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.1');
/*
***************
*** 168,203 ****
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
SET IDENTITY_INSERT phpbb_smilies OFF;
--- 168,201 ----
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
SET IDENTITY_INSERT phpbb_smilies OFF;
Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** mysql_basic.sql 4 Apr 2002 15:00:11 -0000 1.14.2.1
--- mysql_basic.sql 12 May 2002 00:47:40 -0000 1.14.2.2
***************
*** 61,65 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.0');
--- 61,65 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.1');
***************
*** 121,156 ****
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
--- 121,154 ----
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** postgres_basic.sql 4 Apr 2002 15:00:11 -0000 1.15.2.1
--- postgres_basic.sql 12 May 2002 00:47:40 -0000 1.15.2.2
***************
*** 62,66 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.0');
-- Categories
--- 62,66 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.1');
-- Categories
***************
*** 108,155 ****
-- Smilies
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( '8O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( '8-O', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (code, smile_url, emoticon) VALUES ( ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
--- 108,153 ----
-- Smilies
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral');
! INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:44
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv6987/templates/subSilver
Modified Files:
Tag: phpBB-2_0_0
posting_body.tpl profile_add_body.tpl
Log Message:
Loads of bug fixes and updates
Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -C2 -r1.26.2.1 -r1.26.2.2
*** posting_body.tpl 9 Apr 2002 14:39:51 -0000 1.26.2.1
--- posting_body.tpl 12 May 2002 00:47:41 -0000 1.26.2.2
***************
*** 325,343 ****
<td><span class="genmed"> {L_FONT_COLOR}:
<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
! <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option>
! <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">{L_COLOR_DARK_RED}</option>
! <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">{L_COLOR_RED}</option>
! <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">{L_COLOR_ORANGE}</option>
! <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">{L_COLOR_BROWN}</option>
! <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">{L_COLOR_YELLOW}</option>
! <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">{L_COLOR_GREEN}</option>
! <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">{L_COLOR_OLIVE}</option>
! <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">{L_COLOR_CYAN}</option>
! <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">{L_COLOR_BLUE}</option>
! <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">{L_COLOR_DARK_BLUE}</option>
! <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">{L_COLOR_INDIGO}</option>
! <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
! <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option>
! <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option>
</select> {L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
<option value="7" class="genmed">{L_FONT_TINY}</option>
--- 325,343 ----
<td><span class="genmed"> {L_FONT_COLOR}:
<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
! <option style="color:black; background-color: {T_TD_COLOR1}" value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option>
! <option style="color:darkred; background-color: {T_TD_COLOR1}" value="darkred" class="genmed">{L_COLOR_DARK_RED}</option>
! <option style="color:red; background-color: {T_TD_COLOR1}" value="red" class="genmed">{L_COLOR_RED}</option>
! <option style="color:orange; background-color: {T_TD_COLOR1}" value="orange" class="genmed">{L_COLOR_ORANGE}</option>
! <option style="color:brown; background-color: {T_TD_COLOR1}" value="brown" class="genmed">{L_COLOR_BROWN}</option>
! <option style="color:yellow; background-color: {T_TD_COLOR1}" value="yellow" class="genmed">{L_COLOR_YELLOW}</option>
! <option style="color:green; background-color: {T_TD_COLOR1}" value="green" class="genmed">{L_COLOR_GREEN}</option>
! <option style="color:olive; background-color: {T_TD_COLOR1}" value="olive" class="genmed">{L_COLOR_OLIVE}</option>
! <option style="color:cyan; background-color: {T_TD_COLOR1}" value="cyan" class="genmed">{L_COLOR_CYAN}</option>
! <option style="color:blue; background-color: {T_TD_COLOR1}" value="blue" class="genmed">{L_COLOR_BLUE}</option>
! <option style="color:darkblue; background-color: {T_TD_COLOR1}" value="darkblue" class="genmed">{L_COLOR_DARK_BLUE}</option>
! <option style="color:indigo; background-color: {T_TD_COLOR1}" value="indigo" class="genmed">{L_COLOR_INDIGO}</option>
! <option style="color:violet; background-color: {T_TD_COLOR1}" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
! <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option>
! <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option>
</select> {L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
<option value="7" class="genmed">{L_FONT_TINY}</option>
Index: profile_add_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_add_body.tpl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** profile_add_body.tpl 31 Mar 2002 00:06:34 -0000 1.16
--- profile_add_body.tpl 12 May 2002 00:47:41 -0000 1.16.2.1
***************
*** 30,34 ****
<span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
<td class="row2">
! <input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="100" value="{PASSWORD}" />
</td>
</tr>
--- 30,34 ----
<span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
<td class="row2">
! <input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="100" value="{CUR_PASSWORD}" />
</td>
</tr>
***************
*** 38,42 ****
<span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
<td class="row2">
! <input type="password" class="post" style="width: 200px" name="new_password" size="25" maxlength="100" value="{PASSWORD}" />
</td>
</tr>
--- 38,42 ----
<span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
<td class="row2">
! <input type="password" class="post" style="width: 200px" name="new_password" size="25" maxlength="100" value="{NEW_PASSWORD}" />
</td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:44
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv6987/language/lang_english
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
Loads of bug fixes and updates
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** lang_admin.php 10 Mar 2002 03:41:33 -0000 1.35
--- lang_admin.php 12 May 2002 00:47:41 -0000 1.35.2.1
***************
*** 29,53 ****
// in the modules[][] arrays in each module file
//
! $lang['General'] = "General Admin";
! $lang['Users'] = "User Admin";
! $lang['Groups'] = "Group Admin";
! $lang['Forums'] = "Forum Admin";
! $lang['Styles'] = "Styles Admin";
!
! $lang['Configuration'] = "Configuration";
! $lang['Permissions'] = "Permissions";
[...1373 lines suppressed...]
! $lang['Upgrade'] = 'Upgrade';
! $lang['Install_Method'] = 'Choose your installation method';
! $lang['Install_No_Ext'] = 'The php configuration on your server doesn\'t support the database type that you choose';
! $lang['Install_No_PCRE'] = 'phpBB2 Requires the Perl-Compatible Regular Expressions Module for php which your php configuration doesn\'t appear to support!';
//
***************
*** 718,720 ****
// -------------------------------------------------
! ?>
--- 718,720 ----
// -------------------------------------------------
! ?>
\ No newline at end of file
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.85
retrieving revision 1.85.2.1
diff -C2 -r1.85 -r1.85.2.1
*** lang_main.php 25 Mar 2002 19:22:42 -0000 1.85
--- lang_main.php 12 May 2002 00:47:41 -0000 1.85.2.1
***************
*** 21,41 ****
//
! // The format of this file is:
//
! // ---> $lang['message'] = "text";
//
! // You should also try to set a locale and a character
! // encoding (plus direction). The encoding and direction
! // will be sent to the template. The locale may or may
! // not work, it's dependent on OS support and the syntax
[...1943 lines suppressed...]
//
! $lang['Information'] = 'Information';
! $lang['Critical_Information'] = 'Critical Information';
! $lang['General_Error'] = 'General Error';
! $lang['Critical_Error'] = 'Critical Error';
! $lang['An_error_occured'] = 'An Error Occurred';
! $lang['A_critical_error'] = 'A Critical Error Occurred';
//
***************
*** 990,992 ****
// -------------------------------------------------
! ?>
--- 1001,1003 ----
// -------------------------------------------------
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:44
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6987
Modified Files:
Tag: phpBB-2_0_0
common.php modcp.php privmsg.php viewtopic.php
Log Message:
Loads of bug fixes and updates
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.74
retrieving revision 1.74.2.1
diff -C2 -r1.74 -r1.74.2.1
*** common.php 18 Mar 2002 23:45:24 -0000 1.74
--- common.php 12 May 2002 00:47:40 -0000 1.74.2.1
***************
*** 171,184 ****
$sql = "SELECT *
FROM " . CONFIG_TABLE;
! if(!$result = $db->sql_query($sql))
{
message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
}
! else
{
! while($row = $db->sql_fetchrow($result))
! {
! $board_config[$row['config_name']] = $row['config_value'];
! }
}
--- 171,182 ----
$sql = "SELECT *
FROM " . CONFIG_TABLE;
! if( !($result = $db->sql_query($sql)) )
{
message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
}
!
! while ( $row = $db->sql_fetchrow($result) )
{
! $board_config[$row['config_name']] = $row['config_value'];
}
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.1
retrieving revision 1.71.2.2
diff -C2 -r1.71.2.1 -r1.71.2.2
*** modcp.php 7 Apr 2002 14:59:33 -0000 1.71.2.1
--- modcp.php 12 May 2002 00:47:40 -0000 1.71.2.2
***************
*** 331,335 ****
{
// Not confirmed, show confirmation message
-
if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
{
--- 331,334 ----
***************
*** 382,385 ****
--- 381,389 ----
if ( $confirm )
{
+ if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
+ {
+ message_die(GENERAL_MESSAGE, $lang['None_selected']);
+ }
+
$new_forum_id = $HTTP_POST_VARS['new_forum'];
$old_forum_id = $forum_id;
***************
*** 521,524 ****
--- 525,533 ----
case 'lock':
+ if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
+ {
+ message_die(GENERAL_MESSAGE, $lang['None_selected']);
+ }
+
$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
***************
*** 560,563 ****
--- 569,577 ----
case 'unlock':
+ if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
+ {
+ message_die(GENERAL_MESSAGE, $lang['None_selected']);
+ }
+
$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
***************
*** 859,863 ****
WHERE poster_id = $poster_id
GROUP BY poster_ip
! ORDER BY postings DESC";
if ( !($result = $db->sql_query($sql)) )
{
--- 873,877 ----
WHERE poster_id = $poster_id
GROUP BY poster_ip
! ORDER BY " . (( SQL_LAYER == 'msaccess' ) ? 'COUNT(*)' : 'postings' ) . " DESC";
if ( !($result = $db->sql_query($sql)) )
{
***************
*** 906,910 ****
AND p.poster_ip = '" . $post_row['poster_ip'] . "'
GROUP BY u.user_id, u.username
! ORDER BY postings DESC";
if ( !($result = $db->sql_query($sql)) )
{
--- 920,924 ----
AND p.poster_ip = '" . $post_row['poster_ip'] . "'
GROUP BY u.user_id, u.username
! ORDER BY " . (( SQL_LAYER == 'msaccess' ) ? 'COUNT(*)' : 'postings' ) . " DESC";
if ( !($result = $db->sql_query($sql)) )
{
***************
*** 1004,1013 ****
{
$folder_img = $images['folder_announce'];
! $folder_alt = $lang['Announcement'];
}
else if ( $row['topic_type'] == POST_STICKY )
{
$folder_img = $images['folder_sticky'];
! $folder_alt = $lang['Sticky'];
}
else
--- 1018,1027 ----
{
$folder_img = $images['folder_announce'];
! $folder_alt = $lang['Topic_Announcement'];
}
else if ( $row['topic_type'] == POST_STICKY )
{
$folder_img = $images['folder_sticky'];
! $folder_alt = $lang['Topic_Sticky'];
}
else
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.2
retrieving revision 1.96.2.3
diff -C2 -r1.96.2.2 -r1.96.2.3
*** privmsg.php 7 Apr 2002 13:33:51 -0000 1.96.2.2
--- privmsg.php 12 May 2002 00:47:40 -0000 1.96.2.3
***************
*** 1800,1839 ****
// Define correct icons
//
! if ( $folder == 'inbox' )
{
! $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>';
! $reply_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_replymsg'] . '" alt="' . $lang['Post_reply_pm'] . '" border="0"></a>';
! $quote_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>';
! $edit_pm_img = '';
!
! $l_box_name = $lang['Inbox'];
! }
! else if ( $folder == 'outbox' )
! {
! $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>';
! $reply_pm_img = '';
! $quote_pm_img = '';
! $edit_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_editmsg'] . '" alt="' . $lang['Edit_pm'] . '" border="0"></a>';
!
! $l_box_name = $lang['Outbox'];
! }
! else if ( $folder == 'savebox' )
! {
! $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>';
! $reply_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_replymsg'] . '" alt="' . $lang['Post_reply_pm'] . '" border="0"></a>';
! $quote_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>';
! $edit_pm_img = '';
!
! $l_box_name = $lang['Savedbox'];
! }
! else if ( $folder == 'sentbox' )
! {
! $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>';
! $reply_pm_img = '';
! $quote_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>';
! $edit_pm_img = '';
!
! $l_box_name = $lang['Sentbox'];
}
//
--- 1800,1821 ----
// Define correct icons
//
! switch ( $folder )
{
! case 'inbox':
! $l_box_name = $lang['Inbox'];
! break;
! case 'outbox':
! $l_box_name = $lang['Outbox'];
! break;
! case 'savebox':
! $l_box_name = $lang['Savedbox'];
! break;
! case 'sentbox':
! $l_box_name = $lang['Sentbox'];
! break;
}
+ $post_pm = append_sid("privmsg.$phpEx?mode=post");
+ $post_pm_img = '<a href="' . $post_pm . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>';
+ $post_pm = '<a href="' . $post_pm . '">' . $lang['Post_new_pm'] . '</a>';
//
***************
*** 1842,1869 ****
if ( $folder != 'outbox' )
{
! if ( $board_config['max_' . $folder . '_privmsgs'] > 0 )
! {
! $inbox_limit_pct = round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * 100);
! }
! else
! {
! $inbox_limit_pct = 100;
! }
! if ( $board_config['max_' . $folder . '_privmsgs'] > 0 )
! {
! $inbox_limit_img_length = round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * $board_config['privmsg_graphic_length']);
! }
! else
! {
! $inbox_limit_img_length = $board_config['privmsg_graphic_length'];
! }
! if ( $board_config['max_' . $folder . '_privmsgs'] > 0 )
! {
! $inbox_limit_remain = $board_config['max_' . $folder . '_privmsgs'] - $pm_all_total;
! }
! else
! {
! $inbox_limit_remain = 0;
! }
$template->assign_block_vars('switch_box_size_notice', array());
--- 1824,1830 ----
if ( $folder != 'outbox' )
{
! $inbox_limit_pct = ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) ? round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * 100) : 100;
! $inbox_limit_img_length = ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) ? round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * $board_config['privmsg_graphic_length']) : $board_config['privmsg_graphic_length'];
! $inbox_limit_remain = ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) ? $board_config['max_' . $folder . '_privmsgs'] - $pm_all_total : 0;
$template->assign_block_vars('switch_box_size_notice', array());
***************
*** 1901,1904 ****
--- 1862,1866 ----
'POST_PM_IMG' => $post_pm_img,
+ 'POST_PM' => $post_pm,
'INBOX_LIMIT_IMG_WIDTH' => $inbox_limit_img_length,
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186.2.1
retrieving revision 1.186.2.2
diff -C2 -r1.186.2.1 -r1.186.2.2
*** viewtopic.php 5 Apr 2002 15:11:29 -0000 1.186.2.1
--- viewtopic.php 12 May 2002 00:47:40 -0000 1.186.2.2
***************
*** 322,329 ****
$min_post_time = time() - ($post_days * 86400);
! $sql = "SELECT COUNT(post_id) AS num_posts
! FROM " . POSTS_TABLE . "
! WHERE topic_id = $topic_id
! AND post_time >= $min_post_time";
if ( !($result = $db->sql_query($sql)) )
{
--- 322,330 ----
$min_post_time = time() - ($post_days * 86400);
! $sql = "SELECT COUNT(p.post_id) AS num_posts
! FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! WHERE t.topic_id = $topic_id
! AND p.topic_id = t.topic_id
! AND p.post_time >= $min_post_time";
if ( !($result = $db->sql_query($sql)) )
{
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 00:47:43
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv6987/db
Modified Files:
Tag: phpBB-2_0_0
msaccess.php
Log Message:
Loads of bug fixes and updates
Index: msaccess.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/msaccess.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** msaccess.php 20 Mar 2002 17:47:26 -0000 1.8
--- msaccess.php 12 May 2002 00:47:40 -0000 1.8.2.1
***************
*** 138,142 ****
$row_inner = 0;
! while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max )
{
for($j = 0; $j < count($this->field_names[$this->result]); $j++)
--- 138,142 ----
$row_inner = 0;
! while( odbc_fetch_row($this->result) && $row_outer < $row_outer_max )
{
for($j = 0; $j < count($this->field_names[$this->result]); $j++)
|
|
From: James A. <th...@us...> - 2002-05-09 18:54:52
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv20477
Modified Files:
Tag: phpBB-2_0_0
viewforum.php
Log Message:
Fixed bug #154
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139.2.1
retrieving revision 1.139.2.2
diff -C2 -r1.139.2.1 -r1.139.2.2
*** viewforum.php 7 Apr 2002 14:59:33 -0000 1.139.2.1
--- viewforum.php 9 May 2002 18:54:49 -0000 1.139.2.2
***************
*** 481,485 ****
$folder_image = $images['folder'];
! $folder_alt = $lang['Topic_Moved'];
$newest_post_img = '';
}
--- 481,485 ----
$folder_image = $images['folder'];
! $folder_alt = $lang['Topics_Moved'];
$newest_post_img = '';
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:30:35
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28664
Modified Files:
update_script.php
Log Message:
Alter ban_ip's when examining subnets ... this whole thing needs a review for IPv6
Index: update_script.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_script.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** update_script.php 9 May 2002 14:08:36 -0000 1.7
--- update_script.php 9 May 2002 14:13:45 -0000 1.8
***************
*** 163,168 ****
do
{
$sql_update[] = "UPDATE " . BANLIST_TABLE . "
! SET ban_ip = '" . decode_ip($row['ban_ip']) . "'
WHERE ban_id = " . $row['ban_id'];
}
--- 163,169 ----
do
{
+ $ban_ip = str_replace('255', '256', decode_ip($row['ban_ip']));
$sql_update[] = "UPDATE " . BANLIST_TABLE . "
! SET ban_ip = '$ban_ip'
WHERE ban_id = " . $row['ban_id'];
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:30:34
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26634/admin
Modified Files:
admin_mass_email.php admin_user_ban.php index.php
Log Message:
IP related updates
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** admin_mass_email.php 20 Apr 2002 00:22:27 -0000 1.16
--- admin_mass_email.php 9 May 2002 14:07:41 -0000 1.17
***************
*** 128,132 ****
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template('admin_send_email');
--- 128,132 ----
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\r\n";
$emailer->use_template('admin_send_email');
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** admin_user_ban.php 22 Mar 2002 17:00:32 -0000 1.21
--- admin_user_ban.php 9 May 2002 14:07:41 -0000 1.22
***************
*** 34,38 ****
// Load default header
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
--- 34,38 ----
// Load default header
//
! $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
***************
*** 43,49 ****
if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = "";
! $email_bansql = "";
! $ip_bansql = "";
$user_list = array();
--- 43,49 ----
if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = '';
! $email_bansql = '';
! $ip_bansql = '';
$user_list = array();
***************
*** 61,69 ****
if( isset($HTTP_POST_VARS['ban_ip']) )
{
! $ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
for($i = 0; $i < count($ip_list_temp); $i++)
{
! if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
{
//
--- 61,69 ----
if( isset($HTTP_POST_VARS['ban_ip']) )
{
! $ip_list_temp = explode(',', $HTTP_POST_VARS['ban_ip']);
for($i = 0; $i < count($ip_list_temp); $i++)
{
! if( preg_match('/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/', trim($ip_list_temp[$i]), $ip_range_explode) )
{
//
***************
*** 80,87 ****
if($ip_2_counter == 0 && $ip_2_end == 254)
{
! $ip_2_counter = 255;
! $ip_2_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.255.255.255");
}
--- 80,87 ----
if($ip_2_counter == 0 && $ip_2_end == 254)
{
! $ip_2_counter = 256;
! $ip_2_fragment = 256;
! $ip_list[] = "$ip_1_counter.256.256.256";
}
***************
*** 93,100 ****
if($ip_3_counter == 0 && $ip_3_end == 254 )
{
! $ip_3_counter = 255;
! $ip_3_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
}
--- 93,100 ----
if($ip_3_counter == 0 && $ip_3_end == 254 )
{
! $ip_3_counter = 256;
! $ip_3_fragment = 256;
! $ip_list[] = "$ip_1_counter.$ip_2_counter.256.256";
}
***************
*** 106,118 ****
if($ip_4_counter == 0 && $ip_4_end == 254)
{
! $ip_4_counter = 255;
! $ip_4_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
}
while($ip_4_counter <= $ip_4_end)
{
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
$ip_4_counter++;
}
--- 106,118 ----
if($ip_4_counter == 0 && $ip_4_end == 254)
{
! $ip_4_counter = 256;
! $ip_4_fragment = 256;
! $ip_list[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.256";
}
while($ip_4_counter <= $ip_4_end)
{
! $ip_list[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter";
$ip_4_counter++;
}
***************
*** 124,128 ****
}
}
! else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
--- 124,128 ----
}
}
! else if( preg_match('/^([\w\-_]\.?){2,}$/is', trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
***************
*** 132,142 ****
if( !empty($ip[$j]) )
{
! $ip_list[] = encode_ip($ip[$j]);
}
}
}
! else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
{
! $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
}
}
--- 132,142 ----
if( !empty($ip[$j]) )
{
! $ip_list[] = $ip[$j];
}
}
}
! else if( preg_match('/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/', trim($ip_list_temp[$i])) )
{
! $ip_list[] = str_replace('*', '256', trim($ip_list_temp[$i]));
}
}
***************
*** 146,150 ****
if(isset($HTTP_POST_VARS['ban_email']))
{
! $email_list_temp = explode(",", $HTTP_POST_VARS['ban_email']);
for($i = 0; $i < count($email_list_temp); $i++)
--- 146,150 ----
if(isset($HTTP_POST_VARS['ban_email']))
{
! $email_list_temp = explode(',', $HTTP_POST_VARS['ban_email']);
for($i = 0; $i < count($email_list_temp); $i++)
***************
*** 155,159 ****
// section)
//
! if( eregi("^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
--- 155,159 ----
// section)
//
! if( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
***************
*** 171,175 ****
$current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = "";
for($i = 0; $i < count($user_list); $i++)
{
--- 171,175 ----
$current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = '';
for($i = 0; $i < count($user_list); $i++)
{
***************
*** 185,189 ****
if(!$in_banlist)
{
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
--- 185,189 ----
if(!$in_banlist)
{
! $kill_session_sql .= ( ($kill_session_sql != '') ? ' OR ' : '' ) . "session_user_id = " . $user_list[$i];
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
***************
*** 207,222 ****
}
! if(!$in_banlist)
{
! if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
! {
! $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
! }
! else
! {
! $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
! }
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
--- 207,215 ----
}
! if ( !$in_banlist )
{
! $kill_ip_sql = ( preg_match('/256/s') ) ? "session_ip LIKE '" . preg_replace('/(256)/s', '%', $ip_list[$i]) . "'" : "session_ip = '" . $ip_list[$i] . "'";
! $kill_session_sql .= ( ($kill_session_sql != '') ? ' OR ' : '' ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
***************
*** 439,443 ****
if ( !empty($banlist[$i]['ban_ip']) )
{
! $ban_ip = str_replace('255', '*', decode_ip($banlist[$i]['ban_ip']));
$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
$ipban_count++;
--- 432,436 ----
if ( !empty($banlist[$i]['ban_ip']) )
{
! $ban_ip = str_replace('256', '*', $banlist[$i]['ban_ip']);
$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
$ipban_count++;
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** index.php 25 Mar 2002 20:37:14 -0000 1.40
--- index.php 9 May 2002 14:07:41 -0000 1.41
***************
*** 444,448 ****
$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $reg_ip = decode_ip($onlinerow_reg[$i]['session_ip']);
$template->assign_block_vars("reg_user_row", array(
--- 444,448 ----
$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $reg_ip = $onlinerow_reg[$i]['session_ip'];
$template->assign_block_vars("reg_user_row", array(
***************
*** 536,540 ****
$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $guest_ip = decode_ip($onlinerow_guest[$i]['session_ip']);
$template->assign_block_vars("guest_user_row", array(
--- 536,540 ----
$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $guest_ip = $onlinerow_guest[$i]['session_ip'];
$template->assign_block_vars("guest_user_row", array(
|
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:30:32
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv26892
Modified Files:
update_script.php
Log Message:
IP related updates NOTE this is just MySQL! Do not run this if you are using other DB's or the necessary IP changes will not be implemented in future
Index: update_script.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/update_script.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** update_script.php 30 Apr 2002 17:56:50 -0000 1.6
--- update_script.php 9 May 2002 14:08:36 -0000 1.7
***************
*** 3,6 ****
--- 3,16 ----
<?php
+ // --------------------------------
+ //
+ function decode_ip($int_ip)
+ {
+ $hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
+ return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
+ }
+ //
+ // --------------------------------
+
define('IN_PHPBB', 1);
$phpbb_root_path = './';
***************
*** 35,40 ****
echo '<span style="color:green">DONE</span><br /><br />';
- break;
-
case '.1.0 [20020420]':
switch ( SQL_LAYER )
--- 45,48 ----
***************
*** 59,63 ****
break;
}
- break;
case '.1.0 [20020421]':
$user_data_sql = "SELECT COUNT(user_id) AS total_users, MAX(user_id) AS newest_user_id FROM " . USERS_TABLE . " WHERE user_id <> " . ANONYMOUS;
--- 67,70 ----
***************
*** 87,91 ****
$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
VALUES ('num_users', $user_count)";
! break;
default;
echo 'No updates made<br /><br />';
--- 94,134 ----
$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
VALUES ('num_users', $user_count)";
! case '.1.0 [20020430]':
! switch ( SQL_LAYER )
! {
! case 'mysql':
! case 'mysql4':
! $sql[] = "ALTER TABLE " . BANLIST_TABLE . "
! MODIFY ban_email char(60) NULL,
! MODIFY ban_ip char(40) NULL";
! $sql[] = "ALTER TABLE " . DISALLOW_TABLE . "
! MODIFY disallow_username char(30) NOT NULL";
! $sql[] = "ALTER TABLE " . POSTS_TABLE . "
! MODIFY poster_ip char(40) NOT NULL,
! MODIFY post_username char(30) NULL";
! $sql[] = "ALTER TABLE " . PRIVMSGS_TABLE . "
! MODIFY privmsgs_subject char(60) NOT NULL,
! MODIFY privmsgs_ip char(40) NOT NULL";
! $sql[] = "ALTER TABLE " . SESSIONS_TABLE . "
! MODIFY session_ip char(40) NOT NULL";
! $sql[] = "ALTER TABLE " . USERS_TABLE . "
! ADD COLUMN user_ip char(40) NOT NULL";
! $sql[] = "ALTER TABLE " . VOTE_USERS_TABLE . "
! MODIFY COLUMN vote_user_ip char(40) NOT NULL";
! break;
!
! case 'mssql-odbc':
! case 'mssql':
! $sql[] = "";
! break;
!
! case 'postgresql':
! $sql[] = "";
! default:
! die("No DB LAYER found!");
! break;
! }
!
! break;
default;
echo 'No updates made<br /><br />';
***************
*** 96,100 ****
for($i = 0; $i < count($sql); $i++)
{
! if ( !($result = $db->sql_query($sql[$i])) )
{
die("Couldn't run update >> " . $sql[$i]);
--- 139,143 ----
for($i = 0; $i < count($sql); $i++)
{
! if ( !$db->sql_query($sql[$i]) )
{
die("Couldn't run update >> " . $sql[$i]);
***************
*** 102,109 ****
}
}
}
$sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.1.0 [20020430]'
WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
--- 145,267 ----
}
}
+
+ $sql_update = array();
+
+ switch ( $row['config_value'] )
+ {
+ case '.1.0 [20020430]':
+
+ $sql = "SELECT ban_id, ban_ip
+ FROM " . BANLIST_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ die("Couldn't select data >> " . $sql);
+ }
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ do
+ {
+ $sql_update[] = "UPDATE " . BANLIST_TABLE . "
+ SET ban_ip = '" . decode_ip($row['ban_ip']) . "'
+ WHERE ban_id = " . $row['ban_id'];
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+
+ $sql = "SELECT post_id, poster_ip
+ FROM " . POSTS_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ die("Couldn't select data >> " . $sql);
+ }
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ do
+ {
+ $sql_update[] = "UPDATE " . POSTS_TABLE . "
+ SET poster_ip = '" . decode_ip($row['poster_ip']) . "'
+ WHERE post_id = " . $row['post_id'];
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+
+ $sql = "SELECT privmsgs_id, privmsgs_ip
+ FROM " . PRIVMSGS_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ die("Couldn't select data >> " . $sql);
+ }
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ do
+ {
+ $sql_update[] = "UPDATE " . PRIVMSGS_TABLE . "
+ SET privmsgs_ip = '" . decode_ip($row['privmsgs_ip']) . "'
+ WHERE privmsgs_id = " . $row['privmsgs_id'];
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+
+ $sql = "SELECT session_id, session_ip
+ FROM " . SESSIONS_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ die("Couldn't select data >> " . $sql);
+ }
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ do
+ {
+ $sql_update[] = "UPDATE " . SESSIONS_TABLE . "
+ SET session_ip = '" . decode_ip($row['session_ip']) . "'
+ WHERE session_id = '" . $row['session_id'] . "'";
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+
+ $sql = "SELECT vote_id, vote_user_id, vote_user_ip
+ FROM " . VOTE_USERS_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ die("Couldn't select data >> " . $sql);
+ }
+
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ do
+ {
+ $sql_update[] = "UPDATE " . VOTE_USERS_TABLE . "
+ SET vote_user_ip = '" . decode_ip($row['vote_user_ip']) . "'
+ WHERE vote_id = " . $row['vote_id'] . "
+ AND vote_user_id = " . $row['vote_user_id'];
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+ break;
+ }
+
+ if ( count($sql_update) )
+ {
+ echo 'Updating existing data :: ';
+ flush();
+
+ for($i = 0; $i < count($sql_update); $i++)
+ {
+ if ( !$db->sql_query($sql_update[$i]) )
+ {
+ die("Couldn't run update >> " . $sql_update[$i]);
+ }
+ }
+
+ echo "DONE<br /><br />\n";
+ }
}
$sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.1.0 [20020905]'
WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
|
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:30:31
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv26688
Modified Files:
common.php
Log Message:
IP related updates
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** common.php 20 Apr 2002 22:56:09 -0000 1.76
--- common.php 9 May 2002 14:07:52 -0000 1.77
***************
*** 295,311 ****
if( getenv('HTTP_X_FORWARDED_FOR') != '' )
{
! $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
{
$private_ip = array('/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
! $client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
}
}
else
{
! $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
}
- $user_ip = encode_ip($client_ip);
//
--- 295,310 ----
if( getenv('HTTP_X_FORWARDED_FOR') != '' )
{
! $user_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
{
$private_ip = array('/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
! $user_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
}
}
else
{
! $user_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
}
//
|
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:30:31
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv26602/includes
Modified Files:
functions.php sessions.php usercp_email.php
Log Message:
IP related updates + fixed gc in sessions
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** functions.php 20 Apr 2002 00:22:28 -0000 1.134
--- functions.php 9 May 2002 14:07:33 -0000 1.135
***************
*** 298,313 ****
}
- function encode_ip($dotquad_ip)
- {
- $ip_sep = explode('.', $dotquad_ip);
- return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]);
- }
-
- function decode_ip($int_ip)
- {
- $hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
- return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
- }
-
//
// Create date/time from format and timezone
--- 298,301 ----
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** sessions.php 20 Apr 2002 00:36:33 -0000 1.60
--- sessions.php 9 May 2002 14:07:33 -0000 1.61
***************
*** 21,28 ****
***************************************************************************/
! //
! // Adds/updates a new session to the database for the given userid.
! // Returns the new session ID on success.
! //
function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0)
{
--- 21,30 ----
***************************************************************************/
! if ( !defined('IN_PHPBB') )
! {
! die('Hacking attempt');
! exit;
! }
!
function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0)
{
***************
*** 34,37 ****
--- 36,40 ----
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
+ $SID = '?sid=';
if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
***************
*** 110,118 ****
// Initial ban check against user id, IP and email address
//
! preg_match('/(..)(..)(..)(..)/', $user_ip, $user_ip_parts);
$sql = "SELECT ban_ip, ban_userid, ban_email
FROM " . BANLIST_TABLE . "
! WHERE ban_ip IN ('" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "', '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . "ff', '" . $user_ip_parts[1] . $user_ip_parts[2] . "ffff', '" . $user_ip_parts[1] . "ffffff')
OR ban_userid = $user_id";
if ( $user_id != ANONYMOUS )
--- 113,121 ----
// Initial ban check against user id, IP and email address
//
! $user_ip_parts = explode('.', $user_ip);
$sql = "SELECT ban_ip, ban_userid, ban_email
FROM " . BANLIST_TABLE . "
! WHERE ban_ip IN ('" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "', '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . ".256', '" . $user_ip_parts[1] . $user_ip_parts[2] . ".256.256', '" . $user_ip_parts[1] . "256.256.256')
OR ban_userid = $user_id";
if ( $user_id != ANONYMOUS )
***************
*** 134,137 ****
--- 137,142 ----
}
+ $login = 1;
+
//
// Create or update the session
***************
*** 139,144 ****
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
! WHERE session_id = '" . $session_id . "'
! AND session_ip = '$user_ip'";
if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
{
--- 144,148 ----
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
! WHERE session_id = '" . $session_id . "'";
if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
{
***************
*** 155,159 ****
if ( $user_id != ANONYMOUS )
! {// ( $userdata['user_session_time'] > $expiry_time && $auto_create ) ? $userdata['user_lastvisit'] : (
$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
--- 159,163 ----
if ( $user_id != ANONYMOUS )
! {
$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
***************
*** 183,187 ****
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
! $SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
return $userdata;
--- 187,191 ----
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
! $SID .= ( $sessionmethod == SESSION_METHOD_GET ) ? $session_id : '';
return $userdata;
***************
*** 197,207 ****
global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
$cookiename = $board_config['cookie_name'];
$cookiepath = $board_config['cookie_path'];
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
$current_time = time();
- unset($userdata);
if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
--- 201,212 ----
global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
+ unset($userdata);
$cookiename = $board_config['cookie_name'];
$cookiepath = $board_config['cookie_path'];
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
+ $SID = '?sid=';
$current_time = time();
if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
***************
*** 230,235 ****
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
WHERE s.session_id = '$session_id'
! AND u.user_id = s.session_user_id
! AND s.session_ip = '$user_ip'";
if ( !($result = $db->sql_query($sql)) )
{
--- 235,239 ----
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
WHERE s.session_id = '$session_id'
! AND u.user_id = s.session_user_id";
if ( !($result = $db->sql_query($sql)) )
{
***************
*** 244,248 ****
if ( isset($userdata['user_id']) )
{
! $SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
//
--- 248,252 ----
if ( isset($userdata['user_id']) )
{
! $SID .= ( $sessionmethod == SESSION_METHOD_GET ) ? $session_id : '';
//
***************
*** 253,258 ****
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'
! AND session_ip = '$user_ip'";
if ( !$db->sql_query($sql) )
{
--- 257,261 ----
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'";
if ( !$db->sql_query($sql) )
{
***************
*** 262,308 ****
if ( $current_time - $board_config['session_gc'] > $board_config['session_last_gc'] )
{
! $sql = "SELECT *
! FROM " . SESSIONS_TABLE . "
! WHERE session_time < " . ( $current_time - $board_config['session_length'] ) . "
! AND session_logged_in = 1";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(CRITICAL_ERROR, 'Could not obtain expired session list', '', __LINE__, __FILE__, $sql);
! }
!
! $del_session_id = '';
! while ( $row = $db->sql_fetchrow($result) )
! {
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = " . $row['session_time'] . ", user_session_page = " . $row['session_page'] . "
! WHERE user_id = " . $row['session_user_id'];
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Could not update user session info', '', __LINE__, __FILE__, $sql);
! }
!
! $del_session_id .= ( ( $del_session_id != '' ) ? ', ' : '' ) . '\'' . $row['session_id'] . '\'';
! }
!
! if ( $del_session_id != '' )
! {
! //
! // Delete expired sessions
! //
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_id IN ($del_session_id)";
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
! }
! }
!
! $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '$current_time'
! WHERE config_name = 'session_last_gc'";
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Could not update session gc time', '', __LINE__, __FILE__, $sql);
! }
}
--- 265,269 ----
if ( $current_time - $board_config['session_gc'] > $board_config['session_last_gc'] )
{
! session_gc($session_id, $current_time);
}
***************
*** 331,336 ****
//
! // session_end closes out a session
! // deleting the corresponding entry
// in the sessions table
//
--- 292,296 ----
//
! // session_end closes out a session deleting the corresponding entry
// in the sessions table
//
***************
*** 344,347 ****
--- 304,308 ----
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
+ $SID = '?sid=';
//
***************
*** 374,390 ****
}
//
// Append $SID to a url. Borrowed from phplib and modified.
//
function append_sid($url, $non_html_amp = false)
{
global $SID;
! if ( !empty($SID) && !eregi('sid=', $url) )
! {
! $url .= ( ( strpos($url, '?') != false ) ? ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID;
! }
!
! return($url);
}
--- 335,404 ----
}
+ function session_gc($session_id, $current_time)
+ {
+ global $db, $board_config;
+
+ $sql = "SELECT *
+ FROM " . SESSIONS_TABLE . "
+ WHERE session_time < " . ( $current_time - $board_config['session_length'] );
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(CRITICAL_ERROR, 'Could not obtain expired session list', '', __LINE__, __FILE__, $sql);
+ }
+
+ $del_session_id = '';
+ while ( $row = $db->sql_fetchrow($result) )
+ {
+ if ( $row['session_logged_in'] )
+ {
+ $sql = "UPDATE " . USERS_TABLE . "
+ SET user_lastvisit = " . $row['session_time'] . ", user_session_page = " . $row['session_page'] . "
+ WHERE user_id = " . $row['session_user_id'];
+ if ( !$db->sql_query($sql) )
+ {
+ message_die(CRITICAL_ERROR, 'Could not update user session info', '', __LINE__, __FILE__, $sql);
+ }
+ }
+
+ $del_session_id .= ( ( $del_session_id != '' ) ? ', ' : '' ) . '\'' . $row['session_id'] . '\'';
+ }
+
+ if ( $del_session_id != '' )
+ {
+ //
+ // Delete expired sessions
+ //
+ $sql = "DELETE FROM " . SESSIONS_TABLE . "
+ WHERE session_id IN ($del_session_id)";
+ if ( !$db->sql_query($sql) )
+ {
+ message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
+ }
+ }
+
+ $sql = "UPDATE " . CONFIG_TABLE . "
+ SET config_value = '$current_time'
+ WHERE config_name = 'session_last_gc'";
+ if ( !$db->sql_query($sql) )
+ {
+ message_die(CRITICAL_ERROR, 'Could not update session gc time', '', __LINE__, __FILE__, $sql);
+ }
+
+ return;
+ }
+
+
//
// Append $SID to a url. Borrowed from phplib and modified.
//
+ // This routine is doomed I think, instead we just set a URL$SID for
+ // appropriate URLs rather than this append stuff. For the time being
+ // this change will break URL based session propagation
+ //
function append_sid($url, $non_html_amp = false)
{
global $SID;
! return $url;
}
Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_email.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** usercp_email.php 20 Apr 2002 00:22:29 -0000 1.8
--- usercp_email.php 9 May 2002 14:07:33 -0000 1.9
***************
*** 104,108 ****
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template('profile_send_email', $user_lang);
--- 104,108 ----
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\r\n";
$emailer->use_template('profile_send_email', $user_lang);
|
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:23:27
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv32548/includes Modified Files: sessions.php Log Message: doh Index: sessions.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -r1.61 -r1.62 *** sessions.php 9 May 2002 14:07:33 -0000 1.61 --- sessions.php 9 May 2002 14:23:24 -0000 1.62 *************** *** 137,142 **** } - $login = 1; - // // Create or update the session --- 137,140 ---- |
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:08:44
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv26916 Modified Files: modcp.php Log Message: IP related updates Index: modcp.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -r1.72 -r1.73 *** modcp.php 20 Apr 2002 00:22:27 -0000 1.72 --- modcp.php 9 May 2002 14:08:41 -0000 1.73 *************** *** 832,836 **** } ! $ip_this_post = decode_ip($post_row['poster_ip']); $ip_this_post = ( $rdns_ip_num == $ip_this_post ) ? gethostbyaddr($ip_this_post) : $ip_this_post; --- 832,836 ---- } ! $ip_this_post = $post_row['poster_ip']; $ip_this_post = ( $rdns_ip_num == $ip_this_post ) ? gethostbyaddr($ip_this_post) : $ip_this_post; *************** *** 878,882 **** } ! $ip = decode_ip($row['poster_ip']); $ip = ( $rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? gethostbyaddr($ip) : $ip; --- 878,882 ---- } ! $ip = $row['poster_ip']; $ip = ( $rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? gethostbyaddr($ip) : $ip; |
|
From: Paul S. O. <ps...@us...> - 2002-05-08 23:34:42
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv29613/db/schemas
Modified Files:
mssql_schema.sql mysql_schema.sql postgres_schema.sql
Log Message:
IP size to 40 chars
Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** mssql_schema.sql 20 Apr 2002 23:43:46 -0000 1.26
--- mssql_schema.sql 8 May 2002 23:34:36 -0000 1.27
***************
*** 31,35 ****
[ban_id] [int] IDENTITY (1, 1) NOT NULL ,
[ban_userid] [int] NULL ,
! [ban_ip] [char] (8) NULL ,
[ban_email] [varchar] (50) NULL
) ON [PRIMARY]
--- 31,35 ----
[ban_id] [int] IDENTITY (1, 1) NOT NULL ,
[ban_userid] [int] NULL ,
! [ban_ip] [char] (40) NULL ,
[ban_email] [varchar] (50) NULL
) ON [PRIMARY]
***************
*** 112,116 ****
[poster_id] [int] NOT NULL ,
[post_time] [int] NOT NULL ,
! [poster_ip] [char] (8) NULL ,
[post_username] [char] (25) NULL ,
[enable_bbcode] [smallint] NULL ,
--- 112,116 ----
[poster_id] [int] NOT NULL ,
[post_time] [int] NOT NULL ,
! [poster_ip] [char] (40) NULL ,
[post_username] [char] (25) NULL ,
[enable_bbcode] [smallint] NULL ,
***************
*** 138,142 ****
[privmsgs_to_userid] [int] NOT NULL ,
[privmsgs_date] [int] NOT NULL ,
! [privmsgs_ip] [char] (8) NOT NULL ,
[privmsgs_enable_bbcode] [smallint] NULL ,
[privmsgs_enable_html] [smallint] NULL ,
--- 138,142 ----
[privmsgs_to_userid] [int] NOT NULL ,
[privmsgs_date] [int] NOT NULL ,
! [privmsgs_ip] [char] (40) NOT NULL ,
[privmsgs_enable_bbcode] [smallint] NULL ,
[privmsgs_enable_html] [smallint] NULL ,
***************
*** 188,192 ****
[session_start] [int] NULL ,
[session_time] [int] NULL ,
! [session_ip] [char] (8) NOT NULL ,
[session_page] [int] NULL ,
[session_logged_in] [smallint] NULL
--- 188,192 ----
[session_start] [int] NULL ,
[session_time] [int] NULL ,
! [session_ip] [char] (40) NOT NULL ,
[session_page] [int] NULL ,
[session_logged_in] [smallint] NULL
***************
*** 384,388 ****
[vote_id] [int] NOT NULL ,
[vote_user_id] [int] NOT NULL ,
! [vote_user_ip] [char] (8) NOT NULL
) ON [PRIMARY]
GO
--- 384,388 ----
[vote_id] [int] NOT NULL ,
[vote_user_id] [int] NOT NULL ,
! [vote_user_ip] [char] (40) NOT NULL
) ON [PRIMARY]
GO
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** mysql_schema.sql 20 Apr 2002 23:43:46 -0000 1.19
--- mysql_schema.sql 8 May 2002 23:34:36 -0000 1.20
***************
*** 61,66 ****
ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
ban_userid mediumint(8) NOT NULL,
! ban_ip char(8) NOT NULL,
! ban_email varchar(255),
PRIMARY KEY (ban_id),
KEY ban_ip_user_id (ban_ip, ban_userid)
--- 61,66 ----
ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
ban_userid mediumint(8) NOT NULL,
! ban_ip char(40) NOT NULL,
! ban_email char(50),
PRIMARY KEY (ban_id),
KEY ban_ip_user_id (ban_ip, ban_userid)
***************
*** 74,78 ****
CREATE TABLE phpbb_categories (
cat_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! cat_title varchar(100),
cat_order mediumint(8) UNSIGNED NOT NULL,
PRIMARY KEY (cat_id),
--- 74,78 ----
CREATE TABLE phpbb_categories (
cat_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! cat_title char(60),
cat_order mediumint(8) UNSIGNED NOT NULL,
PRIMARY KEY (cat_id),
***************
*** 98,102 ****
CREATE TABLE phpbb_disallow (
disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! disallow_username varchar(25),
PRIMARY KEY (disallow_id)
);
--- 98,102 ----
CREATE TABLE phpbb_disallow (
disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! disallow_username char(30),
PRIMARY KEY (disallow_id)
);
***************
*** 175,179 ****
poster_id mediumint(8) DEFAULT '0' NOT NULL,
post_time int(11) DEFAULT '0' NOT NULL,
! poster_ip char(8) NOT NULL,
post_username varchar(25),
enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
--- 175,179 ----
poster_id mediumint(8) DEFAULT '0' NOT NULL,
post_time int(11) DEFAULT '0' NOT NULL,
! poster_ip char(40) NOT NULL,
post_username varchar(25),
enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
***************
*** 211,219 ****
privmsgs_id mediumint(8) UNSIGNED NOT NULL auto_increment,
privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
! privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
privmsgs_from_userid mediumint(8) DEFAULT '0' NOT NULL,
privmsgs_to_userid mediumint(8) DEFAULT '0' NOT NULL,
privmsgs_date int(11) DEFAULT '0' NOT NULL,
! privmsgs_ip char(8) NOT NULL,
privmsgs_enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
privmsgs_enable_html tinyint(1) DEFAULT '0' NOT NULL,
--- 211,219 ----
privmsgs_id mediumint(8) UNSIGNED NOT NULL auto_increment,
privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
! privmsgs_subject char(60) DEFAULT '0' NOT NULL,
privmsgs_from_userid mediumint(8) DEFAULT '0' NOT NULL,
privmsgs_to_userid mediumint(8) DEFAULT '0' NOT NULL,
privmsgs_date int(11) DEFAULT '0' NOT NULL,
! privmsgs_ip char(40) NOT NULL,
privmsgs_enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
privmsgs_enable_html tinyint(1) DEFAULT '0' NOT NULL,
***************
*** 244,251 ****
CREATE TABLE phpbb_ranks (
rank_id smallint(5) UNSIGNED NOT NULL auto_increment,
! rank_title varchar(50) NOT NULL,
rank_min mediumint(8) DEFAULT '0' NOT NULL,
rank_special tinyint(1) DEFAULT '0',
! rank_image varchar(255),
PRIMARY KEY (rank_id)
);
--- 244,251 ----
CREATE TABLE phpbb_ranks (
rank_id smallint(5) UNSIGNED NOT NULL auto_increment,
! rank_title char(50) NOT NULL,
rank_min mediumint(8) DEFAULT '0' NOT NULL,
rank_special tinyint(1) DEFAULT '0',
! rank_image char(100),
PRIMARY KEY (rank_id)
);
***************
*** 270,274 ****
#
CREATE TABLE phpbb_search_wordlist (
! word_text varchar(50) binary NOT NULL default '',
word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
word_common tinyint(1) unsigned NOT NULL default '0',
--- 270,274 ----
#
CREATE TABLE phpbb_search_wordlist (
! word_text char(25) binary NOT NULL default '',
word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
word_common tinyint(1) unsigned NOT NULL default '0',
***************
*** 309,313 ****
session_start int(11) DEFAULT '0' NOT NULL,
session_time int(11) DEFAULT '0' NOT NULL,
! session_ip char(8) DEFAULT '0' NOT NULL,
session_page int(11) DEFAULT '0' NOT NULL,
session_logged_in tinyint(1) DEFAULT '0' NOT NULL,
--- 309,313 ----
session_start int(11) DEFAULT '0' NOT NULL,
session_time int(11) DEFAULT '0' NOT NULL,
! session_ip char(40) DEFAULT '0' NOT NULL,
session_page int(11) DEFAULT '0' NOT NULL,
session_logged_in tinyint(1) DEFAULT '0' NOT NULL,
***************
*** 324,330 ****
CREATE TABLE phpbb_smilies (
smilies_id smallint(5) UNSIGNED NOT NULL auto_increment,
! code varchar(50),
! smile_url varchar(100),
! emoticon varchar(75),
PRIMARY KEY (smilies_id)
);
--- 324,330 ----
CREATE TABLE phpbb_smilies (
smilies_id smallint(5) UNSIGNED NOT NULL auto_increment,
! code char(10),
! smile_url char(50),
! emoticon char(50),
PRIMARY KEY (smilies_id)
);
***************
*** 337,380 ****
CREATE TABLE phpbb_themes (
themes_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! template_name varchar(30) NOT NULL default '',
! style_name varchar(30) NOT NULL default '',
! head_stylesheet varchar(100) default NULL,
! body_background varchar(100) default NULL,
! body_bgcolor varchar(6) default NULL,
! body_text varchar(6) default NULL,
! body_link varchar(6) default NULL,
! body_vlink varchar(6) default NULL,
! body_alink varchar(6) default NULL,
! body_hlink varchar(6) default NULL,
! tr_color1 varchar(6) default NULL,
! tr_color2 varchar(6) default NULL,
! tr_color3 varchar(6) default NULL,
! tr_class1 varchar(25) default NULL,
! tr_class2 varchar(25) default NULL,
! tr_class3 varchar(25) default NULL,
! th_color1 varchar(6) default NULL,
! th_color2 varchar(6) default NULL,
! th_color3 varchar(6) default NULL,
! th_class1 varchar(25) default NULL,
! th_class2 varchar(25) default NULL,
! th_class3 varchar(25) default NULL,
! td_color1 varchar(6) default NULL,
! td_color2 varchar(6) default NULL,
! td_color3 varchar(6) default NULL,
! td_class1 varchar(25) default NULL,
! td_class2 varchar(25) default NULL,
! td_class3 varchar(25) default NULL,
! fontface1 varchar(50) default NULL,
! fontface2 varchar(50) default NULL,
! fontface3 varchar(50) default NULL,
fontsize1 tinyint(4) default NULL,
fontsize2 tinyint(4) default NULL,
fontsize3 tinyint(4) default NULL,
! fontcolor1 varchar(6) default NULL,
! fontcolor2 varchar(6) default NULL,
! fontcolor3 varchar(6) default NULL,
! span_class1 varchar(25) default NULL,
! span_class2 varchar(25) default NULL,
! span_class3 varchar(25) default NULL,
img_size_poll smallint(5) UNSIGNED,
img_size_privmsg smallint(5) UNSIGNED,
--- 337,380 ----
CREATE TABLE phpbb_themes (
themes_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! template_name char(30) NOT NULL default '',
! style_name char(30) NOT NULL default '',
! head_stylesheet char(100) default NULL,
! body_background char(100) default NULL,
! body_bgcolor char(6) default NULL,
! body_text char(6) default NULL,
! body_link char(6) default NULL,
! body_vlink char(6) default NULL,
! body_alink char(6) default NULL,
! body_hlink char(6) default NULL,
! tr_color1 char(6) default NULL,
! tr_color2 char(6) default NULL,
! tr_color3 char(6) default NULL,
! tr_class1 char(25) default NULL,
! tr_class2 char(25) default NULL,
! tr_class3 char(25) default NULL,
! th_color1 char(6) default NULL,
! th_color2 char(6) default NULL,
! th_color3 char(6) default NULL,
! th_class1 char(25) default NULL,
! th_class2 char(25) default NULL,
! th_class3 char(25) default NULL,
! td_color1 char(6) default NULL,
! td_color2 char(6) default NULL,
! td_color3 char(6) default NULL,
! td_class1 char(25) default NULL,
! td_class2 char(25) default NULL,
! td_class3 char(25) default NULL,
! fontface1 char(50) default NULL,
! fontface2 char(50) default NULL,
! fontface3 char(50) default NULL,
fontsize1 tinyint(4) default NULL,
fontsize2 tinyint(4) default NULL,
fontsize3 tinyint(4) default NULL,
! fontcolor1 char(6) default NULL,
! fontcolor2 char(6) default NULL,
! fontcolor3 char(6) default NULL,
! span_class1 char(25) default NULL,
! span_class2 char(25) default NULL,
! span_class3 char(25) default NULL,
img_size_poll smallint(5) UNSIGNED,
img_size_privmsg smallint(5) UNSIGNED,
***************
*** 470,475 ****
user_id mediumint(8) NOT NULL auto_increment,
user_active tinyint(1) DEFAULT '1',
! username varchar(25) NOT NULL,
! user_password varchar(32) NOT NULL,
user_session_time int(11) DEFAULT '0' NOT NULL,
user_session_page smallint(5) DEFAULT '0' NOT NULL,
--- 470,475 ----
user_id mediumint(8) NOT NULL auto_increment,
user_active tinyint(1) DEFAULT '1',
! username char(30) NOT NULL,
! user_password char(32) NOT NULL,
user_session_time int(11) DEFAULT '0' NOT NULL,
user_session_page smallint(5) DEFAULT '0' NOT NULL,
***************
*** 480,485 ****
user_timezone decimal(4,2) DEFAULT '0' NOT NULL,
user_style tinyint(4),
! user_lang varchar(255),
! user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
--- 480,485 ----
user_timezone decimal(4,2) DEFAULT '0' NOT NULL,
user_style tinyint(4),
! user_lang char(50),
! user_dateformat char(15) DEFAULT 'd M Y H:i' NOT NULL,
user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
***************
*** 498,504 ****
user_popup_pm tinyint(1) DEFAULT '0' NOT NULL,
user_rank int(11) DEFAULT '0',
! user_avatar varchar(100),
user_avatar_type tinyint(4) DEFAULT '0' NOT NULL,
! user_email varchar(255),
user_icq varchar(15),
user_website varchar(100),
--- 498,504 ----
user_popup_pm tinyint(1) DEFAULT '0' NOT NULL,
user_rank int(11) DEFAULT '0',
! user_avatar char(100),
user_avatar_type tinyint(4) DEFAULT '0' NOT NULL,
! user_email char(60),
user_icq varchar(15),
user_website varchar(100),
***************
*** 554,558 ****
vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
vote_user_id mediumint(8) NOT NULL DEFAULT '0',
! vote_user_ip char(8) NOT NULL,
KEY vote_id (vote_id),
KEY vote_user_id (vote_user_id),
--- 554,558 ----
vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
vote_user_id mediumint(8) NOT NULL DEFAULT '0',
! vote_user_ip char(40) NOT NULL,
KEY vote_id (vote_id),
KEY vote_user_id (vote_user_id),
Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** postgres_schema.sql 20 Apr 2002 23:43:46 -0000 1.21
--- postgres_schema.sql 8 May 2002 23:34:36 -0000 1.22
***************
*** 64,68 ****
ban_id int4 DEFAULT nextval('phpbb_banlist_id_seq'::text) NOT NULL,
ban_userid int4,
! ban_ip char(8),
ban_email varchar(255),
CONSTRAINT phpbb_banlist_pkey PRIMARY KEY (ban_id)
--- 64,68 ----
ban_id int4 DEFAULT nextval('phpbb_banlist_id_seq'::text) NOT NULL,
ban_userid int4,
! ban_ip char(40),
ban_email varchar(255),
CONSTRAINT phpbb_banlist_pkey PRIMARY KEY (ban_id)
***************
*** 172,176 ****
post_time int4 DEFAULT '0' NOT NULL,
post_username varchar(25),
! poster_ip char(8) DEFAULT '' NOT NULL,
enable_bbcode int2 DEFAULT '1' NOT NULL,
enable_html int2 DEFAULT '0' NOT NULL,
--- 172,176 ----
post_time int4 DEFAULT '0' NOT NULL,
post_username varchar(25),
! poster_ip char(40) DEFAULT '' NOT NULL,
enable_bbcode int2 DEFAULT '1' NOT NULL,
enable_html int2 DEFAULT '0' NOT NULL,
***************
*** 209,213 ****
privmsgs_to_userid int4 DEFAULT '0' NOT NULL,
privmsgs_date int4 DEFAULT '0' NOT NULL,
! privmsgs_ip char(8) NOT NULL,
privmsgs_enable_bbcode int2 DEFAULT '1' NOT NULL,
privmsgs_enable_html int2 DEFAULT '0' NOT NULL,
--- 209,213 ----
privmsgs_to_userid int4 DEFAULT '0' NOT NULL,
privmsgs_date int4 DEFAULT '0' NOT NULL,
! privmsgs_ip char(40) NOT NULL,
privmsgs_enable_bbcode int2 DEFAULT '1' NOT NULL,
privmsgs_enable_html int2 DEFAULT '0' NOT NULL,
***************
*** 287,291 ****
session_start int4 DEFAULT '0' NOT NULL,
session_time int4 DEFAULT '0' NOT NULL,
! session_ip char(8) DEFAULT '0' NOT NULL,
session_page int4 DEFAULT '0' NOT NULL,
session_logged_in int2 DEFAULT '0' NOT NULL,
--- 287,291 ----
session_start int4 DEFAULT '0' NOT NULL,
session_time int4 DEFAULT '0' NOT NULL,
! session_ip char(40) DEFAULT '0' NOT NULL,
session_page int4 DEFAULT '0' NOT NULL,
session_logged_in int2 DEFAULT '0' NOT NULL,
***************
*** 533,537 ****
vote_id int4 NOT NULL DEFAULT '0',
vote_user_id int4 NOT NULL DEFAULT '0',
! vote_user_ip char(8) NOT NULL
);
CREATE INDEX vote_id_phpbb_vote_voters_index ON phpbb_vote_voters (vote_id);
--- 533,537 ----
vote_id int4 NOT NULL DEFAULT '0',
vote_user_id int4 NOT NULL DEFAULT '0',
! vote_user_ip char(40) NOT NULL
);
CREATE INDEX vote_id_phpbb_vote_voters_index ON phpbb_vote_voters (vote_id);
|
|
From: Jonathan H. <the...@us...> - 2002-05-06 13:46:36
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv17214
Modified Files:
Tag: phpBB-2_0_0
mssql_basic.sql
Log Message:
Oops.. Bugfix for #236
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** mssql_basic.sql 4 Apr 2002 15:00:11 -0000 1.13.2.1
--- mssql_basic.sql 6 May 2002 13:46:32 -0000 1.13.2.2
***************
*** 64,68 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
--- 64,68 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
|
|
From: Paul S. O. <ps...@us...> - 2002-05-05 12:20:39
|
Update of /cvsroot/phpbb/phpBB2/language/lang_greek
In directory usw-pr-cvs1:/tmp/cvs-serv8082/language/lang_greek
Modified Files:
Tag: phpBB-2_0_0
lang_main.php
Log Message:
Removed setlocale ... hopefully the search changes negates the need for it
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/lang_main.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** lang_main.php 8 Apr 2002 14:38:51 -0000 1.5.2.1
--- lang_main.php 5 May 2002 12:20:36 -0000 1.5.2.2
***************
*** 25,30 ****
//
-
- setlocale(LC_ALL, "el_GR.ISO-8859-7");
$lang['ENCODING'] = "iso-8859-7";
$lang['DIRECTION'] = "ltr";
--- 25,28 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-05-05 12:19:46
|
Update of /cvsroot/phpbb/phpBB2/language/lang_russian
In directory usw-pr-cvs1:/tmp/cvs-serv7926/language/lang_russian
Modified Files:
Tag: phpBB-2_0_0
lang_main.php
Log Message:
Removed setlocale ... hopefully the search changes negates the need for it
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/lang_main.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** lang_main.php 10 Mar 2002 17:31:08 -0000 1.12
--- lang_main.php 5 May 2002 12:19:44 -0000 1.12.2.1
***************
*** 25,30 ****
//
-
- setlocale(LC_ALL, "ru_RU.CP1251");
$lang['ENCODING'] = "windows-1251";
$lang['DIRECTION'] = "ltr";
--- 25,28 ----
|
7 messages has been excluded from this view by a project administrator.
