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-12-19 16:59:47
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv13300 Modified Files: posting.php Log Message: Fix bug #494787, censor words in topic title for email notifications of replies Index: posting.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/posting.php,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -r1.129 -r1.130 *** posting.php 2001/12/19 14:12:51 1.129 --- posting.php 2001/12/19 16:59:44 1.130 *************** *** 1343,1346 **** --- 1343,1352 ---- $path = ''; } + + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + $topic_title = preg_replace($orig_word, $replacement_word, $email_set[0]['topic_title']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; *************** *** 1360,1364 **** "USERNAME" => $email_set[$i]['username'], "SITENAME" => $board_config['sitename'], ! "TOPIC_TITLE" => $email_set[$i]['topic_title'], "U_TOPIC" => $protocol . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id", --- 1366,1370 ---- "USERNAME" => $email_set[$i]['username'], "SITENAME" => $board_config['sitename'], ! "TOPIC_TITLE" => $topic_title, "U_TOPIC" => $protocol . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id", |
|
From: Bart v. B. <ba...@us...> - 2001-12-19 16:07:36
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv30282
Modified Files:
functions.php
Log Message:
Made smileys case-sensitive (i.e. :o != :O )
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** functions.php 2001/12/17 00:46:54 1.95
--- functions.php 2001/12/19 16:07:31 1.96
***************
*** 854,858 ****
for($i = 0; $i < count($smilies); $i++)
{
! $orig[] = "/(?<=.\\W|\\W.|^\\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\\W|\\W.|\\W$)/i";
$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
}
--- 854,858 ----
for($i = 0; $i < count($smilies); $i++)
{
! $orig[] = "/(?<=.\\W|\\W.|^\\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\\W|\\W.|\\W$)/";
$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
}
***************
*** 1211,1213 ****
}
! ?>
\ No newline at end of file
--- 1211,1213 ----
}
! ?>
|
|
From: Paul S. O. <ps...@us...> - 2001-12-19 14:12:54
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv30429
Modified Files:
posting.php
Log Message:
Fix for bug #494982, uses IP for anonymous posters and user_id for logged in users
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -r1.128 -r1.129
*** posting.php 2001/12/18 20:35:17 1.128
--- posting.php 2001/12/19 14:12:51 1.129
***************
*** 1183,1189 ****
// Flood control
//
$sql = "SELECT MAX(post_time) AS last_post_time
FROM " . POSTS_TABLE . "
! WHERE poster_ip = '$user_ip'";
if($result = $db->sql_query($sql))
{
--- 1183,1190 ----
// Flood control
//
+ $where_sql = ( $userdata['user_id'] == ANONYMOUS ) ? "poster_ip = '$user_ip'" : "poster_id = " . $userdata['user_id'];
$sql = "SELECT MAX(post_time) AS last_post_time
FROM " . POSTS_TABLE . "
! WHERE $where_sql";
if($result = $db->sql_query($sql))
{
|
|
From: Bart v. B. <ba...@us...> - 2001-12-18 21:28:25
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25069
Modified Files:
modcp.php
Log Message:
Added check if post exist for IP check
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** modcp.php 2001/12/11 02:21:51 1.50
--- modcp.php 2001/12/18 21:28:21 1.51
***************
*** 936,939 ****
--- 936,944 ----
message_die(GENERAL_ERROR, "Could not get poster IP information", "Error", __LINE__, __FILE__, $sql);
}
+
+ if($db->sql_numrows($result) == 0)
+ {
+ message_die(GENERAL_ERROR, "Post doesn't exist", "Error", __LINE__, __FILE__);
+ }
$post_row = $db->sql_fetchrow($result);
***************
*** 1170,1172 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 1175,1177 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
|
|
From: Bart v. B. <ba...@us...> - 2001-12-18 20:40:53
|
Update of /cvsroot/phpbb/phpBB2/language/lang_dutch In directory usw-pr-cvs1:/tmp/cvs-serv8433 Modified Files: lang_main.php Log Message: I'm just too stupid for CVS :D Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/lang_main.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** lang_main.php 2001/12/18 20:25:23 1.5 --- lang_main.php 2001/12/18 20:40:48 1.6 *************** *** 33,37 **** //setlocale(LC_ALL, "en"); ! $lang['ENCODING'] = "utf-8"; $lang['DIRECTION'] = "LTR"; $lang['LEFT'] = "LEFT"; --- 33,37 ---- //setlocale(LC_ALL, "en"); ! $lang['ENCODING'] = "iso-8859-1"; $lang['DIRECTION'] = "LTR"; $lang['LEFT'] = "LEFT"; *************** *** 138,144 **** $lang['Memberlist'] = "Gebruikerslijst"; $lang['FAQ'] = "FAQ"; $lang['Usergroups'] = "Gebruikersgroepen"; $lang['Last_Post'] = "Laatste Bericht"; ! $lang['Moderator'] = "Moderator(s)"; // !!! Shouldn't there be two variables? --- 138,146 ---- $lang['Memberlist'] = "Gebruikerslijst"; $lang['FAQ'] = "FAQ"; + $lang['BBCode_guide'] = "BBCode overzicht"; $lang['Usergroups'] = "Gebruikersgroepen"; $lang['Last_Post'] = "Laatste Bericht"; ! $lang['Moderator'] = "Moderator"; ! $lang['Moderators'] = "Moderators"; *************** *** 220,224 **** $lang['Rules_vote_can'] = "Je <b>mag</b> stemmen in polls"; $lang['Rules_vote_cannot'] = "Ja <b>mag niet</b> stemmen in polls"; ! $lang['Rules_moderate'] = "Je <b>kan</b> dit onderdeel %smoderaten%s"; // %s replaced by a href links, do not remove! $lang['No_topics_post_one'] = "Er zijn geen berichten in dit Forum.<br />Klik op de <b>Plaats Nieuw Bericht</b> link op deze pagina om een bericht te plaatsen."; --- 222,226 ---- $lang['Rules_vote_can'] = "Je <b>mag</b> stemmen in polls"; $lang['Rules_vote_cannot'] = "Ja <b>mag niet</b> stemmen in polls"; ! $lang['Rules_moderate'] = "Je <b>kunt</b> dit onderdeel %smoderaten%s"; // %s replaced by a href links, do not remove! $lang['No_topics_post_one'] = "Er zijn geen berichten in dit Forum.<br />Klik op de <b>Plaats Nieuw Bericht</b> link op deze pagina om een bericht te plaatsen."; *************** *** 257,261 **** $lang['Delete_post'] = "Verwijder dit bericht"; ! $lang['wrote'] = "Schreef"; // proceeds the username and is followed by the quoted text $lang['Quote'] = "Quote"; // comes before bbcode quote output. $lang['Code'] = "Code"; // comes before bbcode code output. --- 259,263 ---- $lang['Delete_post'] = "Verwijder dit bericht"; ! $lang['wrote'] = "schreef"; // proceeds the username and is followed by the quoted text $lang['Quote'] = "Quote"; // comes before bbcode quote output. $lang['Code'] = "Code"; // comes before bbcode code output. *************** *** 332,337 **** $lang['HTML_is_ON'] = "HTML is <u>AAN</u>"; $lang['HTML_is_OFF'] = "HTML is <u>UIT</u>"; ! $lang['BBCode_is_ON'] = "BBCode is <u>AAN</u>"; ! $lang['BBCode_is_OFF'] = "BBCode is <u>UIT</u>"; $lang['Smilies_are_ON'] = "Smilies staan <u>AAN</u>"; $lang['Smilies_are_OFF'] = "Smilies staan <u>UIT</u>"; --- 334,339 ---- $lang['HTML_is_ON'] = "HTML is <u>AAN</u>"; $lang['HTML_is_OFF'] = "HTML is <u>UIT</u>"; ! $lang['BBCode_is_ON'] = "%sBBCode%s is <u>AAN</u>"; // %s are replaced with URI pointing to FAQ ! $lang['BBCode_is_OFF'] = "%sBBCode%s is <u>UIT</u>"; $lang['Smilies_are_ON'] = "Smilies staan <u>AAN</u>"; $lang['Smilies_are_OFF'] = "Smilies staan <u>UIT</u>"; *************** *** 348,352 **** --- 350,396 ---- $lang['Topic_reply_notification'] = "Melding van het plaatsen van een reactie"; + $lang['bbcode_b_help'] = "Vette tekst: [b]tekst[/b] (alt+b)"; + $lang['bbcode_i_help'] = "Italic tekst: [i]tekst[/i] (alt+i)"; + $lang['bbcode_u_help'] = "Underline text: [u]tekst[/u] (alt+u)"; + $lang['bbcode_q_help'] = "Quote text: [quote]tekst[/quote] (alt+q)"; + $lang['bbcode_c_help'] = "Code display: [code]code[/code] (alt+c)"; + $lang['bbcode_l_help'] = "Lijst: [list]tekst[/list] (alt+l)"; + $lang['bbcode_o_help'] = "Geordende lijst: [list=]tekst[/list] (alt+o)"; + $lang['bbcode_p_help'] = "Afbeelding: [img]http://www.phpbb.nl/fotos/foto.jpg[/img] (alt+p)"; + $lang['bbcode_w_help'] = "Link: [url]http://www.phpbb.nl/[/url] or [url=http://www.phpbb.nl/]Dit is een link[/url] (alt+w)"; + $lang['bbcode_a_help'] = "Alle open BBcode tags sluiten"; + $lang['bbcode_s_help'] = "Letter kleur: [color=red]tekst[/color] Tip: Je kan ook dit gebruiken: =#FF0000"; + $lang['bbcode_f_help'] = "Letter grootte: [size=small]Kleine tekst[/size]"; + + $lang['Emoticons'] = "Emoticons"; + $lang['More_emoticons'] = "Meer Emoticons"; + + $lang['Font_color'] = "Letter kleur"; + $lang['color_default'] = "Standaard"; + $lang['color_dark_red'] = "Donkerrood"; + $lang['color_red'] = "Rood"; + $lang['color_orange'] = "Oranja"; + $lang['color_brown'] = "Bruin"; + $lang['color_yellow'] = "Geel"; + $lang['color_green'] = "Groen"; + $lang['color_olive'] = "Olijf"; + $lang['color_cyan'] = "Cyaan"; + $lang['color_blue'] = "Blauw"; + $lang['color_dark_blue'] = "Donkerblauw"; + $lang['color_indigo'] = "Indigo"; + $lang['color_violet'] = "Violet"; + $lang['color_white'] = "Wit"; + $lang['color_black'] = "Zwart"; + + $lang['Font_size'] = "Letter grootte"; + $lang['font_tiny'] = "Heel klein"; + $lang['font_small'] = "Klein"; + $lang['font_normal'] = "Normaal"; + $lang['font_large'] = "Groot"; + $lang['font_huge'] = "Erg groot"; + $lang['Close_Tags'] = "Sluit tags"; + $lang['Styles_tip'] = "Tip: BBcode kan je toepassen op geselecteerde tekst"; + // // Private Messaging *************** *** 398,403 **** $lang['Click_return_index'] = "Klik %shier%s om terug te keren naar de Hoofdpagina"; - $lang['Re'] = "Re"; // Re as in 'Response to' - $lang['Send_a_new_message'] = "Stuur een privé bericht"; $lang['Send_a_reply'] = "Beantwoord een privé bericht"; --- 442,445 ---- *************** *** 716,724 **** // These replace the %s in the above strings ! $lang['Anonymous_Users'] = "<b>Anonieme gebruikers</b>"; ! $lang['Registered_Users'] = "<b>geregistreerde gebruikers</b>"; ! $lang['Users_granted_access'] = "<b>Gebruikers met speciale toegangsrechten</b>"; ! $lang['Moderators'] = "<b>moderators</b>"; ! $lang['Administrators'] = "<b>Beheerders</b>"; $lang['Not_Moderator'] = "Je ben geen moderator van dit forum"; --- 758,766 ---- // These replace the %s in the above strings ! $lang['Auth_Anonymous_Users'] = "<b>Anonieme gebruikers</b>"; ! $lang['Auth_Registered_Users'] = "<b>geregistreerde gebruikers</b>"; ! $lang['Auth_Users_granted_access'] = "<b>Gebruikers met speciale toegangsrechten</b>"; ! $lang['Auth_Moderators'] = "<b>moderators</b>"; ! $lang['Auth_Administrators'] = "<b>Beheerders</b>"; $lang['Not_Moderator'] = "Je ben geen moderator van dit forum"; *************** *** 731,735 **** // Viewonline // !!! Overlap with Registered_users_total etc. ! $lang['Reg_users_online'] = "Er zijn %d geregistreerde en "; // There ae 5 Registered and // !!! no single user line? $lang['Hidden_users_online'] = "%d verborgen gebruikers online"; // 6 Hidden users online $lang['Guest_users_online'] = "Er zijn %d gasten online"; // There are 10 Guest users online --- 773,779 ---- // Viewonline // !!! Overlap with Registered_users_total etc. ! $lang['Reg_user_online'] = "Er is %d geregistreerde en "; // There is 1 Registered and ! $lang['Reg_users_online'] = "Er zijn %d geregistreerde en "; // There are 5 Registered and // ! $lang['Hidden_user_online'] = "%d verborgen gebruiker online"; // 1 Hidden user online $lang['Hidden_users_online'] = "%d verborgen gebruikers online"; // 6 Hidden users online $lang['Guest_users_online'] = "Er zijn %d gasten online"; // There are 10 Guest users online *************** *** 837,854 **** $lang['tz']['-12'] = "(GMT -12:00 uur) Eniwetok, Kwajalein"; $lang['tz']['-11'] = "(GMT -11:00 uur) Midway Island, Samoa"; ! $lang['tz']['10'] = "(GMT -10:00 uur) Hawaii"; $lang['tz']['-9'] = "(GMT -9:00 uur) Alaska"; ! $lang['tz']['-8'] = "(GMT -8:00 uur) Pacific Time (US & Canada)"; ! $lang['tz']['-7'] = "(GMT -7:00 uur) Mountain Time (US & Canada)"; $lang['tz']['-6'] = "(GMT -6:00 uur) Central Time (US & Canada), Mexico City"; $lang['tz']['-5'] = "(GMT -5:00 uur) Eastern Time (US & Canada), Bogota, Lima, Quito"; $lang['tz']['-4'] = "(GMT -4:00 uur) Atlantic Time (Canada), Caracas, La Paz"; $lang['tz']['-3.5'] = "(GMT -3:30 uur) Newfoundland"; ! $lang['tz']['-3'] = "(GMT -3:00 uur) Brazil, Buenos Aires, Georgetown, Falkland Is"; $lang['tz']['-2'] = "(GMT -2:00 uur) Mid-Atlantic, Ascension Is., St. Helena"; $lang['tz']['-1'] = "(GMT -1:00 uur) Azores, Cape Verde Islands"; $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia"; ! $lang['tz']['1'] = "(GMT +1:00 uur) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome"; ! $lang['tz']['2'] = "(GMT +2:00 uur) Kaliningrad, South Africa, Warsaw"; $lang['tz']['3'] = "(GMT +3:00 uur) Baghdad, Riyadh, Moscow, Nairobi"; $lang['tz']['3.5'] = "(GMT +3:30 uur) Tehran"; --- 881,898 ---- $lang['tz']['-12'] = "(GMT -12:00 uur) Eniwetok, Kwajalein"; $lang['tz']['-11'] = "(GMT -11:00 uur) Midway Island, Samoa"; ! $lang['tz']['-10'] = "(GMT -10:00 uur) Hawaii"; $lang['tz']['-9'] = "(GMT -9:00 uur) Alaska"; ! $lang['tz']['-8'] = "(GMT -8:00 uur) Pacific Time (US & Canada), Tijuana"; ! $lang['tz']['-7'] = "(GMT -7:00 uur) Mountain Time (US & Canada), Arizona"; $lang['tz']['-6'] = "(GMT -6:00 uur) Central Time (US & Canada), Mexico City"; $lang['tz']['-5'] = "(GMT -5:00 uur) Eastern Time (US & Canada), Bogota, Lima, Quito"; $lang['tz']['-4'] = "(GMT -4:00 uur) Atlantic Time (Canada), Caracas, La Paz"; $lang['tz']['-3.5'] = "(GMT -3:30 uur) Newfoundland"; ! $lang['tz']['-3'] = "(GMT -3:00 uur) Brassila, Buenos Aires, Georgetown, Falkland Is"; $lang['tz']['-2'] = "(GMT -2:00 uur) Mid-Atlantic, Ascension Is., St. Helena"; $lang['tz']['-1'] = "(GMT -1:00 uur) Azores, Cape Verde Islands"; $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia"; ! $lang['tz']['1'] = "(GMT +1:00 uur) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome"; ! $lang['tz']['2'] = "(GMT +2:00 uur) Cairo, Helsinki, Kaliningrad, South Africa, Warsaw"; $lang['tz']['3'] = "(GMT +3:00 uur) Baghdad, Riyadh, Moscow, Nairobi"; $lang['tz']['3.5'] = "(GMT +3:30 uur) Tehran"; *************** *** 857,866 **** $lang['tz']['5'] = "(GMT +5:00 uur) Ekaterinburg, Islamabad, Karachi, Tashkent"; $lang['tz']['5.5'] = "(GMT +5:30 uur) Bombay, Calcutta, Madras, New Delhi"; ! $lang['tz']['6'] = "(GMT +6:00 uur) Almaty, Colombo, Dhaka"; $lang['tz']['7'] = "(GMT +7:00 uur) Bangkok, Hanoi, Jakarta"; $lang['tz']['8'] = "(GMT +8:00 uur) Beijing, Hong Kong, Perth, Singapore, Taipei"; $lang['tz']['9'] = "(GMT +9:00 uur) Osaka, Sapporo, Seoul, Tokyo, Yakutsk"; $lang['tz']['9.5'] = "(GMT +9:30 uur) Adelaide, Darwin"; ! $lang['tz']['10'] = "(GMT +10:00 uur) Melbourne, Papua New Guinea, Sydney, Vladivostok"; $lang['tz']['11'] = "(GMT +11:00 uur) Magadan, New Caledonia, Solomon Islands"; $lang['tz']['12'] = "(GMT +12:00 uur) Auckland, Wellington, Fiji, Marshall Island"; --- 901,911 ---- $lang['tz']['5'] = "(GMT +5:00 uur) Ekaterinburg, Islamabad, Karachi, Tashkent"; $lang['tz']['5.5'] = "(GMT +5:30 uur) Bombay, Calcutta, Madras, New Delhi"; ! $lang['tz']['6'] = "(GMT +6:00 uur) Almaty, Colombo, Dhaka, Novosibirsk"; ! $lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon"; $lang['tz']['7'] = "(GMT +7:00 uur) Bangkok, Hanoi, Jakarta"; $lang['tz']['8'] = "(GMT +8:00 uur) Beijing, Hong Kong, Perth, Singapore, Taipei"; $lang['tz']['9'] = "(GMT +9:00 uur) Osaka, Sapporo, Seoul, Tokyo, Yakutsk"; $lang['tz']['9.5'] = "(GMT +9:30 uur) Adelaide, Darwin"; ! $lang['tz']['10'] = "(GMT +10:00 uur) Canberra, Guam, Melbourne, Sydney, Vladivostok"; $lang['tz']['11'] = "(GMT +11:00 uur) Magadan, New Caledonia, Solomon Islands"; $lang['tz']['12'] = "(GMT +12:00 uur) Auckland, Wellington, Fiji, Marshall Island"; |
|
From: Paul S. O. <ps...@us...> - 2001-12-18 20:39:29
|
Update of /cvsroot/phpbb/phpBB2/docs In directory usw-pr-cvs1:/tmp/cvs-serv8072/docs Added Files: README_RC-1_pre Log Message: No real reason to commit this, just trying this TortoiseCVS proggy under win2K --- NEW FILE --- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ phpBB 2.0 RC-1 (pre) release : 29th November 2001 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is the final release of phpBB 2.0 before a Release Candidate series (it is beyond beta but not quite RC!). This version uses a database schema (layout) that has now been frozen, in other words an install or upgrade using this release will be database compatible with all future releases of 2.0 (including the soon to follow RC-1). Running phpBB 2.0 RC-1 (pre) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The install system should be fully operational. Upgrading from previous (1.4.x) versions of phpBB is not yet complete. If you do use it PLEASE backup your current database first! We recommend only 'advanced' users utilise upgrade at this time in case of any problems (which may well require manual fixing of the database). PHP compatibility issues ~~~~~~~~~~~~~~~~~~~~~~~~ Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB 2.0 (the most recent stable release of PHP is 4.0.6). If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting. Status of this version ~~~~~~~~~~~~~~~~~~~~~~ This release is effectively feature frozen, no major additions will be made from this point on (only minor or as yet incomplete features will be added). Please do not post suggestions for additional features at this time. Fully functional features (bugs are noted below): * Fully featured Templating sytem (includes subSilver template) * Multi-lingual capable (English supplied by default) * Robust and secure posting system including previews, topic review, polls and fulltext search updating * Notification on topic replies (including people who have not participated in topic) * Usergroups (each user can belong to numerous groups) * Individial control of forum permissions for each user, each group and each major forum operation * Modular Administration system (with numerous configuration options) * Moderator Control Panel * One click installation process * Database abstraction layers for MySQL 3.x/4.x, MSSQL 7/2000, MS Access 2000/XP and Postgresql 7.x * User Profile and User settings including a range of avatar options, definable timezones, dates, etc. * Fully linked self-contained FAQ * Fulltext based (boolean capable) search system * Private Messaging (Inbox, Sentbox, Outbox, Savebox inc. box size limits) * Email from board Features yet to be frozen for release: * Language files (including FAQ) * Template variable names Incomplete features: * Upgrading from 1.4.x to 2.0 * Possible compatibility issues with PHP3 Known bugs ~~~~~~~~~~ Please note the following issues, if you find additional bugs please report them to our Sourceforge bug tracker page: http://sourceforge.net/tracker/index.php?group_id=7885 Please DO NOT post bug reports to our forums. If you do post a new bug (i.e. one that isn't already listed in the bug tracker) then please include details of your server type/version (Apache 1.2.22, IIS 4, Sambar, etc.), PHP version and DB type/version (eg. MySQL 3.23.32, PostgreSQL 7.1.2, etc.) and please select the right "Group" when submitting the bug (ie. 2.0 RC-1 (pre)). Once you have submitted a bug it would be helpful to us if you monitored it to enable us to ask you for feedback or to supply additional information (if required). Current Bug list: * Cannot post very large messages when using PostgreSQL 7.0.x (limitation of Postgresql 7.0.x) * Auto-login can fail to work properly under IIS (due to a known problem with IIS) * Search highlighting can break URIs in posts * Magic URIs occuring at end of posts can cause HTML display problems * Posts can suddenly appear marked read even though they have not yet been visited (last visit time issue) * Searching for your own posts displays only those posts/topics for which you were the last poster * User and Group permissions admin does not properly upgrade settings if you select multiple forums under PostgreSQL 7.x Copyright and disclaimer ~~~~~~~~~~~~~~~~~~~~~~~~ This application is opensource software released under the GPL. Please see source code and the Docs directory for more details. This package and its contents are Copyright © 2001 phpBB Group, All Rights Reserved. |
|
From: Bart v. B. <ba...@us...> - 2001-12-18 20:35:20
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6788
Modified Files:
posting.php privmsg.php
Log Message:
Moved generate_smilies() into includes/post.php, use smileypath in config table
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -r1.127 -r1.128
*** posting.php 2001/12/17 02:02:55 1.127
--- posting.php 2001/12/18 20:35:17 1.128
***************
*** 573,678 ****
}
- function generate_smilies($mode)
- {
- global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
- global $user_ip, $forum_id, $session_length;
- global $userdata;
-
- if( $mode == 'window' )
- {
- $userdata = session_pagestart($user_ip, $forum_id, $session_length);
- init_userprefs($userdata);
-
- $gen_simple_header = TRUE;
-
- $page_title = $lang['Review_topic'] ." - $topic_title";
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
- $template->set_filenames(array(
- "smiliesbody" => "posting_smilies.tpl")
- );
- }
-
- $sql = "SELECT emoticon, code, smile_url
- FROM " . SMILIES_TABLE . "
- ORDER BY smilies_id";
- if( $result = $db->sql_query($sql) )
- {
- if( $db->sql_numrows($result) )
- {
- $rowset = array();
- while( $row = $db->sql_fetchrow($result) )
- {
- if( empty($rowset[$row['smile_url']]) )
- {
- $rowset[$row['smile_url']]['code'] = $row['code'];
- $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
- }
- }
-
- $num_smilies = count($rowset);
-
- $smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
- $smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
-
- $s_colspan = 0;
- $row = 0;
- $col = 0;
-
- while( list($smile_url, $data) = @each($rowset) )
- {
- if( !$col )
- {
- $template->assign_block_vars("smilies_row", array());
- }
-
- $template->assign_block_vars("smilies_row.smilies_col", array(
- "SMILEY_CODE" => $data['code'],
- "SMILEY_IMG" => "images/smiles/" . $smile_url,
- "SMILEY_DESC" => $data['emoticon'])
- );
-
- $s_colspan = max($s_colspan, $col + 1);
-
- if( $col == $smilies_split_row )
- {
- if( $mode == 'inline' && $row == 4 )
- {
- break;
- }
- $col = 0;
- $row++;
- }
- else
- {
- $col++;
- }
- }
-
- if( $mode == 'inline' && $num_smilies > 20)
- {
- $template->assign_block_vars("switch_smilies_extra", array());
-
- $template->assign_vars(array(
- "L_MORE_SMILIES" => $lang['More_emoticons'],
- "U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
- );
- }
-
- $template->assign_vars(array(
- "L_EMOTICONS" => $lang['Emoticons'],
- "L_CLOSE_WINDOW" => $lang['Close_window'],
- "S_SMILIES_COLSPAN" => $s_colspan)
- );
- }
- }
-
- if( $mode == 'window' )
- {
- $template->pparse("smiliesbody");
-
- include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
- }
- }
//
// End page specific functions
--- 573,576 ----
***************
*** 2989,2991 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 2887,2889 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** privmsg.php 2001/12/17 02:02:55 1.65
--- privmsg.php 2001/12/18 20:35:17 1.66
***************
*** 35,152 ****
}
- // -----------------------
- // Page specific functions
- //
- // This isn't really specific since it's used in posting too,
- // however I'm too lazy to move them both to functions at the
- // moment. Of course in 2.2 all the posting routines should
- // be better 'integrated' so this won't be an issue
- //
- function generate_smilies($mode)
- {
- global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
- global $user_ip, $forum_id, $session_length;
- global $userdata;
-
- if( $mode == 'window' )
- {
- $userdata = session_pagestart($user_ip, $forum_id, $session_length);
- init_userprefs($userdata);
-
- $gen_simple_header = TRUE;
-
- $page_title = $lang['Review_topic'] ." - $topic_title";
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
- $template->set_filenames(array(
- "smiliesbody" => "posting_smilies.tpl")
- );
- }
-
- $sql = "SELECT emoticon, code, smile_url
- FROM " . SMILIES_TABLE . "
- ORDER BY smilies_id";
- if( $result = $db->sql_query($sql) )
- {
- if( $db->sql_numrows($result) )
- {
- $rowset = array();
- while( $row = $db->sql_fetchrow($result) )
- {
- if( empty($rowset[$row['smile_url']]) )
- {
- $rowset[$row['smile_url']]['code'] = $row['code'];
- $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
- }
- }
-
- $num_smilies = count($rowset);
-
- $smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
- $smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
-
- $s_colspan = 0;
- $row = 0;
- $col = 0;
-
- while( list($smile_url, $data) = @each($rowset) )
- {
- if( !$col )
- {
- $template->assign_block_vars("smilies_row", array());
- }
-
- $template->assign_block_vars("smilies_row.smilies_col", array(
- "SMILEY_CODE" => $data['code'],
- "SMILEY_IMG" => "images/smiles/" . $smile_url,
- "SMILEY_DESC" => $data['emoticon'])
- );
-
- $s_colspan = max($s_colspan, $col + 1);
-
- if( $col == $smilies_split_row )
- {
- if( $mode == 'inline' && $row == 4 )
- {
- break;
- }
- $col = 0;
- $row++;
- }
- else
- {
- $col++;
- }
- }
-
- if( $mode == 'inline' && $num_smilies > 20)
- {
- $template->assign_block_vars("switch_smilies_extra", array());
-
- $template->assign_vars(array(
- "L_MORE_SMILIES" => $lang['More_emoticons'],
- "U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
- );
- }
-
- $template->assign_vars(array(
- "L_EMOTICONS" => $lang['Emoticons'],
- "L_CLOSE_WINDOW" => $lang['Close_window'],
- "S_SMILIES_COLSPAN" => $s_colspan)
- );
- }
- }
-
- if( $mode == 'window' )
- {
- $template->pparse("smiliesbody");
-
- include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
- }
- }
- //
- // End page specific functions
- // ---------------------------
-
//
// Var definitions
--- 35,38 ----
|
|
From: Bart v. B. <ba...@us...> - 2001-12-18 20:35:20
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv6788/includes
Modified Files:
post.php
Log Message:
Moved generate_smilies() into includes/post.php, use smileypath in config table
Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** post.php 2001/11/26 14:07:33 1.10
--- post.php 2001/12/18 20:35:17 1.11
***************
*** 97,99 ****
}
! ?>
\ No newline at end of file
--- 97,206 ----
}
!
! //
! // Fill smiley templates (or just the variables) with smileys
! // Either in a window or inline
! //
! function generate_smilies($mode)
! {
! global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! global $user_ip, $forum_id, $session_length;
! global $userdata;
!
! if( $mode == 'window' )
! {
! $userdata = session_pagestart($user_ip, $forum_id, $session_length);
! init_userprefs($userdata);
!
! $gen_simple_header = TRUE;
!
! $page_title = $lang['Review_topic'] ." - $topic_title";
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
!
! $template->set_filenames(array(
! "smiliesbody" => "posting_smilies.tpl")
! );
! }
!
! $sql = "SELECT emoticon, code, smile_url
! FROM " . SMILIES_TABLE . "
! ORDER BY smilies_id";
! if( $result = $db->sql_query($sql) )
! {
! if( $db->sql_numrows($result) )
! {
! $rowset = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! if( empty($rowset[$row['smile_url']]) )
! {
! $rowset[$row['smile_url']]['code'] = $row['code'];
! $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
! }
! }
!
! $num_smilies = count($rowset);
!
! $smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
! $smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
!
! $s_colspan = 0;
! $row = 0;
! $col = 0;
!
! while( list($smile_url, $data) = @each($rowset) )
! {
! if( !$col )
! {
! $template->assign_block_vars("smilies_row", array());
! }
!
! $template->assign_block_vars("smilies_row.smilies_col", array(
! "SMILEY_CODE" => $data['code'],
! "SMILEY_IMG" => $board_config['smilies_path'] . "/" . $smile_url,
! "SMILEY_DESC" => $data['emoticon'])
! );
!
! $s_colspan = max($s_colspan, $col + 1);
!
! if( $col == $smilies_split_row )
! {
! if( $mode == 'inline' && $row == 4 )
! {
! break;
! }
! $col = 0;
! $row++;
! }
! else
! {
! $col++;
! }
! }
!
! if( $mode == 'inline' && $num_smilies > 20)
! {
! $template->assign_block_vars("switch_smilies_extra", array());
!
! $template->assign_vars(array(
! "L_MORE_SMILIES" => $lang['More_emoticons'],
! "U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
! );
! }
!
! $template->assign_vars(array(
! "L_EMOTICONS" => $lang['Emoticons'],
! "L_CLOSE_WINDOW" => $lang['Close_window'],
! "S_SMILIES_COLSPAN" => $s_colspan)
! );
! }
! }
!
! if( $mode == 'window' )
! {
! $template->pparse("smiliesbody");
!
! include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! }
! }
! ?>
|
|
From: Bart v. B. <ba...@us...> - 2001-12-18 20:25:27
|
Update of /cvsroot/phpbb/phpBB2/language/lang_dutch In directory usw-pr-cvs1:/tmp/cvs-serv4175 Modified Files: lang_main.php Log Message: Various updates Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/lang_main.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** lang_main.php 2001/12/15 02:19:04 1.4 --- lang_main.php 2001/12/18 20:25:23 1.5 *************** *** 103,112 **** $lang['Reply_with_quote'] = "Reageer met quote"; ! $lang['Click_return_topic'] = "Klik %sHier%s om terug te keren naar het onderwerp"; // %s's here are for uris, do not remove! ! $lang['Click_return_login'] = "Klik %sHier%s om het nogmaals te proberen"; ! $lang['Click_return_forum'] = "Klik %sHier%s om terug te keren naar de onderwerpenlijst"; $lang['Click_view_message'] = "klik %shier%s om je bericht te bekijken"; $lang['Click_return_modcp'] = "klik %shier%s om terug te keren naar het Moderator Control Panel"; ! $lang['Click_return_group'] = "Klik %sHier%s om terug te keren naar het groepen overzicht"; $lang['Admin_panel'] = "Ga naar Administratiepaneel"; --- 103,112 ---- $lang['Reply_with_quote'] = "Reageer met quote"; ! $lang['Click_return_topic'] = "Klik %shier%s om terug te keren naar het onderwerp"; // %s's here are for uris, do not remove! ! $lang['Click_return_login'] = "Klik %shier%s om het nogmaals te proberen"; ! $lang['Click_return_forum'] = "Klik %shier%s om terug te keren naar de onderwerpenlijst"; $lang['Click_view_message'] = "klik %shier%s om je bericht te bekijken"; $lang['Click_return_modcp'] = "klik %shier%s om terug te keren naar het Moderator Control Panel"; ! $lang['Click_return_group'] = "Klik %shier%s om terug te keren naar het groepen overzicht"; $lang['Admin_panel'] = "Ga naar Administratiepaneel"; *************** *** 129,133 **** $lang['You_last_visit'] = "Je laatste bezoek was op %s"; // %s replaced by date/time ! $lang['Search_new'] = "Nieuwe berichten sinds laatste bezoek"; $lang['Search_your_posts'] = "Bekijk je berichten"; $lang['Search_unanswered'] = "Bekijk onbeantwoorde berichten"; --- 129,133 ---- $lang['You_last_visit'] = "Je laatste bezoek was op %s"; // %s replaced by date/time ! $lang['Search_new'] = "Berichten sinds laatste bezoek"; $lang['Search_your_posts'] = "Bekijk je berichten"; $lang['Search_unanswered'] = "Bekijk onbeantwoorde berichten"; *************** *** 174,177 **** --- 174,178 ---- $lang['Log_me_in'] = "Log me automatisch in bij elk bezoek"; + $lang['Error_login'] = "Je hebt een foutieve of inactieve gebruikersnaam of een foutief wachtwoord opgegeven."; // *************** *** 538,541 **** --- 539,562 ---- $lang['COPPA'] = "Je account is aangemaakt maar moet goedkeuring krijgen, bekijk je Email voor meer details."; + $lang['Registration'] = "Registratie Voorwaarden"; + $lang['Reg_agreement'] = "While the administrators and moderators of this forum will attempt to remove or edit any generally + objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts + made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for + posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, + hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being + immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in + enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, + move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being + stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, + administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br + /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the + information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming + your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking + Register below you agree to be bound by these conditions."; + + $lang['Agree_under_13'] = "I stem toe met de voorwaarden en ben <b>jonger</b> dan 13 jaar"; + $lang['Agree_over_13'] = "I stem toe met de voorwaarden en ben <b>ouder</b> dan 13 jaar"; + $lang['Agree_not'] = "Ik ben het niet eens met de voorwaarden"; + $lang['Wrong_activation'] = "De activerings code is onjuist"; $lang['Send_password'] = "Stuur me een nieuw wachtwoord"; *************** *** 898,903 **** $lang['An_error_occured'] = "Er is een fout opgetreden"; $lang['A_critical_error'] = "Er is een fatale fout opgetreden"; - - $lang['Error_login'] = "Je hebt een foutieve of inactieve gebruikersnaam of een foutief wachtwoord opgegeven."; // --- 919,922 ---- |
|
From: Jonathan H. <the...@us...> - 2001-12-18 16:38:23
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv3675
Modified Files:
postgres_schema.sql
Log Message:
Modified to fix Bug # 494598
Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** postgres_schema.sql 2001/12/15 16:40:35 1.11
--- postgres_schema.sql 2001/12/18 16:38:18 1.12
***************
*** 331,337 ****
td_class2 varchar(25),
td_class3 varchar(25),
! fontface1 varchar(25),
! fontface2 varchar(25),
! fontface3 varchar(25),
fontsize1 int2,
fontsize2 int2,
--- 331,337 ----
td_class2 varchar(25),
td_class3 varchar(25),
! fontface1 varchar(50),
! fontface2 varchar(50),
! fontface3 varchar(50),
fontsize1 int2,
fontsize2 int2,
|
|
From: Paul S. O. <ps...@us...> - 2001-12-18 01:53:29
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv23197
Modified Files:
lang_bbcode.php lang_main.php
Log Message:
Tentative freeze(?)
Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_bbcode.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_bbcode.php 2001/12/17 00:30:36 1.2
--- lang_bbcode.php 2001/12/18 01:53:26 1.3
***************
*** 34,59 ****
// If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
//
$faq[] = array("--","Introduction");
! $faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML, whether you can use BBCode is determined by the administrator (you can also disable it on a per post basis from the posting form). BBCode itself is similar in style to HTML, tags are enclosed in square braces [ and ] rather than < and > and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.");
$faq[] = array("--","Text Formatting");
! $faq[] = array("How to create bold, italic and underlined text", "BBCode includes tags to enable you to change the basic look of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <b>[b][/b]</b>, eg. <br /><br /><b>[b]</b>Hello<b>[/b]</b><br /><br />will become <b>Hello</b></li><li>For underlining use <b>[u][/u]</b>, for example:<br /><br /><b>[u]</b>Good Morning<b>[/u]</b><br /><br />becomes <u>Good Morning</u></li><li>To italicise text use <b>[i][/i]</b>, eg.<br /><br />This is <b>[i]</b>Great!<b>[/i]</b><br /><br />would give This is <i>Great!</i></li></ul>");
! $faq[] = array("How to change the text colour or size", "To alter the text colour or size the following tags are used, keep in mind that how the output appears will depend on the persons browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <b>[color=][/color]</b>, you can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><b>[color=red]</b>Hello!<b>[/color]</b><br /><br />or<br /><br /><b>[color=#FF0000]</b>Hello!<b>[/color]</b><br /><br />will both output <span style=\"color:red\">Hello!</span></li><li>Changing the text size is achieved in a similar way using <b>[size=][/size]</b>. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it!) through to 29 (very large!). For example:<br /><br /><b>[size=9]</b>SMALL<b>[/size]</b><br /><br />will generally be <span style=\"font-size:9px\">SMALL</span><br /><br />whereas:<br /><br /><b>[size=24]</b>HUGE!<b>[/size]</b><br /><br />will be <span style=\"font-size:24px\">HUGE!</span></li></ul>");
$faq[] = array("Can I combine formatting tags?", "Yes, of course you can, for example to get someones attention you may write:<br /><br /><b>[size=18][color=red][b]</b>LOOK AT ME!<b>[/b][/color][/size]</b><br /><br />this would output <span style=\"color:red;font-size:18px\"><b>LOOK AT ME!</b></span><br /><br />We don't recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><b>[b][u]</b>This is wrong<b>[/b][/u]</b>");
$faq[] = array("--","Quoting and outputting fixed-width text");
! $faq[] = array("Quoting text in replies", "There are two ways you can quote someone elses text, with a reference or without. When you hit use the quote function of the board you should notice that the post you are responding too is automatically added to the text window enclosed in a <b>[quote=\"\"][/quote]</b> block. This method allows you to quote with a reference to a person, thing, whatever. For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><b>[quote=\"Mr. Blobby\"]</b>The text Mr. Blobby wrote would go here<b>[/quote]</b><br /><br />The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember to include the parenthesis \"\" around the name you are quoting! The second method allows you to blindly quote something, in this case just enclose the text in <b>[quote][/quote]</b>. The output generated will simply add, Quote: before the text itself.");
! $faq[] = array("Outputting code or fixed width data", "If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font then you should enclose the text in <b>[code][/code]</b>, eg.<br /><br /><b>[code]</b>echo \"This is some code\";<b>[/code]</b><br /><br /> All the formatting used within those tags will be retained.");
$faq[] = array("--","Generating lists");
! $faq[] = array("Creating an Un-ordered list", "BBCode supports two types of lists, unordered and ordered, they are essentially the same as their HTML equivalents. An unordered list just ouputs your text one by one with only a bullet character to separate them. To create an unordered list you use <b>[list][/list]</b> and define each item within the list using <b>[*]</b>. For example to list your favorite colours you could use something like:<br /><br /><b>[list]</b><br /><b>[*]</b>Red<br /><b>[*]</b>Blue<br /><b>[*]</b>Yellow<br /><b>[/list]</b><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>");
! $faq[] = array("Creating an Ordered list", "The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use <b>[list=1][/list]</b> or alternatively <b>[list=a][/list]</b> items are still specified using <b>[*]</b>. The first list will output a numbered list while the second will use letters of the alphabet. For example:<br /><br /><b>[list=1]</b><br /><b>[*]</b>Go to the shops<br /><b>[*]</b>Buy a new computer<br /><b>[*]</b>Swear at computer when it crashes<br /><b>[/list]</b><br /><br />will generate the following:<ol type=\"1\"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><b>[list=a]</b><br /><b>[*]</b>The first possible answer<br /><b>[*]</b>The second possible answer<br /><b>[*]</b>The third possible answer<br /><b>[/list]</b><br /><br />giving<ol type=\"a\"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>");
$faq[] = array("--", "Creating Links");
! $faq[] = array("Linking to another site", "phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs. The first of these uses the <b>[url=][/url]</b> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><b>[url=http://www.phpbb.com/]</b>Visit phpBB!<b>[/url]</b><br /><br />This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">Visit phpBB!</a> You will notice the link opens in a new window so the user can continue browsing the forums if they wish. If you want the URL itself displayed as the link you can do this simply using:<br /><br /><b>[url]</b>http://www.phpbb.com/<b>[/url]</b><br /><br />This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a>. Alternatively phpBB features something called <i>Magic Links</i>, this will turn any syntatically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a> being output when you view the message. The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><b>[email]</b>no...@do...<b>[/email]</b><br /><br />which will output <a href=\"emailto:no...@do...\">no...@do...</a> or you can just type no...@do... into your message and it will be automatically converted when you view. In addition you can wrap URLs around any of the other tags such as <b>[img][/img]</b> (see next entry), <b>[b][/b]</b>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/url][/img]</b><br /><br />is <u>not</u> correct which may lead to your post being deleted so take care.");
$faq[] = array("--", "Showing images in posts");
! $faq[] = array("Adding an image to a post", "phpBB BBCode includes a tag for including images in your posts. Two very important things to remember when using this tag are, many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot only exist on your computer for example, unless you run a webserver!) there is no present way of storing images locally with phpBB (both of these issues will be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with <b>[img][/img]</b> tags. For example:<br /><br /><b>[img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img]</b><br /><br />As noted in the URL section above you can wrap an image in a <b>[url][/url]</b> tag if you wish, eg.<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img][/url]</b><br /><br />would generate:<br /><br /><a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a><br />");
$faq[] = array("--", "Other matters");
--- 34,63 ----
// If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
//
+ // In addition please do not translate the colours referenced in relation to BBCode any section, if you do
+ // users browsing in your language may be confused to find they're BBCode doesn't work :D You can change
+ // references which are 'in-line' within the text though.
+ //
$faq[] = array("--","Introduction");
! $faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML. Whether you can actually use BBCode in your posts on the forum is determined by the administrator. In addition you can disable BBCode on a per post basis via the posting form. BBCode itself is similar in style to HTML, tags are enclosed in square braces [ and ] rather than < and > and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.");
$faq[] = array("--","Text Formatting");
! $faq[] = array("How to create bold, italic and underlined text", "BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <b>[b][/b]</b>, eg. <br /><br /><b>[b]</b>Hello<b>[/b]</b><br /><br />will become <b>Hello</b></li><li>For underlining use <b>[u][/u]</b>, for example:<br /><br /><b>[u]</b>Good Morning<b>[/u]</b><br /><br />becomes <u>Good Morning</u></li><li>To italicise text use <b>[i][/i]</b>, eg.<br /><br />This is <b>[i]</b>Great!<b>[/i]</b><br /><br />would give This is <i>Great!</i></li></ul>");
! $faq[] = array("How to change the text colour or size", "To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <b>[color=][/color]</b>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><b>[color=red]</b>Hello!<b>[/color]</b><br /><br />or<br /><br /><b>[color=#FF0000]</b>Hello!<b>[/color]</b><br /><br />will both output <span style=\"color:red\">Hello!</span></li><li>Changing the text size is achieved in a similar way using <b>[size=][/size]</b>. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it) through to 29 (very large). For example:<br /><br /><b>[size=9]</b>SMALL<b>[/size]</b><br /><br />will generally be <span style=\"font-size:9px\">SMALL</span><br /><br />whereas:<br /><br /><b>[size=24]</b>HUGE!<b>[/size]</b><br /><br />will be <span style=\"font-size:24px\">HUGE!</span></li></ul>");
$faq[] = array("Can I combine formatting tags?", "Yes, of course you can, for example to get someones attention you may write:<br /><br /><b>[size=18][color=red][b]</b>LOOK AT ME!<b>[/b][/color][/size]</b><br /><br />this would output <span style=\"color:red;font-size:18px\"><b>LOOK AT ME!</b></span><br /><br />We don't recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><b>[b][u]</b>This is wrong<b>[/b][/u]</b>");
$faq[] = array("--","Quoting and outputting fixed-width text");
! $faq[] = array("Quoting text in replies", "There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <b>[quote=\"\"][/quote]</b> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><b>[quote=\"Mr. Blobby\"]</b>The text Mr. Blobby wrote would go here<b>[/quote]</b><br /><br />The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember you <b>must</b> include the parenthesis \"\" around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <b>[quote][/quote]</b> tags. When you view the message it will simply show, Quote: before the text itself.</li></ul>");
! $faq[] = array("Outputting code or fixed width data", "If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font you should enclose the text in <b>[code][/code]</b> tags, eg.<br /><br /><b>[code]</b>echo \"This is some code\";<b>[/code]</b><br /><br />All formatting used within <b>[code][/code]</b> tags is retained when you later view it.");
$faq[] = array("--","Generating lists");
! $faq[] = array("Creating an Un-ordered list", "BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list ouputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <b>[list][/list]</b> and define each item within the list using <b>[*]</b>. For example to list your favorite colours you could use:<br /><br /><b>[list]</b><br /><b>[*]</b>Red<br /><b>[*]</b>Blue<br /><b>[*]</b>Yellow<br /><b>[/list]</b><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>");
! $faq[] = array("Creating an Ordered list", "The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use <b>[list=1][/list]</b> to create a numbered list or alternatively <b>[list=a][/list]</b> for an alphabetical list. As with the unordered list items are specified using <b>[*]</b>. For example:<br /><br /><b>[list=1]</b><br /><b>[*]</b>Go to the shops<br /><b>[*]</b>Buy a new computer<br /><b>[*]</b>Swear at computer when it crashes<br /><b>[/list]</b><br /><br />will generate the following:<ol type=\"1\"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><b>[list=a]</b><br /><b>[*]</b>The first possible answer<br /><b>[*]</b>The second possible answer<br /><b>[*]</b>The third possible answer<br /><b>[/list]</b><br /><br />giving<ol type=\"a\"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>");
$faq[] = array("--", "Creating Links");
! $faq[] = array("Linking to another site", "phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.<ul><li>The first of these uses the <b>[url=][/url]</b> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><b>[url=http://www.phpbb.com/]</b>Visit phpBB!<b>[/url]</b><br /><br />This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">Visit phpBB!</a> You will notice the link opens in a new window so the user can continue browsing the forums if they wish.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><b>[url]</b>http://www.phpbb.com/<b>[/url]</b><br /><br />This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a></li><li>Additionally phpBB features something called <i>Magic Links</i>, this will turn any syntatically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><b>[email]</b>no...@do...<b>[/email]</b><br /><br />which will output <a href=\"emailto:no...@do...\">no...@do...</a> or you can just type no...@do... into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <b>[img][/img]</b> (see next entry), <b>[b][/b]</b>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/url][/img]</b><br /><br />is <u>not</u> correct which may lead to your post being deleted so take care.");
$faq[] = array("--", "Showing images in posts");
! $faq[] = array("Adding an image to a post", "phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are; many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with <b>[img][/img]</b> tags. For example:<br /><br /><b>[img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img]</b><br /><br />As noted in the URL section above you can wrap an image in a <b>[url][/url]</b> tag if you wish, eg.<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img][/url]</b><br /><br />would generate:<br /><br /><a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a><br />");
$faq[] = array("--", "Other matters");
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** lang_main.php 2001/12/17 00:39:47 1.68
--- lang_main.php 2001/12/18 01:53:26 1.69
***************
*** 33,37 ****
//setlocale(LC_ALL, "en");
! $lang['ENCODING'] = "utf-8";
$lang['DIRECTION'] = "LTR";
$lang['LEFT'] = "LEFT";
--- 33,37 ----
//setlocale(LC_ALL, "en");
! $lang['ENCODING'] = "iso-8859-1";
$lang['DIRECTION'] = "LTR";
$lang['LEFT'] = "LEFT";
***************
*** 449,454 ****
$lang['Click_return_index'] = "Click %sHere%s to return to the Index";
- $lang['Re'] = "Re"; // Re as in 'Response to'
-
$lang['Send_a_new_message'] = "Send a new private message";
$lang['Send_a_reply'] = "Reply to a private message";
--- 449,452 ----
***************
*** 876,893 ****
$lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein";
$lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa";
! $lang['tz']['10'] = "(GMT -10:00 hours) Hawaii";
$lang['tz']['-9'] = "(GMT -9:00 hours) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US & Canada)";
! $lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US & Canada)";
$lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US & Canada), Mexico City";
$lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito";
$lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
$lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown, Falkland Is";
$lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena";
$lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands";
$lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw";
$lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
$lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
--- 874,891 ----
$lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein";
$lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa";
! $lang['tz']['-10'] = "(GMT -10:00 hours) Hawaii";
$lang['tz']['-9'] = "(GMT -9:00 hours) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US & Canada), Tijuana";
! $lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US & Canada), Arizona";
$lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US & Canada), Mexico City";
$lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito";
$lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
$lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 hours) Brassila, Buenos Aires, Georgetown, Falkland Is";
$lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena";
$lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands";
$lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 hours) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 hours) Cairo, Helsinki, Kaliningrad, South Africa, Warsaw";
$lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
$lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
***************
*** 896,905 ****
$lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
$lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka";
$lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
$lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
$lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
$lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok";
$lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
$lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";
--- 894,904 ----
$lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
$lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka, Novosibirsk";
! $lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon";
$lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
$lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
$lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
$lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 hours) Canberra, Guam, Melbourne, Sydney, Vladivostok";
$lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
$lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";
|
|
From: Paul S. O. <ps...@us...> - 2001-12-18 01:13:41
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv14394/db
Modified Files:
mssql-odbc.php msaccess.php
Log Message:
Updated classes, fixed slashing issue and maybe reduced overhead a little, perhaps
Index: mssql-odbc.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql-odbc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mssql-odbc.php 2001/11/30 23:15:53 1.2
--- mssql-odbc.php 2001/12/18 01:13:37 1.3
***************
*** 29,38 ****
var $db_connect_id;
! var $query_result;
! var $query_resultset;
! var $query_numrows;
var $next_id;
! var $row;
! var $row_index;
var $num_queries = 0;
--- 29,42 ----
var $db_connect_id;
! var $result;
!
var $next_id;
!
! var $num_rows;
! var $current_row;
! var $field_names;
! var $field_types;
! var $result_rowset;
!
var $num_queries = 0;
***************
*** 43,69 ****
{
$this->persistency = $persistency;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->dbname = $database;
! $this->server = $sqlserver;
!
! if($this->persistency)
! {
! $this->db_connect_id = odbc_pconnect($this->server, $this->user, $this->password);
! }
! else
! {
! $this->db_connect_id = odbc_connect($this->server, $this->user, $this->password);
! }
! if($this->db_connect_id)
! {
! return $this->db_connect_id;
! }
! else
! {
! return false;
! }
}
//
--- 47,58 ----
{
$this->persistency = $persistency;
+ $this->server = $sqlserver;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->dbname = $database;
! $this->db_connect_id = ($this->persistency) ? odbc_pconnect($this->server, $this->user, $this->password) : odbc_connect($this->server, $this->user, $this->password);
! return ( $this->db_connect_id ) ? $this->db_connect_id : false;
}
//
***************
*** 74,83 ****
if($this->db_connect_id)
{
! if($this->query_result)
{
! @odbc_free_result($this->query_result);
}
! $result = @odbc_close($this->db_connect_id);
! return $result;
}
else
--- 63,81 ----
if($this->db_connect_id)
{
! if( $this->in_transaction )
{
! @odbc_commit($this->db_connect_id);
}
!
! if( count($this->result_rowset) )
! {
! unset($this->result_rowset);
! unset($this->field_names);
! unset($this->field_types);
! unset($this->num_rows);
! unset($this->current_row);
! }
!
! return @odbc_close($this->db_connect_id);
}
else
***************
*** 87,91 ****
}
-
//
// Query method
--- 85,88 ----
***************
*** 93,195 ****
function sql_query($query = "", $transaction = FALSE)
{
! //
! // Remove any pre-existing queries
! //
! unset($this->query_result);
! unset($this->row);
! if($query != "")
{
$this->num_queries++;
! if(!eregi("^INSERT ",$query))
{
! if(eregi("LIMIT", $query))
{
! preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits);
!
! $query = $limits[1];
! if($limits[3])
! {
! $row_offset = $limits[2];
! $num_rows = $limits[3];
! }
! else
! {
! $row_offset = 0;
! $num_rows = $limits[2];
! }
! $this->query_result = odbc_exec($this->db_connect_id, $query);
! $query_limit_offset = $row_offset;
! $this->result_numrows[$this->query_result] = $num_rows;
! }
! else
{
! $this->query_result = odbc_exec($this->db_connect_id, $query);
! $row_offset = 0;
! $this->result_numrows[$this->query_result] = 5E6;
}
! $result_id = $this->query_result;
! if($this->query_result && eregi("^SELECT", $query))
! {
! for($i = 1; $i < odbc_num_fields($result_id)+1; $i++)
{
! $this->result_field_names[$result_id][] = odbc_field_name($result_id, $i);
}
! $i = $row_offset + 1;
! $k = 0;
! while(odbc_fetch_row($result_id, $i) && $k < $this->result_numrows[$result_id])
! {
! for($j = 1; $j < count($this->result_field_names[$result_id])+1; $j++)
{
! $this->result_rowset[$result_id][$k][$this->result_field_names[$result_id][$j-1]] = odbc_result($result_id, $j);
}
! $i++;
! $k++;
}
! $this->result_numrows[$result_id] = $k;
! $this->row_index[$result_id] = 0;
}
! else
{
! $this->result_numrows[$result_id] = @odbc_num_rows($result_id);
! $this->row_index[$result_id] = 0;
}
}
else
{
! if(eregi("^(INSERT|UPDATE) ", $query))
{
! $query = preg_replace("/\\\'/s", "''", $query);
}
! $this->query_result = odbc_exec($this->db_connect_id, $query);
! if($this->query_result)
{
! $sql_id = "SELECT @@IDENTITY";
!
! $id_result = odbc_exec($this->db_connect_id, $sql_id);
! if($id_result)
! {
! $row_result = odbc_fetch_row($id_result);
! if($row_result)
! {
! $this->next_id[$this->query_result] = odbc_result($id_result, 1);
! }
! }
}
! $this->query_limit_offset[$this->query_result] = 0;
! $this->result_numrows[$this->query_result] = 0;
}
! return $this->query_result;
}
else
--- 90,202 ----
function sql_query($query = "", $transaction = FALSE)
{
! if( $query != "" )
{
$this->num_queries++;
! if( $transaction == BEGIN_TRANSACTION )
{
! if( !odbc_autocommit($this->db_connect_id, false) )
{
! return false;
! }
! $this->in_transaction = TRUE;
! }
! if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) )
! {
! $query = $limits[1];
! if( !empty($limits[2]) )
{
! $row_offset = ( $limits[4] ) ? $limits[3] : "";
! $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3];
! $query = "TOP " . ( $row_offset + $num_rows ) . $query;
}
! $this->result = odbc_exec($this->db_connect_id, "SELECT $query");
! if( $this->result )
! {
! if( empty($this->field_names[$this->result]) )
{
! for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++)
! {
! $this->field_names[$this->result][] = odbc_field_name($this->result, $i);
! $this->field_types[$this->result][] = odbc_field_type($this->result, $i);
! }
}
! $this->current_row[$this->result] = 0;
! $this->result_rowset[$this->result] = array();
!
! $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1;
! $row_outer_max = ( isset($num_rows) ) ? $num_rows + 1 : 1E9;
! $row_inner = 0;
! while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max )
! {
! for($j = 0; $j < count($this->field_names[$this->result]); $j++)
{
! $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1));
}
!
! $row_outer++;
! $row_inner++;
}
! $this->num_rows[$this->result] = count($this->result_rowset[$this->result]);
}
!
! }
! else if( eregi("^INSERT ", $query) )
! {
! $this->result = odbc_exec($this->db_connect_id, str_replace("\'", "''", $query));
!
! if( $this->result )
{
! $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY");
! if( $result_id )
! {
! if( odbc_fetch_row($result_id) )
! {
! $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1);
! $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
! }
! }
}
}
else
{
! $this->result = odbc_exec($this->db_connect_id, str_replace("\'", "''", $query));
!
! if( $this->result )
{
! $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
}
! }
! if( !$this->result )
! {
! if( $this->in_transaction )
{
! odbc_rollback($this->db_connect_id);
! odbc_autocommit($this->db_connect_id, true);
! $this->in_transaction = FALSE;
}
! return false;
}
! if( $transaction == END_TRANSACTION && $this->in_transaction )
! {
! odbc_commit($this->db_connect_id);
! odbc_autocommit($this->db_connect_id, true);
! $this->in_transaction = FALSE;
! }
!
! odbc_free_result($this->result);
!
! return $this->result;
}
else
***************
*** 203,301 ****
//
function sql_numrows($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->query_result;
- }
- if($query_id)
- {
- return $this->result_numrows[$query_id];
- }
- else
- {
- return false;
- }
- }
- function sql_affectedrows($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
! {
! return $this->result_numrows[$query_id];
! }
! else
! {
! return false;
! }
}
function sql_numfields($query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
{
! $result = count($this->result_field_names[$query_id]);
! return $result;
! }
! else
! {
! return false;
}
}
function sql_fieldname($offset, $query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
{
! $result = $this->result_field_names[$query_id][$offset];
! return $result;
}
! else
! {
! return false;
! }
}
function sql_fieldtype($offset, $query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
! {
! $result = @odbc_field_type($query_id, $offset);
! return $result;
! }
! else
{
! return false;
}
}
function sql_fetchrow($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! if($this->row_index[$query_id] < $this->result_numrows[$query_id])
! {
! $result = $this->result_rowset[$query_id][$this->row_index[$query_id]];
! $this->row_index[$query_id]++;
! return $result;
! }
! else
! {
! return false;
! }
}
else
--- 210,262 ----
//
function sql_numrows($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! return ( $query_id ) ? $this->num_rows[$query_id] : false;
}
+
function sql_numfields($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
+
+ return ( $query_id ) ? count($this->field_names[$query_id]) : false;
}
+
function sql_fieldname($offset, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! return ( $query_id ) ? $this->field_names[$query_id][$offset] : false;
}
+
function sql_fieldtype($offset, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
+
+ return ( $query_id ) ? $this->field_types[$query_id][$offset] : false;
}
+
function sql_fetchrow($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! return ( $this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false;
}
else
***************
*** 304,317 ****
}
}
function sql_fetchrowset($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! $this->row_index[$query_id] = $this->result_numrows[$query_id];
! return $this->result_rowset[$query_id];
}
else
--- 265,279 ----
}
}
+
function sql_fetchrowset($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! return ( $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id] : false;
}
else
***************
*** 320,343 ****
}
}
function sql_fetchfield($field, $row = -1, $query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! if($row < $this->result_numrows[$query_id])
{
! if($row == -1)
! {
! $getrow = $this->row_index[$query_id]-1;
! }
! else
! {
! $getrow = $row;
! }
! return $this->result_rowset[$query_id][$getrow][$this->result_field_names[$query_id][$field]];
}
--- 282,300 ----
}
}
+
function sql_fetchfield($field, $row = -1, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! if( $row < $this->num_rows[$query_id] )
{
! $getrow = ( $row == -1 ) ? $this->current_row[$query_id] - 1 : $row;
! return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]];
}
***************
*** 352,364 ****
}
}
function sql_rowseek($offset, $query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! $this->row_index[$query_id] = 0;
return true;
}
--- 309,323 ----
}
}
+
function sql_rowseek($offset, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! $this->current_row[$query_id] = $offset - 1;
return true;
}
***************
*** 368,408 ****
}
}
! function sql_nextid($query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
! {
! return $this->next_id[$query_id];
! }
! else
! {
! return false;
! }
}
function sql_freeresult($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
! {
! $result = @odbc_free_result($query_id);
! return $result;
! }
! else
! {
! return false;
! }
}
! function sql_error($query_id = 0)
{
! // $result['code'] = @odbc_error($this->db_connect_id);
! // $result['message'] = @odbc_errormsg($this->db_connect_id);
! return "";
}
--- 327,363 ----
}
}
!
! function sql_nextid()
{
! return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false;
}
+
+ function sql_affectedrows()
+ {
+ return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false;
+ }
+
function sql_freeresult($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! unset($this->num_rows[$query_id]);
! unset($this->current_row[$query_id]);
! unset($this->result_rowset[$query_id]);
! unset($this->field_names[$query_id]);
! unset($this->field_types[$query_id]);
!
! return true;
}
!
! function sql_error()
{
! $error['code'] = odbc_error($this->db_connect_id);
! $error['message'] = odbc_errormsg($this->db_connect_id);
! return $error;
}
Index: msaccess.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/msaccess.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** msaccess.php 2001/11/20 22:27:29 1.1
--- msaccess.php 2001/12/18 01:13:37 1.2
***************
*** 29,38 ****
var $db_connect_id;
! var $query_result;
! var $query_resultset;
! var $query_numrows;
var $next_id;
! var $row;
! var $row_index;
var $num_queries = 0;
--- 29,43 ----
var $db_connect_id;
! var $result_ids;
! var $result;
!
var $next_id;
!
! var $num_rows;
! var $current_row;
! var $field_names;
! var $field_types;
! var $result_rowset;
!
var $num_queries = 0;
***************
*** 40,68 ****
// Constructor
//
! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = false)
{
$this->persistency = $persistency;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->dbname = $database;
- $this->server = $sqlserver;
! if($this->persistency)
! {
! $this->db_connect_id = odbc_pconnect($this->server, "", "");
! }
! else
! {
! $this->db_connect_id = odbc_connect($this->server, "", "");
! }
! if($this->db_connect_id)
! {
! return $this->db_connect_id;
! }
! else
! {
! return false;
! }
}
//
--- 45,59 ----
// Constructor
//
! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
{
$this->persistency = $persistency;
+ $this->server = $sqlserver;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->dbname = $database;
! $this->db_connect_id = ($this->persistency) ? odbc_pconnect($this->server, $this->user, $this->password) : odbc_connect($this->server, $this->user, $this->password);
! return ( $this->db_connect_id ) ? $this->db_connect_id : false;
}
//
***************
*** 73,82 ****
if($this->db_connect_id)
{
! if($this->query_result)
{
! @odbc_free_result($this->query_result);
}
! $result = @odbc_close($this->db_connect_id);
! return $result;
}
else
--- 64,82 ----
if($this->db_connect_id)
{
! if( $this->in_transaction )
! {
! @odbc_commit($this->db_connect_id);
! }
!
! if( count($this->result_rowset) )
{
! unset($this->result_rowset);
! unset($this->field_names);
! unset($this->field_types);
! unset($this->num_rows);
! unset($this->current_row);
}
!
! return @odbc_close($this->db_connect_id);
}
else
***************
*** 86,90 ****
}
-
//
// Query method
--- 86,89 ----
***************
*** 92,197 ****
function sql_query($query = "", $transaction = FALSE)
{
! //
! // Remove any pre-existing queries
! //
! unset($this->query_result);
! unset($this->row);
! if($query != "")
{
$this->num_queries++;
-
- $query = str_replace("LOWER(", "LCASE(", $query);
! if(!eregi("^INSERT ",$query))
{
! if(eregi("LIMIT", $query))
{
! preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits);
!
! $query = $limits[1];
! if($limits[3])
! {
! $row_offset = $limits[2];
! $num_rows = $limits[3];
! }
! else
! {
! $row_offset = 0;
! $num_rows = $limits[2];
! }
! $this->query_result = odbc_exec($this->db_connect_id, $query);
! $query_limit_offset = $row_offset;
! $this->result_numrows[$this->query_result] = $num_rows;
! }
! else
{
! $this->query_result = odbc_exec($this->db_connect_id, $query);
! $row_offset = 0;
! $this->result_numrows[$this->query_result] = 5E6;
}
! $result_id = $this->query_result;
! if($this->query_result && eregi("^SELECT", $query))
! {
! for($i = 1; $i < odbc_num_fields($result_id)+1; $i++)
{
! $this->result_field_names[$result_id][] = odbc_field_name($result_id, $i);
}
! $i = $row_offset + 1;
! $k = 0;
! while(odbc_fetch_row($result_id, $i) && $k < $this->result_numrows[$result_id])
! {
! for($j = 1; $j < count($this->result_field_names[$result_id])+1; $j++)
{
! $this->result_rowset[$result_id][$k][$this->result_field_names[$result_id][$j-1]] = odbc_result($result_id, $j);
}
! $i++;
! $k++;
}
! $this->result_numrows[$result_id] = $k;
! $this->row_index[$result_id] = 0;
}
! else
{
! $this->result_numrows[$result_id] = @odbc_num_rows($result_id);
! $this->row_index[$result_id] = 0;
}
}
else
{
! if(eregi("^(INSERT|UPDATE) ", $query))
{
! $query = preg_replace("/\\\'/s", "''", $query);
}
!
! $this->query_result = odbc_exec($this->db_connect_id, $query);
! if($this->query_result)
{
! $sql_id = "SELECT @@IDENTITY";
!
! $id_result = odbc_exec($this->db_connect_id, $sql_id);
! if($id_result)
! {
! $row_result = odbc_fetch_row($id_result);
! if($row_result)
! {
! $this->next_id[$this->query_result] = odbc_result($id_result, 1);
! }
! }
}
! $this->query_limit_offset[$this->query_result] = 0;
! $this->result_numrows[$this->query_result] = 0;
}
! return $this->query_result;
}
else
--- 91,203 ----
function sql_query($query = "", $transaction = FALSE)
{
! if( $query != "" )
{
$this->num_queries++;
! if( $transaction == BEGIN_TRANSACTION )
{
! if( !odbc_autocommit($this->db_connect_id, false) )
{
! return false;
! }
! $this->in_transaction = TRUE;
! }
! if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) )
! {
! $query = $limits[1];
! if( !empty($limits[2]) )
{
! $row_offset = ( $limits[4] ) ? $limits[3] : "";
! $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3];
! $query = "TOP " . ( $row_offset + $num_rows ) . $query;
}
! $this->result = odbc_exec($this->db_connect_id, "SELECT $query");
! if( $this->result )
! {
! if( empty($this->field_names[$this->result]) )
{
! for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++)
! {
! $this->field_names[$this->result][] = odbc_field_name($this->result, $i);
! $this->field_types[$this->result][] = odbc_field_type($this->result, $i);
! }
}
! $this->current_row[$this->result] = 0;
! $this->result_rowset[$this->result] = array();
!
! $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1;
! $row_outer_max = ( isset($num_rows) ) ? $num_rows + 1 : 1E9;
! $row_inner = 0;
! while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max )
! {
! for($j = 0; $j < count($this->field_names[$this->result]); $j++)
{
! $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1));
}
!
! $row_outer++;
! $row_inner++;
}
+
+ $this->num_rows[$this->result] = count($this->result_rowset[$this->result]);
! odbc_free_result($this->result);
}
!
! }
! else if( eregi("^INSERT ", $query) )
! {
! $this->result = odbc_exec($this->db_connect_id, str_replace("\'", "''", $query));
!
! if( $this->result )
{
! $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY");
! if( $result_id )
! {
! if( odbc_fetch_row($result_id) )
! {
! $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1);
! $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
! }
! }
}
}
else
{
! $this->result = odbc_exec($this->db_connect_id, str_replace("\'", "''", $query));
!
! if( $this->result )
{
! $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
}
! }
! if( !$this->result )
! {
! if( $this->in_transaction )
{
! odbc_rollback($this->db_connect_id);
! odbc_autocommit($this->db_connect_id, true);
! $this->in_transaction = FALSE;
}
! return false;
}
! if( $transaction == END_TRANSACTION && $this->in_transaction )
! {
! odbc_commit($this->db_connect_id);
! odbc_autocommit($this->db_connect_id, true);
! $this->in_transaction = FALSE;
! }
!
! return $this->result;
}
else
***************
*** 205,303 ****
//
function sql_numrows($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->query_result;
- }
- if($query_id)
- {
- return $this->result_numrows[$query_id];
- }
- else
- {
- return false;
- }
- }
- function sql_affectedrows($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
! {
! return $this->result_numrows[$query_id];
! }
! else
! {
! return false;
! }
}
function sql_numfields($query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
{
! $result = count($this->result_field_names[$query_id]);
! return $result;
! }
! else
! {
! return false;
}
}
function sql_fieldname($offset, $query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
{
! $result = $this->result_field_names[$query_id][$offset];
! return $result;
}
! else
! {
! return false;
! }
}
function sql_fieldtype($offset, $query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
! {
! $result = @odbc_field_type($query_id, $offset);
! return $result;
! }
! else
{
! return false;
}
}
function sql_fetchrow($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! if($this->row_index[$query_id] < $this->result_numrows[$query_id])
! {
! $result = $this->result_rowset[$query_id][$this->row_index[$query_id]];
! $this->row_index[$query_id]++;
! return $result;
! }
! else
! {
! return false;
! }
}
else
--- 211,263 ----
//
function sql_numrows($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! return ( $query_id ) ? $this->num_rows[$query_id] : false;
}
+
function sql_numfields($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
+
+ return ( $query_id ) ? count($this->field_names[$query_id]) : false;
}
+
function sql_fieldname($offset, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! return ( $query_id ) ? $this->field_names[$query_id][$offset] : false;
}
+
function sql_fieldtype($offset, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
+
+ return ( $query_id ) ? $this->field_types[$query_id][$offset] : false;
}
+
function sql_fetchrow($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! return ( $this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false;
}
else
***************
*** 306,319 ****
}
}
function sql_fetchrowset($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! $this->row_index[$query_id] = $this->result_numrows[$query_id];
! return $this->result_rowset[$query_id];
}
else
--- 266,280 ----
}
}
+
function sql_fetchrowset($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! return ( $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id] : false;
}
else
***************
*** 322,346 ****
}
}
function sql_fetchfield($field, $row = -1, $query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! if($row < $this->result_numrows[$query_id])
{
! if($row == -1)
! {
! $getrow = $this->row_index[$query_id]-1;
! }
! else
! {
! $getrow = $row;
! }
!
! return $this->result_rowset[$query_id][$getrow][$this->result_field_names[$query_id][$field]];
}
else
--- 283,301 ----
}
}
+
function sql_fetchfield($field, $row = -1, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! if( $row < $this->num_rows[$query_id] )
{
! $getrow = ($row == -1) ? $this->current_row[$query_id] - 1 : $row;
+ return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]];
}
else
***************
*** 354,366 ****
}
}
function sql_rowseek($offset, $query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
{
! $this->row_index[$query_id] = 0;
return true;
}
--- 309,323 ----
}
}
+
function sql_rowseek($offset, $query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! if( $query_id )
{
! $this->current_row[$query_id] = $offset - 1;
return true;
}
***************
*** 370,410 ****
}
}
! function sql_nextid($query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
! {
! return $this->next_id[$query_id];
! }
! else
! {
! return false;
! }
}
function sql_freeresult($query_id = 0)
{
! if(!$query_id)
{
! $query_id = $this->query_result;
}
! if($query_id)
! {
! $result = @odbc_free_result($query_id);
! return $result;
! }
! else
! {
! return false;
! }
}
function sql_error($query_id = 0)
{
! // $result['code'] = @odbc_error($this->db_connect_id);
! // $result['message'] = @odbc_errormsg($this->db_connect_id);
! return "";
}
--- 327,363 ----
}
}
!
! function sql_nextid()
{
! return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false;
}
+
+ function sql_affectedrows()
+ {
+ return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false;
+ }
+
function sql_freeresult($query_id = 0)
{
! if( !$query_id )
{
! $query_id = $this->result;
}
!
! unset($this->num_rows[$query_id]);
! unset($this->current_row[$query_id]);
! unset($this->result_rowset[$query_id]);
! unset($this->field_names[$query_id]);
! unset($this->field_types[$query_id]);
!
! return true;
}
+
function sql_error($query_id = 0)
{
! $error['code'] = odbc_error($this->db_connect_id);
! $error['message'] = odbc_errormsg($this->db_connect_id);
! return $error;
}
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 16:51:40
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv1240/templates/subSilver
Modified Files:
groupcp_info_body.tpl
Log Message:
Was this commited? I was convinced it was after checking the dev board ...
Index: groupcp_info_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/groupcp_info_body.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** groupcp_info_body.tpl 2001/11/18 14:01:35 1.7
--- groupcp_info_body.tpl 2001/12/17 16:51:36 1.8
***************
*** 112,119 ****
<td align="left" valign="top">
<!-- BEGIN switch_mod_option -->
! <span class="genmed"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="add" value="{L_ADD_MEMBER}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span>
<!-- END switch_mod_option -->
! </td>
! <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
--- 112,119 ----
<td align="left" valign="top">
<!-- BEGIN switch_mod_option -->
! <span class="genmed"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="add" value="{L_ADD_MEMBER}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span><br /><br />
<!-- END switch_mod_option -->
! <span class="nav">{PAGE_NUMBER}</span></td>
! <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
</tr>
</table>
|
|
From: James A. <th...@us...> - 2001-12-17 10:52:06
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv31995 Modified Files: lang_admin.php Log Message: Fixed bug #488927 Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** lang_admin.php 2001/12/17 10:03:33 1.22 --- lang_admin.php 2001/12/17 10:52:03 1.23 *************** *** 540,544 **** $lang['Disallowed_deleted'] = "The disallowed username has been successfully removed"; $lang['Disallow_successful'] = "The disallowed username has ben successfully added"; ! $lang['Disallowed_already'] = "The name you entered could not be disallowed. It either already exists in the list or a matching username is present"; $lang['Click_return_disallowadmin'] = "Click %sHere%s to return to Disallow Username Administration"; --- 540,544 ---- $lang['Disallowed_deleted'] = "The disallowed username has been successfully removed"; $lang['Disallow_successful'] = "The disallowed username has ben successfully added"; ! $lang['Disallowed_already'] = "The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present"; $lang['Click_return_disallowadmin'] = "Click %sHere%s to return to Disallow Username Administration"; |
|
From: James A. <th...@us...> - 2001-12-17 10:40:26
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29969/admin
Modified Files:
admin_forum_prune.php
Log Message:
Fixed bug #488093
Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_forum_prune.php 2001/12/07 17:07:39 1.12
--- admin_forum_prune.php 2001/12/17 10:40:23 1.13
***************
*** 98,112 ****
$i = 0;
! @reset($forum_rows);
while(list(, $forum_data) = each ($forum_rows))
{
$p_result = prune($forum_data['forum_id'], $prunedate);
sync("forum", $forum_data['forum_id']);
!
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
$i++;
!
$template->assign_block_vars("prune_results", array(
"ROW_COLOR" => "#" . $row_color,
--- 98,113 ----
$i = 0;
!
! reset($forum_rows);
while(list(, $forum_data) = each ($forum_rows))
{
$p_result = prune($forum_data['forum_id'], $prunedate);
sync("forum", $forum_data['forum_id']);
!
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
!
$i++;
!
$template->assign_block_vars("prune_results", array(
"ROW_COLOR" => "#" . $row_color,
***************
*** 118,121 ****
--- 119,123 ----
}
+
$template->assign_vars(array(
"L_FORUM" => $lang['Forum'],
***************
*** 163,167 ****
else
{
! $forum_id = intval($HTTP_POST_VARS[POST_FORUM_URL]);
//
--- 165,170 ----
else
{
! $forum_id = $HTTP_POST_VARS[POST_FORUM_URL];
!
//
|
|
From: James A. <th...@us...> - 2001-12-17 10:03:37
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv23609/language/lang_english Modified Files: lang_admin.php Log Message: Fixed bug #492183, added checking on theme name when creating new theme. Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** lang_admin.php 2001/12/17 00:39:47 1.21 --- lang_admin.php 2001/12/17 10:03:33 1.22 *************** *** 580,583 **** --- 580,584 ---- $lang['No_template_dir'] = "Could not open the template directory. It may be unreadable by the webserver or may not exist"; $lang['Cannot_remove_style'] = "You cannot remove the style selected since it is currently the forum default. Please change the default style and try again."; + $lang['Style_exists'] = "The style name to selected already exists, please go back and choose a different name."; $lang['Click_return_styleadmin'] = "Click %sHere%s to return to Style Administration"; |
|
From: James A. <th...@us...> - 2001-12-17 10:03:37
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23609/admin
Modified Files:
admin_styles.php
Log Message:
Fixed bug #492183, added checking on theme name when creating new theme.
Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** admin_styles.php 2001/12/16 02:45:06 1.11
--- admin_styles.php 2001/12/17 10:03:33 1.12
***************
*** 70,73 ****
--- 70,74 ----
if( isset($install_to) )
{
+
include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
***************
*** 375,378 ****
--- 376,394 ----
else
{
+ //
+ // First, check if we already have a style by this name
+ //
+ $sql = "SELECT themes_id FROM " . THEMES_TABLE . " WHERE style_name = '" . $updated['style_name'] . "'";
+
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Could not query themes table", "Error", __LINE__, __FILE__, $sql);
+ }
+
+ if($db->sql_numrows($result))
+ {
+ message_die(GENERAL_ERROR, $lang['Style_exists'], $lang['Error']);
+ }
+
while(list($key, $val) = each($updated))
{
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 03:15:12
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv20270
Modified Files:
viewtopic.php
Log Message:
Another lastvisit name change missed
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -r1.153 -r1.154
*** viewtopic.php 2001/12/16 13:41:37 1.153
--- viewtopic.php 2001/12/17 03:15:09 1.154
***************
*** 194,198 ****
$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
! if(!$is_auth['auth_view'] || !$is_auth['auth_read'])
{
//
--- 194,198 ----
$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
! if( !$is_auth['auth_view'] || !$is_auth['auth_read'] )
{
//
***************
*** 773,777 ****
// Define the little post icon
//
! if( $postrow[$i]['post_time'] > $userdata['session_last_visit'] && $postrow[$i]['post_time'] > $topic_last_read )
{
$mini_post_img = '<img src="' . $images['icon_minipost_new'] . '" alt="' . $lang['New_post'] . '" title="' . $lang['New_post'] . '" border="0" />';
--- 773,777 ----
// Define the little post icon
//
! if( $userdata['session_logged_in'] && $postrow[$i]['post_time'] > $userdata['user_lastvisit'] && $postrow[$i]['post_time'] > $topic_last_read )
{
$mini_post_img = '<img src="' . $images['icon_minipost_new'] . '" alt="' . $lang['New_post'] . '" title="' . $lang['New_post'] . '" border="0" />';
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 02:02:58
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6846
Modified Files:
privmsg.php posting.php
Log Message:
Stupid horrible group by clauses
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** privmsg.php 2001/12/16 18:29:20 1.64
--- privmsg.php 2001/12/17 02:02:55 1.65
***************
*** 64,84 ****
}
! $sql = "SELECT *
FROM " . SMILIES_TABLE . "
- GROUP BY emoticon
ORDER BY smilies_id";
if( $result = $db->sql_query($sql) )
{
! if( $num_smilies = $db->sql_numrows($result) )
{
! $rowset = $db->sql_fetchrowset($result);
! $j = 0;
! $s_colspan = 0;
! $smilies_count = ( $mode == 'inline' ) ? min(20, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
! for($i = 0; $i < $smilies_count; $i++)
{
! if( !$j )
{
$template->assign_block_vars("smilies_row", array());
--- 64,96 ----
}
! $sql = "SELECT emoticon, code, smile_url
FROM " . SMILIES_TABLE . "
ORDER BY smilies_id";
if( $result = $db->sql_query($sql) )
{
! if( $db->sql_numrows($result) )
{
! $rowset = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! if( empty($rowset[$row['smile_url']]) )
! {
! $rowset[$row['smile_url']]['code'] = $row['code'];
! $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
! }
! }
! $num_smilies = count($rowset);
!
! $smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
!
! $s_colspan = 0;
! $row = 0;
! $col = 0;
!
! while( list($smile_url, $data) = @each($rowset) )
{
! if( !$col )
{
$template->assign_block_vars("smilies_row", array());
***************
*** 86,97 ****
$template->assign_block_vars("smilies_row.smilies_col", array(
! "SMILEY_CODE" => $rowset[$i]['code'],
! "SMILEY_IMG" => "images/smiles/" . $rowset[$i]['smile_url'],
! "SMILEY_DESC" => $rowset[$i]['emoticon'])
);
! $s_colspan = max($s_colspan, $j + 1);
! $j = ( $j == $smilies_split_row ) ? 0 : $j + 1;
}
--- 98,121 ----
$template->assign_block_vars("smilies_row.smilies_col", array(
! "SMILEY_CODE" => $data['code'],
! "SMILEY_IMG" => "images/smiles/" . $smile_url,
! "SMILEY_DESC" => $data['emoticon'])
);
! $s_colspan = max($s_colspan, $col + 1);
! if( $col == $smilies_split_row )
! {
! if( $mode == 'inline' && $row == 4 )
! {
! break;
! }
! $col = 0;
! $row++;
! }
! else
! {
! $col++;
! }
}
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -r1.126 -r1.127
*** posting.php 2001/12/16 18:13:33 1.126
--- posting.php 2001/12/17 02:02:55 1.127
***************
*** 594,614 ****
}
! $sql = "SELECT *
FROM " . SMILIES_TABLE . "
- GROUP BY emoticon
ORDER BY smilies_id";
if( $result = $db->sql_query($sql) )
{
! if( $num_smilies = $db->sql_numrows($result) )
{
! $rowset = $db->sql_fetchrowset($result);
! $j = 0;
! $s_colspan = 0;
! $smilies_count = ( $mode == 'inline' ) ? min(20, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
! for($i = 0; $i < $smilies_count; $i++)
{
! if( !$j )
{
$template->assign_block_vars("smilies_row", array());
--- 594,626 ----
}
! $sql = "SELECT emoticon, code, smile_url
FROM " . SMILIES_TABLE . "
ORDER BY smilies_id";
if( $result = $db->sql_query($sql) )
{
! if( $db->sql_numrows($result) )
{
! $rowset = array();
! while( $row = $db->sql_fetchrow($result) )
! {
! if( empty($rowset[$row['smile_url']]) )
! {
! $rowset[$row['smile_url']]['code'] = $row['code'];
! $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
! }
! }
! $num_smilies = count($rowset);
!
! $smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
!
! $s_colspan = 0;
! $row = 0;
! $col = 0;
!
! while( list($smile_url, $data) = @each($rowset) )
{
! if( !$col )
{
$template->assign_block_vars("smilies_row", array());
***************
*** 616,627 ****
$template->assign_block_vars("smilies_row.smilies_col", array(
! "SMILEY_CODE" => $rowset[$i]['code'],
! "SMILEY_IMG" => "images/smiles/" . $rowset[$i]['smile_url'],
! "SMILEY_DESC" => $rowset[$i]['emoticon'])
);
! $s_colspan = max($s_colspan, $j + 1);
! $j = ( $j == $smilies_split_row ) ? 0 : $j + 1;
}
--- 628,651 ----
$template->assign_block_vars("smilies_row.smilies_col", array(
! "SMILEY_CODE" => $data['code'],
! "SMILEY_IMG" => "images/smiles/" . $smile_url,
! "SMILEY_DESC" => $data['emoticon'])
);
! $s_colspan = max($s_colspan, $col + 1);
! if( $col == $smilies_split_row )
! {
! if( $mode == 'inline' && $row == 4 )
! {
! break;
! }
! $col = 0;
! $row++;
! }
! else
! {
! $col++;
! }
}
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 00:46:57
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv24809/includes
Modified Files:
functions.php
Log Message:
Oops, another file I forgot to commit, perhaps I should commit myself ...
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** functions.php 2001/12/16 01:27:16 1.94
--- functions.php 2001/12/17 00:46:54 1.95
***************
*** 834,846 ****
static $smilies;
! if(empty($smilies))
{
$sql = "SELECT code, smile_url
FROM " . SMILIES_TABLE;
! if($result = $db->sql_query($sql))
{
! $smilies = $db->sql_fetchrowset($result);
}
}
usort($smilies, 'smiley_sort');
for($i = 0; $i < count($smilies); $i++)
--- 834,854 ----
static $smilies;
! if( empty($smilies) )
{
$sql = "SELECT code, smile_url
FROM " . SMILIES_TABLE;
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
}
+
+ if( !$db->sql_numrows($result) )
+ {
+ return $message;
+ }
+
+ $smilies = $db->sql_fetchrowset($result);
}
+
usort($smilies, 'smiley_sort');
for($i = 0; $i < count($smilies); $i++)
***************
*** 850,867 ****
}
! if($i > 0)
{
$message = preg_replace($orig, $repl, ' ' . $message . ' ');
$message = substr($message, 1, -1);
}
! return($message);
}
function smiley_sort($a, $b)
{
! if (strlen($a['code']) == strlen($b['code']))
{
return 0;
}
! return (strlen($a['code']) > strlen($b['code'])) ? -1 : 1;
}
--- 858,877 ----
}
! if( $i > 0 )
{
$message = preg_replace($orig, $repl, ' ' . $message . ' ');
$message = substr($message, 1, -1);
}
!
! return $message;
}
function smiley_sort($a, $b)
{
! if ( strlen($a['code']) == strlen($b['code']) )
{
return 0;
}
!
! return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1;
}
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 00:39:50
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23638/templates/subSilver/admin
Modified Files:
board_config_body.tpl
Log Message:
Various remaining language fixes for viewonline and board configuration admin
Index: board_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/board_config_body.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** board_config_body.tpl 2001/11/19 20:30:52 1.9
--- board_config_body.tpl 2001/12/17 00:39:47 1.10
***************
*** 22,26 ****
<tr>
<td class="row1">{L_ACCT_ACTIVATION}</td>
! <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED} />{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED} />User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED} />Admin</td>
</tr>
<tr>
--- 22,26 ----
<tr>
<td class="row1">{L_ACCT_ACTIVATION}</td>
! <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED} />{L_NONE} <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED} />{L_USER} <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED} />{L_ADMIN}</td>
</tr>
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 00:39:50
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv23638/language/lang_english Modified Files: lang_main.php lang_admin.php Log Message: Various remaining language fixes for viewonline and board configuration admin Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -r1.67 -r1.68 *** lang_main.php 2001/12/16 18:53:44 1.67 --- lang_main.php 2001/12/17 00:39:47 1.68 *************** *** 143,146 **** --- 143,147 ---- $lang['Memberlist'] = "Memberlist"; $lang['FAQ'] = "FAQ"; + $lang['BBCode_guide'] = "BBCode Guide"; $lang['Usergroups'] = "Usergroups"; $lang['Last_Post'] = "Last Post"; *************** *** 766,770 **** // Viewonline // ! $lang['Reg_users_online'] = "There are %d Registered and "; // There ae 5 Registered and $lang['Hidden_users_online'] = "%d Hidden users online"; // 6 Hidden users online $lang['Guest_users_online'] = "There are %d Guest users online"; // There are 10 Guest users online --- 767,773 ---- // Viewonline // ! $lang['Reg_user_online'] = "There is %d Registered user and "; // There ae 5 Registered and ! $lang['Reg_users_online'] = "There are %d Registered users and "; // There ae 5 Registered and ! $lang['Hidden_user_online'] = "%d Hidden user online"; // 6 Hidden users online $lang['Hidden_users_online'] = "%d Hidden users online"; // 6 Hidden users online $lang['Guest_users_online'] = "There are %d Guest users online"; // There are 10 Guest users online Index: lang_admin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** lang_admin.php 2001/12/16 02:38:45 1.20 --- lang_admin.php 2001/12/17 00:39:47 1.21 *************** *** 235,238 **** --- 235,241 ---- $lang['Board_disable_explain'] = "This will make the board unavailable to users. Do not logout when you disable the board, you will not be able to log back in!"; $lang['Acct_activation'] = "Enable account activation"; + $lang['Acc_None'] = "None"; // These three entries are the type of activation + $lang['Acc_User'] = "User"; + $lang['Acc_Admin'] = "Admin"; $lang['Abilities_settings'] = "User and Forum Basic Settings"; |
|
From: Paul S. O. <ps...@us...> - 2001-12-17 00:39:50
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv23638
Modified Files:
viewonline.php
Log Message:
Various remaining language fixes for viewonline and board configuration admin
Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** viewonline.php 2001/12/14 02:41:00 1.39
--- viewonline.php 2001/12/17 00:39:47 1.40
***************
*** 84,88 ****
AND u.user_id <> " . ANONYMOUS . "
AND u.user_session_time >= " . ( time() - 300 ) . "
! ORDER BY s.session_time DESC";
if(!$result = $db->sql_query($sql))
{
--- 84,88 ----
AND u.user_id <> " . ANONYMOUS . "
AND u.user_session_time >= " . ( time() - 300 ) . "
! ORDER BY u.user_session_time DESC";
if(!$result = $db->sql_query($sql))
{
***************
*** 232,237 ****
}
$template->assign_vars(array(
! "TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], $registered_users) . sprintf($lang['Hidden_users_online'], $hidden_users))
);
--- 232,240 ----
}
+ $l_r_user_s = ( $registered_users == 1 ) ? $lang['Reg_user_online'] : $lang['Reg_users_online'];
+ $l_h_user_s = ( $hidden_users == 1 ) ? $lang['Hidden_user_online'] : $lang['Hidden_users_online'];
+
$template->assign_vars(array(
! "TOTAL_REGISTERED_USERS_ONLINE" => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users))
);
***************
*** 240,244 ****
{
$template->assign_vars(array(
! "TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], 0, 0),
"L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing'])
);
--- 243,247 ----
{
$template->assign_vars(array(
! "TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], 0),
"L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing'])
);
|
|
From: Paul S. O. <ps...@us...> - 2001-12-17 00:39:49
|
Update of /cvsroot/phpbb/phpBB2/admin In directory usw-pr-cvs1:/tmp/cvs-serv23638/admin Modified Files: admin_board.php Log Message: Various remaining language fixes for viewonline and board configuration admin Index: admin_board.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** admin_board.php 2001/11/19 20:30:52 1.36 --- admin_board.php 2001/12/17 00:39:47 1.37 *************** *** 137,140 **** --- 137,143 ---- "L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'], "L_ACCT_ACTIVATION" => $lang['Acct_activation'], + "L_NONE" => $lang['Acc_None'], + "L_USER" => $lang['Acc_User'], + "L_ADMIN" => $lang['Acc_Admin'], "L_COOKIE_SETTINGS" => $lang['Cookie_settings'], "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], |
|
From: Paul S. O. <ps...@us...> - 2001-12-17 00:30:39
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv22354/language/lang_english
Modified Files:
lang_bbcode.php
Log Message:
oops, change title name, etc.
Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_bbcode.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_bbcode.php 2001/12/17 00:24:05 1.1
--- lang_bbcode.php 2001/12/17 00:30:36 1.2
***************
*** 1,5 ****
<?php
/***************************************************************************
! * lang_faq.php [english]
* -------------------
* begin : Wednesday Oct 3, 2001
--- 1,5 ----
<?php
/***************************************************************************
! * lang_bbcode.php [english]
* -------------------
* begin : Wednesday Oct 3, 2001
***************
*** 22,26 ****
//
! // 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");
--- 22,26 ----
//
! // To add an entry to your BBCode guide 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");
***************
*** 28,36 ****
//
// 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("--","Introduction");
--- 28,37 ----
//
// DO NOT forget the ; at the end of the line.
! // Do NOT put double quotes (") in your BBCode guide entries, if you absolutely must then escape them ie. \"something\"
//
! // The BBCode guide items will appear on the BBCode guide page in the same order they are listed in this file
//
! // If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
! //
$faq[] = array("--","Introduction");
***************
*** 60,64 ****
//
! // This ends the FAQ entries
//
--- 61,65 ----
//
! // This ends the BBCode guide entries
//
|
7 messages has been excluded from this view by a project administrator.
