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-16 18:03:25
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv3340/db
Modified Files:
mysql_schema.sql
Log Message:
This is an initial 'final' DB schema, effectively complete but may undergo some (hopefully minor) updates
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_schema.sql,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** mysql_schema.sql 2001/11/16 18:00:49 1.87
--- mysql_schema.sql 2001/11/16 18:03:23 1.88
***************
*** 279,283 ****
PRIMARY KEY (word_text),
KEY word_id (word_id)
! )
# --------------------------------------------------------
--- 279,283 ----
PRIMARY KEY (word_text),
KEY word_id (word_id)
! );
# --------------------------------------------------------
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 18:00:52
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv2157/db
Modified Files:
mysql_schema.sql
Log Message:
This is an initial 'final' DB schema, effectively complete but may undergo some (hopefully minor) updates
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_schema.sql,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** mysql_schema.sql 2001/11/15 22:07:29 1.86
--- mysql_schema.sql 2001/11/16 18:00:49 1.87
***************
*** 272,282 ****
#
DROP TABLE IF EXISTS phpbb_search_wordlist;
! 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`)
)
--- 272,282 ----
#
DROP TABLE IF EXISTS phpbb_search_wordlist;
! 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)
)
***************
*** 481,490 ****
user_password varchar(32) NOT NULL,
user_autologin_key varchar(32),
user_level tinyint(4) DEFAULT '0',
user_posts int(11) DEFAULT '0' NOT NULL,
user_timezone int(11) DEFAULT '0' NOT NULL,
- user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
user_style int(11),
user_lang varchar(255),
user_emailtime int(11),
user_viewemail tinyint(1),
--- 481,494 ----
user_password varchar(32) NOT NULL,
user_autologin_key varchar(32),
+ 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),
***************
*** 498,502 ****
user_notify tinyint(1) DEFAULT '1' NOT NULL,
user_notify_pm tinyint(1) DEFAULT '1' NOT NULL,
- user_regdate int(11) DEFAULT '0' NOT NULL,
user_rank int(11) DEFAULT '0',
user_avatar varchar(100),
--- 502,505 ----
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:39:36
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28844
Modified Files:
viewforum.php viewtopic.php
Log Message:
Mainly language updates but some bug fixes too
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -r1.101 -r1.102
*** viewforum.php 2001/11/16 17:27:36 1.101
--- viewforum.php 2001/11/16 17:39:33 1.102
***************
*** 375,382 ****
"FORUM_NAME" => $forum_row['forum_name'],
"MODERATORS" => $forum_moderators,
! "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"),
--- 375,382 ----
"FORUM_NAME" => $forum_row['forum_name'],
"MODERATORS" => $forum_moderators,
! "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" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $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.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** viewtopic.php 2001/11/16 17:27:36 1.135
--- viewtopic.php 2001/11/16 17:39:33 1.136
***************
*** 475,480 ****
$view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=next");
! $reply_img = ($forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED) ? $images['reply_locked'] : $images['reply_new'];
! $post_img = ($forum_row['forum_status'] == FORUM_LOCKED) ? $images['post_locked'] : $images['post_new'];
//
--- 475,482 ----
$view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=next");
! $reply_img = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new'];
! $reply_alt = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic'];
! $post_img = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'];
! $post_alt = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'];
//
***************
*** 524,527 ****
--- 526,532 ----
"L_VIEW_NEXT_TOPIC" => $lang['View_next_topic'],
"L_VIEW_PREVIOUS_TOPIC" => $lang['View_previous_topic'],
+
+ "L_POST_NEW_TOPIC" => $post_alt,
+ "L_POST_REPLY_TOPIC" => $reply_alt,
"IMG_POST" => $post_img,
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:39:36
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv28844/language/lang_english Modified Files: lang_main.php Log Message: Mainly language updates but some bug fixes too Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** lang_main.php 2001/11/16 17:27:36 1.36 --- lang_main.php 2001/11/16 17:39:33 1.37 *************** *** 49,52 **** --- 49,53 ---- $lang['Views'] = "Views"; $lang['Post'] = "Post"; + $lang['Posts'] = "Posts"; $lang['Posted'] = "Posted"; $lang['Username'] = "Username"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:32:28
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv26825/templates/subSilver
Modified Files:
viewtopic_body.tpl
Log Message:
Mainly language updates but some bug fixes too
Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** viewtopic_body.tpl 2001/11/16 17:27:36 1.8
--- viewtopic_body.tpl 2001/11/16 17:32:26 1.9
***************
*** 9,13 ****
<table width="100%" cellspacing="2" cellpadding="2" border="0">
<tr>
! <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_TOPIC_POST}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_TOPIC_REPLY}" align="middle" width="82" height="25" /></a></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>
--- 9,13 ----
<table width="100%" cellspacing="2" cellpadding="2" border="0">
<tr>
! <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><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></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>
***************
*** 84,88 ****
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_TOPIC_POST}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_TOPIC_REPLY}" 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>
--- 84,88 ----
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<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>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:31:52
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv26630/templates/subSilver
Modified Files:
viewforum_body.tpl
Log Message:
Mainly language updates but some bug fixes too
Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** viewforum_body.tpl 2001/11/04 12:55:23 1.9
--- viewforum_body.tpl 2001/11/16 17:31:49 1.10
***************
*** 9,13 ****
</tr>
<tr>
! <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_NEW_TOPIC}" width="82" height="25" /></a></td>
<td align="left" valign="middle" class="nav" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> {FORUM_NAME}</span></td>
<td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
--- 9,13 ----
</tr>
<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" class="nav" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> {FORUM_NAME}</span></td>
<td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
***************
*** 48,52 ****
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_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>
--- 48,52 ----
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<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>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:30:50
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv26318/templates/subSilver
Modified Files:
groupcp_info_body.tpl
Log Message:
Mainly language updates but some bug fixes too
Index: groupcp_info_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/groupcp_info_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** groupcp_info_body.tpl 2001/11/03 19:17:06 1.4
--- groupcp_info_body.tpl 2001/11/16 17:30:47 1.5
***************
*** 32,36 ****
<!-- BEGIN switch_mod_option -->
<tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_STATUS}:</span></td>
<td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
</tr>
--- 32,36 ----
<!-- BEGIN switch_mod_option -->
<tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_TYPE}:</span></td>
<td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:29:38
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv26039/templates/subSilver
Modified Files:
viewonline_body.tpl
Log Message:
Mainly language updates but some bug fixes too
Index: viewonline_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewonline_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** viewonline_body.tpl 2001/10/01 23:22:18 1.2
--- viewonline_body.tpl 2001/11/16 17:29:35 1.3
***************
*** 5,13 ****
</tr>
</table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th width="35%" class="thCornerL" height="25"> {L_USERNAME} </th>
<th width="25%" class="thTop"> {L_LAST_UPDATE} </th>
! <th width="40%" class="thCornerR"> {L_LOCATION} </th>
</tr>
<tr>
--- 5,14 ----
</tr>
</table>
+
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th width="35%" class="thCornerL" height="25"> {L_USERNAME} </th>
<th width="25%" class="thTop"> {L_LAST_UPDATE} </th>
! <th width="40%" class="thCornerR"> {L_FORUM_LOCATION} </th>
</tr>
<tr>
***************
*** 18,22 ****
<td width="35%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span> </td>
<td width="25%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td>
! <td width="40%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.LOCATION}</a></span> </td>
</tr>
<!-- END reg_user_row -->
--- 19,23 ----
<td width="35%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span> </td>
<td width="25%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td>
! <td width="40%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.FORUM_LOCATION}</a></span> </td>
</tr>
<!-- END reg_user_row -->
***************
*** 29,38 ****
<!-- BEGIN guest_user_row -->
<tr>
! <td width="35%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_USER_PROFILE}" class="gen">{guest_user_row.USERNAME}</a></span> </td>
<td width="25%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td>
! <td width="40%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.LOCATION}</a></span> </td>
</tr>
<!-- END guest_user_row -->
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
--- 30,40 ----
<!-- BEGIN guest_user_row -->
<tr>
! <td width="35%" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.USERNAME}</span> </td>
<td width="25%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td>
! <td width="40%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.FORUM_LOCATION}</a></span> </td>
</tr>
<!-- END guest_user_row -->
</table>
+
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
***************
*** 41,44 ****
--- 43,47 ----
</tr>
</table>
+
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:27:40
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv25429/includes
Modified Files:
functions.php page_header.php
Log Message:
Mainly language updates but some bug fixes too
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** functions.php 2001/11/13 17:26:36 1.80
--- functions.php 2001/11/16 17:27:36 1.81
***************
*** 164,171 ****
}
}
- else
- {
- $boxstring .= '<option value="-1">-- ! No Forums ! --</option>';
- }
}
$boxstring .= '</select>';
--- 164,167 ----
***************
*** 173,177 ****
else
{
! $boxstring .= '<select><option value="-1">-- ! No Categories ! --</option></select>';
}
--- 169,173 ----
else
{
! $boxstring .= '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
}
***************
*** 274,277 ****
--- 270,285 ----
{
include($phpbb_root_path . 'language/lang_english/lang_main.' . $phpEx);
+ }
+
+ if( defined("IN_ADMIN") )
+ {
+ if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) )
+ {
+ include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
+ }
+ else
+ {
+ include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx);
+ }
}
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** page_header.php 2001/11/14 06:37:05 1.60
--- page_header.php 2001/11/16 17:27:36 1.61
***************
*** 147,151 ****
$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
! $l_online_users = ( $total_online_users == 1 ) ? sprintf($lang['Online_user'], $total_online_users, $logged_visible_online, $logged_hidden_online, $guests_online) : sprintf($lang['Online_users'], $total_online_users, $logged_visible_online, $logged_hidden_online, $guests_online);
//
--- 147,154 ----
$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
! $l_online_users = ( $total_online_users == 1 ) ? sprintf($lang['Online_user_total'], $total_online_users) : sprintf($lang['Online_users'], $total_online_users);
! $l_online_users .= ( $logged_visible_online == 1 ) ? sprintf($lang['Reg_user_total'], $logged_visible_online) : sprintf($lang['Reg_users_total'], $logged_visible_online);
! $l_online_users .= ( $logged_hidden_online == 1 ) ? sprintf($lang['Hidden_user_total'], $logged_hidden_online) : sprintf($lang['Hidden_user_total'], $logged_hidden_online);
! $l_online_users .= ( $guests_online == 1 ) ? sprintf($lang['Guest_user_total'], $guests_online) : sprintf($lang['Guest_user_total'], $guests_online);
//
***************
*** 194,198 ****
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
! "LAST_VISIT_DATE" => $s_last_visit,
"L_USERNAME" => $lang['Username'],
--- 197,201 ----
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
! "LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
"L_USERNAME" => $lang['Username'],
***************
*** 231,235 ****
"L_BY" => $lang['by'],
"L_LOGIN_LOGOUT" => $l_login_logout,
- "L_LAST_VISIT" => $lang['You_last_visit'],
"L_SEARCH_UNANSWERED" => $lang['Search_unanswered'],
--- 234,237 ----
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 17:27:40
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv25429/language/lang_english Modified Files: lang_main.php Added Files: lang_admin.php Log Message: Mainly language updates but some bug fixes too --- NEW FILE --- <?php // -------------------- // Main Admin section/s // -------------------- // // Index // $lang['Admin'] = "Administration"; $lang['Not_admin'] = "You are not authorised to administer this board"; $lang['Welcome_phpBB'] = "Welcome to phpBB"; $lang['Admin_intro'] = "Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the phpBB logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience, each screen will have instructions on how to use the tools."; $lang['Forum_stats'] = "Forum Statistics"; $lang['Admin_Index'] = "Admin Index"; $lang['Preview_forum'] = "Preview Forum"; $lang['Statistic'] = "Statistic"; $lang['Value'] = "Value"; $lang['Number_posts'] = "Number of posts"; $lang['Posts_per_day'] = "Posts per day"; $lang['Number_topics'] = "Number of topics"; $lang['Topics_per_day'] = "Topics per day"; $lang['Number_users'] = "Number of users"; $lang['Users_per_day'] = "Users per day"; $lang['Board_started'] = "Board started"; $lang['Avatar_dir_size'] = "Avatar directory size"; $lang['Database_size'] = "Database size"; $lang['Gzip_compression'] ="Gzip compression"; $lang['Not_available'] = "Not available"; // // DB Utils // $lang['Database_Utilities'] = "Database Utilities"; $lang['Restore'] = "Restore"; $lang['Backup'] = "Backup"; $lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may upload a gzip compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete."; $lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names seperated by commas in the Additional Tables textbox below. If your server supports it you may also gzip compress the file to reduce its size before download."; $lang['Backup_options'] = "Backup options"; $lang['Start_backup'] = "Start Backup"; $lang['Full_backup'] = "Full backup"; $lang['Structure_backup'] = "Structure Only backup"; $lang['Data_backup'] = "Data only backup"; $lang['Additional_tables'] = "Additional tables"; $lang['Gzip_compress'] = "Gzip compress file"; $lang['Select_file'] = "Select a file"; $lang['Start_Restore'] = "Start Restore"; $lang['Restore_success'] = "The Database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made."; $lang['Backup_download'] = "Your download will start shortly please wait till it begins"; $lang['Backups_not_supported'] = "Sorry but database backups are not currently supported for your database system"; $lang['Restore_Error_uploading'] = "Error in uploading the backup file"; $lang['Restore_Error_filename'] = "Filename problem, please try an alternative file"; $lang['Restore_Error_decompress'] = "Cannot decompress a gzip file, please upload a plain text version"; $lang['Restore_Error_no_file'] = "No file was uploaded"; // // Auth pages // $lang['Administrator'] = "Administrator"; $lang['User'] = "User"; $lang['Group'] = "Group"; $lang['Forum'] = "Forum"; $lang['Select_a'] = "Select a"; // followed by on the entries above $lang['Auth_Control'] = "Authorisation Control"; // preceeded by one of the above options $lang['Look_up'] = "Look up"; // preceeded by one of the above options $lang['Group_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case."; $lang['User_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each individual user. Do not forget when changing user permissions that group permissions may still allow the user entry to forums, etc. You will be warned if this is the case."; $lang['Forum_auth_explain'] = "Here you can alter the authorisation levels of each forum. You will have both a simple and advanced method for doing this, advanced offers greater control of each forum operation. Remember that changing the permission level of forums will affect which users can carry out the various operations within them."; $lang['Simple_mode'] = "Simple Mode"; $lang['Advanced_mode'] = "Advanced Mode"; $lang['Moderator_status'] = "Moderator status"; $lang['Allowed_Access'] = "Allowed Access"; $lang['Disallowed_Access'] = "Disallowed Access"; $lang['Is_Moderator'] = "Is Moderator"; $lang['Not_Moderator'] = "Not Moderator"; $lang['Conflict_warning'] = "Authorisation Conflict Warning"; $lang['Conflict_message_userauth'] = "This user still has access/moderator rights to this forum via group membership. You may want to alter the group authorisation or remove this user the group to fully prevent them having access/moderator rights. The groups granting rights are noted below."; $lang['Conflict_message_groupauth'] = "The following user/s still have access/moderator rights to this forum via their user auth settings. You may want to alter the user authorisation/s to fully prevent them having access/moderator rights. The users granted rights are noted below."; $lang['has_moderator_status'] = "has moderator status on"; $lang['has_access_status'] = "has access status to"; $lang['grants_access_status'] = "grants access status to"; $lang['grants_moderator_status'] = "grants moderator status to"; $lang['for_this_user'] = "for this user"; $lang['Submit_changes'] = "Submit changes"; $lang['Reset_changes'] = "Reset changes"; $lang['Public'] = "Public"; $lang['Private'] = "Private"; $lang['Registered'] = "Registered"; $lang['Administrators'] = "Administrators"; $lang['Hidden'] = "Hidden"; $lang['View'] = "View"; $lang['Read'] = "Read"; $lang['Post'] = "Post"; $lang['Reply'] = "Reply"; $lang['Edit'] = "Edit"; $lang['Delete'] = "Delete"; $lang['Sticky'] = "Sticky"; $lang['Announce'] = "Announce"; $lang['Vote'] = "Vote"; $lang['Pollcreate'] = "Poll create"; $lang['Permissions'] = "Permissions"; $lang['Simple_Permission'] = "Simple Permission"; $lang['This_user_is'] = "This user is a"; // followed by User/Administrator and then next line $lang['and_belongs_groups'] = "and belongs to the following groups"; // followed by list of groups $lang['Group_has_members'] = "This group has the following members"; $lang['Forum_auth_updated'] = "Forum permissions updated"; $lang['User_auth_updated'] = "User permissions updated"; $lang['Group_auth_updated'] = "Group permissions updated"; $lang['return_forum_auth_admin'] = "to return to the forum permissions panel"; $lang['return_group_auth_admin'] = "to return to the group permissions panel"; $lang['return_user_auth_admin'] = "to return to the user permissions panel"; // // Banning // $lang['Ban_control'] = "Ban Control"; $lang['Ban_explain'] = "Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses or hostnames. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to logon or post to your board, you should use one of the first two methods to achieve this."; $lang['Ban_explain_warn'] = "Please note that entering a range of IP addresses results in all the addresses between the start and end being added to the banlist. Attempts will be made to minimise the number of addresses added to the database by introducing wildcards automatically where appropriate. If you really must enter a range try to keep it small or better yet state specific addresses."; $lang['Ban_username'] = "Ban one or more specific users"; $lang['Ban_username_explain'] = "You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser"; $lang['Ban_IP'] = "Ban one or more IP addresses or hostnames"; $lang['IP_hostname'] = "IP addresses or hostnames"; $lang['Ban_IP_explain'] = "To specify several different IP's or hostnames separate them with commas. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *"; $lang['Ban_email'] = "Ban one or more email addresses"; $lang['Ban_email_explain'] = "To specify more than one email address separate them with commas. To specify a wildcard username use *, for example *@hotmail.com"; $lang['Unban_username'] = "Un-ban one more specific users"; $lang['Unban_username_explain'] = "You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser"; $lang['Unban_IP'] = "Un-ban one or more IP addresses"; $lang['Unban_IP_explain'] = "You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser"; $lang['Unban_email'] = "Un-ban one or more email addresses"; $lang['Unban_email_explain'] = "You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser"; $lang['No_banned_users'] = "No banned users"; $lang['No_banned_ip'] = "No banned IP addresses"; $lang['No_banned_email'] = "No banned email addresses"; $lang['No_unban'] = "Leave list unchanged"; $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully"; // // Configuration // $lang['General_Config'] = "General Configuration"; $lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side."; $lang['General_settings'] = "General Board Settings"; $lang['Site_name'] = "Site name"; $lang['Site_desc'] = "Site description"; $lang['Acct_activation'] = "Enable account activation"; $lang['Abilities_settings'] = "User/Forum Ability Settings"; $lang['Flood_Interval'] = "Flood Interval"; $lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; $lang['Board_email_form'] = "User email via board"; $lang['Board_email_form_explain'] = "Users send email to each other via this board"; $lang['Topics_per_page'] = "Topics Per Page"; $lang['Posts_per_page'] = "Posts Per Page"; $lang['Hot_threshold'] = "Hot Threshold"; $lang['Default_style'] = "Default Style"; $lang['Override_style'] = "Override user style"; $lang['Override_style_explain'] = "Replaces users style with the default"; $lang['Default_language'] = "Default Language"; $lang['Date_format'] = "Date Format"; $lang['System_timezone'] = "System Timezone"; $lang['Enable_gzip'] = "Enable GZip Compression"; $lang['Enable_prune'] = "Enable Forum Pruning"; $lang['Allow_HTML'] = "Allow HTML"; $lang['Allow_BBCode'] = "Allow BBCode"; $lang['Allowed_tags'] = "Allowed HTML tags"; $lang['Allowed_tags_explain'] = "Seperate tags with commas"; $lang['Allow_smilies'] = "Allow Smilies"; $lang['Smilies_path'] = "Smilies Storage Path"; $lang['Smilies_path_explain'] = "Path under your phpBB root dir, e.g. images/smilies"; $lang['Allow_sig'] = "Allow Signatures"; $lang['Max_sig_length'] = "Maximum signature length"; $lang['Max_sig_length_explain'] = "Most number of characters allowed in a users signature"; $lang['Allow_name_change'] = "Allow Name Change"; $lang['Avatar_settings'] = "Avatar Settings"; $lang['Allow_local'] = "Allow local gallery avatars"; $lang['Allow_remote'] = "Allow remote avatars"; $lang['Allow_remote_explain'] = "Avatars linked from another website"; $lang['Allow_upload'] = "Allow avatar uploading"; $lang['Max_filesize'] = "Max. Avatar File Size"; $lang['Max_filesize_explain'] = "For uploaded avatar files"; $lang['Max_avatar_size'] = "Max. Avatar Size"; $lang['Max_avatar_size_explain'] = "(height x width)"; $lang['Avatar_storage_path'] = "Avatar Storage Path"; $lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars"; $lang['Avatar_gallery_path'] = "Avatar Gallery Path"; $lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery"; $lang['COPPA_settings'] = "COPPA Settings"; $lang['COPPA_fax'] = "COPPA Fax Number"; $lang['COPPA_mail'] = "COPPA Mailing Address"; $lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms"; $lang['Email_settings'] = "Email Settings"; $lang['Admin_email'] = "Admin Email Address"; $lang['Email_sig'] = "Email Signature"; $lang['Email_sig_explain'] = "This text will be attached to all emails the board sends"; $lang['Use_SMTP'] = "Use SMTP for delivery"; $lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a server instead of the local mail function"; $lang['SMTP_server'] = "SMTP Server Address"; $lang['Disable_privmsg'] = "Disable Private Messaging"; $lang['Inbox_limits'] = "Max posts in Inbox"; $lang['Sentbox_limits'] = "Max posts in Sentbox"; $lang['Savebox_limits'] = "Max posts in Savebox"; // // Forum Management // $lang['Forum_admin'] = "Forum Administration"; $lang['Forum_admin_explain'] = "From this panel you can add, delete, edit, re-order and re-synchronise categories and forums"; $lang['Edit_forum'] = "Edit forum"; $lang['Create_forum'] = "Create new forum"; $lang['Create_category'] = "Create new category"; $lang['Remove'] = "Remove"; $lang['Action'] = "Action"; $lang['Update_order'] = "Update Order"; $lang['Config_updated'] = "Forum Configuration Updated Sucessfully"; $lang['Edit'] = "Edit"; $lang['Delete'] = "Delete"; $lang['Move_up'] = "Move up"; $lang['Move_down'] = "Move down"; $lang['Resync'] = "Resync"; $lang['No_mode'] = "No mode was set"; $lang['Forum_edit_delete_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side"; // // Smiley Management // $lang['smiley_return'] = "Return to smiley listing"; $lang['smiley_del_success'] = "The smiley was successfully removed"; $lang['smiley_title'] = "Smiles Editing Utility"; $lang['smiley_code'] = "Smiley Code"; $lang['smiley_url'] = "Smiley Image File"; $lang['smiley_emot'] = "Smiley Emotion"; $lang['smiley_add_success'] = "The smiley was successfully added"; $lang['smiley_edit_success'] = "The smiley was successfully updated"; $lang['smile_add'] = "Add a new Smiley"; $lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages."; $lang['smiley_config'] = "Smiley Configuration"; $lang['Smile'] = "Smile"; $lang['Emotion'] = "Emotion"; $lang['Select_pak'] = "Select Pak File"; $lang['replace_existing'] = "Replace Existing Smiley"; $lang['keep_existing'] = "Keep Existing Smiley"; $lang['smiley_import_inst'] = "You should unzip the smiley package and upload all files to the proper Smiley directory for your installation. Then select the correct information in this form to import the smiley pack."; $lang['smiley_import'] = "Smiley Pack Import"; $lang['choose_smile_pak'] = "Choose the correct Smile Pack .pak file"; $lang['import'] = "Import Smileys"; $lang['smile_conflicts'] = "What should be done in case of conflicts"; $lang['del_existing_smileys'] = "Delete all existing smileys before import"; $lang['import_smile_pack'] = "Import Smiley Pack"; $lang['export_smile_pack'] = "Create Smiley Pack"; $lang['export_smiles'] = "To create a smiley pack from your currently installed smileys, <a href='admin_smilies.php?mode=export&send_file=1'>Click Here</a> to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension. Then create a zip file containing all of your smiley images plus this .pak configuration file."; $lang['smiley_import_success'] = "The smiley pack was imported successfully!"; // // User Management // $lang['User_admin'] = "Administration"; $lang['User_admin_explain'] = "Here you can change your user's information and certain specific options. To modify the users permissions please use the user and group permissions system."; $lang['User_delete'] = "Delete this user"; $lang['User_delete_explain'] = "Click here to delete this user, this cannot be undone."; $lang['User_deleted'] = "User was successfully deleted."; $lang['User_status'] = "User is active"; $lang['User_allowpm'] = "Can send Private Messages"; $lang['User_allowavatar'] = "Can display avatar"; $lang['Admin_avatar_explain'] = "Here you can see and delete the user's current avatar."; $lang['User_special'] = "Special admin-only fields"; $lang['User_special_explain'] = "These fields are not able to be modified by the users. Here you can set their status and other options that are not given to users."; // // Group Management // $lang['Group_admin_explain'] = "From this panel you can administer all your usergroups, you can; delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description"; $lang['Error_updating_groups'] = "There was an error while updating the groups"; $lang['Updated_group'] = "The group was successfully updated"; $lang['Added_new_group'] = "The new group was successfully created"; $lang['Deleted_group'] = "The group was successfully deleted"; $lang['New_group'] = "Create new group"; $lang['Edit_group'] = "Edit group"; $lang['group_name'] = "Group name"; $lang['group_description'] = "Group description"; $lang['group_moderator'] = "Group moderator"; $lang['group_status'] = "Group status"; $lang['group_open'] = "Open group"; $lang['group_closed'] = "Closed group"; $lang['group_hidden'] = "Hidden group"; $lang['group_delete'] = "Delete group"; $lang['group_delete_check'] = "Delete this group"; $lang['submit_group_changes'] = "Submit Changes"; $lang['reset_group_changes'] = "Reset Changes"; $lang['No_group_name'] = "You must specify a name for this group"; $lang['No_group_moderator'] = "You must specify a moderator for this group"; $lang['No_group_mode'] = "You must specify a mode for this group, open or closed"; $lang['delete_group_moderator'] = "Delete the old group moderator?"; $lang['delete_moderator_explain'] = "If you're changing the group moderator, check this box to remove the old moderator from the group. Otherwise, do not check it, and the user will become a regular member of the group."; // // Prune Administration // $lang['Forum_Prune'] = "Forum Prune"; $lang['Forum_Prune_explain'] = "This will delete any topic which has not been posted to within the number of days you select. If you do not enter a number then all topics will be deleted. It will not remove topics in which polls are still running nor will it remove announcements. You will need to remove these topics manually."; $lang['Do_Prune'] = "Do Prune"; $lang['All_Forums'] = "All Forums"; $lang['prune_days'] = "Remove topics that have not been posted to in"; $lang['Prune_topics_not_posted'] = "Prune topics that haven't been posted to in the last"; $lang['prune_freq'] = 'Check for topic age every'; $lang['Set_prune_data'] = "You have turned on auto-prune for this forum but did not set a frequency or number of days to prune. Please go back and do so"; $lang['Topics_pruned'] = "Topics pruned"; $lang['Posts_pruned'] = "Posts pruned"; $lang['Prune_success'] = "Pruning of forums was successful"; // // Word censor // $lang['Word_censor'] = "Word Censor"; $lang['Word'] = "Word"; $lang['Replacement'] = "Replacement"; $lang['Add_new_word'] = "Add new word"; $lang['Update_word'] = "Update word censor"; $lang['Words_title'] = "Word Censors"; $lang['Words_explain'] = "From this control panel you can add, edit, and remove words that will be automatically censored on your forums. Wildcards (*) are accepted in the word field! (i.e.: *test*, test*, *test, and test are all valid)"; $lang['Must_enter_word'] = "You must enter a word and it's replacement!"; $lang['No_word_selected'] = "No word selected for editing"; $lang['Word_updated'] = "The selected word censor has been successfully updated"; $lang['Word_added'] = "The word censor has been successfully added"; $lang['Word_removed'] = "The selected word censor has been successfully removed"; // // Mass Email // $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all receptients. If you are emailing a large group of people, please be patient after submiting and DO NOT stop the page halfway through. It is normal for amass emailing to take a long time."; $lang['Compose'] = "Compose"; // // Install Process // $lang['Welcome_install'] = "Welcome to phpBB 2 Installation"; $lang['Initial_config'] = "Basic Configuration"; $lang['DB_config'] = "Database Configuration"; $lang['Admin_config'] = "Admin Configuration"; $lang['Installer_Error'] = "An error has occured during installation"; $lang['Previous_Install'] = "A previous installation has been detected"; $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist"; $lang['Start_Install'] = "Start Install"; $lang['Default_lang'] = "Default board language"; $lang['DB_Host'] = "Database Server Hostname"; $lang['DB_Name'] = "Your Database Name"; $lang['Database'] = "Your Database"; $lang['Install_lang'] = "Choose Language for Installation"; $lang['dbms'] = "Database Type"; $lang['Inst_Step_1'] = "Your database tables have been created and filled with some basic default data. Please enter your chosen phpBB Admin Username and Password."; $lang['Create_User'] = "Create User"; $lang['Inst_Step_2'] = "Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2."; $lang['Finish_Install'] = "Finish Installation"; $lang['Install_db_error'] = "An error occured trying to update the database"; $lang['ODBC_Instructs'] = "Someone please write some odbc instructions in the \$lang['ODBC_Instructs'] variable!"; $lang['Table_Prefix'] = "Prefix for tables in database"; $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2."; $lang['Download_config'] = "Download Config"; $lang['ftp_choose'] = "Choose Download Method"; $lang['Attempt_ftp'] = "Attempt to ftp config file into place:"; $lang['Send_file'] = "Just send the file to me and I'll ftp it manually:"; $lang['ftp_option'] = "<br />Since the ftp extensions are loaded in php you may will also be given the option of first trying to automatically ftp the config file into place."; $lang['ftp_instructs'] = "You have chosen to attempt to ftp the file to your phpBB installation automagically. Please enter the information below to facilitate this process. Note that the FTP Path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it."; $lang['ftp_path'] = "FTP Path to phpBB2:"; $lang['ftp_username'] = "Your FTP Username:"; $lang['ftp_password'] = "Your FTP Password:"; $lang['Transfer_config'] = "Start Transfer"; $lang['ftp_info'] = "Enter Your FTP Information"; $lang['Install'] = "Install"; $lang['Upgrade'] = "Upgrade"; $lang['Install_Method'] = 'Choose your installation method'; // // Ranks admin // $lang['Must_select_rank'] = "Sorry, you didn't select a rank. Please go back and try again."; $lang['No_assigned_rank'] = "No special rank assigned"; $lang['Ranks_title'] = "Rank Administration"; $lang['Ranks_explain'] = "Here you can add, edit, view, and delete ranks. This is also a place to create custom ranks"; $lang['Rank_title'] = "Rank Title"; $lang['Rank_special'] = "Is special rank"; $lang['Rank_minimum'] = "Minimum Posts"; $lang['Rank_maximum'] = "Maximum Posts"; $lang['Rank_updated'] = "The rank was successfully updated"; $lang['Rank_added'] = "The rank was successfully added"; $lang['Rank_removed'] = "The rank was successfully deleted"; $lang['Add_new_rank'] = "Add new rank"; $lang['Rank_image'] = "Rank Image"; $lang['Rank_image_explain'] = "This is the place to set a custom image for everyone in the rank. You can specify either a relative or absolute path to the image"; $lang['return_rank_admin'] = "to return to rank admin"; // // Disallow Username Admin // $lang['Add'] = "Add"; $lang['disallowed_deleted'] = "The disallowed username has successfully been removed"; $lang['disallowed_already'] = "The username you are trying to disallow has already been disallowed, or a user currently exists that this would disallow"; $lang['disallow_successful'] = "The disallowed username has successfully been added"; $lang['Disallow_control'] = "Username Disallow Control"; $lang['disallow_instructs'] = "Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of '*'. Please note that you will not be allowed to specify a username to disallow if that username has already been registered. You must first delete that username, and then disallow it."; $lang['del_disallow'] = "Remove a Disallowed Username"; $lang['del_disallow_explain'] = "You can remove a disallowed username by selecting the username from this list and clicking submit"; $lang['add_disallow'] = "Add a disallowed username"; $lang['add_disallow_explain'] = "You can disallow a username using the wildcard character '*' to match any character"; $lang['no_disallowed'] = "No Disallowed Usernames"; // // Styles Admin // $lang['Styles_admin'] = "Styles Administration"; $lang['Styles_explain'] = "Using this facility you can add, remove and manage styles (templates and themes) available to your users."; $lang['Styles_addnew_explain'] = "The following list contains all the themes that are available for the templates you currently have. The items on this list HAVE NOT yet been installed into the phpBB database. To install a theme simply click the 'install' link beside a selected entry"; $lang['Style'] = "Style"; $lang['Template'] = "Template"; $lang['Install'] = "Install"; $lang['Confirm_delete_style'] = "Are you sure you want to delete this style?"; $lang['Style_removed'] = "The selected style has been removed from the database. To fully remove this style from your system you must delete the appropriate directory from your templates directory."; $lang['Theme_installed'] = "The selected theme has been installed successfully"; $lang['Export_themes'] = "Export Themes"; $lang['Download_theme_cfg'] = "The exporter could not write the theme information file. Click the button below to download this file with your browser. Once you have downloaded it you can transer it to your templates dir and package your template for distribution if you choose."; $lang['No_themes'] = "The template you selected has no themes attached to it. Click on the 'Create New' link to the left to create one."; $lang['Download'] = "Download"; $lang['No_template_dir'] = "Could not open template dir, it may be unreadable by the webserver or may not exist"; $lang['Export_explain'] = "In this panel you will be able to export the theme data for a selected template. Select the template from the list below and the script will create the theme configuration file and attempt to save it to the selected template directory. If it cannot save the file itself it will give you the option to download it. In order for the script to save the file you must give write access to the webserver for the selected template dir. For more information on this see the phpBB users guide."; $lang['Select_template'] = "Select a Template"; $lang['Theme_info_saved'] = "The theme information for the selected template has been saved. You should now return the permissions on the theme_info.cfg and/or selected template directory to READ ONLY."; $lang['Edit_theme'] = "Edit Theme"; $lang['Edit_theme_explain'] = "In the form below you can edit the settings for the selected theme."; $lang['Create_theme'] = "Create Theme"; $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When referancing color HEX codes DO NOT include the pound sign (#), ie: CCCCCC is valid, #CCCCCC is NOT."; $lang['Theme_settings'] = "Theme Settings"; $lang['Theme_element'] = "Theme Element"; $lang['Simple_name'] = "Simple Name"; $lang['Value'] = "Value"; $lang['Stylesheet'] = "CSS Stylesheet"; $lang['Background_image'] = "Background Image"; $lang['Background_color'] = "Background Color"; $lang['Theme_name'] = "Theme Name"; $lang['Link_color'] = "Link Color"; $lang['VLink_color'] = "Visited Link Color"; $lang['ALink_color'] = "Active Link Color"; $lang['HLink_color'] = "Hilighted Link Color"; $lang['Tr_color1'] = "Table Row Color 1"; $lang['Tr_color2'] = "Table Row Color 2"; $lang['Tr_color3'] = "Table Row Color 3"; $lang['Tr_class1'] = "Table Row Class 1"; $lang['Tr_class2'] = "Table Row Class 2"; $lang['Tr_class3'] = "Table Row Class 3"; $lang['Th_color1'] = "Table Header Color 1"; $lang['Th_color2'] = "Table Header Color 2"; $lang['Th_color3'] = "Table Header Color 3"; $lang['Th_class1'] = "Table Header Class 1"; $lang['Th_class2'] = "Table Header Class 2"; $lang['Th_class3'] = "Table Header Class 3"; $lang['Td_color1'] = "Table Cell Color 1"; $lang['Td_color2'] = "Table Cell Color 2"; $lang['Td_color3'] = "Table Cell Color 3"; $lang['Td_class1'] = "Table Cell Class 1"; $lang['Td_class2'] = "Table Cell Class 2"; $lang['Td_class3'] = "Table Cell Class 3"; $lang['fontface1'] = "Font Face 1"; $lang['fontface2'] = "Font Face 2"; $lang['fontface3'] = "Font Face 3"; $lang['fontsize1'] = "Font Size 1"; $lang['fontsize2'] = "Font Size 2"; $lang['fontsize3'] = "Font Size 3"; $lang['fontcolor1'] = "Font Color 1"; $lang['fontcolor2'] = "Font Color 2"; $lang['fontcolor3'] = "Font Color 3"; $lang['span_class1'] = "Span Class 1"; $lang['span_class2'] = "Span Class 2"; $lang['span_class3'] = "Span Class 3"; $lang['Theme_updated'] = "The selected theme has been updated. Don't forget to export the new theme settings to the theme configuration file!"; $lang['Theme_created'] = "Theme created! Don't forget to export the new theme settings to the theme configuration file!"; $lang['Cannot_remove_style'] = "The style you have selected is the current forum wide default style. Therefor, you cannot remove it. Please change the default style and try again."; ?> Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** lang_main.php 2001/11/15 18:37:01 1.35 --- lang_main.php 2001/11/16 17:27:36 1.36 *************** *** 43,61 **** // $lang['Forum'] = "Forum"; - $lang['Forums'] = "Forums"; $lang['Category'] = "Category"; - $lang['Categories'] = "Categories"; $lang['Topic'] = "Topic"; - $lang['Topics'] = "Topics"; $lang['Reply'] = "Reply"; $lang['Replies'] = "Replies"; $lang['Views'] = "Views"; [...1054 lines suppressed...] ! $lang['6'] = "GMT + 6 Hours"; ! $lang['7'] = "GMT + 7 Hours"; $lang['8'] = "WST (Australia)"; ! $lang['9'] = "GMT + 9 Hours"; $lang['9.5'] = "CST (Australia)"; $lang['10'] = "EST (Australia)"; ! $lang['11'] = "GMT + 11 Hours"; ! $lang['12'] = "GMT + 12 Hours"; *************** *** 1300,1302 **** // ------------------------------------------------- ! ?> --- 795,797 ---- // ------------------------------------------------- ! ?> \ No newline at end of file |
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))
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv25429/templates/subSilver
Modified Files:
index_body.tpl memberlist_body.tpl privmsgs_body.tpl
privmsgs_read_body.tpl profile_view_body.tpl
viewtopic_body.tpl
Log Message:
Mainly language updates but some bug fixes too
Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/index_body.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** index_body.tpl 2001/11/14 06:37:05 1.8
--- index_body.tpl 2001/11/16 17:27:36 1.9
***************
*** 8,12 ****
<!-- END egosearch -->
<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br />
! <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br />{L_LAST_VISIT} {LAST_VISIT_DATE}</td>
</tr>
</table>
--- 8,12 ----
<!-- END egosearch -->
<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br />
! <a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br />{LAST_VISIT_DATE}</td>
</tr>
</table>
Index: memberlist_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/memberlist_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** memberlist_body.tpl 2001/10/01 23:22:18 1.2
--- memberlist_body.tpl 2001/11/16 17:27:36 1.3
***************
*** 31,50 ****
<!-- END memberrow -->
<tr>
! <td class="catbottom" colspan="7" height="28">
! <table width="100%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <td><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td>
! <td align="right"><span class="nav">{PAGINATION} </span></td>
! </tr>
! </table>
! </td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
! </form>
<table width="100%" cellspacing="2" border="0" align="center">
--- 31,49 ----
<!-- END memberrow -->
<tr>
! <td class="catbottom" colspan="7" height="28"> </td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="right" valign="top"></td>
</tr>
</table>
!
! <table width="100%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <td><span class="nav">{PAGE_NUMBER}</span></td>
! <td align="right"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION} </span></td>
! </tr>
! </table></form>
<table width="100%" cellspacing="2" border="0" align="center">
Index: privmsgs_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/privmsgs_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** privmsgs_body.tpl 2001/11/09 13:15:36 1.4
--- privmsgs_body.tpl 2001/11/16 17:27:36 1.5
***************
*** 96,104 ****
<tr>
<td class="catBottom" colspan="5" height="28" align="right"> {S_HIDDEN_FIELDS}
! <input type="submit" name="save" value="Save Marked" class="mainoption" />
! <input type="submit" name="delete" value="Delete Marked" class="liteoption" />
! <input type="submit" name="deleteall" value="Delete All" class="liteoption" />
</td>
</tr>
--- 96,104 ----
<tr>
<td class="catBottom" colspan="5" height="28" align="right"> {S_HIDDEN_FIELDS}
! <input type="submit" name="save" value="{L_SAVE_MARKED}" class="mainoption" />
! <input type="submit" name="delete" value="{L_DELETE_MARKED}" class="liteoption" />
! <input type="submit" name="deleteall" value="{L_DELETE_ALL}" class="liteoption" />
</td>
</tr>
***************
*** 108,118 ****
<tr>
<td align="left" valign="middle"><span class="nav">{POST_PM_IMG}</span></td>
! <td align="left" valign="middle" width="100%"><span class="nav"> {L_PAGE}
! <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td>
! <td align="right" valign="top" nowrap="nowrap"><b><span class="gensmall"><a href="javascript:select_switch(true);" class="gensmall">Mark
! all</a> :: <a href="javascript:select_switch(false);" class="gensmall">Unmark
! all</a></span></b><br />
! <span class="nav">{PAGINATION}<br />
! </span><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
--- 108,113 ----
<tr>
<td align="left" valign="middle"><span class="nav">{POST_PM_IMG}</span></td>
! <td align="left" valign="middle" width="100%"><span class="nav">{PAGE_NUMBER}</span></td>
! <td align="right" valign="top" nowrap="nowrap"><b><span class="gensmall"><a href="javascript:select_switch(true);" class="gensmall">{L_MARK_ALL}</a> :: <a href="javascript:select_switch(false);" class="gensmall">{L_UNMARK_ALL}</a></span></b><br /><span class="nav">{PAGINATION}<br /></span><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
Index: privmsgs_read_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/privmsgs_read_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** privmsgs_read_body.tpl 2001/10/01 23:22:18 1.2
--- privmsgs_read_body.tpl 2001/11/16 17:27:36 1.3
***************
*** 12,16 ****
</tr>
</table>
! <br />
<form method="post" action="{S_PRIVMSGS_ACTION}">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
--- 12,18 ----
</tr>
</table>
!
! <br clear="all" />
!
<form method="post" action="{S_PRIVMSGS_ACTION}">
<table width="100%" cellspacing="2" cellpadding="2" border="0">
***************
*** 20,23 ****
--- 22,26 ----
</tr>
</table>
+
<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline">
<tr>
***************
*** 49,55 ****
<tr>
<td valign="middle" nowrap="nowrap">{PROFILE_IMG} {PM_IMG} {EMAIL_IMG}
! {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG} </td>
!
! <td valign="top" align="left" width="100%" nowrap="nowrap">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</td>
</tr>
</table>
--- 52,56 ----
<tr>
<td valign="middle" nowrap="nowrap">{PROFILE_IMG} {PM_IMG} {EMAIL_IMG}
! {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG} </td><td valign="top" align="left" width="100%" nowrap="nowrap">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</td>
</tr>
</table>
***************
*** 58,64 ****
<tr>
<td class="catBottom" colspan="3" height="28" align="right"> {S_HIDDEN_FIELDS}
! <input type="submit" name="save" value="Save Post" class="liteoption" />
! <input type="submit" name="delete" value="Delete Post" class="liteoption" />
</td>
</tr>
--- 59,65 ----
<tr>
<td class="catBottom" colspan="3" height="28" align="right"> {S_HIDDEN_FIELDS}
! <input type="submit" name="save" value="{L_SAVE_MSG}" class="liteoption" />
! <input type="submit" name="delete" value="{L_DELETE_MSG}" class="liteoption" />
</td>
</tr>
***************
*** 71,74 ****
--- 72,76 ----
</table>
</form>
+
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
Index: profile_view_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_view_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** profile_view_body.tpl 2001/11/15 16:26:41 1.5
--- profile_view_body.tpl 2001/11/16 17:27:36 1.6
***************
*** 5,15 ****
</tr>
</table>
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
! <th class="thHead" colspan="2" height="25">{L_VIEWING_PROFILE} <i>{USERNAME}</i></th>
</tr>
<tr>
! <td class="catLeft" align="center" width="40%" height="28"><b><span class="gen">Avatar</span></b></td>
! <td class="catRight" width="60%"><b><span class="gen">All about {USERNAME}</span></b></td>
</tr>
<tr>
--- 5,16 ----
</tr>
</table>
!
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
<tr>
! <th class="thHead" colspan="2" height="25">{L_VIEWING_PROFILE}</th>
</tr>
<tr>
! <td class="catLeft" align="center" width="40%" height="28"><b><span class="gen">{L_AVATAR}</span></b></td>
! <td class="catRight" width="60%"><b><span class="gen">{L_ABOUT_USER}</span></b></td>
</tr>
<tr>
***************
*** 22,31 ****
</tr>
<tr>
! <td valign="top" align="right"><span class="gen">{L_POSTS}: </span></td>
<td valign="top"><b><span class="gen">{POSTS}</span></b><br />
! <span class="genmed">[{PERCENTAGE} {L_OF_TOTAL} / {POSTS_PER_DAY}
! {L_PER_DAY}]</span> <br />
! <span class="genmed"><a href="{U_SEARCH_USER}" class="genmed">Find
! all posts by {USERNAME}</a></span></td>
</tr>
<tr>
--- 23,30 ----
</tr>
<tr>
! <td valign="top" align="right"><span class="gen">{L_TOTAL_POSTS}: </span></td>
<td valign="top"><b><span class="gen">{POSTS}</span></b><br />
! <span class="genmed">[{POST_PERCENT_STATS} / {POST_DAY_STATS}]</span> <br />
! <span class="genmed"><a href="{U_SEARCH_USER}" class="genmed">{L_SEARCH_USER_POSTS}</a></span></td>
</tr>
<tr>
***************
*** 83,90 ****
</tr>
</table>
! <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
! <td align="right"><span class="nav"><br />
! {JUMPBOX}</span></td>
</tr>
</table>
--- 82,89 ----
</tr>
</table>
!
! <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
<tr>
! <td align="right"><span class="nav"><br />{JUMPBOX}</span></td>
</tr>
</table>
Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** viewtopic_body.tpl 2001/10/25 23:21:12 1.7
--- viewtopic_body.tpl 2001/11/16 17:27:36 1.8
***************
*** 59,64 ****
<tr>
<td valign="middle" nowrap="nowrap">{postrow.PROFILE_IMG} {postrow.PM_IMG} {postrow.EMAIL_IMG}
! {postrow.WWW_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG} </td>
! <td valign="top" align="left" nowrap="nowrap">{postrow.ICQ_ADD_IMG}</td>
</tr>
</table>
--- 59,63 ----
<tr>
<td valign="middle" nowrap="nowrap">{postrow.PROFILE_IMG} {postrow.PM_IMG} {postrow.EMAIL_IMG}
! {postrow.WWW_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG} </td><td valign="top" align="left" width="100%" nowrap="nowrap">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</td>
</tr>
</table>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 15:16:18
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv11989/templates/subSilver
Modified Files:
faq_body.tpl
Log Message:
Updated FAQ, links, more text, etc. ... I was bored
Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/faq_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** faq_body.tpl 2001/10/16 16:24:51 1.2
--- faq_body.tpl 2001/11/16 15:16:14 1.3
***************
*** 1,16 ****
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
! <th class="thHead">{L_FAQ}</th>
</tr>
! <!-- BEGIN faqrow -->
<tr>
! <td width="22%" align="left" valign="top" class="row1"><span class="name"><b>{faqrow.FAQ_QUESTION}</b></span><br />
! <br />
! <span class="postbody">{faqrow.FAQ_ANSWER}</span>
! </td>
</tr>
! <tr>
! <td colspan="2" height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
! </tr>
! <!-- END faqrow -->
! </table>
\ No newline at end of file
--- 1,51 ----
!
! <table width="100%" cellspacing="2" cellpadding="2" border="0">
<tr>
! <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td>
</tr>
! </table>
!
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
! <tr>
! <th class="thHead">{L_FAQ}</th>
! </tr>
! <tr>
! <td align="left" valign="top" class="row1"><table cellspacing="3" cellpadding="0" border="0">
! <tr>
! <td><br /></td>
! </tr>
! <!-- BEGIN faq_block_link -->
! <!-- BEGIN faq_row_link -->
! <tr>
! <td><span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}">{faq_block_link.faq_row_link.FAQ_LINK}</a></span></td>
! </tr>
! <!-- END faq_row_link -->
! <tr>
! <td><br /></td>
! </tr>
! <!-- END faq_block_link -->
! </table></td>
! </tr>
! <tr>
! <td height="28" class="cat"> </td>
! </tr>
! <!-- BEGIN faq_block -->
! <!-- BEGIN faq_row -->
! <tr>
! <td align="left" valign="top" class="row1"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}</span></td>
! </tr>
! <tr>
! <td height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
! </tr>
! <!-- END faq_row -->
! <tr>
! <td height="28" class="cat"> </td>
! </tr>
! <!-- END faq_block -->
! </table>
!
! <table width="100%" cellspacing="2" border="0" align="center">
<tr>
! <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><br />{JUMPBOX}</td>
</tr>
! </table>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 15:16:18
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11989
Modified Files:
faq.php
Log Message:
Updated FAQ, links, more text, etc. ... I was bored
Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** faq.php 2001/10/11 12:17:15 1.6
--- faq.php 2001/11/16 15:16:14 1.7
***************
*** 34,49 ****
//
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_faq.' . $phpEx);
$template->set_filenames(array(
! "body" => "faq_body.tpl")
);
! $template->assign_vars(array("L_FAQ" => $lang['FAQ']));
! for($i = 0; $i < count($faq); $i++)
{
! $template->assign_block_vars("faqrow", array("FAQ_QUESTION" => $faq[$i][0], "FAQ_ANSWER" => $faq[$i][1]));
}
--- 34,118 ----
//
! //
! // Load the appropriate faq file
! //
include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_faq.' . $phpEx);
+ //
+ // Pull the array data from the lang pack
+ //
+ $j = 0;
+ $counter = 0;
+ $counter_2 = 0;
+ $faq_block = array();
+ for($i = 0; $i < count($faq); $i++)
+ {
+ if( $faq[$i][0] != "--" )
+ {
+ $faq_block[$j][$counter]['id'] = $counter_2;
+ $faq_block[$j][$counter]['question'] = $faq[$i][0];
+ $faq_block[$j][$counter]['answer'] = $faq[$i][1];
+
+ $counter++;
+ $counter_2++;
+ }
+ else
+ {
+ $counter = 0;
+ $j++;
+ }
+ }
+
+ //
+ // Lets build a page ...
+ //
+ $page_title = $lang['FAQ'];
+ include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
$template->set_filenames(array(
! "body" => "faq_body.tpl",
! "jumpbox" => "jumpbox.tpl")
);
! $jumpbox = make_jumpbox($forum_id);
! $template->assign_vars(array(
! "L_GO" => $lang['Go'],
! "L_JUMP_TO" => $lang['Jump_to'],
! "L_SELECT_FORUM" => $lang['Select_forum'],
! "S_JUMPBOX_LIST" => $jumpbox,
! "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
! );
! $template->assign_var_from_handle("JUMPBOX", "jumpbox");
!
! $template->assign_vars(array(
! "L_FAQ" => $lang['FAQ'])
! );
!
! for($i = 0; $i < count($faq_block); $i++)
{
! if( count($faq_block[$i]) )
! {
! $template->assign_block_vars("faq_block", array(
! "BLOCK_TITLE" => $faq_block[$i]['title'])
! );
! $template->assign_block_vars("faq_block_link", array(
! "BLOCK_TITLE" => $faq_block[$i]['title'])
! );
!
! for($j = 0; $j < count($faq_block[$i]); $j++)
! {
! $template->assign_block_vars("faq_block.faq_row", array(
! "FAQ_QUESTION" => $faq_block[$i][$j]['question'],
! "FAQ_ANSWER" => $faq_block[$i][$j]['answer'],
! "U_FAQ_ID" => $faq_block[$i][$j]['id'])
! );
!
! $template->assign_block_vars("faq_block_link.faq_row_link", array(
! "FAQ_LINK" => $faq_block[$i][$j]['question'],
! "U_FAQ_LINK" => "#" . $faq_block[$i][$j]['id'])
! );
! }
! }
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 15:16:17
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv11989/language/lang_english
Modified Files:
lang_faq.php
Log Message:
Updated FAQ, links, more text, etc. ... I was bored
Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_faq.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_faq.php 2001/10/11 12:14:55 1.1
--- lang_faq.php 2001/11/16 15:16:14 1.2
***************
*** 1,5 ****
<?php
/***************************************************************************
! * faq-english.php
* -------------------
* begin : Wednesday Oct 3, 2001
--- 1,5 ----
<?php
/***************************************************************************
! * lang_faq.php [english]
* -------------------
* begin : Wednesday Oct 3, 2001
***************
*** 19,44 ****
* (at your option) any later version.
*
! ***************************************************************************/
!
! //
! // To add an entry to your FAQ simply add a line to this file in this format:
! // $faq[] = array("question", "answer");
! // DO NOT forget the ; at the end of the line.
! // Do not put double quotes (") in your FAQ entries, or if you do escape them ie: \"something\"
! //
! // The FAQ items will appear on the FAQ page in the same order they are listed in this file
! //
!
!
! $faq[] = array("Why do email addresses look like 'name at domain.com'?", "They look this way in order to reduce the possibility of email address gathering programs from finding your email address. These 'bots' look for email addresses in web pages and store them where they are often used to send you spam email. In order to send email to someone you will need to remove the ' at ' in the address and replace it with usual '@'");
! $faq[] = array("Why do I get logged off automatically?", "If you do not check the 'Log me in automatically' box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, eg. library, internet cafe, university cluster, etc.");
! $faq[] = array("Why can't I upload an avatar image?", "An avatar is a small image generally unique to a user displayed next to their posts. It is up to the board administrator to enable avatars (and the way in which avatars can be set). If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons (we're sure they'll be good!)");
! $faq[] = array("Why am I showing up more than once in the online listing?", "You shouldn't! phpBB 2.0 includes controls to prevent a user being logged in twice from different machines. However, if the connection between your machine and the system serving this board is interrupted mid-transmission it may possibly corrupt the cookie data used to identify you. In this case the session management code will interpret you as a 'returning user' (if you checked the automatic login box) and create a new session. If you suspect this is not the problem you should contact the board administrator as soon as possible.");
! $faq[] = array("Why can't I login?", "Have you registered?! Seriously, you must register in order to login. Have you been banned from the board (a message will be displayed if you have)? If so then you should contact the webmaster or board administrator to find out why. If you have registered and are not banned and you still cannot login then check and double check your username and password. Usually this is the problem, if not then contact the board administrator they may have incorrect configuration settings for the board.");
! $faq[] = array("I keep getting unwanted private messages!", "In the future we will be adding an ignore list to the private messaging system. For now though if you keep receiving unwanted private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.");
! $faq[] = array("How do I become a usergroup moderator?", "Usergroups are initially created by the board admin, they also assign a board moderator. If you are interested in creating a usergroup then your first point of contact should be the admin.");
! $faq[] = array("How do I join a usergroup?", "To join a usergroup click the usergroup link on the page header (dependent on template design), you can then view all usergroups and request to join one. The board administrator will need to approve your request, they may ask why you want to join the group. Please don't pester a group moderator if they turn your request down, they'll have their reasons.");
! $faq[] = array("Why can't I access X forum?", "Some groups may be limited to certain users or groups. To view, read, post, etc. you may need special authorisation, only the forum moderator and board admin can grant this access, you should contact them.");
! $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option 'Hide your online status', if you switch this 'on' you'll only appear to board admins.");
! ?>
!
\ No newline at end of file
--- 19,76 ----
* (at your option) any later version.
*
! ***************************************************************************/
!
! //
! // To add an entry to your FAQ simply add a line to this file in this format:
! // $faq[] = array("question", "answer");
! // If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
! // Links will be created automatically
! //
! // DO NOT forget the ; at the end of the line.
! // Do NOT put double quotes (") in your FAQ entries, if you absolutely must then escape them ie. \"something\"
! //
! // The FAQ items will appear on the FAQ page in the same order they are listed in this file
! //
!
!
! $faq[] = array("Why can't I login?", "Have you registered? Seriously, you must register in order to login. Have you been banned from the board (a message will be displayed if you have)? If so then you should contact the webmaster or board administrator to find out why. If you have registered and are not banned and you still cannot login then check and double check your username and password. Usually this is the problem, if not then contact the board administrator they may have incorrect configuration settings for the board.");
! $faq[] = array("Why do I need to register at all?", "You may not have too, it is up to the administrator of the board as to whether you need to register in order to post messages. However registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.");
! $faq[] = array("Why do I get logged off automatically?", "If you do not check the 'Log me in automatically' box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, eg. library, internet cafe, university cluster, etc.");
! $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option 'Hide your online status', if you switch this 'on' you'll only appear to board admins or to yourself. You will be counted as a hidden user.");
! $faq[] = array("I've lost my password!", "Don't panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click <u>I've forgotten my password</u>, follow the instructions and you should be back online in no time");
! $faq[] = array("I registered but cannot login!", "Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <u>I am under 13 years old</u> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of 'roque' users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.");
! $faq[] = array("I registered in the past but cannot login any more?!", "The most likely reasons for this are; you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the later case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions.");
! $faq[] = array("--","");
!
! $faq[] = array("How do I change my settings?", "All your settings (if you are registered) are stored in the database. To alter them click the <u>Profile</u> link (generally shown at the top of pages but this may not be the case). This will allow you to change all your settings");
! $faq[] = array("The times are not correct!", "The times are almost certainly correct, however what you may be seeing are times displayed in a timezone different from the one you are in. If this is the case you should change your profile setting for the timezone to match your particular area, eg. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings can only be done by registered users. So if you are not registered this is a good 'time' to do so, if you pardon the pun!");
! $faq[] = array("I changed the timezone and the time is still wrong!", "If you are sure you have set the timezone correctly and the time is still different the most likely answer is 'daylight savings time' (or 'summer time' as it is known in the UK and other places). The board is not designed to handle the changeovers between standard and daylight time so during summer months the time may be an hour different from the 'real' local time.");
! $faq[] = array("My language is not in the list!", "The most likely reasons for this are either the administrator did not install your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need, if it does not exist then please feel free to create a new translation. More information can be found at the phpBB Group website (see link at bottom of pages)");
! $faq[] = array("How do I show an image below my username?", "There may be two images below a username when viewing posts. The first is an image associated with your 'rank', generally these take the form of stars or blocks indicating how many posts you have made or your 'status' on the forums. Below this may be a larger image known as an avatar, this is generally unique or personal to each user. It is up to the board administrator to enable avatars and they have a choice over the way in which avatars can be made available. If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons (we're sure they'll be good!)");
! $faq[] = array("When I click the email link for a user it asks me to login?", "Sorry but only registered users can send email to people via the built-in email form (if the admin has enabled this feature). This is to prevent malicious use of the email system by anonymous users.");
! $faq[] = array("--","");
!
! $faq[] = array("How do I post a topic in a forum?", "Easy, click the relevant button on either the forum or topic screens. You may need to register before you can post a message, the facilities available to you are listed at the bottom of the forum and topic screens (the 'You can post new topics, You can vote in polls, etc.' list)");
! $faq[] = array("How do I edit or delete a post?", "Unless you are the board admin or forum moderator you can only edit or delete your own posts. You can edit a post (sometimes for only a limited time after it was made) by clicking the 'edit' button for the relevant post. If someone has already replied to the post you will find a small piece of text output below the post when you return to the topic, this lists the number of times you edited it. This will only appear if no one has replied, it also will not appear if moderators or admins edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied.");
! $faq[] = array("How do I create a poll?", "Creating a poll is easy, when you post a new topic (or edit the first post of a topic, if you have permission) you shoul see a 'Add Poll' form below the main posting box (if you cannot see this then you probably do not have rights to create polls). You should enter a title for the poll and then at least two options (to set an option type in the poll question and click the 'Add option' button. You can also set a time limit for the poll, 0 is an infinite poll. There will be a limit to the number of options you can list, this is set by the board administrator");
! $faq[] = array("How do I edit or delete a poll?", "As with posts, polls can only be edited by the original poster, a moderator or board admin. To edit a poll click the first post in the topic (this always has the poll associated with it). If no one has cast a vote then users can delete the poll or edit any poll option, however if people have already placed votes only moderators or admins can edit or delete it. This is to prevent people rigging polls by changing options mid-way through a poll");
! $faq[] = array("Why can't I access a forum?", "Some forums may be limited to certain users or groups. To view, read, post, etc. you may need special authorisation, only the forum moderator and board admin can grant this access, you should contact them.");
! $faq[] = array("Why can't I vote in polls?", "Only registered users can vote in polls (so as to prevent spoofing of results). If you have registered and still cannot vote then you probably do not have appropriate access rights.");
! $faq[] = array("--","");
!
! $faq[] = array("I cannot send private messages!", "There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board or the board administrator has prevented you from sending messages. If it is the later case you should try asking the administrator why.");
! $faq[] = array("I keep getting unwanted private messages!", "In the future we will be adding an ignore list to the private messaging system. For now though if you keep receiving unwanted private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.");
! $faq[] = array("I have recieved a spamming or abusive email from someone on this board!", "We are sorry to hear that. The email form feature of this board includes safeguards to try and track users who send such posts. You should email the board administrator with a full copy of the email you received, it is very important this include the headers (these list details of the user that sent the email). They can then take action.");
! $faq[] = array("--","");
!
! $faq[] = array("What are usergroups?", "Usergroups are a way in which board administrators can group users. Each user can belong to several groups (this differs from most other boards) and each group can be assigned individual access rights. This makes it easy for admins to set up several users as moderators of a forum, or to give them access to a private forum, etc.");
! $faq[] = array("How do I join a usergroup?", "To join a usergroup click the usergroup link on the page header (dependent on template design), you can then view all usergroups. Not all groups are 'open access', some are closed and some may even have hidden memberships. If the board is open then you can request to join it by clicking the appropriate button. The user group moderator will need to approve your request, they may ask why you want to join the group. Please do not pester a group moderator if they turn your request down, they will have their reasons.");
! $faq[] = array("How do I become a usergroup moderator?", "Usergroups are initially created by the board admin, they also assign a board moderator. If you are interested in creating a usergroup then your first point of contact should be the admin, try dropping them a private message.");
! $faq[] = array("--","");
!
!
! $faq[] = array("Why isn't X feature available?", "This software was written by and licenced through phpBB Group. If you believe a feature needs to be added then please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the Group uses sourceforge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.");
! $faq[] = array("Who do I contact about abusive and/or legal matters related to this board?", "You should contact the administrator of this board. If you cannot find who this you should first contact one of the forum moderators and ask them who you should in turn contact. If still get no response you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (eg. yahoo, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that phpBB Group has absolutely no control and cannot in any way be held liable over how, where or by whom this board is used. It is absolutely pointless contacting phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpbb.com website or the discrete software of phpBB itself. If you do email phpBB Group about any third party use of this software then you should expect a terse response or no response at all.");
! $faq[] = array("--","");
!
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 00:20:45
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv20313 Modified Files: search.php Log Message: Pagination update Index: search.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/search.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** search.php 2001/11/14 23:08:56 1.26 --- search.php 2001/11/16 00:20:42 1.27 *************** *** 1057,1065 **** $template->assign_vars(array( "PAGINATION" => generate_pagination($base_url, $total_match_count, $per_page, $start), ! "ON_PAGE" => floor( $start / $per_page ) + 1, ! "TOTAL_PAGES" => ceil( $total_match_count / $per_page ), - "L_OF" => $lang['of'], - "L_PAGE" => $lang['Page'], "L_GOTO_PAGE" => $lang['Goto_page']) ); --- 1057,1062 ---- $template->assign_vars(array( "PAGINATION" => generate_pagination($base_url, $total_match_count, $per_page, $start), ! "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )), "L_GOTO_PAGE" => $lang['Goto_page']) ); |
|
From: Paul S. O. <ps...@us...> - 2001-11-16 00:20:45
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv20313/templates/subSilver
Modified Files:
search_results_posts.tpl search_results_topics.tpl
Log Message:
Pagination update
Index: search_results_posts.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_posts.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search_results_posts.tpl 2001/10/01 23:22:18 1.2
--- search_results_posts.tpl 2001/11/16 00:20:43 1.3
***************
*** 40,47 ****
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b>
! {L_OF} <b>{TOTAL_PAGES}</b></span></td>
! <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><span class="gensmall"><br />
! {S_TIMEZONE}</span></td>
</tr>
</table>
--- 40,45 ----
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
! <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
Index: search_results_topics.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_topics.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** search_results_topics.tpl 2001/11/09 13:00:04 1.4
--- search_results_topics.tpl 2001/11/16 00:20:43 1.5
***************
*** 44,51 ****
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b>
! {L_OF} <b>{TOTAL_PAGES}</b></span></td>
! <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><span class="gensmall"><br />
! {S_TIMEZONE}</span></td>
</tr>
</table>
--- 44,49 ----
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
! <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-16 00:18:36
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19743
Modified Files:
viewtopic.php
Log Message:
Lang related update for topic watch
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -r1.133 -r1.134
*** viewtopic.php 2001/11/15 18:37:01 1.133
--- viewtopic.php 2001/11/16 00:18:32 1.134
***************
*** 241,245 ****
);
! $message = $lang['No_longer_watching']. "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&start=$start") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
message_die(GENERAL_MESSAGE, $message);
}
--- 241,245 ----
);
! $message = $lang['No_longer_watching']. "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&start=$start") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
}
***************
*** 285,289 ****
);
! $message = $lang['You_are_watching']. "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&start=$start") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
message_die(GENERAL_MESSAGE, $message);
}
--- 285,289 ----
);
! $message = $lang['You_are_watching']. "<br /><br />" . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&start=$start") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-15 22:09:23
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv15667
Modified Files:
posting.php
Log Message:
Fixed problem where deleting a post with a poll could error deletion of remaining posts
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** posting.php 2001/11/15 21:38:09 1.97
--- posting.php 2001/11/15 22:09:20 1.98
***************
*** 1638,1641 ****
--- 1638,1651 ----
}
}
+ else if( !$is_last_post_topic )
+ {
+ $sql = "UPDATE " . TOPICS_TABLE . "
+ SET topic_vote = 0
+ WHERE topic_id = $topic_id";
+ if( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't update topic poll field", "", __LINE__, __FILE__, $sql);
+ }
+ }
}
else
|
|
From: Bart v. B. <ba...@us...> - 2001-11-15 22:07:32
|
Update of /cvsroot/phpbb/phpBB2/db In directory usw-pr-cvs1:/tmp/cvs-serv15065/db Modified Files: mysql_schema.sql Log Message: New and improved search_fill.php, still has a weird memory exhaustion bug Index: mysql_schema.sql =================================================================== RCS file: /cvsroot/phpbb/phpBB2/db/mysql_schema.sql,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** mysql_schema.sql 2001/11/15 16:26:41 1.85 --- mysql_schema.sql 2001/11/15 22:07:29 1.86 *************** *** 272,283 **** # DROP TABLE IF EXISTS phpbb_search_wordlist; ! CREATE TABLE phpbb_search_wordlist ( ! word_id int(11) NOT NULL auto_increment, ! word_text varchar(100) NOT NULL default '', ! word_weight tinyint(4) NOT NULL default '0', ! PRIMARY KEY (word_id), ! KEY word_text (word_text) ! ); ! # -------------------------------------------------------- --- 272,283 ---- # DROP TABLE IF EXISTS phpbb_search_wordlist; ! 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`) ! ) # -------------------------------------------------------- |
|
From: Bart v. B. <ba...@us...> - 2001-11-15 22:07:32
|
Update of /cvsroot/phpbb/phpBB2/develop
In directory usw-pr-cvs1:/tmp/cvs-serv15065/develop
Modified Files:
search_fill.php
Log Message:
New and improved search_fill.php, still has a weird memory exhaustion bug
Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search_fill.php 2001/11/09 13:00:04 1.1
--- search_fill.php 2001/11/15 22:07:29 1.2
***************
*** 1,48 ****
<?php
! function clean_words($entry, &$stopword_list, &$synonym_list)
{
! $init_match = array("^", "$", "&", "(", ")", "<", ">", "`", "'", "|", ",", "@", "_", "?", "%");
! $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
! $later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
! $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
! $entry = " " . stripslashes(strip_tags(strtolower($entry))) . " ";
$entry = preg_replace("/[\n\r]/is", " ", $entry);
$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
! $entry = str_replace($init_match, $init_replace, $entry);
$entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
$entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
$entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
$entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
$entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
$entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
$entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
$entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
$entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
-
- $entry = str_replace($later_match, $later_replace, $entry);
! if( !empty($stopword_list) )
{
! for ($j = 0; $j < count($stopword_list); $j++)
! {
! $filter_word = trim(strtolower($stopword_list[$j]));
! $entry = preg_replace("/\b" . preg_quote($filter_word, "/") . "\b/is", " ", $entry);
! }
}
! if( !empty($synonym_list) )
! {
! for ($j = 0; $j < count($synonym_list); $j++)
! {
! list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
! $entry = preg_replace("/\b" . preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
! }
! }
return $entry;
--- 1,51 ----
<?php
! // Clean up an entry (posting), remove HTML, BBcode, stopwords, etc
! function clean_words($entry, &$search, &$replace)
{
! // Weird, $init_match doesn't work with static when double quotes (") are used...
! static $init_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%');
! static $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
! static $later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
! static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ", " ", " ", " ");
! $entry = " " . strip_tags(strtolower($entry)) . " ";
+ // Replace line endings by a space
$entry = preg_replace("/[\n\r]/is", " ", $entry);
+ // Remove URL's
$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
! // Filter out strange characters like ^, $, &, change "it's" to "its"
! // str_replace with arrays is buggy in some PHP versions so traverse the arrays manually ;(
! for($i = 0; $i < count($init_match); $i++)
! {
! $entry = str_replace($init_match[$i], $init_replace[$i], $entry);
! }
+ // Quickly remove BBcode.
$entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
$entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
$entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
+ // URLs
$entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
$entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
+ // Numbers
$entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
+ // HTML entities like &1234;
$entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
+ // 'words' that consist of <2 or >50 characters are removed.
$entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
$entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
! // Remove some more strange characters
! for($i = 0; $i < count($later_match); $i++)
{
! $entry = str_replace($later_match[$i], $later_replace[$i], $entry);
}
! // Remove stopwords
! $entry = preg_replace($search, $replace, $entry);
return $entry;
***************
*** 56,117 ****
}
! function remove_common($percent)
{
global $db;
!
! $sql = "SELECT sl.word_id, SUM(sm.word_count) AS post_occur_count
! FROM phpbb_search_wordlist sl, phpbb_search_wordmatch sm
! WHERE sl.word_id = sm.word_id
! GROUP BY sl.word_id
! ORDER BY post_occur_count DESC";
$result = $db->sql_query($sql);
if( !$result )
{
! message_die(GENERAL_ERROR, "Couldn't obtain search word sums", "", __LINE__, __FILE__, $sql);
}
!
! $post_count = $db->sql_numrows($result);
! $rowset = $db->sql_fetchrowset($result);
!
! $sql = "SELECT COUNT(post_id) AS total_posts
! FROM phpbb_posts";
$result = $db->sql_query($sql);
if( !$result )
{
! message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
}
! $row = $db->sql_fetchrow($result);
! $words_removed = 0;
! for($i = 0; $i < $post_count; $i++)
{
! if( ($rowset[$i]['post_occur_count'] / $row['total_posts'] ) >= $percent )
{
! $sql = "DELETE FROM phpbb_search_wordlist
! WHERE word_id = " . $rowset[$i]['word_id'];
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM phpbb_search_wordmatch
! WHERE word_id = " . $rowset[$i]['word_id'];
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
! }
!
! $words_removed++;
}
}
!
! return $words_removed;
}
! set_time_limit(2400);
$phpbb_root_path = "../";
--- 59,143 ----
}
! function remove_common($percent, $delete_common = 0)
{
global $db;
!
! $sql = "
! SELECT
! COUNT(DISTINCT post_id) as total_posts
! FROM " . SEARCH_MATCH_TABLE;
$result = $db->sql_query($sql);
if( !$result )
{
! $error = $db->sql_error();
! die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']);
}
! $total_posts = $db->sql_fetchrow($result);
! $total_posts = $total_posts['total_posts'];
!
! $common_threshold = floor($total_posts * ($percent/100));
!
! $sql = "
! SELECT
! word_id,
! count(word_id) AS word_occur
! FROM
! ".SEARCH_MATCH_TABLE."
! GROUP BY
! word_id
! HAVING
! word_occur > $common_threshold
! ";
$result = $db->sql_query($sql);
if( !$result )
{
! $error = $db->sql_error();
! die("Couldn't obtain common word list :: " . $sql . " :: " . $error['message']);
}
+ $common_words = $db->sql_numrows($result);
! while($row = $db->sql_fetchrow($result))
! {
! $common_word_ids[] = $row['word_id'];
! }
! $db->sql_freeresult($result);
!
! if(count($common_word_ids) != 0)
! {
! $common_word_ids = implode(',',$common_word_ids);
! }
! else
! {
! // We didn't remove any common words
! return 0;
! }
! $sql = "UPDATE ". SEARCH_WORD_TABLE ."
! SET word_common = 1
! WHERE word_id IN ($common_word_ids)";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! $error = $db->sql_error();
! die("Couldn't delete word list entry :: " . $sql . " :: " . $error['message']);
! }
! if( $delete_common)
{
! $sql = "DELETE FROM phpbb_search_wordmatch
! WHERE word_id IN ($common_word_ids)";
! $result = $db->sql_query($sql);
! if( !$result )
{
! $error = $db->sql_error();
! die("Couldn't delete word match entry :: " . $sql . " :: " . $error['message']);
}
}
!
! return $common_words;
}
! set_time_limit(0);
! $common_percent = 40; // Percentage of posts in which a word has to appear to be marked as common
$phpbb_root_path = "../";
***************
*** 122,125 ****
--- 148,153 ----
include($phpbb_root_path . 'includes/db.'.$phpEx);
+ print "<html>\n<body>\n";
+
//
// Try and load stopword and synonym files
***************
*** 127,214 ****
//$stopword_array = file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
//$synonym_array = file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
$stopword_array = file($phpbb_root_path . "language/lang_english/search_stopwords.txt");
$synonym_array = file($phpbb_root_path . "language/lang_english/search_synonyms.txt");
//
! // Build search ...
//
! $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
!
! $sql = "SELECT *
! FROM " . POSTS_TEXT_TABLE . "
! ORDER BY post_id ASC
! LIMIT $start, 200";
! $result = $db->sql_query($sql);
! if( !$result )
{
$error = $db->sql_error();
! die("Couldn't select words :: " . $sql . " :: " . $error['message']);
}
!
! $rowset = $db->sql_fetchrowset($result);
!
! if( $post_rows = $db->sql_numrows($result) )
{
! // $sql = "LOCK TABLES phpbb_posts_text WRITE";
! // $result = $db->sql_query($sql);
! for($i = 0; $i < $post_rows; $i++ )
! {
! $matches = array();
! $post_id = $rowset[$i]['post_id'];
! $data = $rowset[$i]['post_text'];
! $text = clean_words($data, $stopword_array, $synonym_array);
! $matches = split_words($text);
! if( count($matches) )
! {
$word = array();
$word_count = array();
$phrase_string = $text;
! $sql_in = "";
! for ($j = 0; $j < count($matches); $j++)
! {
$this_word = strtolower(trim($matches[$j]));
!
! if( empty($word_count[$this_word]) )
! {
! $word_count[$this_word] = 1;
! }
!
! $new_word = true;
! for($k = 0; $k < count($word); $k++)
! {
! if( $this_word == $word[$k] )
! {
! $new_word = false;
! $word_count[$this_word]++;
! }
! }
!
! if( $new_word )
{
! $word[] = $this_word;
}
}
!
! for($j = 0; $j < count($word); $j++)
{
! if( $word[$j] )
! {
! if( $sql_in != "" )
! {
! $sql_in .= ", ";
! }
! $sql_in .= "'" . $word[$j] . "'";
! }
}
! $sql = "SELECT word_id, word_text
FROM phpbb_search_wordlist
! WHERE word_text IN ($sql_in)";
$result = $db->sql_query($sql);
if( !$result )
--- 155,283 ----
//$stopword_array = file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
//$synonym_array = file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
+
+ // This needs fixing! Shouldn't be hardcoded to English files!
$stopword_array = file($phpbb_root_path . "language/lang_english/search_stopwords.txt");
$synonym_array = file($phpbb_root_path . "language/lang_english/search_synonyms.txt");
+ for ($j = 0; $j < count($stopword_array); $j++)
+ {
+ $filter_word = trim(strtolower($stopword_array[$j]));
+ $search[] = "/\b" . preg_quote($filter_word, "/") . "\b/is";
+ $replace[] = '';
+ }
+
+ for ($j = 0; $j < count($synonym_list); $j++)
+ {
+ list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
+ $search[] = "/\b" . preg_quote(trim($match_synonym), "/") . "\b/is";
+ $replace[] = " " . trim($replace_synonym) . " ";
+ }
+
//
! // Fetch a batch of posts_text entries
//
! $sql = "
! SELECT
! count(*) as total,
! max(post_id) as max_post_id
! FROM ". POSTS_TEXT_TABLE;
! if(!$result = $db->sql_query($sql))
{
$error = $db->sql_error();
! die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']);
}
! $max_post_id = $db->sql_fetchrow($result);
! $totalposts = $max_post_id['total'];
! $max_post_id = $max_post_id['max_post_id'];
!
! $postcounter = (!isset($HTTP_GET_VARS['batchstart'])) ? 0 : $HTTP_GET_VARS['batchstart'];
!
! $batchsize = 200; // Process this many posts per loop
! $batchcount = 0;
! for(;$postcounter <= $max_post_id; $postcounter += $batchsize)
{
+ $batchstart = $postcounter + 1;
+ $batchend = $postcounter + $batchsize;
+ $batchcount++;
+
+ $sql = "SELECT *
+ FROM " .
+ POSTS_TEXT_TABLE ."
+ WHERE
+ post_id BETWEEN $batchstart AND $batchend";
+ if(!$posts_result = $db->sql_query($sql))
+ {
+ $error = $db->sql_error();
+ die("Couldn't get post_text :: " . $sql . " :: " . $error['message']);
+ }
! $rowset = $db->sql_fetchrowset($posts_result);
! if( $post_rows = $db->sql_numrows($posts_result) )
! {
! // $sql = "LOCK TABLES phpbb_posts_text WRITE";
! // $result = $db->sql_query($sql);
! print "\n<p>\n<a href='$PHP_SELF?batchstart=$batchstart'>Restart from posting $batchstart</a><br>\n";
! // For every post in the batch:
! for($post_nr = 0; $post_nr < $post_rows; $post_nr++ )
! {
! print ".";
! flush();
! $matches = array();
!
! $post_id = $rowset[$post_nr]['post_id'];
! $data = $rowset[$post_nr]['post_text']; // Raw data
!
! $text = clean_words($data, $search, $replace); // Cleaned up post
! $matches = split_words($text);
! $num_matches = count($matches);
! if($num_matches < 1)
! {
! // Skip this post if no words where found
! continue;
! }
!
$word = array();
$word_count = array();
+ $sql_in = "";
$phrase_string = $text;
! // For all words in the posting
! $sql_insert = '';
! $sql_select = '';
! for($j = 0; $j < $num_matches; $j++)
! {
$this_word = strtolower(trim($matches[$j]));
! if($this_word != '')
{
! $word_count[$this_word]++;
! $comma = ($sql_insert != '')? ', ': '';
!
! $sql_insert .= "$comma('" .$this_word. "')";
! $sql_select .= "$comma'" .$this_word. "'";
}
}
! if($sql_insert == '')
{
! die("no words found");
! }
!
! $sql = 'INSERT IGNORE INTO '.SEARCH_WORD_TABLE."
! (word_text)
! VALUES $sql_insert";
! if( !$result = $db->sql_query($sql) )
! {
! $error = $db->sql_error();
! die("Couldn't INSERT words :: " . $sql . " :: " . $error['message']);
}
! // Get the word_id's out of the DB (to see if they are already there)
! $sql = "SELECT word_id, word_text
FROM phpbb_search_wordlist
! WHERE word_text IN ($sql_select)
! GROUP BY word_text";
$result = $db->sql_query($sql);
if( !$result )
***************
*** 217,271 ****
die("Couldn't select words :: " . $sql . " :: " . $error['message']);
}
-
if( $word_check_count = $db->sql_numrows($result) )
{
! $check_words = $db->sql_fetchrowset($result);
}
!
! for ($j = 0; $j < count($word); $j++)
! {
! if( $word[$j] )
! {
! $new_match = true;
!
! if( $word_check_count )
! {
! for($k = 0; $k < $word_check_count; $k++)
! {
! if( $word[$j] == $check_words[$k]['word_text'] )
! {
! $new_match = false;
! $word_id = $check_words[$k]['word_id'];
! }
! }
! }
!
! if( $new_match )
! {
! $sql = "INSERT INTO phpbb_search_wordlist (word_text)
! VALUES ('". addslashes($word[$j]) . "')";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! $error = $db->sql_error();
! die("Couldn't insert new word :: " . $sql . " :: " . $error['message']);
! }
!
! $word_id = $db->sql_nextid();
! }
!
! $sql = "INSERT INTO phpbb_search_wordmatch (post_id, word_id, word_count, title_match)
! VALUES ($post_id, $word_id, " . $word_count[$word[$j]] . ", 0)";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! $error = $db->sql_error();
! die("Couldn't insert new word match :: " . $sql . " :: " . $error['message']);
! }
!
! $phrase_string = preg_replace("/\b" . preg_quote($word[$j], "/") . "\b/is", $word_id, $phrase_string);
! }
}
/*
$phrase_string = trim(preg_replace("/ {2,}/s", " ", str_replace(array("*", "'"), " ", $phrase_string)));
--- 286,320 ----
die("Couldn't select words :: " . $sql . " :: " . $error['message']);
}
if( $word_check_count = $db->sql_numrows($result) )
{
! $selected_words = $db->sql_fetchrowset($result);
}
! else
! {
! print "Couldn't do sql_numrows<br>\n";
}
+ $db->sql_freeresult($result);
+
+ $sql_insert = '';
+ while(list($junk, $row) = each($selected_words))
+ {
+ $comma = ($sql_insert != '')? ', ': '';
+ $sql_insert .= "$comma($post_id, ".$row['word_id'].", ".$word_count[$row['word_text']]." ,0)";
+ }
+
+ $sql = "INSERT INTO ".SEARCH_MATCH_TABLE."
+ (post_id, word_id, word_count, title_match)
+ VALUES
+ $sql_insert
+ ";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ $error = $db->sql_error();
+ die("Couldn't insert new word match :: " . $sql . " :: " . $error['message']);
+ }
+
/*
+ //$phrase_string = preg_replace("/\b" . preg_quote($word[$j], "/") . "\b/is", $word_id, $phrase_string);
$phrase_string = trim(preg_replace("/ {2,}/s", " ", str_replace(array("*", "'"), " ", $phrase_string)));
***************
*** 279,311 ****
}
*/
! }
! }
! // $sql = "UNLOCK TABLES";
! // $result = $db->sql_query($sql);
! }
! if( $post_rows == 200 )
! {
! header("Location: search_fill.php?start=" . ($start+200) . "&total=" . ($start + $post_rows));
}
-
- ?>
- <html>
- <body>
-
- <?php
-
- $total_rows = ( $HTTP_GET_VARS['total'] ) ? $HTTP_GET_VARS['total'] : $post_rows;
-
- echo "<BR><BR>Total posts = " . $total_rows . "<BR><BR>";
-
- echo remove_common(0.4);
! exit;
?>
</body>
! </html>
\ No newline at end of file
--- 328,358 ----
}
*/
! } // All posts
! // $sql = "UNLOCK TABLES";
! // $result = $db->sql_query($sql);
! }
! else
! {
! print "Couldn't get rowcount for number of posts<br>$sql<br>\n";
! } // All posts;
! $db->sql_freeresult($posts_result);
!
! // Remove common words after the first 2 batches and after every 4th batch after that.
! if( $batchcount % 4 == 3 )
! {
! print "<br>Removing common words (words that appear in more than $common_percent of the posts)<br>\n";
! flush();
! print "Removed ". remove_common($common_percent, 1) ." words that where too common.<br>";
! }
!
}
! echo "<br>Done";
?>
</body>
! </html>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-15 21:44:04
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv8170/templates/subSilver
Modified Files:
modcp_move.tpl
Log Message:
A little tidy up
Index: modcp_move.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_move.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modcp_move.tpl 2001/11/14 20:21:01 1.3
--- modcp_move.tpl 2001/11/15 21:44:01 1.4
***************
*** 17,29 ****
</tr>
<tr>
! <td align="center"><span class="gen">{L_MOVE_TO_FORUM} {S_FORUM_BOX}<br />
! <input type="checkbox" name="move_leave_shadow" CHECKED>{L_LEAVESHADOW}<br />
<br />
{MESSAGE_TEXT}</span><br />
<br />
{S_HIDDEN_FIELDS}
! <input type="submit" name="confirm" value="{L_YES}" />
! <input type="submit" name="cancel" value="{L_NO}" />
</td>
</tr>
--- 17,29 ----
</tr>
<tr>
! <td align="center"><span class="gen">{L_MOVE_TO_FORUM} {S_FORUM_BOX}<br /><br />
! <input type="checkbox" name="move_leave_shadow" checked="checked" />{L_LEAVESHADOW}<br />
<br />
{MESSAGE_TEXT}</span><br />
<br />
{S_HIDDEN_FIELDS}
! <input class="mainoption" type="submit" name="confirm" value="{L_YES}" />
! <input class="liteoption" type="submit" name="cancel" value="{L_NO}" />
</td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-15 21:38:12
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6384
Modified Files:
posting.php
Log Message:
Got a bad piece of tape that time, fell on the carpet, euuggh, this one should work
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** posting.php 2001/11/15 21:36:31 1.96
--- posting.php 2001/11/15 21:38:09 1.97
***************
*** 304,313 ****
}
! $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
! WHERE word_id IN ($word_id_sql)";
! $result = $db->sql_query($sql);
! if( !$result )
{
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
}
}
--- 304,316 ----
}
! if( $word_id_sql )
{
! $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
! WHERE word_id IN ($word_id_sql)";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! }
}
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-15 21:36:33
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5876
Modified Files:
posting.php
Log Message:
Sticky tape fell off, that's what happens when you don't buy the real thing...
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** posting.php 2001/11/15 21:28:58 1.95
--- posting.php 2001/11/15 21:36:31 1.96
***************
*** 168,187 ****
}
! $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
! WHERE word_id IN ($word_id_sql)";
! $result = $db->sql_query($sql);
! if( !$result )
{
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! }
! $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
! WHERE word_id IN ($word_id_sql)";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
}
-
}
}
--- 168,189 ----
}
! if( $word_id_sql != "" )
{
! $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
! WHERE word_id IN ($word_id_sql)";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! }
! $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
! WHERE word_id IN ($word_id_sql)";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
! }
}
}
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-15 21:29:02
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv3305
Modified Files:
posting.php
Log Message:
This removes the looping queries causing the horendous query count ... clutch now fixed, but only with sticky tape
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** posting.php 2001/11/15 16:35:09 1.94
--- posting.php 2001/11/15 21:28:58 1.95
***************
*** 153,180 ****
$words_removed = 0;
!
for($i = 0; $i < $post_count; $i++)
{
if( ( $rowset[$i]['post_occur_count'] / $row['total_posts'] ) >= $percent )
{
! $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
! WHERE word_id = " . $rowset[$i]['word_id'];
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
! WHERE word_id = " . $rowset[$i]['word_id'];
! $result = $db->sql_query($sql);
! if( !$result )
{
! message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
}
$words_removed++;
}
}
}
}
--- 153,187 ----
$words_removed = 0;
! $word_id_sql = "";
for($i = 0; $i < $post_count; $i++)
{
if( ( $rowset[$i]['post_occur_count'] / $row['total_posts'] ) >= $percent )
{
! if( $word_id_sql != "" )
{
! $word_id_sql .= ", ";
}
+ $word_id_sql .= $rowset[$i]['word_id'];
$words_removed++;
}
}
+
+ $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
+ WHERE word_id IN ($word_id_sql)";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
+ }
+
+ $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
+ WHERE word_id IN ($word_id_sql)";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
+ }
+
}
}
***************
*** 282,297 ****
$rowset = $db->sql_fetchrowset($result);
for($i = 0; $i < $post_count; $i++)
{
if( $rowset[$i]['post_occur_count'] == 1 )
{
! $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
! WHERE word_id = " . $rowset[$i]['word_id'];
! $result = $db->sql_query($sql);
! if( !$result )
{
! message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
}
}
}
}
--- 289,311 ----
$rowset = $db->sql_fetchrowset($result);
+ $word_id_sql = "";
for($i = 0; $i < $post_count; $i++)
{
if( $rowset[$i]['post_occur_count'] == 1 )
{
! if( $word_id_sql != "" )
{
! $word_id_sql .= ", ";
}
+ $word_id_sql .= $rowset[$i]['word_id'];
}
+ }
+
+ $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
+ WHERE word_id IN ($word_id_sql)";
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
}
}
|
7 messages has been excluded from this view by a project administrator.
