Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.20,1.21 index.php,1.77,1.78 memberlist.php,1.24,1.25 privmsg.php,1.45,1.46 profile.php,1.129,1.130 search.php,1.27,1.28 viewforum.php,1.100,1.101 viewtopic.php,1.134,1.135 viewonline.php,1.37,1.38
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25429
Modified Files:
groupcp.php index.php memberlist.php privmsg.php profile.php
search.php viewforum.php viewtopic.php viewonline.php
Log Message:
Mainly language updates but some bug fixes too
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** groupcp.php 2001/11/15 18:37:01 1.20
--- groupcp.php 2001/11/16 17:27:36 1.21
***************
*** 652,656 ****
"L_GROUP_NAME" => $lang['Group_name'],
"L_GROUP_DESC" => $lang['Group_description'],
! "L_GROUP_STATUS" => $lang['group_status'],
"L_GROUP_MEMBERSHIP" => $lang['Group_membership'],
"L_SUBSCRIBE" => $lang['Subscribe'],
--- 652,656 ----
"L_GROUP_NAME" => $lang['Group_name'],
"L_GROUP_DESC" => $lang['Group_description'],
! "L_GROUP_TYPE" => $lang['Group_type'],
"L_GROUP_MEMBERSHIP" => $lang['Group_membership'],
"L_SUBSCRIBE" => $lang['Subscribe'],
***************
*** 658,664 ****
"L_JOIN_GROUP" => $lang['Join_group'],
"L_UNSUBSCRIBE_GROUP" => $lang['Unsubscribe'],
! "L_GROUP_OPEN" => $lang['group_open'],
! "L_GROUP_CLOSED" => $lang['group_closed'],
! "L_GROUP_HIDDEN" => $lang['group_hidden'],
"L_UPDATE" => $lang['Update'],
--- 658,664 ----
"L_JOIN_GROUP" => $lang['Join_group'],
"L_UNSUBSCRIBE_GROUP" => $lang['Unsubscribe'],
! "L_GROUP_OPEN" => $lang['Group_open'],
! "L_GROUP_CLOSED" => $lang['Group_closed'],
! "L_GROUP_HIDDEN" => $lang['Group_hidden'],
"L_UPDATE" => $lang['Update'],
***************
*** 719,723 ****
$posts = ($group_members[$i]['user_posts']) ? $group_members[$i]['user_posts'] : 0;
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . " $poster\" border=\"0\" /></a>";
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
--- 719,723 ----
$posts = ($group_members[$i]['user_posts']) ? $group_members[$i]['user_posts'] : 0;
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
***************
*** 727,731 ****
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $group_members[$i]['user_id']) : "mailto:" . $group_members[$i]['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " " . $group_members[$i]['username'] . "\" border=\"0\" /></a>";
}
else
--- 727,731 ----
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $group_members[$i]['user_id']) : "mailto:" . $group_members[$i]['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
}
else
***************
*** 876,880 ****
$posts = ( $modgroup_pending_list[$i]['user_posts'] ) ? $modgroup_pending_list[$i]['user_posts'] : 0;
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . " $poster\" border=\"0\" /></a>";
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
--- 876,880 ----
$posts = ( $modgroup_pending_list[$i]['user_posts'] ) ? $modgroup_pending_list[$i]['user_posts'] : 0;
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** index.php 2001/10/25 23:21:11 1.77
--- index.php 2001/11/16 17:27:36 1.78
***************
*** 50,95 ****
if( $mark_read == "forums" )
{
!
! $sql = "SELECT f.forum_id, t.topic_id
! FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! WHERE t.forum_id = f.forum_id
! AND p.post_id = t.topic_last_post_id
! AND p.post_time > " . $userdata['session_last_visit'] . "
! AND t.topic_moved_id IS NULL";
! if(!$t_result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! }
!
! if( $mark_read_rows = $db->sql_numrows($t_result) )
! {
! $mark_read_list = $db->sql_fetchrowset($t_result);
! for($i = 0; $i < $mark_read_rows; $i++ )
{
! $forum_id = $mark_read_list[$i]['forum_id'];
! $topic_id = $mark_read_list[$i]['topic_id'];
! if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
! {
! setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! }
! else
{
! if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
}
}
- }
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' .append_sid("index.$phpEx") . '">')
! );
! $message = $lang['Forums_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a> ");
! message_die(GENERAL_MESSAGE, $message);
}
//
--- 50,97 ----
if( $mark_read == "forums" )
{
! if( $userdata['session_last_visit'] )
{
! $sql = "SELECT f.forum_id, t.topic_id
! FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! WHERE t.forum_id = f.forum_id
! AND p.post_id = t.topic_last_post_id
! AND p.post_time > " . $userdata['session_last_visit'] . "
! AND t.topic_moved_id IS NULL";
! if(!$t_result = $db->sql_query($sql))
! {
! message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! }
! if( $mark_read_rows = $db->sql_numrows($t_result) )
{
! $mark_read_list = $db->sql_fetchrowset($t_result);
! for($i = 0; $i < $mark_read_rows; $i++ )
{
! $forum_id = $mark_read_list[$i]['forum_id'];
! $topic_id = $mark_read_list[$i]['topic_id'];
!
! if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
+ else
+ {
+ if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
+ {
+ setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ }
+ }
}
}
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' .append_sid("index.$phpEx") . '">')
! );
! $message = $lang['Forums_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a> ");
! message_die(GENERAL_MESSAGE, $message);
! }
}
//
***************
*** 248,252 ****
$template->assign_vars(array(
! "TOTAL_POSTS" => sprintf($lang['Posted_total'], $total_posts),
"TOTAL_USERS" => ( $total_users == 1 ) ? sprintf($lang['Registered_user_total'], $total_users) : sprintf($lang['Registered_users_total'], $total_users),
"NEWEST_USER" => sprintf($lang['Newest_user'], "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . "\">", $newest_user, "</a>"),
--- 250,254 ----
$template->assign_vars(array(
! "TOTAL_POSTS" => ( $total_posts == 1 ) ? sprintf($lang['Posted_article_total'], $total_posts) : sprintf($lang['Posted_articles_total'], $total_posts),
"TOTAL_USERS" => ( $total_users == 1 ) ? sprintf($lang['Registered_user_total'], $total_users) : sprintf($lang['Registered_users_total'], $total_users),
"NEWEST_USER" => sprintf($lang['Newest_user'], "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . "\">", $newest_user, "</a>"),
Index: memberlist.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** memberlist.php 2001/11/15 18:37:01 1.24
--- memberlist.php 2001/11/16 17:27:36 1.25
***************
*** 99,103 ****
// Memberlist sorting
//
! $mode_types_text = array($lang['Joined'], $lang['Username'], $lang['Location'], $lang['Posts'], $lang['Email'], $lang['Website'], $lang['Top_Ten']);
$mode_types = array("joindate", "username", "location", "posts", "email", "website", "topten");
--- 99,103 ----
// 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");
***************
*** 113,121 ****
if($sort_order == "ASC")
{
! $select_sort_order .= "<option value=\"ASC\" selected=\"selected\">" . $lang['Ascending'] . "</option><option value=\"DESC\">" . $lang['Descending'] . "</option>";
}
else
{
! $select_sort_order .= "<option value=\"ASC\">" . $lang['Ascending'] . "</option><option value=\"DESC\" selected=\"selected\">" . $lang['Descending'] . "</option>";
}
$select_sort_order .= "</select>";
--- 113,121 ----
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>";
***************
*** 190,194 ****
$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'] . " " . $members[$i]['username'] . "\" /></a>";
}
else
--- 190,194 ----
$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
***************
*** 279,287 ****
$template->assign_vars(array(
"PAGINATION" => $pagination,
! "ON_PAGE" => ( floor( $start / $board_config['topics_per_page'] ) + 1 ),
! "TOTAL_PAGES" => ceil( $total_members / $board_config['topics_per_page'] ),
- "L_OF" => $lang['of'],
- "L_PAGE" => $lang['Page'],
"L_GOTO_PAGE" => $lang['Goto_page'])
);
--- 279,284 ----
$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'])
);
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** privmsg.php 2001/11/15 18:57:07 1.45
--- privmsg.php 2001/11/16 17:27:36 1.46
***************
*** 374,378 ****
"L_DATE" => $lang['Date'],
"L_FROM" => $lang['From'],
! "L_TO" => $lang['To'],
"S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"),
--- 374,380 ----
"L_DATE" => $lang['Date'],
"L_FROM" => $lang['From'],
! "L_TO" => $lang['To'],
! "L_SAVE_MSG" => $lang['Save_message'],
! "L_DELETE_MSG" => $lang['Delete_message'],
"S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"),
***************
*** 387,391 ****
$post_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']);
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . " $username_from\" border=\"0\" /></a>";
if( !empty($privmsg['user_viewemail']) )
--- 389,393 ----
$post_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']);
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
if( !empty($privmsg['user_viewemail']) )
***************
*** 393,397 ****
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $user_id_from) : "mailto:" . $privmsg['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " $username_from\" border=\"0\" /></a>";
}
else
--- 395,399 ----
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $user_id_from) : "mailto:" . $privmsg['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
}
else
***************
*** 550,554 ****
$template->assign_vars(array(
"MESSAGE_TITLE" => $lang['Information'],
! "MESSAGE_TEXT" => "Are you sure you want to delete these message?",
"L_YES" => $lang['Yes'],
--- 552,556 ----
$template->assign_vars(array(
"MESSAGE_TITLE" => $lang['Information'],
! "MESSAGE_TEXT" => $lang['Confirm_delete'],
"L_YES" => $lang['Yes'],
***************
*** 1663,1667 ****
//
$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364);
! $previous_days_text = array($lang['All_Messages'], "1 " . $lang['Day'], "7 " . $lang['Days'], "2 " . $lang['Weeks'], "1 " . $lang['Month'], "3 ". $lang['Months'], "6 " . $lang['Months'], "1 " . $lang['Year']);
$select_msg_days = "";
--- 1665,1669 ----
//
$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364);
! $previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']);
$select_msg_days = "";
***************
*** 1723,1731 ****
$template->assign_block_vars("box_size_notice", array());
! // $lang_match = array("'{BOXNAME}'", "'{BOXSIZE}'");
! // $lang_replace = array($l_box_name, $inbox_limit_pct);
! // $l_box_size_status = preg_replace($lang_match, $lang_replace, $lang['Box_size']);
!
! $l_box_size_status = sprintf($lang['Box_size'], $l_box_name, $inbox_limit_pct);
}
--- 1725,1743 ----
$template->assign_block_vars("box_size_notice", array());
! switch( $folder )
! {
! case 'inbox':
! $l_box_size_status = sprintf($lang['Inbox_size'], $l_box_name, $inbox_limit_pct);
! break;
! case 'sentbox':
! $l_box_size_status = sprintf($lang['Sentbox_size'], $l_box_name, $inbox_limit_pct);
! break;
! case 'savebox':
! $l_box_size_status = sprintf($lang['Savebox_size'], $l_box_name, $inbox_limit_pct);
! break;
! default:
! $l_box_size_status = "";
! break;
! }
}
***************
*** 1764,1767 ****
--- 1776,1782 ----
"L_MARK_ALL" => $lang['Mark_all'],
"L_UNMARK_ALL" => $lang['Unmark_all'],
+ "L_DELETE_MARKED" => $lang['Delete_marked'],
+ "L_DELETE_ALL" => $lang['Delete_all'],
+ "L_SAVE_MARKED" => $lang['Save_marked'],
"S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"),
***************
*** 1829,1837 ****
$template->assign_vars(array(
"PAGINATION" => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start),
! "ON_PAGE" => (floor($start/$board_config['topics_per_page'])+1),
! "TOTAL_PAGES" => ceil(($pm_total)/$board_config['topics_per_page']),
- "L_OF" => $lang['of'],
- "L_PAGE" => $lang['Page'],
"L_GOTO_PAGE" => $lang['Goto_page'])
);
--- 1844,1849 ----
$template->assign_vars(array(
"PAGINATION" => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start),
! "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $pm_total / $board_config['topics_per_page'] )),
"L_GOTO_PAGE" => $lang['Goto_page'])
);
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -r1.129 -r1.130
*** profile.php 2001/11/15 18:37:01 1.129
--- profile.php 2001/11/16 17:27:36 1.130
***************
*** 264,268 ****
$email = "<a href=\"$email_uri\">" . $lang['Send_email'] . "</a>";
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " " . $profiledata['username'] . "\" border=\"0\" /></a>";
}
else
--- 264,268 ----
$email = "<a href=\"$email_uri\">" . $lang['Send_email'] . "</a>";
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
}
else
***************
*** 364,368 ****
"POSTS_PER_DAY" => $posts_per_day,
"POSTS" => $profiledata['user_posts'],
! "PERCENTAGE" => $percentage . "%",
"EMAIL" => $email,
"EMAIL_IMG" => $email_img,
--- 364,370 ----
"POSTS_PER_DAY" => $posts_per_day,
"POSTS" => $profiledata['user_posts'],
! "PERCENTAGE" => $percentage . "%",
! "POST_DAY_STATS" => sprintf($lang['User_post_day_stats'], $posts_per_day),
! "POST_PERCENT_STATS" => sprintf($lang['User_post_pct_stats'], $percentage),
"EMAIL" => $email,
"EMAIL_IMG" => $email_img,
***************
*** 385,392 ****
"AVATAR_IMG" => $avatar_img,
! "L_VIEWING_PROFILE" => $lang['Viewing_profile_of'],
"L_POSTER_RANK" => $lang['Poster_rank'],
! "L_PER_DAY" => $lang['posts_per_day'],
! "L_OF_TOTAL" => $lang['of_total'],
"L_CONTACT" => $lang['Contact'],
"L_EMAIL_ADDRESS" => $lang['Email_address'],
--- 387,396 ----
"AVATAR_IMG" => $avatar_img,
! "L_VIEWING_PROFILE" => sprintf($lang['Viewing_user_profile'], $profiledata['username']),
! "L_ABOUT_USER" => sprintf($lang['About_user'], $profiledata['username']),
! "L_AVATAR" => $lang['Avatar'],
"L_POSTER_RANK" => $lang['Poster_rank'],
! "L_TOTAL_POSTS" => $lang['Total_posts'],
! "L_SEARCH_USER_POSTS" => sprintf($lang['Search_user_posts'], $profiledata['username']),
"L_CONTACT" => $lang['Contact'],
"L_EMAIL_ADDRESS" => $lang['Email_address'],
***************
*** 1538,1542 ****
"L_WEBSITE" => $lang['Website'],
"L_AIM" => $lang['AIM'],
! "L_LOCATION" => $lang['From'],
"L_OCCUPATION" => $lang['Occupation'],
"L_BOARD_LANGUAGE" => $lang['Board_lang'],
--- 1542,1546 ----
"L_WEBSITE" => $lang['Website'],
"L_AIM" => $lang['AIM'],
! "L_LOCATION" => $lang['Location'],
"L_OCCUPATION" => $lang['Occupation'],
"L_BOARD_LANGUAGE" => $lang['Board_lang'],
***************
*** 1555,1559 ****
"L_AVATAR_PANEL" => $lang['Avatar_panel'],
! "L_AVATAR_EXPLAIN" => $lang['Avatar_explain'],
"L_UPLOAD_AVATAR_FILE" => $lang['Upload_Avatar_file'],
"L_UPLOAD_AVATAR_URL" => $lang['Upload_Avatar_URL'],
--- 1559,1563 ----
"L_AVATAR_PANEL" => $lang['Avatar_panel'],
! "L_AVATAR_EXPLAIN" => sprintf($lang['Avatar_explain'], $board_config['avatar_max_width'], $board_config['avatar_max_height'], (round($board_config['avatar_filesize'] / 1024))),
"L_UPLOAD_AVATAR_FILE" => $lang['Upload_Avatar_file'],
"L_UPLOAD_AVATAR_URL" => $lang['Upload_Avatar_URL'],
***************
*** 1567,1571 ****
"L_SIGNATURE" => $lang['Signature'],
! "L_SIGNATURE_EXPLAIN" => $lang['Signature_explain'],
"L_NOTIFY_ON_REPLY" => $lang['Always_notify'],
"L_NOTIFY_ON_REPLY_EXPLAIN" => $lang['Always_notify_explain'],
--- 1571,1575 ----
"L_SIGNATURE" => $lang['Signature'],
! "L_SIGNATURE_EXPLAIN" => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']),
"L_NOTIFY_ON_REPLY" => $lang['Always_notify'],
"L_NOTIFY_ON_REPLY_EXPLAIN" => $lang['Always_notify_explain'],
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** search.php 2001/11/16 00:20:42 1.27
--- search.php 2001/11/16 17:27:36 1.28
***************
*** 1178,1182 ****
"L_SORT_BY" => $lang['Sort_by'],
"L_SORT_ASCENDING" => $lang['Sort_Ascending'],
! "L_SORT_DESCENDING" => $lang['Sort_Decending'],
"L_SEARCH_PREVIOUS" => $lang['Search_previous'],
"L_DISPLAY_RESULTS" => $lang['Display_results'],
--- 1178,1182 ----
"L_SORT_BY" => $lang['Sort_by'],
"L_SORT_ASCENDING" => $lang['Sort_Ascending'],
! "L_SORT_DESCENDING" => $lang['Sort_Descending'],
"L_SEARCH_PREVIOUS" => $lang['Search_previous'],
"L_DISPLAY_RESULTS" => $lang['Display_results'],
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -r1.100 -r1.101
*** viewforum.php 2001/11/14 13:20:22 1.100
--- viewforum.php 2001/11/16 17:27:36 1.101
***************
*** 377,381 ****
"IMG_POST" => ($forum_row['forum_status'] == FORUM_LOCKED) ? $images['post_locked'] : $images['post_new'],
! "L_MARK_TOPICS_READ" => $lang['Mark_all_topics'],
"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"),
--- 377,382 ----
"IMG_POST" => ($forum_row['forum_status'] == FORUM_LOCKED) ? $images['post_locked'] : $images['post_new'],
! "L_MARK_TOPICS_READ" => $lang['Mark_all_topics'],
! "L_POST_NEW_TOPIC" => $lang['Post_new_topic'],
"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"),
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** viewtopic.php 2001/11/16 00:18:32 1.134
--- viewtopic.php 2001/11/16 17:27:36 1.135
***************
*** 316,320 ****
//
$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364);
! $previous_days_text = array($lang['All_Posts'], "1 " . $lang['Day'], "7 " . $lang['Days'], "2 " . $lang['Weeks'], "1 " . $lang['Month'], "3 ". $lang['Months'], "6 " . $lang['Months'], "1 " . $lang['Year']);
if(!empty($HTTP_POST_VARS['postdays']) || !empty($HTTP_GET_VARS['postdays']))
--- 316,320 ----
//
$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364);
! $previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']);
if(!empty($HTTP_POST_VARS['postdays']) || !empty($HTTP_GET_VARS['postdays']))
***************
*** 782,786 ****
if($poster_id != ANONYMOUS)
{
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . " $poster\" border=\"0\" /></a>";
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
--- 782,786 ----
if($poster_id != ANONYMOUS)
{
! $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
***************
*** 796,801 ****
$email_img = "";
}
-
- $email_img = ( $postrow[$i]['user_viewemail'] ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=$poster_id") . "\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " $poster\" border=\"0\" /></a>" : "";
$www_img = ($postrow[$i]['user_website']) ? "<a href=\"" . $postrow[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : "";
--- 796,799 ----
Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** viewonline.php 2001/11/05 00:29:25 1.37
--- viewonline.php 2001/11/16 17:27:36 1.38
***************
*** 120,124 ****
"L_ONLINE_EXPLAIN" => $lang['Online_explain'],
"L_USERNAME" => $lang['Username'],
! "L_LOCATION" => $lang['Location'],
"L_LAST_UPDATE" => $lang['Last_updated'])
);
--- 120,124 ----
"L_ONLINE_EXPLAIN" => $lang['Online_explain'],
"L_USERNAME" => $lang['Username'],
! "L_FORUM_LOCATION" => $lang['Forum_Location'],
"L_LAST_UPDATE" => $lang['Last_updated'])
);
***************
*** 223,227 ****
"USERNAME" => $username,
"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_time'], $board_config['board_timezone']),
! "LOCATION" => $location,
"U_USER_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
--- 223,227 ----
"USERNAME" => $username,
"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_time'], $board_config['board_timezone']),
! "FORUM_LOCATION" => $location,
"U_USER_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
***************
*** 233,237 ****
$template->assign_vars(array(
! "TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], $registered_users, $hidden_users))
);
--- 233,237 ----
$template->assign_vars(array(
! "TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], $registered_users) . sprintf($lang['Hidden_users_online'], $hidden_users))
);
***************
*** 316,320 ****
"USERNAME" => $lang['Guest'],
"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
! "LOCATION" => $location,
"U_FORUM_LOCATION" => append_sid($location_url))
--- 316,320 ----
"USERNAME" => $lang['Guest'],
"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
! "FORUM_LOCATION" => $location,
"U_FORUM_LOCATION" => append_sid($location_url))
|
