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...> - 2001-11-19 14:49:02
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv5547/language/lang_english Modified Files: lang_main.php Log Message: Yet More language updates Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** lang_main.php 2001/11/19 14:12:08 1.45 --- lang_main.php 2001/11/19 14:48:58 1.46 *************** *** 650,658 **** $lang['Search_for_any'] = "Search for any terms or use query as entered"; $lang['Search_for_all'] = "Search for all terms"; $lang['Search_author'] = "Search for Author"; ! $lang['Return_first'] = "Return first"; // followed by xxx characters $lang['characters_posts'] = "characters of posts"; ! $lang['Search_previous'] = "Search previous"; // followed by days, weeks, months, year, all $lang['Sort_by'] = "Sort by"; $lang['Display_results'] = "Display results as"; $lang['All'] = "All"; --- 650,668 ---- $lang['Search_for_any'] = "Search for any terms or use query as entered"; $lang['Search_for_all'] = "Search for all terms"; + $lang['Search_author'] = "Search for Author"; ! ! $lang['Return_first'] = "Return first"; // followed by xxx characters in a select box $lang['characters_posts'] = "characters of posts"; ! ! $lang['Search_previous'] = "Search previous"; // followed by days, weeks, months, year, all in a select box ! $lang['Sort_by'] = "Sort by"; + $lang['Sort_Time'] = "Post Time"; + $lang['Sort_Post_Subject'] = "Post Subject"; + $lang['Sort_Topic_Title'] = "Topic Title"; + $lang['Sort_Author'] = "Author"; + $lang['Sort_Forum'] = "Forum"; + $lang['Display_results'] = "Display results as"; $lang['All'] = "All"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 14:49:02
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5547
Modified Files:
search.php
Log Message:
Yet More language updates
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** search.php 2001/11/19 14:12:08 1.32
--- search.php 2001/11/19 14:48:58 1.33
***************
*** 219,223 ****
// Define some globally used data
//
! $sortby_types = array("Post Time", "Post Subject", "Topic Title", "Author Name", "Forum");
$sortby_sql = array("p.post_time", "pt.post_subject", "t.topic_title", "u.username", "f.forum_id");
--- 219,223 ----
// Define some globally used data
//
! $sortby_types = array($lang['Sort_Time'], $lang['Sort_Post_Subject'], $lang['Sort_Topic_Title'], $lang['Sort_Author'], $lang['Sort_Forum']);
$sortby_sql = array("p.post_time", "pt.post_subject", "t.topic_title", "u.username", "f.forum_id");
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 14:12:12
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv29531/includes
Modified Files:
functions.php
Log Message:
More language updates
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** functions.php 2001/11/16 17:27:36 1.81
--- functions.php 2001/11/19 14:12:08 1.82
***************
*** 774,819 ****
function tz_select($default, $select_name = 'timezone')
{
! global $sys_timezone;
! if(!isset($default))
{
$default == $sys_timezone;
}
$tz_select = "<select name=\"$select_name\">";
- $tz_array = array(
- "-12" => "(GMT -12:00 hours) Eniwetok, Kwajalein",
- "-11" => "(GMT -11:00 hours) Midway Island, Samoa",
- "-10" => "(GMT -10:00 hours) Hawaii",
- "-9" => "(GMT -9:00 hours) Alaska",
- "-8" => "(GMT -8:00 hours) Pacific Time (US & Canada)",
- "-7" => "(GMT -7:00 hours) Mountain Time (US & Canada)",
- "-6" => "(GMT -6:00 hours) Central Time (US & Canada), Mexico City",
- "-5" => "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito",
- "-4" => "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz",
- "-3.5" => "(GMT -3:30 hours) Newfoundland",
- "-3" => "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown",
- "-2" => "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena, ",
- "-1" => "(GMT -1:00 hours) Azores, Cape Verde Islands",
- "0" => "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia",
- "1" => "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome",
- "2" => "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw",
- "3" => "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi",
- "3.5" => "(GMT +3:30 hours) Tehran",
- "4" => "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi",
- "4.5" => "(GMT +4:30 hours) Kabul",
- "5" => "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent",
- "5.5" => "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi",
- "6" => "(GMT +6:00 hours) Almaty, Colombo, Dhaka",
- "7" => "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta",
- "8" => "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei",
- "9" => "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk",
- "9.5" => "(GMT +9:30 hours) Adelaide, Darwin",
- "10" => "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok",
- "11" => "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands",
- "12" => "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island");
! while( list($offset, $zone) = each($tz_array) )
{
! $selected = ($offset == $default) ? " selected=\"selected\"" : "";
$tz_select .= "\t<option value=\"$offset\"$selected>$zone</option>";
}
--- 774,788 ----
function tz_select($default, $select_name = 'timezone')
{
! global $sys_timezone, $lang;
! if( !isset($default) )
{
$default == $sys_timezone;
}
$tz_select = "<select name=\"$select_name\">";
! while( list($offset, $zone) = each($lang['tz']) )
{
! $selected = ( $offset == $default ) ? " selected=\"selected\"" : "";
$tz_select .= "\t<option value=\"$offset\"$selected>$zone</option>";
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 14:12:12
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv29531/templates/subSilver
Modified Files:
privmsgs_body.tpl search_results_posts.tpl
search_results_topics.tpl
Log Message:
More language updates
Index: privmsgs_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/privmsgs_body.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** privmsgs_body.tpl 2001/11/18 14:01:35 1.6
--- privmsgs_body.tpl 2001/11/19 14:12:09 1.7
***************
*** 65,69 ****
<select name="msgdays">{S_MSG_DAYS_OPTIONS}
</select>
! <input type="submit" value="Go" name="submit_msgdays" class="liteoption" />
</span></td>
</tr>
--- 65,69 ----
<select name="msgdays">{S_MSG_DAYS_OPTIONS}
</select>
! <input type="submit" value="{L_GO}" name="submit_msgdays" class="liteoption" />
</span></td>
</tr>
Index: search_results_posts.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_posts.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** search_results_posts.tpl 2001/11/18 14:02:03 1.4
--- search_results_posts.tpl 2001/11/19 14:12:09 1.5
***************
*** 2,10 ****
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" valign="bottom" colspan="3"><span class="maintitle">{L_SEARCH}
! - {SEARCH_MATCHES} Matches</span><br />
! </td>
</tr>
</table>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
--- 2,9 ----
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td>
</tr>
</table>
+
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
***************
*** 12,16 ****
</tr>
</table>
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
<th width="22%" height="25" class="thCornerL">{L_AUTHOR}</th>
--- 11,16 ----
</tr>
</table>
!
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
<tr>
<th width="22%" height="25" class="thCornerL">{L_AUTHOR}</th>
***************
*** 38,41 ****
--- 38,42 ----
</tr>
</table>
+
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
***************
*** 44,47 ****
--- 45,49 ----
</tr>
</table>
+
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
Index: search_results_topics.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_topics.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search_results_topics.tpl 2001/11/18 14:02:03 1.6
--- search_results_topics.tpl 2001/11/19 14:12:09 1.7
***************
*** 2,10 ****
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" valign="bottom" colspan="3"><span class="maintitle">{L_SEARCH}
! - {SEARCH_MATCHES} Matches</span><br />
! </td>
</tr>
</table>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
--- 2,9 ----
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td>
</tr>
</table>
+
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
***************
*** 12,16 ****
</tr>
</table>
! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th width="4%" height="25" class="thCornerL"> </th>
--- 11,16 ----
</tr>
</table>
!
! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
<th width="4%" height="25" class="thCornerL"> </th>
***************
*** 42,45 ****
--- 42,46 ----
</tr>
</table>
+
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
***************
*** 48,51 ****
--- 49,53 ----
</tr>
</table>
+
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 14:12:12
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv29531
Modified Files:
groupcp.php search.php
Log Message:
More language updates
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** groupcp.php 2001/11/18 18:11:42 1.24
--- groupcp.php 2001/11/19 14:12:08 1.25
***************
*** 690,694 ****
"L_EMAIL" => $lang['Email'],
"L_WEBSITE" => $lang['Website'],
! "L_FROM" => $lang['From'],
"L_ORDER" => $lang['Order'],
"L_SORT" => $lang['Sort'],
--- 690,694 ----
"L_EMAIL" => $lang['Email'],
"L_WEBSITE" => $lang['Website'],
! "L_FROM" => $lang['Location'],
"L_ORDER" => $lang['Order'],
"L_SORT" => $lang['Sort'],
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** search.php 2001/11/17 17:44:31 1.31
--- search.php 2001/11/19 14:12:08 1.32
***************
*** 739,747 ****
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
! $template->assign_vars(array(
! "SEARCH_MATCHES" => $total_match_count,
! "L_FOUND" => $lang['found'],
! "L_MATCHES" => (count($searchset) == 1) ? $lang['match'] : $lang['matches'],
"L_TOPIC" => $lang['Topic'])
);
--- 739,746 ----
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
! $l_search_matches = ( $total_match_count == 1 ) ? sprintf($lang['Found_search_match'], $total_match_count) : sprintf($lang['Found_search_matches'], $total_match_count);
! $template->assign_vars(array(
! "L_SEARCH_MATCHES" => $l_search_matches,
"L_TOPIC" => $lang['Topic'])
);
***************
*** 959,962 ****
--- 958,964 ----
$topic_type = $lang['Topic_Moved'] . " ";
$topic_id = $searchset[$i]['topic_moved_id'];
+
+ $folder_image = "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
+ $newest_post_img = "";
}
else
***************
*** 994,997 ****
--- 996,1001 ----
{
$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
+
+ $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
}
else
***************
*** 999,1019 ****
if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
! $folder_image = ($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] ) ? "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
}
else
{
! $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
}
}
- }
-
- if( $searchset[$i]['post_time'] >= $userdata['session_last_visit'] )
- {
- $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
- }
- else
- {
- $newest_post_img = "";
}
--- 1003,1026 ----
if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
! if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] )
! {
! $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
!
! $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
! }
! else
! {
! $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! $folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
! $newest_post_img = "";
! }
}
else
{
! $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
+ $newest_post_img = "";
}
}
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 14:12:11
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv29531/language/lang_english Modified Files: lang_main.php Log Message: More language updates Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** lang_main.php 2001/11/19 01:04:58 1.44 --- lang_main.php 2001/11/19 14:12:08 1.45 *************** *** 38,41 **** --- 38,42 ---- $lang['RIGHT'] = "RIGHT"; + // // Common, these terms are used *************** *** 127,130 **** --- 128,132 ---- $lang['You_last_visit'] = "You last visited on %s"; // %s replaced by date/time + $lang['Search_new'] = "View posts since last visit"; $lang['Search_your_posts'] = "View your posts"; $lang['Search_unanswered'] = "View unanswered posts"; *************** *** 218,221 **** --- 220,224 ---- $lang['Rules_moderate'] = "You <b>can</b> %smoderate this forum%s"; // %s replaced by a href links, do not remove! + // // Viewtopic *************** *** 633,636 **** --- 636,640 ---- $lang['View_Information'] = "View Information"; + // // Search *************** *** 638,645 **** --- 642,651 ---- $lang['Search_query'] = "Search Query"; $lang['Search_options'] = "Search Options"; + $lang['Search_keywords'] = "Search for Keywords"; $lang['Search_keywords_explain'] = "You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches. To define a phrase enclose it within """; $lang['Search_author'] = "Search for Author"; $lang['Search_author_explain'] = "Use * as a wildcard for partial matches"; + $lang['Search_for_any'] = "Search for any terms or use query as entered"; $lang['Search_for_all'] = "Search for all terms"; *************** *** 651,661 **** $lang['Display_results'] = "Display results as"; $lang['All'] = "All"; $lang['No_search_match'] = "No topics or posts met your search criteria"; ! $lang['found'] = "found"; // this precedes the number of matches found and follows Search ! $lang['match'] = "Match"; // this and the following entry proceed the number of matches found ! $lang['matches'] = "Matches"; ! $lang['Search_new'] = "View posts since last visit"; $lang['Close_window'] = "Close Window"; // // Auth related entries --- 657,668 ---- $lang['Display_results'] = "Display results as"; $lang['All'] = "All"; + $lang['No_search_match'] = "No topics or posts met your search criteria"; ! $lang['Found_search_match'] = "Search found %d match"; // eg. Search found 1 match ! $lang['Found_search_matches'] = "Search found %d matches"; // eg. Search found 24 matches ! $lang['Close_window'] = "Close Window"; + // // Auth related entries *************** *** 786,789 **** --- 793,828 ---- $lang['11'] = "GMT + 11 Hours"; $lang['12'] = "GMT + 12 Hours"; + + // These are displayed in the timezone select box + $lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein"; + $lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa"; + $lang['tz']['10'] = "(GMT -10:00 hours) Hawaii"; + $lang['tz']['-9'] = "(GMT -9:00 hours) Alaska"; + $lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US & Canada)"; + $lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US & Canada)"; + $lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US & Canada), Mexico City"; + $lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito"; + $lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz"; + $lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland"; + $lang['tz']['-3'] = "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown, Falkland Is"; + $lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena"; + $lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands"; + $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia"; + $lang['tz']['1'] = "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome"; + $lang['tz']['2'] = "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw"; + $lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi"; + $lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran"; + $lang['tz']['4'] = "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi"; + $lang['tz']['4.5'] = "(GMT +4:30 hours) Kabul"; + $lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent"; + $lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi"; + $lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka"; + $lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta"; + $lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei"; + $lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk"; + $lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin"; + $lang['tz']['10'] = "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok"; + $lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands"; + $lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 01:05:02
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv26508/language/lang_english Modified Files: lang_main.php Log Message: Altered storage of private message info Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -r1.43 -r1.44 *** lang_main.php 2001/11/18 22:18:46 1.43 --- lang_main.php 2001/11/19 01:04:58 1.44 *************** *** 358,361 **** --- 358,364 ---- $lang['New_pm'] = "You have %d new message"; // You have 1 new message $lang['No_new_pm'] = "You have no new messages"; + $lang['Unread_pms'] = "You have %d unread messages"; + $lang['Unread_pm'] = "You have %d unread message"; + $lang['No_unread_pm'] = "You have no unread messages"; $lang['Inbox'] = "Inbox"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-19 01:05:02
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv26508/includes
Modified Files:
page_header.php
Log Message:
Altered storage of private message info
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** page_header.php 2001/11/18 15:00:54 1.65
--- page_header.php 2001/11/19 01:04:58 1.66
***************
*** 158,180 ****
if( $userdata['session_logged_in'] )
{
! $sql = "SELECT COUNT(privmsgs_type) AS new_messages
! FROM " . PRIVMSGS_TABLE . "
! WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
! AND privmsgs_to_userid = " . $userdata['user_id'];
! if( !$result_pm = $db->sql_query($sql) )
{
! message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
! }
! if( $pm_result = $db->sql_fetchrow($result_pm) )
! {
! $new_pm_messages = $pm_result['new_messages'];
! $l_message_new = ( $new_pm_messages == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
! $l_privmsgs_text = sprintf($l_message_new, $new_pm_messages);
}
else
{
$l_privmsgs_text = $lang['No_new_pm'];
}
}
--- 158,198 ----
if( $userdata['session_logged_in'] )
{
! if( $userdata['user_new_privmsg'] )
{
! $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
! $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']);
! if( $userdata['user_last_privmsg'] > $userdata['session_start'] )
! {
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_last_privmsg = " . $userdata['session_start'] . "
! WHERE user_id = " . $userdata['user_id'];
! if( !$status = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Could not update private message new/read time for user.", "", __LINE__, __FILE__, $sql);
! }
! $s_privmsg_new = true;
! }
! else
! {
! $s_privmsg_new = 0;
! }
}
else
{
$l_privmsgs_text = $lang['No_new_pm'];
+
+ $s_privmsg_new = 0;
+ }
+
+ if( $userdata['user_unread_privmsg'] )
+ {
+ $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms'];
+ $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']);
+ }
+ else
+ {
+ $l_privmsgs_text_unread = $lang['No_unread_pm'];
}
}
***************
*** 182,185 ****
--- 200,205 ----
{
$l_privmsgs_text = $lang['Login_check_pm'];
+ $l_privmsgs_text_unread = "";
+ $s_privmsg_new = 0;
}
***************
*** 196,200 ****
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
! "PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
--- 216,221 ----
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
! "PRIVATE_MESSAGE_INFO_UNREAD" => $l_privmsgs_text_unread,
! "PRIVATE_MESSAGE_NEW_FLAG" => $s_privmsg_new,
"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 01:05:02
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv26508
Modified Files:
privmsg.php
Log Message:
Altered storage of private message info
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** privmsg.php 2001/11/18 18:11:42 1.50
--- privmsg.php 2001/11/19 01:04:58 1.51
***************
*** 76,79 ****
--- 76,82 ----
//
+ //
+ // Var definitions
+ //
if( !empty($HTTP_POST_VARS['mode']) || !empty($HTTP_GET_VARS['mode']) )
{
***************
*** 219,222 ****
--- 222,233 ----
}
+ $sql = "UPDATE " . USERS_TABLE . "
+ SET user_unread_privmsg = user_unread_privmsg - 1
+ WHERE user_id = " . $userdata['user_id'];
+ if( !$user_upd_status = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Could not update private message read status for user.", "", __LINE__, __FILE__, $sql);
+ }
+
//
// Check to see if the poster has a 'full' sent box
***************
*** 767,771 ****
// This 'will' handle a simple user search
// performed from within the private message post
! // form
//
--- 778,783 ----
// This 'will' handle a simple user search
// performed from within the private message post
! // form ... for 2.2 now, too late for 2.0 ... if we
! // decide to do it all, I'm sooo lazy!
//
***************
*** 986,989 ****
--- 998,1013 ----
else if( $mode != "edit" )
{
+
+ //
+ // Add to the users new pm counter
+ //
+ $sql = "UPDATE " . USERS_TABLE . "
+ SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . "
+ WHERE user_id = " . $to_userdata['user_id'];
+ if( !$status = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Could not update private message new/read status for user.", "", __LINE__, __FILE__, $sql);
+ }
+
if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
{
***************
*** 1513,1521 ****
// Default page
//
! if(!$userdata['session_logged_in'])
{
header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
$page_title = $lang['Private_Messaging'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 1537,1565 ----
// Default page
//
! if( !$userdata['session_logged_in'] )
{
header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
+ //
+ // Update unread status
+ //
+ $sql = "UPDATE " . USERS_TABLE . "
+ SET user_unread_privmsg = " . ( $userdata['user_new_privmsg'] + $userdata['user_unread_privmsg'] ) . ", user_new_privmsg = 0, user_last_privmsg = " . $userdata['session_start'] . "
+ WHERE user_id = " . $userdata['user_id'];
+ if( !$status = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Could not update private message new/read status for user.", "", __LINE__, __FILE__, $sql);
+ }
+
+ //
+ // Reset PM counters
+ //
+ $userdata['user_new_privmsg'] = 0;
+ $userdata['user_unread_privmsg'] = ( $userdata['user_new_privmsg'] + $userdata['user_unread_privmsg'] );
+
+ //
+ // Generate page
+ //
$page_title = $lang['Private_Messaging'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
|
|
From: Paul S. O. <ps...@us...> - 2001-11-19 00:08:10
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv15340/templates/subSilver
Modified Files:
profile_view_body.tpl
Log Message:
Minor change to MSNM output, no point in graphic
Index: profile_view_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_view_body.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** profile_view_body.tpl 2001/11/18 14:01:35 1.7
--- profile_view_body.tpl 2001/11/19 00:08:07 1.8
***************
*** 63,67 ****
<tr>
<td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_MESSENGER}:</span></td>
! <td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td>
</tr>
<tr>
--- 63,67 ----
<tr>
<td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_MESSENGER}:</span></td>
! <td class="row1" valign="middle"><span class="gen">{MSN}</span></td>
</tr>
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 23:27:25
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv5465/db
Modified Files:
mysql_schema.sql
Log Message:
This is pre-freeze ... a final index and general check through is needed
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_schema.sql,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** mysql_schema.sql 2001/11/17 20:43:31 1.89
--- mysql_schema.sql 2001/11/18 23:27:22 1.90
***************
*** 11,15 ****
CREATE TABLE phpbb_auth_access (
group_id int(11) DEFAULT '0' NOT NULL,
! forum_id int(11) DEFAULT '0' NOT NULL,
auth_view tinyint(1) DEFAULT '0' NOT NULL,
auth_read tinyint(1) DEFAULT '0' NOT NULL,
--- 11,15 ----
CREATE TABLE phpbb_auth_access (
group_id int(11) DEFAULT '0' NOT NULL,
! forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_view tinyint(1) DEFAULT '0' NOT NULL,
auth_read tinyint(1) DEFAULT '0' NOT NULL,
***************
*** 63,67 ****
DROP TABLE IF EXISTS phpbb_banlist;
CREATE TABLE phpbb_banlist (
! ban_id int(11) NOT NULL auto_increment,
ban_userid int(11) NOT NULL,
ban_ip char(8) NOT NULL,
--- 63,67 ----
DROP TABLE IF EXISTS phpbb_banlist;
CREATE TABLE phpbb_banlist (
! ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
ban_userid int(11) NOT NULL,
ban_ip char(8) NOT NULL,
***************
*** 78,84 ****
DROP TABLE IF EXISTS phpbb_categories;
CREATE TABLE phpbb_categories (
! cat_id int(11) NOT NULL auto_increment,
cat_title varchar(100),
! cat_order int(11) NOT NULL,
PRIMARY KEY (cat_id),
KEY cat_order (cat_order)
--- 78,84 ----
DROP TABLE IF EXISTS phpbb_categories;
CREATE TABLE phpbb_categories (
! cat_id mediumint(8) UNSIGNED NOT NULL auto_increment,
cat_title varchar(100),
! cat_order mediumint(8) UNSIGNED NOT NULL,
PRIMARY KEY (cat_id),
KEY cat_order (cat_order)
***************
*** 104,108 ****
DROP TABLE IF EXISTS phpbb_disallow;
CREATE TABLE phpbb_disallow (
! disallow_id int(11) NOT NULL auto_increment,
disallow_username varchar(25),
PRIMARY KEY (disallow_id)
--- 104,108 ----
DROP TABLE IF EXISTS phpbb_disallow;
CREATE TABLE phpbb_disallow (
! disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
disallow_username varchar(25),
PRIMARY KEY (disallow_id)
***************
*** 116,123 ****
DROP TABLE IF EXISTS phpbb_forum_prune;
CREATE TABLE phpbb_forum_prune (
! prune_id int(11) NOT NULL auto_increment,
! forum_id int(11) NOT NULL,
! prune_days int(3) NOT NULL,
! prune_freq int(3) NOT NULL,
PRIMARY KEY(prune_id),
KEY forum_id (forum_id)
--- 116,123 ----
DROP TABLE IF EXISTS phpbb_forum_prune;
CREATE TABLE phpbb_forum_prune (
! prune_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! forum_id mediumint(8) UNSIGNED NOT NULL,
! prune_days tinyint(4) UNSIGNED NOT NULL,
! prune_freq tinyint(4) UNSIGNED NOT NULL,
PRIMARY KEY(prune_id),
KEY forum_id (forum_id)
***************
*** 131,143 ****
DROP TABLE IF EXISTS phpbb_forums;
CREATE TABLE phpbb_forums (
! forum_id int(11) NOT NULL auto_increment,
! cat_id int(11) NOT NULL,
forum_name varchar(150),
forum_desc text,
forum_status tinyint(4) DEFAULT '0' NOT NULL,
! forum_order int(11) DEFAULT '1' NOT NULL,
! forum_posts int(11) DEFAULT '0' NOT NULL,
! forum_topics int(11) DEFAULT '0' NOT NULL,
! forum_last_post_id int(11) DEFAULT '0' NOT NULL,
prune_next int(11),
prune_enable tinyint(1) DEFAULT '1' NOT NULL,
--- 131,143 ----
DROP TABLE IF EXISTS phpbb_forums;
CREATE TABLE phpbb_forums (
! forum_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! cat_id mediumint(8) UNSIGNED NOT NULL,
forum_name varchar(150),
forum_desc text,
forum_status tinyint(4) DEFAULT '0' NOT NULL,
! forum_order mediumint(8) UNSIGNED DEFAULT '1' NOT NULL,
! forum_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! forum_topics mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
prune_next int(11),
prune_enable tinyint(1) DEFAULT '1' NOT NULL,
***************
*** 154,158 ****
auth_attachments tinyint(2) DEFAULT '0' NOT NULL,
PRIMARY KEY (forum_id),
- KEY forum_id (forum_id),
KEY forums_order (forum_order),
KEY cat_id (cat_id),
--- 154,157 ----
***************
*** 167,173 ****
DROP TABLE IF EXISTS phpbb_posts;
CREATE TABLE phpbb_posts (
! post_id int(11) NOT NULL auto_increment,
! topic_id int(11) DEFAULT '0' NOT NULL,
! forum_id int(11) DEFAULT '0' NOT NULL,
poster_id int(11) DEFAULT '0' NOT NULL,
post_time int(11) DEFAULT '0' NOT NULL,
--- 166,172 ----
DROP TABLE IF EXISTS phpbb_posts;
CREATE TABLE phpbb_posts (
! post_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
poster_id int(11) DEFAULT '0' NOT NULL,
post_time int(11) DEFAULT '0' NOT NULL,
***************
*** 180,184 ****
bbcode_uid char(10) NOT NULL,
post_edit_time int(11),
! post_edit_count smallint(6) DEFAULT '0' NOT NULL,
PRIMARY KEY (post_id),
KEY forum_id (forum_id),
--- 179,183 ----
bbcode_uid char(10) NOT NULL,
post_edit_time int(11),
! post_edit_count smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (post_id),
KEY forum_id (forum_id),
***************
*** 194,198 ****
DROP TABLE IF EXISTS phpbb_posts_text;
CREATE TABLE phpbb_posts_text (
! post_id int(11) DEFAULT '0' NOT NULL,
post_subject varchar(255),
post_text text,
--- 193,197 ----
DROP TABLE IF EXISTS phpbb_posts_text;
CREATE TABLE phpbb_posts_text (
! post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
post_subject varchar(255),
post_text text,
***************
*** 207,211 ****
DROP TABLE IF EXISTS phpbb_privmsgs;
CREATE TABLE phpbb_privmsgs (
! privmsgs_id int(11) NOT NULL auto_increment,
privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
--- 206,210 ----
DROP TABLE IF EXISTS phpbb_privmsgs;
CREATE TABLE phpbb_privmsgs (
! privmsgs_id mediumint(8) UNSIGNED NOT NULL auto_increment,
privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
***************
*** 230,234 ****
DROP TABLE IF EXISTS phpbb_privmsgs_text;
CREATE TABLE phpbb_privmsgs_text (
! privmsgs_text_id int(11) DEFAULT '0' NOT NULL,
privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL,
privmsgs_text text,
--- 229,233 ----
DROP TABLE IF EXISTS phpbb_privmsgs_text;
CREATE TABLE phpbb_privmsgs_text (
! privmsgs_text_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL,
privmsgs_text text,
***************
*** 243,250 ****
DROP TABLE IF EXISTS phpbb_ranks;
CREATE TABLE phpbb_ranks (
! rank_id int(11) NOT NULL auto_increment,
rank_title varchar(50) NOT NULL,
! rank_min int(11) DEFAULT '0' NOT NULL,
! rank_max int(11) DEFAULT '0' NOT NULL,
rank_special tinyint(1) DEFAULT '0',
rank_image varchar(255),
--- 242,249 ----
DROP TABLE IF EXISTS phpbb_ranks;
CREATE TABLE phpbb_ranks (
! rank_id smallint(5) UNSIGNED NOT NULL auto_increment,
rank_title varchar(50) NOT NULL,
! rank_min mediumint(8) DEFAULT '0' NOT NULL,
! rank_max mediumint(8) DEFAULT '0' NOT NULL,
rank_special tinyint(1) DEFAULT '0',
rank_image varchar(255),
***************
*** 259,263 ****
DROP TABLE IF EXISTS phpbb_search_results;
CREATE TABLE phpbb_search_results (
! search_id int(11) NOT NULL default '0',
session_id char(32) NOT NULL default '',
search_array text NOT NULL,
--- 258,262 ----
DROP TABLE IF EXISTS phpbb_search_results;
CREATE TABLE phpbb_search_results (
! search_id mediumint(8) UNSIGNED NOT NULL default '0',
session_id char(32) NOT NULL default '',
search_array text NOT NULL,
***************
*** 274,281 ****
CREATE TABLE phpbb_search_wordlist (
word_text varchar(50) binary NOT NULL default '',
! word_id int(11) NOT NULL auto_increment,
! word_weight tinyint(4) NOT NULL default '0',
word_common tinyint(1) unsigned NOT NULL default '0',
! PRIMARY KEY (word_text),
KEY word_id (word_id)
);
--- 273,279 ----
CREATE TABLE phpbb_search_wordlist (
word_text varchar(50) binary NOT NULL default '',
! word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
word_common tinyint(1) unsigned NOT NULL default '0',
! PRIMARY KEY (word_text),
KEY word_id (word_id)
);
***************
*** 287,293 ****
DROP TABLE IF EXISTS phpbb_search_wordmatch;
CREATE TABLE phpbb_search_wordmatch (
! post_id int(11) NOT NULL default '0',
! word_id int(11) NOT NULL default '0',
! word_count smallint(6) NOT NULL default '0',
title_match tinyint(1) NOT NULL default '0',
KEY word_id (word_id)
--- 285,291 ----
DROP TABLE IF EXISTS phpbb_search_wordmatch;
CREATE TABLE phpbb_search_wordmatch (
! post_id mediumint(8) UNSIGNED NOT NULL default '0',
! word_id mediumint(8) UNSIGNED NOT NULL default '0',
! word_count smallint(5) UNSIGNED NOT NULL default '0',
title_match tinyint(1) NOT NULL default '0',
KEY word_id (word_id)
***************
*** 332,336 ****
DROP TABLE IF EXISTS phpbb_smilies;
CREATE TABLE phpbb_smilies (
! smilies_id int(11) NOT NULL auto_increment,
code varchar(50),
smile_url varchar(100),
--- 330,334 ----
DROP TABLE IF EXISTS phpbb_smilies;
CREATE TABLE phpbb_smilies (
! smilies_id smallint(5) UNSIGNED NOT NULL auto_increment,
code varchar(50),
smile_url varchar(100),
***************
*** 346,350 ****
DROP TABLE IF EXISTS phpbb_themes;
CREATE TABLE phpbb_themes (
! themes_id int(11) NOT NULL auto_increment,
template_name varchar(30) NOT NULL default '',
style_name varchar(30) NOT NULL default '',
--- 344,348 ----
DROP TABLE IF EXISTS phpbb_themes;
CREATE TABLE phpbb_themes (
! themes_id mediumint(8) UNSIGNED NOT NULL auto_increment,
template_name varchar(30) NOT NULL default '',
style_name varchar(30) NOT NULL default '',
***************
*** 397,431 ****
DROP TABLE IF EXISTS phpbb_themes_name;
CREATE TABLE phpbb_themes_name (
! themes_id int(11) DEFAULT '0' NOT NULL,
! tr_color1_name varchar(50),
! tr_color2_name varchar(50),
! tr_color3_name varchar(50),
! tr_class1_name varchar(50),
! tr_class2_name varchar(50),
! tr_class3_name varchar(50),
! th_color1_name varchar(50),
! th_color2_name varchar(50),
! th_color3_name varchar(50),
! th_class1_name varchar(50),
! th_class2_name varchar(50),
! th_class3_name varchar(50),
! td_color1_name varchar(50),
! td_color2_name varchar(50),
! td_color3_name varchar(50),
! td_class1_name varchar(50),
! td_class2_name varchar(50),
! td_class3_name varchar(50),
! fontface1_name varchar(50),
! fontface2_name varchar(50),
! fontface3_name varchar(50),
! fontsize1_name varchar(50),
! fontsize2_name varchar(50),
! fontsize3_name varchar(50),
! fontcolor1_name varchar(50),
! fontcolor2_name varchar(50),
! fontcolor3_name varchar(50),
! span_class1_name varchar(50),
! span_class2_name varchar(50),
! span_class3_name varchar(50),
PRIMARY KEY (themes_id)
);
--- 395,429 ----
DROP TABLE IF EXISTS phpbb_themes_name;
CREATE TABLE phpbb_themes_name (
! themes_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
! tr_color1_name char(50),
! tr_color2_name char(50),
! tr_color3_name char(50),
! tr_class1_name char(50),
! tr_class2_name char(50),
! tr_class3_name char(50),
! th_color1_name char(50),
! th_color2_name char(50),
! th_color3_name char(50),
! th_class1_name char(50),
! th_class2_name char(50),
! th_class3_name char(50),
! td_color1_name char(50),
! td_color2_name char(50),
! td_color3_name char(50),
! td_class1_name char(50),
! td_class2_name char(50),
! td_class3_name char(50),
! fontface1_name char(50),
! fontface2_name char(50),
! fontface3_name char(50),
! fontsize1_name char(50),
! fontsize2_name char(50),
! fontsize3_name char(50),
! fontcolor1_name char(50),
! fontcolor2_name char(50),
! fontcolor3_name char(50),
! span_class1_name char(50),
! span_class2_name char(50),
! span_class3_name char(50),
PRIMARY KEY (themes_id)
);
***************
*** 438,453 ****
DROP TABLE IF EXISTS phpbb_topics;
CREATE TABLE phpbb_topics (
! topic_id int(11) NOT NULL auto_increment,
! forum_id int(11) DEFAULT '0' NOT NULL,
! topic_title varchar(100) NOT NULL,
topic_poster int(11) DEFAULT '0' NOT NULL,
topic_time int(11) DEFAULT '0' NOT NULL,
! topic_views int(11) DEFAULT '0' NOT NULL,
! topic_replies int(11) DEFAULT '0' NOT NULL,
topic_status tinyint(3) DEFAULT '0' NOT NULL,
topic_vote tinyint(1) DEFAULT '0' NOT NULL,
topic_type tinyint(3) DEFAULT '0' NOT NULL,
! topic_last_post_id int(11) DEFAULT '0' NOT NULL,
! topic_moved_id int(11),
PRIMARY KEY (topic_id),
KEY forum_id (forum_id)
--- 436,451 ----
DROP TABLE IF EXISTS phpbb_topics;
CREATE TABLE phpbb_topics (
! topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! topic_title char(100) NOT NULL,
topic_poster int(11) DEFAULT '0' NOT NULL,
topic_time int(11) DEFAULT '0' NOT NULL,
! topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! topic_replies mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
topic_status tinyint(3) DEFAULT '0' NOT NULL,
topic_vote tinyint(1) DEFAULT '0' NOT NULL,
topic_type tinyint(3) DEFAULT '0' NOT NULL,
! topic_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! topic_moved_id mediumint(8) UNSIGNED,
PRIMARY KEY (topic_id),
KEY forum_id (forum_id)
***************
*** 461,465 ****
DROP TABLE IF EXISTS phpbb_topics_watch;
CREATE TABLE phpbb_topics_watch (
! topic_id int(11) NOT NULL DEFAULT '0',
user_id int(11) NOT NULL DEFAULT '0',
notify_status tinyint(1) NOT NULL default '0',
--- 459,463 ----
DROP TABLE IF EXISTS phpbb_topics_watch;
CREATE TABLE phpbb_topics_watch (
! topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
user_id int(11) NOT NULL DEFAULT '0',
notify_status tinyint(1) NOT NULL default '0',
***************
*** 477,481 ****
CREATE TABLE phpbb_users (
user_id int(11) NOT NULL auto_increment,
! user_active tinyint(4) DEFAULT '1',
username varchar(25) NOT NULL,
user_password varchar(32) NOT NULL,
--- 475,479 ----
CREATE TABLE phpbb_users (
user_id int(11) NOT NULL auto_increment,
! user_active tinyint(1) DEFAULT '1',
username varchar(25) NOT NULL,
user_password varchar(32) NOT NULL,
***************
*** 483,499 ****
user_regdate int(11) DEFAULT '0' NOT NULL,
user_level tinyint(4) DEFAULT '0',
! user_posts int(11) DEFAULT '0' NOT NULL,
! user_timezone int(11) DEFAULT '0' NOT NULL,
! user_style int(11),
user_lang varchar(255),
user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
user_lastvisit int(11) DEFAULT '0' NOT NULL,
! user_new_privmsg smallint(6) DEFAULT '0' NOT NULL,
! user_unread_privmsg smallint(6) DEFAULT '0' NOT NULL,
user_emailtime int(11),
! user_viewemail tinyint(1),
! user_attachsig tinyint(1),
! user_allowhtml tinyint(1),
! user_allowbbcode tinyint(1),
user_allowsmile tinyint(1),
user_allowavatar tinyint(1) DEFAULT '1' NOT NULL,
--- 481,498 ----
user_regdate int(11) DEFAULT '0' NOT NULL,
user_level tinyint(4) DEFAULT '0',
! user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
! user_timezone tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
! user_style tinyint(4),
user_lang varchar(255),
user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
user_lastvisit int(11) DEFAULT '0' NOT NULL,
! user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
! user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
! user_last_privmsg int(11) DEFAULT '0' NOT NULL,
user_emailtime int(11),
! user_viewemail tinyint(1),
! user_attachsig tinyint(1),
! user_allowhtml tinyint(1),
! user_allowbbcode tinyint(1),
user_allowsmile tinyint(1),
user_allowavatar tinyint(1) DEFAULT '1' NOT NULL,
***************
*** 528,533 ****
DROP TABLE IF EXISTS phpbb_vote_desc;
CREATE TABLE phpbb_vote_desc (
! vote_id int(11) NOT NULL auto_increment,
! topic_id int(11) NOT NULL DEFAULT '0',
vote_text text NOT NULL,
vote_start int(11) NOT NULL DEFAULT '0',
--- 527,532 ----
DROP TABLE IF EXISTS phpbb_vote_desc;
CREATE TABLE phpbb_vote_desc (
! vote_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
vote_text text NOT NULL,
vote_start int(11) NOT NULL DEFAULT '0',
***************
*** 544,549 ****
DROP TABLE IF EXISTS phpbb_vote_results;
CREATE TABLE phpbb_vote_results (
! vote_id int(11) NOT NULL DEFAULT '0',
! vote_option_id int(11) NOT NULL DEFAULT '0',
vote_option_text varchar(255) NOT NULL,
vote_result int(11) NOT NULL DEFAULT '0',
--- 543,548 ----
DROP TABLE IF EXISTS phpbb_vote_results;
CREATE TABLE phpbb_vote_results (
! vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
! vote_option_id tinyint(4) UNSIGNED NOT NULL DEFAULT '0',
vote_option_text varchar(255) NOT NULL,
vote_result int(11) NOT NULL DEFAULT '0',
***************
*** 559,563 ****
DROP TABLE IF EXISTS phpbb_vote_voters;
CREATE TABLE phpbb_vote_voters (
! vote_id int(11) NOT NULL DEFAULT '0',
vote_user_id int(11) NOT NULL DEFAULT '0',
vote_user_ip char(8) NOT NULL,
--- 558,562 ----
DROP TABLE IF EXISTS phpbb_vote_voters;
CREATE TABLE phpbb_vote_voters (
! vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
vote_user_id int(11) NOT NULL DEFAULT '0',
vote_user_ip char(8) NOT NULL,
***************
*** 574,580 ****
DROP TABLE IF EXISTS phpbb_words;
CREATE TABLE phpbb_words (
! word_id int(11) NOT NULL auto_increment,
! word varchar(100) NOT NULL,
! replacement varchar(100) NOT NULL,
PRIMARY KEY (word_id)
);
--- 573,579 ----
DROP TABLE IF EXISTS phpbb_words;
CREATE TABLE phpbb_words (
! word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
! word char(100) NOT NULL,
! replacement char(100) NOT NULL,
PRIMARY KEY (word_id)
);
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 22:18:49
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv23146/language/lang_english Modified Files: lang_main.php Log Message: Could've sworn I'd commited this ... oh well, brain is going, yeah I know, what brain? Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** lang_main.php 2001/11/18 15:00:54 1.42 --- lang_main.php 2001/11/18 22:18:46 1.43 *************** *** 97,100 **** --- 97,102 ---- $lang['YIM'] = "Yahoo Messenger"; + $lang['Forum_Index'] = "%s Forum Index"; // eg. sitename Forum Index, %s can be removed if you prefer + $lang['Post_new_topic'] = "Post new topic"; $lang['Reply_to_topic'] = "Reply to topic"; *************** *** 173,178 **** // Index page // $lang['No_Posts'] = "No Posts"; - $lang['Forum_Index'] = "%s Forum Index"; // eg. sitename Forum Index, %s can be removed if you prefer $lang['No_forums'] = "This board has no forums"; --- 175,180 ---- // Index page // + $lang['Index'] = "Index"; $lang['No_Posts'] = "No Posts"; $lang['No_forums'] = "This board has no forums"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-18 22:17:47
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv22978 Modified Files: index.php Log Message: Could've sworn I'd commited this ... oh well, brain is going, yeah I know, what brain? Index: index.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/index.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -r1.78 -r1.79 *** index.php 2001/11/16 17:27:36 1.78 --- index.php 2001/11/18 22:17:44 1.79 *************** *** 409,413 **** // code // ! $page_title = $lang['Forum_Index']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); --- 409,413 ---- // code // ! $page_title = $lang['Index']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); |
|
From: Paul S. O. <ps...@us...> - 2001-11-18 18:11:44
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv839
Modified Files:
privmsg.php profile.php groupcp.php posting.php
Log Message:
Hopefully cope with boards running from SSL, ie. https://
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** privmsg.php 2001/11/18 14:00:31 1.49
--- privmsg.php 2001/11/18 18:11:42 1.50
***************
*** 990,993 ****
--- 990,994 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
***************
*** 1010,1014 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_INBOX" => "http://" . $server_name . $path . "/privmsg.$phpEx?folder=inbox")
);
--- 1011,1015 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_INBOX" => $protocol . $server_name . $path . "/privmsg.$phpEx?folder=inbox")
);
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** profile.php 2001/11/18 16:08:11 1.135
--- profile.php 2001/11/18 18:11:42 1.136
***************
*** 346,350 ****
$aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : " ";
! $msnm_img = ($profiledata['user_msnm']) ? "<a href=\"mailto:" . $profiledata['user_msnm'] . "\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a> " . $profiledata['user_msnm'] : " ";
$yim_img = ( $profiledata['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>" : " ";
--- 346,350 ----
$aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : " ";
! $msnm_img = ($profiledata['user_msnm']) ? "<img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /> " . $profiledata['user_msnm'] : " ";
$yim_img = ( $profiledata['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>" : " ";
***************
*** 1000,1003 ****
--- 1000,1004 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
if( $board_config['require_activation'] == USER_ACTIVATION_SELF )
***************
*** 1019,1023 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 1020,1024 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
$emailer->send();
***************
*** 1106,1109 ****
--- 1107,1111 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template($email_template);
***************
*** 1120,1124 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey",
"FAX_INFO" => $board_config['coppa_fax'],
"MAIL_INFO" => $board_config['coppa_mail'],
--- 1122,1126 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey",
"FAX_INFO" => $board_config['coppa_fax'],
"MAIL_INFO" => $board_config['coppa_mail'],
***************
*** 1142,1146 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
}
--- 1144,1148 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
}
***************
*** 1161,1165 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 1163,1167 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
$emailer->send();
***************
*** 1662,1665 ****
--- 1664,1668 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("user_activate_passwd");
***************
*** 1674,1678 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 1677,1681 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
);
$emailer->send();
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** groupcp.php 2001/11/18 01:41:09 1.23
--- groupcp.php 2001/11/18 18:11:42 1.24
***************
*** 172,175 ****
--- 172,176 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("group_request");
***************
*** 183,187 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => "http://" . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
--- 184,188 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
***************
*** 364,367 ****
--- 365,369 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("group_added");
***************
*** 375,379 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => "http://" . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
--- 377,381 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
***************
*** 476,479 ****
--- 478,482 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$emailer->use_template("group_approved");
***************
*** 487,491 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => "http://" . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
--- 490,494 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -r1.99 -r1.100
*** posting.php 2001/11/17 17:51:59 1.99
--- posting.php 2001/11/18 18:11:42 1.100
***************
*** 1388,1393 ****
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
-
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
for($i = 0; $i < count($email_set); $i++)
--- 1388,1393 ----
$path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
for($i = 0; $i < count($email_set); $i++)
***************
*** 1406,1411 ****
"TOPIC_TITLE" => $email_set[$i]['topic_title'],
! "U_TOPIC" => "http://" . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! "U_STOP_WATCHING_TOPIC" => "http://" . $server_name . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
);
--- 1406,1411 ----
"TOPIC_TITLE" => $email_set[$i]['topic_title'],
! "U_TOPIC" => $protocol . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! "U_STOP_WATCHING_TOPIC" => $protocol . $server_name . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
);
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 16:14:37
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv10498/templates/subSilver
Modified Files:
viewforum_body.tpl viewtopic_body.tpl
Log Message:
Just call me Homer Simpson! Doh
Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** viewforum_body.tpl 2001/11/18 14:01:35 1.11
--- viewforum_body.tpl 2001/11/18 16:14:34 1.12
***************
*** 49,53 ****
<tr>
<td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" width="82" height="25" /></a></td>
! <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> {FORUM_NAME}</span></td>
<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span>
</td>
--- 49,53 ----
<tr>
<td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" width="82" height="25" /></a></td>
! <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> {FORUM_NAME}</span></td>
<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span>
</td>
Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** viewtopic_body.tpl 2001/11/18 14:01:35 1.11
--- viewtopic_body.tpl 2001/11/18 16:14:34 1.12
***************
*** 85,89 ****
<tr>
<td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" width="82" height="25" /></a><span class="nav"></span></td>
! <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a>
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span>
--- 85,89 ----
<tr>
<td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" width="82" height="25" /></a><span class="nav"></span></td>
! <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{L_INDEX}</a>
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 16:08:14
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9358
Modified Files:
profile.php
Log Message:
Slightly fairer sig length check, removes =.*? from BBCode and HTML tags - version 2
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** profile.php 2001/11/18 15:36:56 1.134
--- profile.php 2001/11/18 16:08:11 1.135
***************
*** 489,493 ****
$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(strip_tags(str_replace("<br />", "\n", $HTTP_POST_VARS['signature']))) : "";
// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
--- 489,493 ----
$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(str_replace("<br />", "\n", $HTTP_POST_VARS['signature'])) : "";
// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
***************
*** 632,639 ****
if( $signature != "" )
{
! $sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", $signature);
if( $allowhtml )
{
! $sig_length_check = preg_replace("/(<.*?)(=.*?)([ \/]?" . ">)/is", "\\1\\3", $signature);
}
--- 632,639 ----
if( $signature != "" )
{
! $sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
if( $allowhtml )
{
! $sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 15:36:59
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv1447
Modified Files:
profile.php
Log Message:
Slightly fairer sig length check, removes =.*? from BBCode and HTML tags
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -r1.133 -r1.134
*** profile.php 2001/11/18 15:17:05 1.133
--- profile.php 2001/11/18 15:36:56 1.134
***************
*** 632,637 ****
if( $signature != "" )
{
! if( strlen($signature) > $board_config['max_sig_chars'] )
{
$error = TRUE;
if( isset($error_msg) )
--- 632,646 ----
if( $signature != "" )
{
! $sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", $signature);
! if( $allowhtml )
{
+ $sig_length_check = preg_replace("/(<.*?)(=.*?)([ \/]?" . ">)/is", "\\1\\3", $signature);
+ }
+
+ $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
+ $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
+
+ if( strlen($sig_length_check) > $board_config['max_sig_chars'] )
+ {
$error = TRUE;
if( isset($error_msg) )
***************
*** 640,648 ****
}
$error_msg .= $lang['Signature_too_long'];
- }
- else
- {
- $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
- $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
}
}
--- 649,652 ----
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 15:17:08
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv30103
Modified Files:
profile.php
Log Message:
Another lang related update
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -r1.132 -r1.133
*** profile.php 2001/11/18 14:40:58 1.132
--- profile.php 2001/11/18 15:17:05 1.133
***************
*** 355,359 ****
$www_img = ($profiledata['user_website']) ? "<a href=\"" . $profiledata['user_website'] . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " ";
! $pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $profiledata['user_id']) . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\" /></a>";
$template->assign_vars(array(
--- 355,359 ----
$www_img = ($profiledata['user_website']) ? "<a href=\"" . $profiledata['user_website'] . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " ";
! $pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $profiledata['user_id']) . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Send_private_message'] . "\" border=\"0\" /></a>";
$template->assign_vars(array(
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 15:00:57
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv27238/language/lang_english Modified Files: lang_main.php Log Message: Yet more cleanups Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -r1.41 -r1.42 *** lang_main.php 2001/11/18 14:51:36 1.41 --- lang_main.php 2001/11/18 15:00:54 1.42 *************** *** 523,527 **** $lang['Reactivate'] = "Reactivate your account!"; $lang['COPPA'] = "Your account has been created but has to be approved, please check your email for details."; - $lang['Welcome_COPPA'] = "Your account has been created, however in complance with the COPPA act you must print out this page and have you parent or guardian mail it to: <br />" . $lang['Mailing_address'] . "<br />Or fax it to: <br />" . $lang['Fax_info'] . "<br /> Once this information has been received your account will be activated by the administrator and you will receive an email notification."; $lang['Wrong_activation'] = "The activation key you supplied does not match any in the database"; --- 523,526 ---- *************** *** 545,548 **** --- 544,548 ---- $lang['Empty_message_email'] = "You must enter a message to be emailed"; + // // Memberslist *************** *** 683,688 **** $lang['Guest_users_online'] = "There are %d Guest users online"; $lang['Guest_user_online'] = "There is %d Guest user online"; - $lang['Online_explain'] = "This data is based on users active over the past five minutes"; $lang['No_users_browsing'] = "There are no users currently browsing this forum"; $lang['Forum_Location'] = "Forum Location"; $lang['Last_updated'] = "Last Updated"; --- 683,690 ---- $lang['Guest_users_online'] = "There are %d Guest users online"; $lang['Guest_user_online'] = "There is %d Guest user online"; $lang['No_users_browsing'] = "There are no users currently browsing this forum"; + + $lang['Online_explain'] = "This data is based on users active over the past five minutes"; + $lang['Forum_Location'] = "Forum Location"; $lang['Last_updated'] = "Last Updated"; *************** *** 700,729 **** // - // Errors (not related to a - // specific failure on a page) - // - $lang['Information'] = "Information"; - $lang['Critical_Information'] = "Critical Information"; - - $lang['You_been_banned'] = "You have been banned from this forum<br />Please contact the webmaster or board administrator for more information"; - $lang['No_topics_post_one'] = "There are no posts in this forum<br />Click on the <b>Post New Topic</b> link on this page to post one"; - $lang['Board_disable'] = "Sorry but this board is currently unavailable, please try again later"; - - $lang['General_Error'] = "General Error"; - $lang['Critical_Error'] = "Critical Error"; - $lang['An_error_occured'] = "An Error Occured"; - $lang['A_critical_error'] = "A Critical Error Occured"; - - $lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password"; - - $lang['Not_Moderator'] = "You are not a moderator of this forum"; - $lang['Not_Authorised'] = "Not Authorised"; - - - // // Moderator Control Panel // $lang['Mod_CP'] = "Moderator Control Panel"; $lang['Mod_CP_explain'] = "Using the form below you can perform mass moderation operations on this forum. You can lock, unlock, move or delete any number of topics. If this forum is defined as private in some way you can also modify which users can and cannot access it."; $lang['Select'] = "Select"; $lang['Delete'] = "Delete"; --- 702,710 ---- // // Moderator Control Panel // $lang['Mod_CP'] = "Moderator Control Panel"; $lang['Mod_CP_explain'] = "Using the form below you can perform mass moderation operations on this forum. You can lock, unlock, move or delete any number of topics. If this forum is defined as private in some way you can also modify which users can and cannot access it."; + $lang['Select'] = "Select"; $lang['Delete'] = "Delete"; *************** *** 731,745 **** $lang['Lock'] = "Lock"; $lang['Unlock'] = "Unlock"; $lang['Topics_Removed'] = "The selected topics have been successfully removed from the database."; $lang['Topics_Locked'] = "The selected topics have been locked"; $lang['Topics_Moved'] = "The selected topics have been moved"; $lang['Topics_Unlocked'] = "The selected topics have been unlocked"; ! $lang['Return_to_modcp'] = "to return to the moderator control panel"; $lang['Confirm_delete_topic'] = "Are you sure you want to remove the selected topic/s?"; $lang['Confirm_lock_topic'] = "Are you sure you want to lock the selected topic/s?"; $lang['Confirm_unlock_topic'] = "Are you sure you want to unlock the selected topic/s?"; $lang['Confirm_move_topic'] = "Are you sure you want to move the selected topic/s?"; $lang['Move_to_forum'] = "Move to forum"; $lang['Leave_shadow_topic'] = "Leave shadow topic in old forum."; $lang['Split_Topic'] = "Split Topic Control Panel"; $lang['Split_Topic_explain'] = "Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post"; --- 712,729 ---- $lang['Lock'] = "Lock"; $lang['Unlock'] = "Unlock"; + $lang['Topics_Removed'] = "The selected topics have been successfully removed from the database."; $lang['Topics_Locked'] = "The selected topics have been locked"; $lang['Topics_Moved'] = "The selected topics have been moved"; $lang['Topics_Unlocked'] = "The selected topics have been unlocked"; ! $lang['Confirm_delete_topic'] = "Are you sure you want to remove the selected topic/s?"; $lang['Confirm_lock_topic'] = "Are you sure you want to lock the selected topic/s?"; $lang['Confirm_unlock_topic'] = "Are you sure you want to unlock the selected topic/s?"; $lang['Confirm_move_topic'] = "Are you sure you want to move the selected topic/s?"; + $lang['Move_to_forum'] = "Move to forum"; $lang['Leave_shadow_topic'] = "Leave shadow topic in old forum."; + $lang['Split_Topic'] = "Split Topic Control Panel"; $lang['Split_Topic_explain'] = "Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post"; *************** *** 749,755 **** $lang['Split_after'] = "Split from selected post"; $lang['Topic_split'] = "The selected topic has been split successfully"; $lang['Too_many_error'] = "You have selected too many posts. You can only select one post to split a topic after!"; ! $lang['New_forum'] = "New forum"; $lang['None_selected'] = "You have no selected any topics to preform this operation on. Please go back and select at least one."; $lang['This_posts_IP'] = "IP for this post"; $lang['Other_IP_this_user'] = "Other IP's this user has posted from"; --- 733,742 ---- $lang['Split_after'] = "Split from selected post"; $lang['Topic_split'] = "The selected topic has been split successfully"; + $lang['Too_many_error'] = "You have selected too many posts. You can only select one post to split a topic after!"; ! $lang['None_selected'] = "You have no selected any topics to preform this operation on. Please go back and select at least one."; + $lang['New_forum'] = "New forum"; + $lang['This_posts_IP'] = "IP for this post"; $lang['Other_IP_this_user'] = "Other IP's this user has posted from"; *************** *** 762,766 **** // Timezones ... for display on each page // ! $lang['All_times'] = "All times are"; // This is followed by GMT and the timezone offset $lang['-12'] = "GMT - 12 Hours"; --- 749,753 ---- // Timezones ... for display on each page // ! $lang['All_times'] = "All times are %s"; // eg. All times are GMT - 12 Hours (times from next block) $lang['-12'] = "GMT - 12 Hours"; *************** *** 797,802 **** // // That's all Folks! // ------------------------------------------------- ! ?> --- 784,810 ---- // + // Errors (not related to a + // specific failure on a page) + // + $lang['Information'] = "Information"; + $lang['Critical_Information'] = "Critical Information"; + + $lang['You_been_banned'] = "You have been banned from this forum<br />Please contact the webmaster or board administrator for more information"; + $lang['No_topics_post_one'] = "There are no posts in this forum<br />Click on the <b>Post New Topic</b> link on this page to post one"; + $lang['Board_disable'] = "Sorry but this board is currently unavailable, please try again later"; + + $lang['General_Error'] = "General Error"; + $lang['Critical_Error'] = "Critical Error"; + $lang['An_error_occured'] = "An Error Occured"; + $lang['A_critical_error'] = "A Critical Error Occured"; + + $lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password"; + + $lang['Not_Moderator'] = "You are not a moderator of this forum"; + $lang['Not_Authorised'] = "Not Authorised"; + + // // That's all Folks! // ------------------------------------------------- ! ?> \ No newline at end of file |
|
From: Paul S. O. <ps...@us...> - 2001-11-18 15:00:57
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27238/includes
Modified Files:
page_header.php
Log Message:
Yet more cleanups
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** page_header.php 2001/11/18 14:51:36 1.64
--- page_header.php 2001/11/18 15:00:54 1.65
***************
*** 255,259 ****
"S_CONTENT_DIR_LEFT" => $lang['LEFT'],
"S_CONTENT_DIR_RIGHT" => $lang['RIGHT'],
! "S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['board_timezone']],
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
"S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
--- 255,259 ----
"S_CONTENT_DIR_LEFT" => $lang['LEFT'],
"S_CONTENT_DIR_RIGHT" => $lang['RIGHT'],
! "S_TIMEZONE" => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
"S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 14:51:40
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv25466/includes Modified Files: page_header.php Log Message: More lang cleanups Index: page_header.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -r1.63 -r1.64 *** page_header.php 2001/11/18 14:00:31 1.63 --- page_header.php 2001/11/18 14:51:36 1.64 *************** *** 207,211 **** "L_PROFILE" => $lang['Profile'], "L_SEARCH" => $lang['Search'], ! "L_PRIVATEMSGS" => $lang['Private_msgs'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], "L_MEMBERLIST" => $lang['Memberlist'], --- 207,211 ---- "L_PROFILE" => $lang['Profile'], "L_SEARCH" => $lang['Search'], ! "L_PRIVATEMSGS" => $lang['Private_messages'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], "L_MEMBERLIST" => $lang['Memberlist'], |
|
From: Paul S. O. <ps...@us...> - 2001-11-18 14:51:40
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv25466/language/lang_english Modified Files: lang_main.php Log Message: More lang cleanups Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -r1.40 -r1.41 *** lang_main.php 2001/11/18 14:00:31 1.40 --- lang_main.php 2001/11/18 14:51:36 1.41 *************** *** 131,135 **** $lang['Edit_profile'] = "Edit your profile"; $lang['Search'] = "Search"; - $lang['Private_msgs'] = "Private Messages"; $lang['Memberlist'] = "Memberlist"; $lang['FAQ'] = "FAQ"; --- 131,134 ---- *************** *** 162,168 **** --- 161,170 ---- // Login // + $lang['Enter_password'] = "Please enter your username and password to login"; $lang['Login'] = "Login"; $lang['Logout'] = "Logout"; + $lang['Forgotten_password'] = "I forgot my password"; + $lang['Log_me_in'] = "Log me on automatically each visit"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-18 14:51:39
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25466
Modified Files:
viewtopic.php
Log Message:
More lang cleanups
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -r1.138 -r1.139
*** viewtopic.php 2001/11/18 14:40:58 1.138
--- viewtopic.php 2001/11/18 14:51:35 1.139
***************
*** 789,793 ****
$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>";
if( !empty($postrow[$i]['user_viewemail']) )
--- 789,793 ----
$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['Send_private_message'] . "\" border=\"0\" /></a>";
if( !empty($postrow[$i]['user_viewemail']) )
***************
*** 795,799 ****
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $poster_id) : "mailto:" . $postrow[$i]['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " $poster\" border=\"0\" /></a>";
}
else
--- 795,799 ----
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $poster_id) : "mailto:" . $postrow[$i]['user_email'];
! $email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
}
else
|
|
From: Paul S. O. <ps...@us...> - 2001-11-18 14:41:04
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv20490 Modified Files: profile.php viewtopic.php Log Message: More lang cleanups Index: profile.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/profile.php,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -r1.131 -r1.132 *** profile.php 2001/11/17 17:51:59 1.131 --- profile.php 2001/11/18 14:40:58 1.132 *************** *** 402,406 **** "L_MESSENGER" => $lang['MSNM'], "L_WEBSITE" => $lang['Website'], ! "L_LOCATION" => $lang['From'], "L_OCCUPATION" => $lang['Occupation'], "L_INTERESTS" => $lang['Interests'], --- 402,406 ---- "L_MESSENGER" => $lang['MSNM'], "L_WEBSITE" => $lang['Website'], ! "L_LOCATION" => $lang['Location'], "L_OCCUPATION" => $lang['Occupation'], "L_INTERESTS" => $lang['Interests'], Index: viewtopic.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -r1.137 -r1.138 *** viewtopic.php 2001/11/16 23:03:12 1.137 --- viewtopic.php 2001/11/18 14:40:58 1.138 *************** *** 699,703 **** $poster_posts = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Posts'] . ": " . $postrow[$i]['user_posts'] : ""; ! $poster_from = ($postrow[$i]['user_from'] && $postrow[$i]['user_id'] != ANONYMOUS) ? $lang['From'] . ": " . $postrow[$i]['user_from'] : ""; $poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : ""; --- 699,703 ---- $poster_posts = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Posts'] . ": " . $postrow[$i]['user_posts'] : ""; ! $poster_from = ($postrow[$i]['user_from'] && $postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Location'] . ": " . $postrow[$i]['user_from'] : ""; $poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : ""; |
|
From: Paul S. O. <ps...@us...> - 2001-11-18 14:02:27
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv12515
Modified Files:
modcp_move.tpl modcp_split.tpl modcp_viewip.tpl
Log Message:
More lang related cleanups
Index: modcp_move.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_move.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** modcp_move.tpl 2001/11/15 21:44:01 1.4
--- modcp_move.tpl 2001/11/18 14:02:25 1.5
***************
*** 3,7 ****
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td>
</tr>
</table>
--- 3,7 ----
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
</tr>
</table>
Index: modcp_split.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_split.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** modcp_split.tpl 2001/10/01 23:22:18 1.2
--- modcp_split.tpl 2001/11/18 14:02:25 1.3
***************
*** 3,7 ****
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a><span class="nav">
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
</tr>
--- 3,7 ----
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a><span class="nav">
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
</tr>
Index: modcp_viewip.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_viewip.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** modcp_viewip.tpl 2001/10/15 19:14:48 1.4
--- modcp_viewip.tpl 2001/11/18 14:02:25 1.5
***************
*** 2,8 ****
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
</tr>
</table>
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
<tr>
--- 2,9 ----
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
+
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
<tr>
***************
*** 44,49 ****
<!-- BEGIN iprow -->
<tr>
! <td class="{iprow.ROW_CLASS}">
! <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td> <span class="gen">{iprow.IP}</span></td>
--- 45,49 ----
<!-- BEGIN iprow -->
<tr>
! <td class="{iprow.ROW_CLASS}"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td> <span class="gen">{iprow.IP}</span></td>
***************
*** 51,57 ****
] </span></td>
</tr>
! </table>
! </td>
</tr>
<!-- END iprow -->
</table>
--- 51,58 ----
] </span></td>
</tr>
! </table></td>
</tr>
<!-- END iprow -->
</table>
+
+ <br clear="all" />
|
7 messages has been excluded from this view by a project administrator.
