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-03-31 00:06:38
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv12947
Modified Files:
config.php faq.php groupcp.php index.php login.php
memberlist.php modcp.php posting.php privmsg.php search.php
viewforum.php viewonline.php viewtopic.php
Log Message:
pre-freeze on main templates, various bug fixes (highlighting search results, various search related issues, blah blah). These updates need _thorough_ checking, quickly
Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** config.php 18 Mar 2002 14:52:15 -0000 1.49
--- config.php 31 Mar 2002 00:06:33 -0000 1.50
***************
*** 0 ****
--- 1,51 ----
+ <?php
+
+ //
+ // phpBB 2.x auto-generated config file
+ // Do not change anything in this file!
+ //
+
+ $dbms = "mysql4";
+ $dbhost = "localhost";
+ $dbname = "dev_starstreak_net";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ $dbhost = "localhost";
+ $dbname = "phpbb_com";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ /*
+ $dbhost = "localhost";
+ $dbname = "phpbb_test";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ $dbms = "mssql-odbc";
+
+ $dbhost = "mssql_phpbb_odbc";
+ $dbname = "";
+ $dbuser = "phpbb";
+ $dbpasswd = "efx2000";
+
+ $dbms = "msaccess";
+
+ $dbhost = "phpbb_msaccess_odbc";
+ $dbname = "";
+ $dbuser = "devhttp";
+ $dbpasswd = "efx2KarizonaD";
+
+ $dbms = "mssql";
+
+ $dbhost = "localhost";
+ $dbname = "phpbb";
+ $dbuser = "phpbb";
+ $dbpasswd = "efx2000";
+ */
+
+ $table_prefix = "phpbb_";
+
+ define('PHPBB_INSTALLED', true);
+
+ ?>
\ No newline at end of file
Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** faq.php 18 Mar 2002 13:35:42 -0000 1.13
--- faq.php 31 Mar 2002 00:06:33 -0000 1.14
***************
*** 22,26 ****
define('IN_PHPBB', true);
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
--- 22,26 ----
define('IN_PHPBB', true);
! $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
***************
*** 38,42 ****
// Load the appropriate faq file
//
-
if( isset($HTTP_GET_VARS['mode']) )
{
--- 38,41 ----
***************
*** 44,52 ****
{
case 'bbcode':
! $lang_file = "lang_bbcode";
$l_title = $lang['BBCode_guide'];
break;
default:
! $lang_file = "lang_faq";
$l_title = $lang['FAQ'];
break;
--- 43,51 ----
{
case 'bbcode':
! $lang_file = 'lang_bbcode';
$l_title = $lang['BBCode_guide'];
break;
default:
! $lang_file = 'lang_faq';
$l_title = $lang['FAQ'];
break;
***************
*** 55,59 ****
else
{
! $lang_file = "lang_faq";
$l_title = $lang['FAQ'];
}
--- 54,58 ----
else
{
! $lang_file = 'lang_faq';
$l_title = $lang['FAQ'];
}
***************
*** 71,75 ****
for($i = 0; $i < count($faq); $i++)
{
! if( $faq[$i][0] != "--" )
{
$faq_block[$j][$counter]['id'] = $counter_2;
--- 70,74 ----
for($i = 0; $i < count($faq); $i++)
{
! if( $faq[$i][0] != '--' )
{
$faq_block[$j][$counter]['id'] = $counter_2;
***************
*** 97,118 ****
$template->set_filenames(array(
! "body" => "faq_body.tpl",
! "jumpbox" => "jumpbox.tpl")
! );
!
! $jumpbox = make_jumpbox($forum_id);
! $template->assign_vars(array(
! "L_GO" => $lang['Go'],
! "L_JUMP_TO" => $lang['Jump_to'],
! "L_SELECT_FORUM" => $lang['Select_forum'],
!
! "S_JUMPBOX_LIST" => $jumpbox,
! "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
);
! $template->assign_var_from_handle("JUMPBOX", "jumpbox");
$template->assign_vars(array(
! "L_FAQ_TITLE" => $l_title,
! "L_BACK_TO_TOP" => $lang['Back_to_top'])
);
--- 96,106 ----
$template->set_filenames(array(
! 'body' => 'faq_body.tpl')
);
! make_jumpbox('viewforum.'.$phpEx, $forum_id);
$template->assign_vars(array(
! 'L_FAQ_TITLE' => $l_title,
! 'L_BACK_TO_TOP' => $lang['Back_to_top'])
);
***************
*** 121,129 ****
if( count($faq_block[$i]) )
{
! $template->assign_block_vars("faq_block", array(
! "BLOCK_TITLE" => $faq_block_titles[$i])
);
! $template->assign_block_vars("faq_block_link", array(
! "BLOCK_TITLE" => $faq_block_titles[$i])
);
--- 109,117 ----
if( count($faq_block[$i]) )
{
! $template->assign_block_vars('faq_block', array(
! 'BLOCK_TITLE' => $faq_block_titles[$i])
);
! $template->assign_block_vars('faq_block_link', array(
! 'BLOCK_TITLE' => $faq_block_titles[$i])
);
***************
*** 133,151 ****
$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars("faq_block.faq_row", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "FAQ_QUESTION" => $faq_block[$i][$j]['question'],
! "FAQ_ANSWER" => $faq_block[$i][$j]['answer'],
! "U_FAQ_ID" => $faq_block[$i][$j]['id'])
);
! $template->assign_block_vars("faq_block_link.faq_row_link", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "FAQ_LINK" => $faq_block[$i][$j]['question'],
! "U_FAQ_LINK" => "#" . $faq_block[$i][$j]['id'])
);
}
--- 121,139 ----
$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars('faq_block.faq_row', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'FAQ_QUESTION' => $faq_block[$i][$j]['question'],
! 'FAQ_ANSWER' => $faq_block[$i][$j]['answer'],
! 'U_FAQ_ID' => $faq_block[$i][$j]['id'])
);
! $template->assign_block_vars('faq_block_link.faq_row_link', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'FAQ_LINK' => $faq_block[$i][$j]['question'],
! 'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id'])
);
}
***************
*** 153,157 ****
}
! $template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
--- 141,145 ----
}
! $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** groupcp.php 22 Mar 2002 23:17:03 -0000 1.56
--- groupcp.php 31 Mar 2002 00:06:33 -0000 1.57
***************
*** 26,29 ****
--- 26,112 ----
include($phpbb_root_path . 'common.'.$phpEx);
+ // -------------------------
+ //
+ function generate_user_info(&$row, $date_format, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
+ {
+ global $lang, $images, $board_config;
+
+ $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' ';
[...1722 lines suppressed...]
if ( $s_pending_groups_opt != '' )
{
! $template->assign_block_vars('switch_groups_joined.switch_groups_pending', array() );
}
if ( $s_group_list_opt != '' )
{
! $template->assign_block_vars('switch_groups_remaining', array() );
}
***************
*** 1326,1332 ****
}
- //
- // Page footer
- //
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
--- 1266,1269 ----
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** index.php 19 Mar 2002 12:38:12 -0000 1.97
--- index.php 31 Mar 2002 00:06:33 -0000 1.98
***************
*** 268,271 ****
--- 268,282 ----
'FORUM_LOCKED_IMG' => $images['forum_locked'],
+ 'L_FORUM' => $lang['Forum'],
+ 'L_TOPICS' => $lang['Topics'],
+ 'L_REPLIES' => $lang['Replies'],
+ 'L_VIEWS' => $lang['Views'],
+ 'L_POSTS' => $lang['Posts'],
+ 'L_LASTPOST' => $lang['Last_Post'],
+ 'L_NO_NEW_POSTS' => $lang['No_new_posts'],
+ 'L_NEW_POSTS' => $lang['New_posts'],
+ 'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
+ 'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],
+
'L_MODERATOR' => $lang['Moderators'],
'L_FORUM_LOCKED' => $lang['Forum_is_locked'],
***************
*** 300,307 ****
if ( $display_forums )
{
! $template->assign_block_vars("catrow", array(
! "CAT_ID" => $cat_id,
! "CAT_DESC" => $category_rows[$i]['cat_title'],
! "U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
);
--- 311,318 ----
if ( $display_forums )
{
! $template->assign_block_vars('catrow', array(
! 'CAT_ID' => $cat_id,
! 'CAT_DESC' => $category_rows[$i]['cat_title'],
! 'U_VIEWCAT' => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
);
***************
*** 318,322 ****
if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED )
{
! $folder_image = '<img src="' . $images['forum_locked'] . '" alt="' . $lang['Forum_locked'] . '" />';
}
else
--- 329,334 ----
if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED )
{
! $folder_image = $images['forum_locked'];
! $folder_alt = $lang['Forum_locked'];
}
else
***************
*** 366,370 ****
}
! $folder_image = ( $unread_topics ) ? '<img src="' . $images['forum_new'] . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />' : '<img src="' . $images['forum'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />';
}
--- 378,383 ----
}
! $folder_image = ( $unread_topics ) ? $images['forum_new'] : $images['forum'];
! $folder_alt = ( $unread_topics ) ? $lang['New_posts'] : $lang['No_new_posts'];
}
***************
*** 378,384 ****
$last_post = $last_post_time . '<br />';
! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != "" ) ? $forum_data[$j]['post_username'] . " " : $lang['Guest'] . " " ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
! $last_post .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
}
else
--- 391,397 ----
$last_post = $last_post_time . '<br />';
! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
! $last_post .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
}
else
***************
*** 401,418 ****
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars("catrow.forumrow", array(
! "ROW_COLOR" => '#' . $row_color,
! "ROW_CLASS" => $row_class,
! "FOLDER" => $folder_image,
! "FORUM_NAME" => $forum_data[$j]['forum_name'],
! "FORUM_DESC" => $forum_data[$j]['forum_desc'],
! "POSTS" => $forum_data[$j]['forum_posts'],
! "TOPICS" => $forum_data[$j]['forum_topics'],
! "LAST_POST" => $last_post,
! "MODERATORS" => $moderator_list,
! "L_MODERATOR" => $l_moderators,
! "U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
);
}
--- 414,432 ----
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars('catrow.forumrow', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'FORUM_FOLDER_IMG' => $folder_image,
! 'FORUM_NAME' => $forum_data[$j]['forum_name'],
! 'FORUM_DESC' => $forum_data[$j]['forum_desc'],
! 'POSTS' => $forum_data[$j]['forum_posts'],
! 'TOPICS' => $forum_data[$j]['forum_topics'],
! 'LAST_POST' => $last_post,
! 'MODERATORS' => $moderator_list,
! 'L_MODERATOR' => $l_moderators,
! 'L_FORUM_FOLDER_ALT' => $folder_alt,
! 'U_VIEWFORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
);
}
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** login.php 28 Mar 2002 19:52:21 -0000 1.46
--- login.php 31 Mar 2002 00:06:33 -0000 1.47
***************
*** 28,32 ****
define('IN_PHPBB', true);
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
--- 28,32 ----
define('IN_PHPBB', true);
! $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
***************
*** 41,44 ****
--- 41,46 ----
//
+ $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+
if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) )
{
***************
*** 48,57 ****
// normal Location redirector is used in preference
//
- $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
-
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
{
! $username = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : "";
! $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : "";
$sql = "SELECT user_id, username, user_password, user_active, user_level
--- 50,57 ----
// normal Location redirector is used in preference
//
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
{
! $username = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : '';
! $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : '';
$sql = "SELECT user_id, username, user_password, user_active, user_level
***************
*** 60,64 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Error in obtaining userdata : login", "", __LINE__, __FILE__, $sql);
}
--- 60,64 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql);
}
***************
*** 95,102 ****
else
{
! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
$template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
);
--- 95,102 ----
else
{
! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : '';
$template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
);
***************
*** 112,116 ****
$template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
);
--- 112,116 ----
$template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
);
***************
*** 160,164 ****
$template->set_filenames(array(
! "body" => "login_body.tpl")
);
--- 160,164 ----
$template->set_filenames(array(
! 'body' => 'login_body.tpl')
);
***************
*** 171,179 ****
$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
! $forward_match = explode("&", $forward_to);
if(count($forward_match) > 1)
{
! $forward_page = "";
for($i = 1; $i < count($forward_match); $i++)
--- 171,179 ----
$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
! $forward_match = explode('&', $forward_to);
if(count($forward_match) > 1)
{
! $forward_page = '';
for($i = 1; $i < count($forward_match); $i++)
***************
*** 181,187 ****
if( !ereg("sid=", $forward_match[$i]) )
{
! if( $forward_page != "" )
{
! $forward_page .= "&";
}
$forward_page .= $forward_match[$i];
--- 181,187 ----
if( !ereg("sid=", $forward_match[$i]) )
{
! if( $forward_page != '' )
{
! $forward_page .= '&';
}
$forward_page .= $forward_match[$i];
***************
*** 189,193 ****
}
! $forward_page = $forward_match[0] . "?" . $forward_page;
}
else
--- 189,193 ----
}
! $forward_page = $forward_match[0] . '?' . $forward_page;
}
else
***************
*** 199,221 ****
else
{
! $forward_page = "";
}
! $username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : "";
$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
$template->assign_vars(array(
! "USERNAME" => $username,
! "L_ENTER_PASSWORD" => $lang['Enter_password'],
! "L_SEND_PASSWORD" => $lang['Forgotten_password'],
! "U_SEND_PASSWORD" => append_sid("profile.$phpEx?mode=sendpassword"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields)
);
! $template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
--- 199,222 ----
else
{
! $forward_page = '';
}
! $username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : '';
$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
+ make_jumpbox('viewforum.'.$phpEx, $forum_id);
$template->assign_vars(array(
! 'USERNAME' => $username,
! 'L_ENTER_PASSWORD' => $lang['Enter_password'],
! 'L_SEND_PASSWORD' => $lang['Forgotten_password'],
! 'U_SEND_PASSWORD' => append_sid("profile.$phpEx?mode=sendpassword"),
! 'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
! $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
***************
*** 223,230 ****
else
{
! header("Location: " . append_sid("index.$phpEx", true));
}
}
! ?>
--- 224,231 ----
else
{
! header($header_location . append_sid("index.$phpEx", true));
}
}
! ?>
\ No newline at end of file
Index: memberlist.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** memberlist.php 18 Mar 2002 13:35:42 -0000 1.35
--- memberlist.php 31 Mar 2002 00:06:33 -0000 1.36
***************
*** 21,25 ****
define('IN_PHPBB', true);
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
--- 21,25 ----
define('IN_PHPBB', true);
! $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
***************
*** 38,57 ****
if(isset($HTTP_POST_VARS['order']))
{
! $sort_order = ($HTTP_POST_VARS['order'] == "ASC") ? "ASC" : "DESC";
}
else if(isset($HTTP_GET_VARS['order']))
{
! $sort_order = ($HTTP_GET_VARS['order'] == "ASC") ? "ASC" : "DESC";
}
else
{
! $sort_order = "ASC";
}
! if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
{
! $mode = (isset($HTTP_POST_VARS['mode'])) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
! switch($mode)
{
case 'joined':
--- 38,113 ----
if(isset($HTTP_POST_VARS['order']))
{
! $sort_order = ($HTTP_POST_VARS['order'] == 'ASC') ? 'ASC' : 'DESC';
}
else if(isset($HTTP_GET_VARS['order']))
{
! $sort_order = ($HTTP_GET_VARS['order'] == 'ASC') ? 'ASC' : 'DESC';
}
else
{
! $sort_order = 'ASC';
}
! //
! // Memberlist sorting
! //
! $mode_types_text = array($lang['Sort_Joined'], $lang['Sort_Username'], $lang['Sort_Location'], $lang['Sort_Posts'], $lang['Sort_Email'], $lang['Sort_Website'], $lang['Sort_Top_Ten']);
! $mode_types = array('joindate', 'username', 'location', 'posts', 'email', 'website', 'topten');
!
! $select_sort_mode = '<select name="mode">';
! for($i = 0; $i < count($mode_types_text); $i++)
! {
! $selected = ( $mode == $mode_types[$i] ) ? ' selected="selected"' : '';
! $select_sort_mode .= "<option value=\"" . $mode_types[$i] . "\"$selected>" . $mode_types_text[$i] . "</option>";
! }
! $select_sort_mode .= '</select>';
!
! $select_sort_order = '<select name="order">';
! if($sort_order == 'ASC')
! {
! $select_sort_order .= '<option value="ASC" selected="selected">' . $lang['Sort_Ascending'] . '</option><option value="DESC">' . $lang['Sort_Descending'] . '</option>';
! }
! else
! {
! $select_sort_order .= '<option value="ASC">' . $lang['Sort_Ascending'] . '</option><option value="DESC" selected="selected">' . $lang['Sort_Descending'] . '</option>';
! }
! $select_sort_order .= '</select>';
!
! //
! // Generate page
! //
! $page_title = $lang['Memberlist'];
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
!
! $template->set_filenames(array(
! 'body' => 'memberlist_body.tpl')
! );
! make_jumpbox('viewforum.'.$phpEx);
!
! $template->assign_vars(array(
! 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
! 'L_EMAIL' => $lang['Email'],
! 'L_WEBSITE' => $lang['Website'],
! 'L_FROM' => $lang['Location'],
! 'L_ORDER' => $lang['Order'],
! 'L_SORT' => $lang['Sort'],
! 'L_SUBMIT' => $lang['Sort'],
! 'L_AIM' => $lang['AIM'],
! 'L_YIM' => $lang['YIM'],
! 'L_MSNM' => $lang['MSNM'],
! 'L_ICQ' => $lang['ICQ'],
! 'L_JOINED' => $lang['Joined'],
! 'L_POSTS' => $lang['Posts'],
!
! 'S_MODE_SELECT' => $select_sort_mode,
! 'S_ORDER_SELECT' => $select_sort_order,
! 'S_MODE_ACTION' => append_sid("memberlist.$phpEx"))
! );
!
! if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
{
! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
! switch( $mode )
{
case 'joined':
***************
*** 85,88 ****
--- 141,145 ----
$order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page'];
}
+
$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar
FROM " . USERS_TABLE . "
***************
*** 91,265 ****
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't query users", "", __LINE__, __FILE__, $sql);
}
- $members = $db->sql_fetchrowset($result);
-
- $db->sql_freeresult($result);
-
- //
- // Memberlist sorting
- //
- $mode_types_text = array($lang['Sort_Joined'], $lang['Sort_Username'], $lang['Sort_Location'], $lang['Sort_Posts'], $lang['Sort_Email'], $lang['Sort_Website'], $lang['Sort_Top_Ten']);
- $mode_types = array("joindate", "username", "location", "posts", "email", "website", "topten");
! $select_sort_mode = "<select name=\"mode\">";
! for($i = 0; $i < count($mode_types_text); $i++)
! {
! $selected = ($mode == $mode_types[$i]) ? " selected=\"selected\"" : "";
! $select_sort_mode .= "<option value=\"" . $mode_types[$i] . "\"$selected>" . $mode_types_text[$i] . "</option>";
! }
! $select_sort_mode .= "</select>";
!
! $select_sort_order = "<select name=\"order\">";
! if($sort_order == "ASC")
{
! $select_sort_order .= "<option value=\"ASC\" selected=\"selected\">" . $lang['Sort_Ascending'] . "</option><option value=\"DESC\">" . $lang['Sort_Descending'] . "</option>";
! }
! else
! {
! $select_sort_order .= "<option value=\"ASC\">" . $lang['Sort_Ascending'] . "</option><option value=\"DESC\" selected=\"selected\">" . $lang['Sort_Descending'] . "</option>";
! }
! $select_sort_order .= "</select>";
!
! //
! // Generate page
! //
! $page_title = $lang['Memberlist'];
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
!
! $template->set_filenames(array(
! "body" => "memberlist_body.tpl",
! "jumpbox" => "jumpbox.tpl"));
!
! $jumpbox = make_jumpbox();
! $template->assign_vars(array(
! "L_GO" => $lang['Go'],
! "L_JUMP_TO" => $lang['Jump_to'],
! "L_SELECT_FORUM" => $lang['Select_forum'],
!
! "S_JUMPBOX_LIST" => $jumpbox,
! "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
! );
! $template->assign_var_from_handle("JUMPBOX", "jumpbox");
!
! $template->assign_vars(array(
! "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'],
! "L_EMAIL" => $lang['Email'],
! "L_WEBSITE" => $lang['Website'],
! "L_FROM" => $lang['Location'],
! "L_ORDER" => $lang['Order'],
! "L_SORT" => $lang['Sort'],
! "L_SUBMIT" => $lang['Sort'],
! "L_AIM" => $lang['AIM'],
! "L_YIM" => $lang['YIM'],
! "L_MSNM" => $lang['MSNM'],
! "L_ICQ" => $lang['ICQ'],
!
! "S_MODE_SELECT" => $select_sort_mode,
! "S_ORDER_SELECT" => $select_sort_order,
! "S_MODE_ACTION" => append_sid("memberlist.$phpEx"))
! );
!
! for($i = 0; $i < count($members); $i++)
! {
! $username = $members[$i]['username'];
! $user_id = $members[$i]['user_id'];
! $from = ( !empty($members[$i]['user_from']) ) ? $members[$i]['user_from'] : " ";
! $joined = create_date($lang['DATE_FORMAT'], $members[$i]['user_regdate'], $board_config['board_timezone']);
! $posts = ( $members[$i]['user_posts'] ) ? $members[$i]['user_posts'] : 0;
! if( $members[$i]['user_avatar_type'] && $user_id != ANONYMOUS && $members[$i]['user_allowavatar'] )
! {
! switch( $postrow[$i]['user_avatar_type'] )
{
! case USER_AVATAR_UPLOAD:
! $poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
! break;
! case USER_AVATAR_REMOTE:
! $poster_avatar = "<img src=\"" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
! break;
! case USER_AVATAR_GALLERY:
! $poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
! break;
}
- }
- else
- {
- $poster_avatar = "";
- }
! if( !empty($members[$i]['user_viewemail']) || $userdata['user_level'] == ADMIN )
! {
! $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $members[$i]['user_id']) : "mailto:" . $members[$i]['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" border=\"0\" alt=\"" . $lang['Send_email'] . "\" /></a>";
! }
! else
! {
! $email_img = " ";
! }
! $pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $members[$i]['user_id']) . "\"><img src=\"" . $images['icon_pm'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\" /></a>";
! if( $members[$i]['user_website'] != "" )
! {
! $www_img = "<a href=\"" . $members[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" border=\"0\" alt=\"" . $lang['Visit_website'] . "\" /></a>";
! }
! else
! {
! $www_img = " ";
! }
! if( $members[$i]['user_icq'] )
! {
! $icq_status_img = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&img=5\" border=\"0\" alt=\"\" /></a>";
! $icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
! }
! else
! {
! $icq_status_img = " ";
! $icq_add_img = " ";
}
!
! $aim_img = ( $members[$i]['user_aim'] ) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : " ";
!
! $msn_img = ( $members[$i]['user_msnm'] ) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : " ";
!
! $yim_img = ( $members[$i]['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : " ";
!
! $search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search'] . "\" /></a>";
!
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars("memberrow", array(
! "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id),
!
! "ROW_NUMBER" => $i + ( $HTTP_GET_VARS['start'] + 1 ),
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "USERNAME" => $username,
! "FROM" => $from,
! "JOINED" => $joined,
! "POSTS" => $posts,
!
! "AVATAR_IMG" => $poster_avatar,
! "EMAIL_IMG" => $email_img,
! "PM_IMG" => $pm_img,
! "WWW_IMG" => $www_img,
! "ICQ_STATUS_IMG" => $icq_status_img,
! "ICQ_ADD_IMG" => $icq_add_img,
! "AIM_IMG" => $aim_img,
! "YIM_IMG" => $yim_img,
! "MSN_IMG" => $msn_img,
! "SEARCH_IMG" => $search)
! );
}
! if($mode != "topten" || $board_config['topics_per_page'] < 10)
{
$sql = "SELECT count(*) AS total
--- 148,275 ----
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not query users', '', __LINE__, __FILE__, $sql);
}
! if ( $row = $db->sql_fetchrow($result) )
{
! $i = 0;
! do
! {
! $username = $row['username'];
! $user_id = $row['user_id'];
! $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' ';
! $joined = create_date($lang['DATE_FORMAT'], $row['user_regdate'], $board_config['board_timezone']);
! $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
! $poster_avatar = '';
! if ( $row['user_avatar_type'] && $user_id != ANONYMOUS && $row['user_allowavatar'] )
! {
! switch( $row['user_avatar_type'] )
! {
! case USER_AVATAR_UPLOAD:
! $poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . '/' . $row['user_avatar'] . '" alt="" border="0" />' : '';
! break;
! case USER_AVATAR_REMOTE:
! $poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $row['user_avatar'] . '" alt="" border="0" />' : '';
! break;
! case USER_AVATAR_GALLERY:
! $poster_avatar = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . '/' . $row['user_avatar'] . '" alt="" border="0" />' : '';
! break;
! }
! }
! if ( !empty($row['user_viewemail']) || $userdata['user_level'] == ADMIN )
! {
! $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $row['user_email'];
! $email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
! $email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
! }
! else
{
! $email_img = ' ';
! $email = ' ';
}
! $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id");
! $profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>';
! $profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>';
!
! $temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id");
! $pm_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>';
! $pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';
! $www_img = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '';
! $www = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww">' . $lang['Visit_website'] . '</a>' : '';
! if ( !empty($row['user_icq']) )
! {
! $icq_status_img = '<a href="http://wwp.icq.com/' . $row['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
! $icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>';
! $icq = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '">' . $lang['ICQ'] . '</a>';
! }
! else
! {
! $icq_status_img = '';
! $icq_img = '';
! $icq = '';
! }
! $aim_img = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '';
! $aim = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '';
! $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id");
! $msn_img = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '';
! $msn = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $lang['MSNM'] . '</a>' : '';
!
! $yim_img = ( $row['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '';
! $yim = ( $row['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&.src=pg">' . $lang['YIM'] . '</a>' : '';
!
! $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=posts");
! $search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
! $search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';
!
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars('memberrow', array(
! 'ROW_NUMBER' => $i + ( $HTTP_GET_VARS['start'] + 1 ),
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'USERNAME' => $username,
! 'FROM' => $from,
! 'JOINED' => $joined,
! 'POSTS' => $posts,
! 'AVATAR_IMG' => $poster_avatar,
! 'PROFILE_IMG' => $profile_img,
! 'PROFILE' => $profile,
! 'SEARCH_IMG' => $search_img,
! 'SEARCH' => $search,
! 'PM_IMG' => $pm_img,
! 'PM' => $pm,
! 'EMAIL_IMG' => $email_img,
! 'EMAIL' => $email,
! 'WWW_IMG' => $www_img,
! 'WWW' => $www,
! 'ICQ_STATUS_IMG' => $icq_status_img,
! 'ICQ_IMG' => $icq_img,
! 'ICQ' => $icq,
! 'AIM_IMG' => $aim_img,
! 'AIM' => $aim,
! 'MSN_IMG' => $msn_img,
! 'MSN' => $msn,
! 'YIM_IMG' => $yim_img,
! 'YIM' => $yim,
!
! 'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id"))
! );
! $i++;
}
! while ( $row = $db->sql_fetchrow($result) );
}
! if ( $mode != 'topten' || $board_config['topics_per_page'] < 10 )
{
$sql = "SELECT count(*) AS total
***************
*** 267,297 ****
WHERE user_id <> " . ANONYMOUS;
! if(!$count_result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Error getting total users.", "", __LINE__, __FILE__, $sql);
}
! else
{
- $total = $db->sql_fetchrow($count_result);
$total_members = $total['total'];
! $pagination = generate_pagination("memberlist.$phpEx?mode=$mode&order=$sort_order", $total_members, $board_config['topics_per_page'], $start)." ";
}
}
else
{
! $pagination = " ";
$total_members = 10;
}
$template->assign_vars(array(
! "PAGINATION" => $pagination,
! "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_members / $board_config['topics_per_page'] )),
! "L_GOTO_PAGE" => $lang['Goto_page'])
);
! $template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 277,308 ----
WHERE user_id <> " . ANONYMOUS;
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Error getting total users', '', __LINE__, __FILE__, $sql);
}
!
! if ( $total = $db->sql_fetchrow($result) )
{
$total_members = $total['total'];
! $pagination = generate_pagination("memberlist.$phpEx?mode=$mode&order=$sort_order", $total_members, $board_config['topics_per_page'], $start). ' ';
}
}
else
{
! $pagination = ' ';
$total_members = 10;
}
$template->assign_vars(array(
! 'PAGINATION' => $pagination,
! 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_members / $board_config['topics_per_page'] )),
! 'L_GOTO_PAGE' => $lang['Goto_page'])
);
!
! $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** modcp.php 26 Mar 2002 16:27:20 -0000 1.68
--- modcp.php 31 Mar 2002 00:06:33 -0000 1.69
***************
*** 87,91 ****
$redirect = "index.$phpEx";
}
! header("Location: " . append_sid($redirect, true));
}
--- 87,93 ----
$redirect = "index.$phpEx";
}
!
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . append_sid($redirect, true));
}
***************
*** 180,184 ****
$is_auth = auth(AUTH_ALL, $forum_id, $userdata);
! if( !$is_auth['auth_mod'] )
{
message_die(GENERAL_MESSAGE, $lang['Not_Moderator'], $lang['Not_Authorised']);
--- 182,186 ----
$is_auth = auth(AUTH_ALL, $forum_id, $userdata);
! if ( !$is_auth['auth_mod'] )
{
message_die(GENERAL_MESSAGE, $lang['Not_Moderator'], $lang['Not_Authorised']);
***************
*** 404,415 ****
}
! $sql_select = "SELECT *
FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($topic_list)
AND topic_moved_id = 0";
!
! if ( !($result = $db->sql_query($sql_select, BEGIN_TRANSACTION)) )
{
! message_die(GENERAL_ERROR, 'Could not select from topic table', '', __LINE__, __FILE__, $sql_select);
}
--- 406,416 ----
}
! $sql = "SELECT *
FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($topic_list)
AND topic_moved_id = 0";
! if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
{
! message_die(GENERAL_ERROR, 'Could not select from topic table', '', __LINE__, __FILE__, $sql);
}
***************
*** 519,530 ****
'L_NO' => $lang['No'],
! 'S_FORUM_BOX' => make_forum_select('new_forum', $forum_id),
'S_MODCP_ACTION' => append_sid("modcp.$phpEx"),
'S_HIDDEN_FIELDS' => $hidden_fields)
);
- $template->pparse("movetopic");
! include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
break;
--- 520,531 ----
'L_NO' => $lang['No'],
! 'S_FORUM_SELECT' => make_forum_select('new_forum', $forum_id),
'S_MODCP_ACTION' => append_sid("modcp.$phpEx"),
'S_HIDDEN_FIELDS' => $hidden_fields)
);
! $template->pparse('movetopic');
+ include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
break;
***************
*** 725,728 ****
--- 726,730 ----
'L_MARK_ALL' => $lang['Mark_all'],
'L_UNMARK_ALL' => $lang['Unmark_all'],
+ 'L_POST' => $lang['Post'],
'FORUM_NAME' => $forum_name,
***************
*** 798,803 ****
'POST_SUBJECT' => $post_subject,
'MESSAGE' => $message,
! 'SPLIT_CHECKBOX' => $checkbox,
! 'POST_ID' => $post_id)
);
}
--- 800,806 ----
'POST_SUBJECT' => $post_subject,
'MESSAGE' => $message,
! 'POST_ID' => $post_id,
!
! 'S_SPLIT_CHECKBOX' => $checkbox)
);
}
***************
*** 873,903 ****
}
! $poster_ips = $db->sql_fetchrowset($result);
!
! $j = 0;
! for($i = 0; $i < count($poster_ips); $i++)
{
! if ( $poster_ips[$i]['poster_ip'] == $post_row['poster_ip'] )
{
! $template->assign_vars(array(
! 'POSTINGS' => $poster_ips[$i]['postings'] . ' ' .$lang['Posts'])
! );
! continue;
! }
! $ip = decode_ip($poster_ips[$i]['poster_ip']);
! $ip = ( $rdns_ip_num == $poster_ips[$i]['poster_ip'] || $rdns_ip_num == 'all') ? gethostbyaddr($ip) : $ip;
! $j++; // Can't use $i because of the 'continue'
! $row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars('iprow', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'IP' => $ip,
! 'POSTINGS' => $poster_ips[$i]['postings'] . ' ' .$lang['Posts'],
! 'U_LOOKUP_IP' => append_sid("modcp.$phpEx?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $poster_ips[$i]['poster_ip']))
! );
}
--- 876,910 ----
}
! if ( $row = $db->sql_fetchrow($result) )
{
! $i = 0;
! do
{
! if ( $row['poster_ip'] == $post_row['poster_ip'] )
! {
! $template->assign_vars(array(
! 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ))
! );
! continue;
! }
! $ip = decode_ip($row['poster_ip']);
! $ip = ( $rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? gethostbyaddr($ip) : $ip;
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars('iprow', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'IP' => $ip,
! 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ),
!
! 'U_LOOKUP_IP' => append_sid("modcp.$phpEx?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $row['poster_ip']))
! );
!
! $i++;
! }
! while ( $row = $db->sql_fetchrow($result) );
}
***************
*** 905,909 ****
// Get other users who've posted under this IP
//
! $sql = "SELECT u.user_id, u.username, count(*) as postings
FROM " . USERS_TABLE ." u, " . POSTS_TABLE . " p
WHERE p.poster_id = u.user_id
--- 912,916 ----
// Get other users who've posted under this IP
//
! $sql = "SELECT u.user_id, u.username, COUNT(*) as postings
FROM " . USERS_TABLE ." u, " . POSTS_TABLE . " p
WHERE p.poster_id = u.user_id
***************
*** 916,942 ****
}
! $poster_ids = $db->sql_fetchrowset($result);
!
! for($i = 0; $i < count($poster_ids); $i++)
{
! $id = $poster_ids[$i]['user_id'];
! $username = ( $is == ANONYMOUS ) ? $lang['Guest'] : $poster_ids[$i]['username'];
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars('userrow', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'USERNAME' => $username,
! 'POSTINGS' => $poster_ids[$i]['postings'] . ' ' .$lang['Posts'],
! 'L_SEARCH_POSTS' => sprintf($lang['Search_user_posts'], $username),
! 'U_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
! 'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=topics"))
! );
}
! $template->pparse("viewip");
break;
--- 923,954 ----
}
! if ( $row = $db->sql_fetchrow($result) )
{
! $i = 0;
! do
! {
! $id = $row['user_id'];
! $username = ( $id == ANONYMOUS ) ? $lang['Guest'] : $row['username'];
! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
! $template->assign_block_vars('userrow', array(
! 'ROW_COLOR' => '#' . $row_color,
! 'ROW_CLASS' => $row_class,
! 'USERNAME' => $username,
! 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ),
! 'L_SEARCH_POSTS' => sprintf($lang['Search_user_posts'], $username),
! 'U_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
! 'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=topics"))
! );
! $i++;
! }
! while ( $row = $db->sql_fetchrow($result) );
}
! $template->pparse('viewip');
break;
***************
*** 962,965 ****
--- 974,981 ----
'L_LOCK' => $lang['Lock'],
'L_UNLOCK' => $lang['Unlock'],
+ 'L_TOPICS' => $lang['Topics'],
+ 'L_REPLIES' => $lang['Replies'],
+ 'L_LASTPOST' => $lang['Last_Post'],
+ 'L_SELECT' => $lang['Select'],
'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
***************
*** 1019,1024 ****
}
- $folder_image = '<img src="' . $folder_img . '" alt="' . $folder_alt . '" title="' . $folder_alt . '" />';
-
$topic_id = $row['topic_id'];
$topic_type = $row['topic_type'];
--- 1035,1038 ----
***************
*** 1061,1070 ****
'U_VIEW_TOPIC' => $u_view_topic,
! 'FOLDER_IMG' => $folder_image,
'TOPIC_TYPE' => $topic_type,
'TOPIC_TITLE' => $topic_title,
'REPLIES' => $topic_replies,
! 'LAST_POST' => $last_post_time,
! 'TOPIC_ID' => $topic_id)
);
}
--- 1075,1086 ----
'U_VIEW_TOPIC' => $u_view_topic,
! 'TOPIC_FOLDER_IMG' => $folder_img,
'TOPIC_TYPE' => $topic_type,
'TOPIC_TITLE' => $topic_title,
'REPLIES' => $topic_replies,
! 'LAST_POST_TIME' => $last_post_time,
! 'TOPIC_ID' => $topic_id,
!
! 'L_TOPIC_FOLDER_ALT' => $folder_alt)
);
}
***************
*** 1072,1078 ****
$template->assign_vars(array(
'PAGINATION' => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start),
-
'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )),
-
'L_GOTO_PAGE' => $lang['Goto_page'])
);
--- 1088,1092 ----
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -r1.157 -r1.158
*** posting.php 28 Mar 2002 19:52:21 -0000 1.157
--- posting.php 31 Mar 2002 00:06:33 -0000 1.158
***************
*** 22,26 ****
define('IN_PHPBB', true);
! $phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
--- 22,26 ----
define('IN_PHPBB', true);
! $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);
***************
*** 56,60 ****
// that review ...
//
! if( $mode == 'topicreview' )
{
require($phpbb_root_path . 'includes/topic_review.'.$phpEx);
--- 56,60 ----
// that review ...
//
! if ( $mode == 'topicreview' )
{
require($phpbb_root_path . 'includes/topic_review.'.$phpEx);
***************
*** 63,69 ****
exit;
}
! else if( $mode == 'smilies' )
{
! generate_smilies("window", PAGE_POSTING);
exit;
}
--- 63,69 ----
exit;
}
! else if ( $mode == 'smilies' )
{
! generate_smilies('window', PAGE_POSTING);
exit;
}
***************
*** 73,77 ****
// page, no point in continuing with any further checks
//
! if( isset($HTTP_POST_VARS['cancel']) )
{
if ( $post_id )
--- 73,77 ----
// page, no point in continuing with any further checks
//
! if ( isset($HTTP_POST_VARS['cancel']) )
{
if ( $post_id )
***************
*** 96,100 ****
}
! header('Location: ' . append_sid($redirect) . $post_append, true);
}
--- 96,102 ----
}
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . append_sid($redirect) . $post_append, true);
! exit;
}
***************
*** 115,123 ****
{
case 'newtopic':
! if( $topic_type == POST_ANNOUNCE )
{
$is_auth_type = 'auth_announce';
}
! else if( $topic_type == POST_STICKY )
{
$is_auth_type = 'auth_sticky';
--- 117,125 ----
{
case 'newtopic':
! if ( $topic_type == POST_ANNOUNCE )
{
$is_auth_type = 'auth_announce';
}
! else if ( $topic_type == POST_STICKY )
{
$is_auth_type = 'auth_sticky';
***************
*** 191,197 ****
}
! $select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : "";
! $from_sql = ( !$submit ) ? ", " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u" : "";
! $where_sql = ( !$submit ) ? "AND pt.post_id = p.post_id AND u.user_id = p.poster_id" : "";
$sql = "SELECT f.*, t.topic_id, t.topic_status, t.topic_type, t.topic_first_post_id, t.topic_last_post_id, t.topic_vote, p.post_id, p.poster_id" . $select_sql . "
--- 193,199 ----
}
! $select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : '';
! $from_sql = ( !$submit ) ? ", " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u" : '';
! $where_sql = ( !$submit ) ? "AND pt.post_id = p.post_id AND u.user_id = p.poster_id" : '';
$sql = "SELECT f.*, t.topic_id, t.topic_status, t.topic_type, t.topic_first_post_id, t.topic_last_post_id, t.topic_vote, p.post_id, p.poster_id" . $select_sql . "
***************
*** 246,250 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain vote data for this topic", "", __LINE__, __FILE__, $sql);
}
--- 248,252 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql);
}
***************
*** 277,290 ****
if ( $post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'] )
{
! $message = ( $delete || $mode == "delete" ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts'];
$message .= '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
}
! else if ( !$post_data['last_post'] && !$is_auth['auth_mod'] && ( $mode == "delete" || $delete ) )
{
message_die(GENERAL_MESSAGE, $lang['Cannot_delete_replied']);
}
! else if ( !$post_data['edit_poll'] && !$is_auth['auth_mod'] && ( $mode == "poll_delete" || $poll_delete ) )
{
message_die(GENERAL_MESSAGE, $lang['Cannot_delete_poll']);
--- 279,292 ----
if ( $post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'] )
{
! $message = ( $delete || $mode == 'delete' ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts'];
$message .= '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
}
! else if ( !$post_data['last_post'] && !$is_auth['auth_mod'] && ( $mode == 'delete' || $delete ) )
{
message_die(GENERAL_MESSAGE, $lang['Cannot_delete_replied']);
}
! else if ( !$post_data['edit_poll'] && !$is_auth['auth_mod'] && ( $mode == 'poll_delete' || $poll_delete ) )
{
message_die(GENERAL_MESSAGE, $lang['Cannot_delete_poll']);
***************
*** 335,339 ****
}
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit;
--- 337,341 ----
}
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit;
***************
*** 384,388 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain topic watch information", "", __LINE__, __FILE__, $sql);
}
--- 386,390 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain topic watch information', '', __LINE__, __FILE__, $sql);
}
***************
*** 400,404 ****
// What shall we do?
//
! if ( ( $delete || $poll_delete || $mode == "delete" ) && !$confirm )
{
//
--- 402,406 ----
// What shall we do?
//
! if ( ( $delete || $poll_delete || $mode == 'delete' ) && !$confirm )
{
//
***************
*** 451,455 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain vote data for this topic", "", __LINE__, __FILE__, $sql);
}
--- 453,457 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql);
}
***************
*** 464,468 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain user vote data for this topic", "", __LINE__, __FILE__, $sql);
}
--- 466,470 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain user vote data for this topic', '', __LINE__, __FILE__, $sql);
}
***************
*** 475,479 ****
if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
{
! message_die(GENERAL_ERROR, "Couldn't update poll result", "", __LINE__, __FILE__, $sql);
}
--- 477,481 ----
if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
{
! message_die(GENERAL_ERROR, 'Could not update poll result', '', __LINE__, __FILE__, $sql);
}
***************
*** 482,486 ****
if ( !$db->sql_query($sql, END_TRANSACTION) )
{
! message_die(GENERAL_ERROR, "Couldn't insert user_id for poll", "", __LINE__, __FILE__, $sql);
}
--- 484,488 ----
if ( !$db->sql_query($sql, END_TRANSACTION) )
{
! message_die(GENERAL_ERROR, "Could not insert user_id for poll", "", __LINE__, __FILE__, $sql);
}
***************
*** 688,692 ****
'L_POST_SUBJECT' => $lang['Post_subject'],
'L_PREVIEW' => $lang['Preview'],
! 'L_POSTED' => $lang['Posted'])
);
$template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview');
--- 690,695 ----
'L_POST_SUBJECT' => $lang['Post_subject'],
'L_PREVIEW' => $lang['Preview'],
! 'L_POSTED' => $lang['Posted'],
! 'L_POST' => $lang['Post'])
);
$template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview');
***************
*** 792,796 ****
if( $user_sig != '' )
{
! $template->assign_block_vars('signature_checkbox', array());
}
--- 795,799 ----
if( $user_sig != '' )
{
! $template->assign_block_vars('switch_signature_checkbox', array());
}
***************
*** 801,805 ****
{
$html_status = $lang['HTML_is_ON'];
! $template->assign_block_vars('html_checkbox', array());
}
else
--- 804,808 ----
{
$html_status = $lang['HTML_is_ON'];
! $template->assign_block_vars('switch_html_checkbox', array());
}
else
***************
*** 814,818 ****
{
$bbcode_status = $lang['BBCode_is_ON'];
! $template->assign_block_vars('bbcode_checkbox', array());
}
else
--- 817,821 ----
{
$bbcode_status = $lang['BBCode_is_ON'];
! $template->assign_block_vars('switch_bbcode_checkbox', array());
}
else
***************
*** 827,831 ****
{
$smilies_status = $lang['Smilies_are_ON'];
! $template->assign_block_vars('smilies_checkbox', array());
}
else
--- 830,834 ----
{
$smilies_status = $lang['Smilies_are_ON'];
! $template->assign_block_vars('switch_smilies_checkbox', array());
}
else
***************
*** 836,840 ****
if( !$userdata['session_logged_in'] || ( $mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS ) )
{
! $template->assign_block_vars('username_select', array());
}
--- 839,843 ----
if( !$userdata['session_logged_in'] || ( $mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS ) )
{
! $template->assign_block_vars('switch_username_select', array());
}
***************
*** 846,850 ****
if ( $mode != 'editpost' || ( $mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS ) )
{
! $template->assign_block_vars('notify_checkbox', array());
}
}
--- 849,853 ----
if ( $mode != 'editpost' || ( $mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS ) )
{
! $template->assign_block_vars('switch_notify_checkbox', array());
}
}
***************
*** 855,859 ****
if ( $mode == 'editpost' && ( ( $is_auth['auth_delete'] && $post_data['last_post'] && ( !$post_data['has_poll'] || $post_data['edit_poll'] ) ) || $is_auth['auth_mod'] ) )
{
! $template->assign_block_vars('delete_checkbox', array());
}
--- 858,862 ----
if ( $mode == 'editpost' && ( ( $is_auth['auth_delete'] && $post_data['last_post'] && ( !$post_data['has_poll'] || $post_data['edit_poll'] ) ) || $is_auth['auth_mod'] ) )
{
! $template->assign_block_vars('switch_delete...
[truncated message content] |
|
From: Paul S. O. <ps...@us...> - 2002-03-30 12:17:04
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images In directory usw-pr-cvs1:/tmp/cvs-serv28432/templates/subSilver/images Removed Files: icon_icq.gif voting_bar2.gif Log Message: Not used --- icon_icq.gif DELETED --- --- voting_bar2.gif DELETED --- |
|
From: Paul S. O. <ps...@us...> - 2002-03-29 01:03:16
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24771/admin
Modified Files:
admin_ug_auth.php
Log Message:
Fix bug where user level wasn't reset to 2 when downgrading a user from admin
Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** admin_ug_auth.php 24 Mar 2002 20:58:33 -0000 1.11
--- admin_ug_auth.php 29 Mar 2002 01:03:11 -0000 1.12
***************
*** 153,188 ****
// Carry out requests
//
! if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'user' && $user_level == ADMIN )
! {
! //
! // Make admin a user (if already admin) ... ignore if you're trying
! // to change yourself from an admin to user!
! //
! if ( $userdata['user_id'] != $user_id )
! {
! $sql = "UPDATE " . AUTH_ACCESS_TABLE . "
! SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
! WHERE group_id = $group_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not update auth access', '', __LINE__, __FILE__, $sql);
! }
!
! //
! // Update users level, reset to USER
! //
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_level = " . USER . "
! WHERE user_id = $user_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
! }
! }
!
! $message = $lang['Auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_userauth'], '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
! message_die(GENERAL_MESSAGE, $message);
! }
! else if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'admin' && $user_level != ADMIN )
{
//
--- 153,157 ----
// Carry out requests
//
! if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'admin' && $user_level != ADMIN )
{
//
***************
*** 225,398 ****
else
{
! $change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false;
!
! if ( empty($adv) )
! {
! $change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false;
! }
! else
{
! $change_acl_list = array();
! for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $auth_field = $forum_auth_fields[$j];
! while( list($forum_id, $value) = @each($HTTP_POST_VARS['private_' . $auth_field]) )
{
! $change_acl_list[$forum_id][$auth_field] = $value;
}
}
- }
! $sql = "SELECT *
! FROM " . FORUMS_TABLE . " f
! ORDER BY forum_order";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql);
}
!
! $forum_access = array();
! while( $row = $db->sql_fetchrow($result) )
{
! $forum_access[] = $row;
! }
! $db->sql_freeresult($result);
! $sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . TRUE : "SELECT * FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql);
! }
! $auth_access = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! $auth_access[$row['forum_id']] = $row;
! }
! $db->sql_freeresult($result);
! $forum_auth_action = array();
! $update_acl_status = array();
! $update_mod_status = array();
! for($i = 0; $i < count($forum_access); $i++)
! {
! $forum_id = $forum_access[$i]['forum_id'];
! if (
! ( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) ||
! ( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) )
! )
{
! $update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod'];
! if ( !$update_mod_status[$forum_id] )
! {
! $forum_auth_action[$forum_id] = 'delete';
! }
! else if ( !isset($auth_access[$forum_id]['auth_mod']) )
! {
! $forum_auth_action[$forum_id] = 'insert';
! }
! else
! {
! $forum_auth_action[$forum_id] = 'update';
! }
}
! for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $auth_field = $forum_auth_fields[$j];
! if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id][$auth_field]) )
{
! if ( ( empty($auth_access[$forum_id]['auth_mod']) &&
! ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) ||
! ( !isset($auth_access[$forum_id][$auth_field]) && !empty($change_acl_list[$forum_id][$auth_field]) ) ) ||
! !empty($update_mod_status[$forum_id])
! )
{
! $update_acl_status[$forum_id][$auth_field] = ( !empty($update_mod_status[$forum_id]) ) ? 0 : $change_acl_list[$forum_id][$auth_field];
! if ( isset($auth_access[$forum_id][$auth_field]) && empty($update_acl_status[$forum_id][$auth_field]) && $forum_auth_action[$forum_id] != 'insert' && $forum_auth_action[$forum_id] != 'update' )
! {
! $forum_auth_action[$forum_id] = 'delete';
! }
! else if ( !isset($auth_access[$forum_id][$auth_field]) && !( $forum_auth_action[$forum_id] == 'delete' && empty($update_acl_status[$forum_id][$auth_field]) ) )
{
! $forum_auth_action[$forum_id] = 'insert';
}
! else if ( isset($auth_access[$forum_id][$auth_field]) && !empty($update_acl_status[$forum_id][$auth_field]) )
{
$forum_auth_action[$forum_id] = 'update';
}
}
- else if ( ( empty($auth_access[$forum_id]['auth_mod']) &&
- ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] == $auth_access[$forum_id][$auth_field] ) ) && $forum_auth_action[$forum_id] == 'delete' )
- {
- $forum_auth_action[$forum_id] = 'update';
- }
}
}
- }
! //
! // Checks complete, make updates to DB
! //
! $delete_sql = '';
! while( list($forum_id, $action) = @each($forum_auth_action) )
! {
! if ( $action == 'delete' )
! {
! $delete_sql .= ( ( $delete_sql != '' ) ? ', ' : '' ) . $forum_id;
! }
! else
{
! if ( $action == 'insert' )
{
! $sql_field = '';
! $sql_value = '';
! while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
! {
! $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . $auth_type;
! $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . $value;
! }
! $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . 'auth_mod';
! $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
!
! $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field)
! VALUES ($forum_id, $group_id, $sql_value)";
}
else
{
! $sql_values = '';
! while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
{
! $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . $auth_type . ' = ' . $value;
}
! $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . 'auth_mod = ' . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
! $sql = "UPDATE " . AUTH_ACCESS_TABLE . "
! SET $sql_values
! WHERE group_id = $group_id
! AND forum_id = $forum_id";
}
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't update private forum permissions", "", __LINE__, __FILE__, $sql);
}
}
- }
! if ( $delete_sql != '' )
! {
! $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! WHERE group_id = $group_id
! AND forum_id IN ($delete_sql)";
! if( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't delete permission entries", "", __LINE__, __FILE__, $sql);
! }
}
--- 194,404 ----
else
{
! if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'user' && $user_level == ADMIN )
{
! //
! // Make admin a user (if already admin) ... ignore if you're trying
! // to change yourself from an admin to user!
! //
! if ( $userdata['user_id'] != $user_id )
{
! $sql = "UPDATE " . AUTH_ACCESS_TABLE . "
! SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
! WHERE group_id = $group_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not update auth access', '', __LINE__, __FILE__, $sql);
! }
! //
! // Update users level, reset to USER
! //
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_level = " . USER . "
! WHERE user_id = $user_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
}
}
! $message = $lang['Auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_userauth'], '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
}
! else
{
!
! $change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false;
! if ( empty($adv) )
! {
! $change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false;
! }
! else
! {
! $change_acl_list = array();
! for($j = 0; $j < count($forum_auth_fields); $j++)
! {
! $auth_field = $forum_auth_fields[$j];
! while( list($forum_id, $value) = @each($HTTP_POST_VARS['private_' . $auth_field]) )
! {
! $change_acl_list[$forum_id][$auth_field] = $value;
! }
! }
! }
! $sql = "SELECT *
! FROM " . FORUMS_TABLE . " f
! ORDER BY forum_order";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql);
! }
! $forum_access = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! $forum_access[] = $row;
! }
! $db->sql_freeresult($result);
! $sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . TRUE : "SELECT * FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql);
! }
! $auth_access = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! $auth_access[$row['forum_id']] = $row;
}
+ $db->sql_freeresult($result);
! $forum_auth_action = array();
! $update_acl_status = array();
! $update_mod_status = array();
!
! for($i = 0; $i < count($forum_access); $i++)
{
! $forum_id = $forum_access[$i]['forum_id'];
! if (
! ( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) ||
! ( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) )
! )
{
! $update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod'];
!
! if ( !$update_mod_status[$forum_id] )
! {
! $forum_auth_action[$forum_id] = 'delete';
! }
! else if ( !isset($auth_access[$forum_id]['auth_mod']) )
{
! $forum_auth_action[$forum_id] = 'insert';
! }
! else
! {
! $forum_auth_action[$forum_id] = 'update';
! }
! }
! for($j = 0; $j < count($forum_auth_fields); $j++)
! {
! $auth_field = $forum_auth_fields[$j];
!
! if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id][$auth_field]) )
! {
! if ( ( empty($auth_access[$forum_id]['auth_mod']) &&
! ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) ||
! ( !isset($auth_access[$forum_id][$auth_field]) && !empty($change_acl_list[$forum_id][$auth_field]) ) ) ||
! !empty($update_mod_status[$forum_id])
! )
{
! $update_acl_status[$forum_id][$auth_field] = ( !empty($update_mod_status[$forum_id]) ) ? 0 : $change_acl_list[$forum_id][$auth_field];
!
! if ( isset($auth_access[$forum_id][$auth_field]) && empty($update_acl_status[$forum_id][$auth_field]) && $forum_auth_action[$forum_id] != 'insert' && $forum_auth_action[$forum_id] != 'update' )
! {
! $forum_auth_action[$forum_id] = 'delete';
! }
! else if ( !isset($auth_access[$forum_id][$auth_field]) && !( $forum_auth_action[$forum_id] == 'delete' && empty($update_acl_status[$forum_id][$auth_field]) ) )
! {
! $forum_auth_action[$forum_id] = 'insert';
! }
! else if ( isset($auth_access[$forum_id][$auth_field]) && !empty($update_acl_status[$forum_id][$auth_field]) )
! {
! $forum_auth_action[$forum_id] = 'update';
! }
}
! else if ( ( empty($auth_access[$forum_id]['auth_mod']) &&
! ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] == $auth_access[$forum_id][$auth_field] ) ) && $forum_auth_action[$forum_id] == 'delete' )
{
$forum_auth_action[$forum_id] = 'update';
}
}
}
}
! //
! // Checks complete, make updates to DB
! //
! $delete_sql = '';
! while( list($forum_id, $action) = @each($forum_auth_action) )
{
! if ( $action == 'delete' )
{
! $delete_sql .= ( ( $delete_sql != '' ) ? ', ' : '' ) . $forum_id;
}
else
{
! if ( $action == 'insert' )
{
! $sql_field = '';
! $sql_value = '';
! while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
! {
! $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . $auth_type;
! $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . $value;
! }
! $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . 'auth_mod';
! $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
!
! $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field)
! VALUES ($forum_id, $group_id, $sql_value)";
}
! else
! {
! $sql_values = '';
! while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
! {
! $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . $auth_type . ' = ' . $value;
! }
! $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . 'auth_mod = ' . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
! $sql = "UPDATE " . AUTH_ACCESS_TABLE . "
! SET $sql_values
! WHERE group_id = $group_id
! AND forum_id = $forum_id";
! }
! if( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't update private forum permissions", "", __LINE__, __FILE__, $sql);
! }
}
+ }
+
+ if ( $delete_sql != '' )
+ {
+ $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
+ WHERE group_id = $group_id
+ AND forum_id IN ($delete_sql)";
if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, "Couldn't delete permission entries", "", __LINE__, __FILE__, $sql);
}
}
! $l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
! $message = $lang['Auth_updated'] . '<br /><br />' . sprintf($l_auth_return, '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
}
***************
*** 498,503 ****
}
- $l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
- $message = $lang['Auth_updated'] . '<br /><br />' . sprintf($l_auth_return, '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
}
--- 504,507 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-03-29 00:24:16
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14546/includes
Modified Files:
usercp_register.php
Log Message:
Check returned language string
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** usercp_register.php 24 Mar 2002 20:03:20 -0000 1.16
--- usercp_register.php 29 Mar 2002 00:24:13 -0000 1.17
***************
*** 146,150 ****
$user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
! $user_lang = ( !empty($HTTP_POST_VARS['language']) ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
$user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
$user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
--- 146,166 ----
$user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
! if ( !empty($HTTP_POST_VARS['language']) )
! {
! if ( preg_match('/^[a-z_]+$/i', $HTTP_POST_VARS['language']) )
! {
! $user_lang = $HTTP_POST_VARS['language'];
! }
! else
! {
! $error = true;
! $error_msg = $lang['Fields_empty'];
! }
! }
! else
! {
! $user_lang = $board_config['default_lang'];
! }
!
$user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
$user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
|
|
From: Jonathan H. <the...@us...> - 2002-03-28 19:52:26
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv1066
Modified Files:
login.php posting.php privmsg.php profile.php viewforum.php
viewtopic.php
Log Message:
Ok all of these damned httpd server that are different are about annoying
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** login.php 22 Mar 2002 12:22:58 -0000 1.45
--- login.php 28 Mar 2002 19:52:21 -0000 1.46
***************
*** 48,52 ****
// normal Location redirector is used in preference
//
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
--- 48,52 ----
// normal Location redirector is used in preference
//
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** posting.php 26 Mar 2002 13:13:06 -0000 1.156
--- posting.php 28 Mar 2002 19:52:21 -0000 1.157
***************
*** 335,339 ****
}
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit;
--- 335,339 ----
}
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit;
***************
*** 1094,1096 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 1094,1096 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** privmsg.php 25 Mar 2002 19:40:57 -0000 1.94
--- privmsg.php 28 Mar 2002 19:52:21 -0000 1.95
***************
*** 184,188 ****
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true));
}
--- 184,188 ----
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true));
}
***************
*** 258,262 ****
if ( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 258,262 ----
if ( !( $privmsg = $db->sql_fetchrow($pm_status) ) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 591,595 ****
if (!$userdata['session_logged_in'])
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 591,595 ----
if (!$userdata['session_logged_in'])
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
***************
*** 788,792 ****
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 788,792 ----
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
***************
*** 881,885 ****
{
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : "";
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
}
--- 881,885 ----
{
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : "";
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
}
***************
*** 1266,1270 ****
if ( !($privmsg = $db->sql_fetchrow($pm_edit_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 1266,1270 ----
if ( !($privmsg = $db->sql_fetchrow($pm_edit_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 1305,1309 ****
if ( !($privmsg = $db->sql_fetchrow($pm_reply_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
--- 1305,1309 ----
if ( !($privmsg = $db->sql_fetchrow($pm_reply_status)) )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
}
***************
*** 1659,1663 ****
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
--- 1659,1663 ----
if ( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -r1.192 -r1.193
*** profile.php 22 Mar 2002 23:17:05 -0000 1.192
--- profile.php 28 Mar 2002 19:52:21 -0000 1.193
***************
*** 84,88 ****
if ( !$userdata['session_logged_in'] && $mode == 'editprofile' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true));
exit;
--- 84,88 ----
if ( !$userdata['session_logged_in'] && $mode == 'editprofile' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true));
exit;
***************
*** 110,117 ****
else
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("index.$phpEx", true));
exit;
}
! ?>
\ No newline at end of file
--- 110,117 ----
else
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("index.$phpEx", true));
exit;
}
! ?>
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** viewforum.php 22 Mar 2002 22:27:10 -0000 1.134
--- viewforum.php 28 Mar 2002 19:52:21 -0000 1.135
***************
*** 104,108 ****
{
$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
}
--- 104,108 ----
{
$redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
}
***************
*** 673,675 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 673,675 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -r1.184 -r1.185
*** viewtopic.php 23 Mar 2002 22:18:04 -0000 1.184
--- viewtopic.php 28 Mar 2002 19:52:21 -0000 1.185
***************
*** 192,196 ****
$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id";
$redirect .= ( isset($start) ) ? "&start=$start" : '';
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
}
--- 192,196 ----
$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id";
$redirect .= ( isset($start) ) ? "&start=$start" : '';
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
}
***************
*** 309,313 ****
if ( $HTTP_GET_VARS['unwatch'] == 'topic' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true));
}
--- 309,313 ----
if ( $HTTP_GET_VARS['unwatch'] == 'topic' )
{
! $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true));
}
***************
*** 1172,1174 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 1172,1174 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
|
|
From: Jonathan H. <the...@us...> - 2002-03-27 19:15:43
|
Update of /cvsroot/phpbb/phpBB2/admin In directory usw-pr-cvs1:/tmp/cvs-serv13387 Modified Files: admin_users.php Log Message: Sorry this is just me being anal.. Fix the CVS id line so that it's working again Index: admin_users.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** admin_users.php 27 Mar 2002 19:11:09 -0000 1.56 --- admin_users.php 27 Mar 2002 19:15:39 -0000 1.57 *************** *** 7,11 **** * email : su...@ph... * ! * $user_id: admin_users.php,v 1.53 2002/03/19 00:26:49 psotfx Exp $ * * --- 7,11 ---- * email : su...@ph... * ! * $Id$ * * |
|
From: Jonathan H. <the...@us...> - 2002-03-27 19:11:13
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv11563
Modified Files:
admin_users.php
Log Message:
Fix for bug # 535531... How'd that echo get in there?
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** admin_users.php 23 Mar 2002 15:36:14 -0000 1.55
--- admin_users.php 27 Mar 2002 19:11:09 -0000 1.56
***************
*** 643,647 ****
if( isset( $HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) )
{
! echo $user_id = ( isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ? intval( $HTTP_POST_VARS[POST_USERS_URL]) : intval( $HTTP_GET_VARS[POST_USERS_URL]);
$this_userdata = get_userdata($user_id);
if( !$this_userdata )
--- 643,647 ----
if( isset( $HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) )
{
! $user_id = ( isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ? intval( $HTTP_POST_VARS[POST_USERS_URL]) : intval( $HTTP_GET_VARS[POST_USERS_URL]);
$this_userdata = get_userdata($user_id);
if( !$this_userdata )
***************
*** 1071,1073 ****
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
--- 1071,1073 ----
include('page_footer_admin.'.$phpEx);
! ?>
|
|
From: Paul S. O. <ps...@us...> - 2002-03-27 18:27:43
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv5050/templates/subSilver/images/lang_english Modified Files: icon_icq_add.gif Log Message: Add ICQ flower icon Index: icon_icq_add.gif =================================================================== RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_english/icon_icq_add.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvsMBbf3n and /tmp/cvs6n85PB differ |
|
From: Paul S. O. <ps...@us...> - 2002-03-27 18:27:43
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_italian In directory usw-pr-cvs1:/tmp/cvs-serv5050/templates/subSilver/images/lang_italian Modified Files: icon_icq_add.gif Log Message: Add ICQ flower icon Index: icon_icq_add.gif =================================================================== RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_italian/icon_icq_add.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvsTl9w9Y and /tmp/cvsYivSaO differ |
|
From: Paul S. O. <ps...@us...> - 2002-03-27 18:27:43
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_french In directory usw-pr-cvs1:/tmp/cvs-serv5050/templates/subSilver/images/lang_french Modified Files: icon_icq_add.gif Log Message: Add ICQ flower icon Index: icon_icq_add.gif =================================================================== RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_french/icon_icq_add.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvscD0kEU and /tmp/cvsMbpg2E differ |
|
From: Paul S. O. <ps...@us...> - 2002-03-27 18:27:43
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_dutch In directory usw-pr-cvs1:/tmp/cvs-serv5050/templates/subSilver/images/lang_dutch Modified Files: icon_icq_add.gif Log Message: Add ICQ flower icon Index: icon_icq_add.gif =================================================================== RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_dutch/icon_icq_add.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvsD6cx2m and /tmp/cvs85sOmz differ |
|
From: Jonathan H. <the...@us...> - 2002-03-26 17:47:20
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv30356
Modified Files:
page_header.php
Log Message:
New set of cache control headers, will these work, who knows?
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** page_header.php 22 Mar 2002 18:46:31 -0000 1.103
--- page_header.php 26 Mar 2002 17:47:15 -0000 1.104
***************
*** 469,479 ****
}
}
!
! header ('Cache-Control: private, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0');
! header ('Pragma: no-cache');
! header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
$template->pparse('overall_header');
! ?>
\ No newline at end of file
--- 469,485 ----
}
}
! if ( $HTTP_SERVER_VARS['REQUEST_METHOD'] == 'POST' )
! {
! header ('Cache-Control: private, must-revalidate, max-age=25');
! }
! else
! {
! header ('Cache-Control: private, no-cache, must-revalidate, pre-check=2, post-check=2, max-age=25');
! header ('Pragma: no-cache');
! header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
! }
header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
$template->pparse('overall_header');
! ?>
|
|
From: James A. <th...@us...> - 2002-03-26 16:38:03
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv2029
Modified Files:
modcp.php
Log Message:
Fixed bug #535245
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** modcp.php 19 Mar 2002 13:07:35 -0000 1.67
--- modcp.php 26 Mar 2002 16:27:20 -0000 1.68
***************
*** 789,793 ****
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $checkbox = ( $i > 1 || $total_posts > 1 ) ? '<input type="checkbox" name="post_id_list[]" value="' . $post_id . '" />' : ' ';
$template->assign_block_vars('postrow', array(
--- 789,793 ----
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! $checkbox = ( $i > 0 ) ? '<input type="checkbox" name="post_id_list[]" value="' . $post_id . '" />' : ' ';
$template->assign_block_vars('postrow', array(
|
|
From: Paul S. O. <ps...@us...> - 2002-03-26 13:13:10
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5306
Modified Files:
posting.php
Log Message:
Fix bug with editing polls containing options with quotes
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -r1.155 -r1.156
*** posting.php 23 Mar 2002 22:18:04 -0000 1.155
--- posting.php 26 Mar 2002 13:13:06 -0000 1.156
***************
*** 1065,1069 ****
{
$template->assign_block_vars('poll_option_rows', array(
! 'POLL_OPTION' => $option_text,
'S_POLL_OPTION_NUM' => $option_id)
--- 1065,1069 ----
{
$template->assign_block_vars('poll_option_rows', array(
! 'POLL_OPTION' => str_replace("\"", """, $option_text),
'S_POLL_OPTION_NUM' => $option_id)
|
|
From: Jonathan H. <the...@us...> - 2002-03-25 23:10:38
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv5986
Modified Files:
board_config_body.tpl
Log Message:
Ok fine it's a password field now, will everyone shutup already...
Index: board_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/board_config_body.tpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** board_config_body.tpl 1 Mar 2002 18:04:26 -0000 1.19
--- board_config_body.tpl 25 Mar 2002 23:10:32 -0000 1.20
***************
*** 238,242 ****
<tr>
<td class="row1">{L_SMTP_PASSWORD}<br /><span class="gensmall">{L_SMTP_PASSWORD_EXPLAIN}</span></td>
! <td class="row2"><input type="text" name="smtp_password" value="{SMTP_PASSWORD}" size="25" maxlength="255" /></td>
</tr>
<tr>
--- 238,242 ----
<tr>
<td class="row1">{L_SMTP_PASSWORD}<br /><span class="gensmall">{L_SMTP_PASSWORD_EXPLAIN}</span></td>
! <td class="row2"><input type="password" name="smtp_password" value="{SMTP_PASSWORD}" size="25" maxlength="255" /></td>
</tr>
<tr>
|
|
From: Jonathan H. <the...@us...> - 2002-03-25 23:03:36
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv3788
Modified Files:
usercp_viewprofile.php
Log Message:
fix bug #534904
Index: usercp_viewprofile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_viewprofile.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** usercp_viewprofile.php 18 Mar 2002 23:53:12 -0000 1.3
--- usercp_viewprofile.php 25 Mar 2002 23:03:32 -0000 1.4
***************
*** 133,137 ****
for($i = 0; $i < count($ranksrow); $i++)
{
! if ( $profiledata['user_posts'] > $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] )
{
$poster_rank = $ranksrow[$i]['rank_title'];
--- 133,137 ----
for($i = 0; $i < count($ranksrow); $i++)
{
! if ( $profiledata['user_posts'] >= $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] )
{
$poster_rank = $ranksrow[$i]['rank_title'];
***************
*** 231,233 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 231,233 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
|
|
From: Jonathan H. <the...@us...> - 2002-03-25 20:37:17
|
Update of /cvsroot/phpbb/phpBB2/admin In directory usw-pr-cvs1:/tmp/cvs-serv22624 Modified Files: index.php Log Message: Fix for #534847 Index: index.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** index.php 22 Mar 2002 17:00:33 -0000 1.39 --- index.php 25 Mar 2002 20:37:14 -0000 1.40 *************** *** 147,150 **** --- 147,152 ---- "L_AVATAR_DIR_SIZE" => $lang['Avatar_dir_size'], "L_DB_SIZE" => $lang['Database_size'], + "L_FORUM_LOCATION" => $lang['Forum_Location'], + "L_STARTED" => $lang['Login'], "L_GZIP_COMPRESSION" => $lang['Gzip_compression']) ); |
|
From: Doug K. <dou...@us...> - 2002-03-25 20:32:41
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv21078/templates/subSilver
Modified Files:
formIE.css subSilver.css
Log Message:
Fixing bug 520011-multiple inline images break layout in NS. Tom sent this to me, so here it is.
Index: formIE.css
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/formIE.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** formIE.css 1 Oct 2001 23:22:18 -0000 1.2
--- formIE.css 25 Mar 2002 20:32:36 -0000 1.3
***************
*** 17,18 ****
--- 17,19 ----
}
+ .postbody { line-height: 18px}
Index: subSilver.css
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/subSilver.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** subSilver.css 24 Mar 2002 14:02:00 -0000 1.8
--- subSilver.css 25 Mar 2002 20:32:36 -0000 1.9
***************
*** 141,145 ****
/* The content of the posts (body of text) */
! .postbody { font-size : 12px; line-height: 18px}
a.postlink:link { text-decoration: none; color : #006699 }
a.postlink:visited { text-decoration: none; color : #5493B4; }
--- 141,145 ----
/* The content of the posts (body of text) */
! .postbody { font-size : 12px;}
a.postlink:link { text-decoration: none; color : #006699 }
a.postlink:visited { text-decoration: none; color : #5493B4; }
|
|
From: James A. <th...@us...> - 2002-03-25 20:28:16
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv19858 Modified Files: upgrade.php Log Message: Fixed bug #534526, now my birthday won't show up as users board_startdates :D Index: upgrade.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** upgrade.php 22 Mar 2002 17:25:27 -0000 1.26 --- upgrade.php 25 Mar 2002 20:28:11 -0000 1.27 *************** *** 1809,1813 **** $sql = "SELECT MIN(user_regdate) AS oldest_time FROM " . USERS_TABLE . " ! WHERE user_regdate > 0"; $result = query($sql, "Couldn't obtain oldest post time"); --- 1809,1813 ---- $sql = "SELECT MIN(user_regdate) AS oldest_time FROM " . USERS_TABLE . " ! WHERE user_regdate > 0 AND user_id > 0"; $result = query($sql, "Couldn't obtain oldest post time"); |
|
From: Jonathan H. <the...@us...> - 2002-03-25 19:41:01
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5763
Modified Files:
privmsg.php
Log Message:
Fix for Bug #534313 Max posts in Inbox/Savebox/Sentbox = 0
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** privmsg.php 25 Mar 2002 13:22:46 -0000 1.93
--- privmsg.php 25 Mar 2002 19:40:57 -0000 1.94
***************
*** 1901,1907 ****
if ( $folder != "outbox" )
{
! $inbox_limit_pct = round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * 100);
! $inbox_limit_img_length = round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * $board_config['privmsg_graphic_length']);
! $inbox_limit_remain = $board_config['max_' . $folder . '_privmsgs'] - $pm_all_total;
$template->assign_block_vars("box_size_notice", array());
--- 1901,1928 ----
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("box_size_notice", array());
|
|
From: Jonathan H. <the...@us...> - 2002-03-25 19:31:23
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv3304
Modified Files:
postgres_basic.sql
Log Message:
Fix for bug # 534781 Smiles in Postgres install
Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** postgres_basic.sql 19 Mar 2002 22:00:17 -0000 1.14
--- postgres_basic.sql 25 Mar 2002 19:31:18 -0000 1.15
***************
*** 108,155 ****
-- 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, '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');
--- 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');
|
|
From: Doug K. <dou...@us...> - 2002-03-25 19:22:45
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv383/language/lang_english Modified Files: lang_main.php Log Message: Calling flight 532682, your bug is ready, and we will now begin general boarding... :P In other words, bug 532682 is now fixed. The missing lang entry in the English files ONLY has been added. Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -r1.84 -r1.85 *** lang_main.php 10 Mar 2002 03:23:55 -0000 1.84 --- lang_main.php 25 Mar 2002 19:22:42 -0000 1.85 *************** *** 893,896 **** --- 893,897 ---- $lang['5.5'] = "GMT + 5.5 Hours"; $lang['6'] = "GMT + 6 Hours"; + $lang['6.5'] = "GMT + 6.5 Hours"; $lang['7'] = "GMT + 7 Hours"; $lang['8'] = "WST (Australia)"; |
|
From: Paul S. O. <ps...@us...> - 2002-03-25 13:22:50
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5197
Modified Files:
privmsg.php
Log Message:
Fix non-sending of email notifications ... user_active hadn't been added to the SQL query yet was being checked before email was sent
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** privmsg.php 24 Mar 2002 13:54:09 -0000 1.92
--- privmsg.php 25 Mar 2002 13:22:46 -0000 1.93
***************
*** 31,35 ****
// Is PM disabled?
//
! if( !empty($board_config['privmsg_disable']) )
{
message_die(GENERAL_MESSAGE, 'PM_disabled');
--- 31,35 ----
// Is PM disabled?
//
! if ( !empty($board_config['privmsg_disable']) )
{
[...1679 lines suppressed...]
$msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject);
--- 1990,1994 ----
$msg_subject = $pm_list[$i]['privmsgs_subject'];
! if ( count($orig_word) )
{
$msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject);
***************
*** 2014,2018 ****
$msg_date = create_date($board_config['default_dateformat'], $pm_list[$i]['privmsgs_date'], $board_config['board_timezone']);
! if( $flag == PRIVMSGS_NEW_MAIL && $folder == "inbox" )
{
$msg_subject = "<b>" . $msg_subject . "</b>";
--- 1999,2003 ----
$msg_date = create_date($board_config['default_dateformat'], $pm_list[$i]['privmsgs_date'], $board_config['board_timezone']);
! if ( $flag == PRIVMSGS_NEW_MAIL && $folder == "inbox" )
{
$msg_subject = "<b>" . $msg_subject . "</b>";
|
|
From: Paul S. O. <ps...@us...> - 2002-03-25 13:04:00
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv28665/includes
Modified Files:
functions_post.php
Log Message:
Should fix bug where a solitary < caused the text to repeat
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** functions_post.php 24 Mar 2002 13:21:16 -0000 1.5
--- functions_post.php 25 Mar 2002 13:03:55 -0000 1.6
***************
*** 76,80 ****
$match_tag = trim($allowed_html_tags[$i]);
! if ( preg_match('/^<\/?' . $match_tag . '\W/i', $hold_string) )
{
$tagallowed = true;
--- 76,80 ----
$match_tag = trim($allowed_html_tags[$i]);
! if ( preg_match('/^<\/?' . $match_tag . '\b/i', $hold_string) )
{
$tagallowed = true;
***************
*** 91,94 ****
--- 91,95 ----
$start_html = strlen($message);
+ $end_html = $start_html;
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-03-25 12:41:44
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv13066/includes Modified Files: bbcode.php functions.php Log Message: Move phpbb_preg_quote back into functions because it's plain annoying ... :D Index: bbcode.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** bbcode.php 18 Mar 2002 17:46:43 -0000 1.35 --- bbcode.php 25 Mar 2002 12:41:41 -0000 1.36 *************** *** 765,785 **** } - // - // this does exactly what preg_quote() does in PHP 4-ish: - // http://www.php.net/manual/en/function.preg-quote.php - // - // This function is here because the 2nd paramter to preg_quote was added in some - // version of php 4.0.x.. So we use this in order to maintain compatibility with - // earlier versions of PHP. - // - // If you just need the 1-parameter preg_quote call, then don't bother using this. - // - function phpbb_preg_quote($str, $delimiter) - { - $text = preg_quote($str); - $text = str_replace($delimiter, "\\" . $delimiter, $text); - - return $text; - } ! ?> --- 765,768 ---- } ! ?> \ No newline at end of file Index: functions.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -r1.130 -r1.131 *** functions.php 25 Mar 2002 12:39:17 -0000 1.130 --- functions.php 25 Mar 2002 12:41:41 -0000 1.131 *************** *** 424,427 **** --- 424,439 ---- // + // This does exactly what preg_quote() does in PHP 4-ish + // If you just need the 1-parameter preg_quote call, then don't bother using this. + // + function phpbb_preg_quote($str, $delimiter) + { + $text = preg_quote($str); + $text = str_replace($delimiter, "\\" . $delimiter, $text); + + return $text; + } + + // // Obtain list of naughty words and build preg style replacement arrays for use by the // calling script, note that the vars are passed as references this just makes it easier |
7 messages has been excluded from this view by a project administrator.
