Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Paul S. O. <ps...@us...> - 2002-01-03 16:04:21
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv2584/includes Modified Files: functions.php Log Message: Removed windows carriage returns and newline at end of file ... Index: functions.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -r1.102 -r1.103 *** functions.php 2002/01/03 15:12:10 1.102 --- functions.php 2002/01/03 16:04:18 1.103 *************** *** 1,1205 **** ! <?php ! /*************************************************************************** ! * functions.php ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * [...2382 lines suppressed...] ! // ! // this does exactly what preg_quote() does in PHP 4-ish: ! // http://www.php.net/manual/en/function.preg-quote.php ! // ! // This function is here because the 2nd paramter to preg_quote was added in some ! // version of php 4.0.x.. So we use this in order to maintain compatibility with ! // earlier versions of PHP. ! // ! // If you just need the 1-parameter preg_quote call, then don't bother using this. ! // ! function phpbb_preg_quote($str, $delimiter) ! { ! $text = preg_quote($str); ! $text = str_replace($delimiter, "\\" . $delimiter, $text); ! ! return $text; ! } ! ! ?> \ No newline at end of file |
|
From: Jonathan H. <the...@us...> - 2002-01-03 15:12:13
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv22506
Modified Files:
functions.php
Log Message:
Ok that was stupid.. Better version of a fix for 497077... Somebody hand me a beer.
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -r1.101 -r1.102
*** functions.php 2002/01/03 15:09:22 1.101
--- functions.php 2002/01/03 15:12:10 1.102
***************
*** 503,506 ****
--- 503,507 ----
{
case 'mysql':
+ case 'mysql4':
$sql_users = "SELECT u.username, g.group_name
FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
***************
*** 527,555 ****
}
break;
- case 'mysql4':
- $sql_users = "SELECT u.username, g.group_name
- FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
- WHERE ug.user_id = u.user_id
- AND g.group_id = ug.group_id
- AND ( LOWER(u.username) = '" . strtolower(str_replace("\'", "''", $username)) . "'
- OR LOWER(g.group_name) = '" . strtolower(str_replace("\'", "''", $username)) . "' )";
- $sql_disallow = "SELECT disallow_username
- FROM " . DISALLOW_TABLE . "
- WHERE '" . str_replace("\'", "''", $username) . "' LIKE disallow_username";
- if($result = $db->sql_query($sql_users))
- {
- if($db->sql_numrows($result) > 0)
- {
- return(FALSE);
- }
- }
- if($result = $db->sql_query($sql_disallow))
- {
- if($db->sql_numrows($result) > 0)
- {
- return(FALSE);
- }
- }
- break;
default:
--- 528,531 ----
|
|
From: Jonathan H. <the...@us...> - 2002-01-03 15:09:26
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv21851 Modified Files: functions.php Log Message: Updated validate_username function for use with mysql4 Bug #497077 Index: functions.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -r1.100 -r1.101 *** functions.php 2002/01/02 15:40:53 1.100 --- functions.php 2002/01/03 15:09:22 1.101 *************** *** 1,1204 **** ! <?php ! /*************************************************************************** ! * functions.php ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * [...2404 lines suppressed...] ! ! // ! // this does exactly what preg_quote() does in PHP 4-ish: ! // http://www.php.net/manual/en/function.preg-quote.php ! // ! // This function is here because the 2nd paramter to preg_quote was added in some ! // version of php 4.0.x.. So we use this in order to maintain compatibility with ! // earlier versions of PHP. ! // ! // If you just need the 1-parameter preg_quote call, then don't bother using this. ! // ! function phpbb_preg_quote($str, $delimiter) ! { ! $text = preg_quote($str); ! $text = str_replace($delimiter, "\\" . $delimiter, $text); ! ! return $text; ! } ! ! ?> |
|
From: Paul S. O. <ps...@us...> - 2002-01-03 14:59:43
|
Update of /cvsroot/phpbb/phpBB2/language/lang_polish
In directory usw-pr-cvs1:/tmp/cvs-serv19361/language/lang_polish
Modified Files:
lang_faq.php lang_main.php
Log Message:
Minor updates
Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/lang_faq.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_faq.php 2002/01/01 14:11:08 1.1
--- lang_faq.php 2002/01/03 14:59:39 1.2
***************
*** 30,34 ****
$faq[] = array("--","Problemy Logowania i Rejestracji");
! $faq[] = array("Dlaczego nie mogê siê zalogowaæ?", "A zarejestrowa³e¶ siê? Naprawdê musisz siê zarejestrowaæ aby móc siê logowaæ. A mo¿e zosta³e¶ wyrzucony z forum (je¶li tak siê sta³o zobaczysz odpowiedni± informacjê)? W takim wypadku skontaktuj siê z webmasterem lub administratorem forum aby poznaæ powód tego. Je¿eli zarejestrowa³e¶ siê, nie zosta³e¶ wyrzucony a i tak nie mo¿esz siê logowaæ sprawd¼ ponownie swój login i has³o. Zazwyczaj to w³a¶nie b³edny login lub has³o s± problemem, ale je¶li tak nie jest skontaktuj siê z administratorem forum, gdy¿ problem mo¿e le¿eæ po stronie b³êdnej konfiguracji skryptu.");
$faq[] = array("Dlaczego w ogóle muszê siê rejestrowaæ?", "Byæ mo¿e nie musisz, zale¿y to od administratora forum czy musisz siê rejestrowaæ by móc siê wypowiedzieæ. Jednak¿e rejestracja da ci dostêp do dodatkowych funkcji niedostêpnych dla go¶ci, takich jak w³asny emblemat, prywatne wiadomo¶ci, wysy³anie emaili, subskrypcja grup u¿ytkowników itd. Rejestracja zajmuje tylko chwilê i naprawdê zalecamy jej dokonanie.");
$faq[] = array("Dlaczego wci±¿ jestem wylogowywany?", "Je¿eli nie zaznaczysz opcji <i>Loguj mnie automatycznie</i> podczas logowania na forum bêdziesz zawsze wylogowywany po pewnym czasie. To zapobiega wykorzystaniu twojego konta przez kogokolwiek innego. Aby pozostawaæ zalogowanym zaznacz powy¿sz± opcjê. Nie jest to zalecane, gdy korzystasz z publicznego komputera, np. w bibliotece, kawiarni internetowej czy na uczelni.");
--- 30,34 ----
$faq[] = array("--","Problemy Logowania i Rejestracji");
! $faq[] = array("Dlaczego nie mogê siê zalogowaæ?", "A zarejestrowa³e¶ siê? Naprawdê musisz siê zarejestrowaæ aby móc siê logowaæ. A mo¿e zosta³e¶ wyrzucony z forum (je¶li tak siê sta³o zobaczysz odpowiedni± informacjê)? W takim wypadku skontaktuj siê z webmasterem lub administratorem forum aby poznaæ powód tego. Je¿eli zarejestrowa³e¶ siê, nie zosta³e¶ wyrzucony a i tak nie mo¿esz siê logowaæ sprawd¼ ponownie swój login i has³o. Zazwyczaj to w³a¶nie b³êdny login lub has³o s± problemem, ale je¶li tak nie jest skontaktuj siê z administratorem forum, gdy¿ problem mo¿e le¿eæ po stronie b³êdnej konfiguracji skryptu.");
$faq[] = array("Dlaczego w ogóle muszê siê rejestrowaæ?", "Byæ mo¿e nie musisz, zale¿y to od administratora forum czy musisz siê rejestrowaæ by móc siê wypowiedzieæ. Jednak¿e rejestracja da ci dostêp do dodatkowych funkcji niedostêpnych dla go¶ci, takich jak w³asny emblemat, prywatne wiadomo¶ci, wysy³anie emaili, subskrypcja grup u¿ytkowników itd. Rejestracja zajmuje tylko chwilê i naprawdê zalecamy jej dokonanie.");
$faq[] = array("Dlaczego wci±¿ jestem wylogowywany?", "Je¿eli nie zaznaczysz opcji <i>Loguj mnie automatycznie</i> podczas logowania na forum bêdziesz zawsze wylogowywany po pewnym czasie. To zapobiega wykorzystaniu twojego konta przez kogokolwiek innego. Aby pozostawaæ zalogowanym zaznacz powy¿sz± opcjê. Nie jest to zalecane, gdy korzystasz z publicznego komputera, np. w bibliotece, kawiarni internetowej czy na uczelni.");
***************
*** 36,40 ****
$faq[] = array("Zgubi³em moje has³o!", "Nie panikuj! Twoje has³o co prawda nie mo¿e zostaæ odzyskane, ale mo¿na je wyczy¶ciæ. Aby to zrobiæ przejd¼ na stronê logowania i kliknij <u>Zapomnia³em has³a</u>, oraz postêpuj zgodnie z podanymi instrukcjami a szybko wrócisz na forum");
$faq[] = array("Zarejestrowa³em siê ale nie mogê siê zalogowaæ!", "Na pocz±tek sprawd¼ czy wpisujesz poprawny login i has³o. Je¿eli te s± w porz±dku to problemem mo¿e byæ jedna z dwóch rzeczy. Je¿eli w³±czone s± funkcje COPPA i klikn±³e¶ odno¶nik <u>Mam mniej ni¿ 13 lat</u> podczas rejestracji musisz post±piæ zgodnie z otrzymanymi instrukcjami. Je¿eli tak nie jest to mo¿e twoje konto wymaga aktywacji? Niektóre fora wymagaj± aktywacji wszystkich nowych kont, albo przez samych u¿ytkowników, albo przez administratora, zanim mo¿na siê na nie logowaæ. Po rejestracji powiniene¶ otrzymaæ wiadomo¶æ czy wymagana jest aktywacja. Je¿eli otrzyma³e¶ email postêpuj zgodnie z instrukcjami w nim zawartymi, a je¶li nie otrzyma³e¶ email'a, to czy jeste¶ pewien, ¿e poda³e¶ w³a¶ciwy adres? Jednym z powodów wykorzystania aktywacji jest redukcja dostêpu do forum osób nieporz±danych, które zechc± je spamowaæ lub obra¿aæ u¿ytkowników. Je¿eli jeste¶ pewien, ¿e poda³e¶ w³a¶ciwy email spróbuj skontaktowaæ siê z administratorem forum.");
! $faq[] = array("Rejestrowa³em siê kiedy¶ ale nie mogê siê ju¿ logowaæ!", "Najbardziej prawdopodobne powody takiego stanu to: wpisa³e¶ niew³a¶ciwy login i has³o (poszukaj email'a, który dosta³e¶ po rejestracji)lub administrator usun±³ twoje konto z jakiego¶ powodu. Byæ mo¿e sta³o siê tak, poniewa¿ nic nie napisa³e¶? Czêsto administratorzy usuwaj± u¿ytkowników, którzy w ogóle nic nie napisali aby zmniejszyæ rozmiar bazy danych. Spróbuj zarejestrowaæ siê ponownie i b±d¼ aktywny w dyskusjach.");
--- 36,40 ----
$faq[] = array("Zgubi³em moje has³o!", "Nie panikuj! Twoje has³o co prawda nie mo¿e zostaæ odzyskane, ale mo¿na je wyczy¶ciæ. Aby to zrobiæ przejd¼ na stronê logowania i kliknij <u>Zapomnia³em has³a</u>, oraz postêpuj zgodnie z podanymi instrukcjami a szybko wrócisz na forum");
$faq[] = array("Zarejestrowa³em siê ale nie mogê siê zalogowaæ!", "Na pocz±tek sprawd¼ czy wpisujesz poprawny login i has³o. Je¿eli te s± w porz±dku to problemem mo¿e byæ jedna z dwóch rzeczy. Je¿eli w³±czone s± funkcje COPPA i klikn±³e¶ odno¶nik <u>Mam mniej ni¿ 13 lat</u> podczas rejestracji musisz post±piæ zgodnie z otrzymanymi instrukcjami. Je¿eli tak nie jest to mo¿e twoje konto wymaga aktywacji? Niektóre fora wymagaj± aktywacji wszystkich nowych kont, albo przez samych u¿ytkowników, albo przez administratora, zanim mo¿na siê na nie logowaæ. Po rejestracji powiniene¶ otrzymaæ wiadomo¶æ czy wymagana jest aktywacja. Je¿eli otrzyma³e¶ email postêpuj zgodnie z instrukcjami w nim zawartymi, a je¶li nie otrzyma³e¶ email'a, to czy jeste¶ pewien, ¿e poda³e¶ w³a¶ciwy adres? Jednym z powodów wykorzystania aktywacji jest redukcja dostêpu do forum osób nieporz±danych, które zechc± je spamowaæ lub obra¿aæ u¿ytkowników. Je¿eli jeste¶ pewien, ¿e poda³e¶ w³a¶ciwy email spróbuj skontaktowaæ siê z administratorem forum.");
! $faq[] = array("Rejestrowa³em siê kiedy¶ ale nie mogê siê ju¿ logowaæ!", "Najbardziej prawdopodobne powody takiego stanu to: wpisa³e¶ niew³a¶ciwy login i has³o (poszukaj email'a, który dosta³e¶ po rejestracji) lub administrator usun±³ twoje konto z jakiego¶ powodu. Byæ mo¿e sta³o siê tak, poniewa¿ nic nie napisa³e¶? Czêsto administratorzy usuwaj± u¿ytkowników, którzy w ogóle nic nie napisali aby zmniejszyæ rozmiar bazy danych. Spróbuj zarejestrowaæ siê ponownie i b±d¼ aktywny w dyskusjach.");
***************
*** 55,59 ****
$faq[] = array("Jak mogê utworzyæ ankietê?", "Tworzenie ankiet jest proste, kiedy piszesz nowy temat (lub zmieniasz pierwszy post w temacie, je¶li masz do tego uprawnienia) powiniene¶ zobaczyæ formularz <i>Dodaj Ankietê</i> pod g³ównym polem wiadomo¶ci (je¿eli nie widzisz go, to prawdopodobnie nie masz uprawnieñ do tworzenia ankiet). Musisz wpisaæ tytu³ ankiety i podaæ przynajmniej dwie opcje (kolejne opcje mo¿esz dodawaæ przyciskiem <i>Dodaj opcjê</i>). Mo¿esz tak¿e wyznaczyæ limit czasowy dla ankiety, ustaw 0 dla niekoñcz±cej siê. Liczba mo¿liwych do ustawienia opcji jest okre¶lana przez administratora.");
$faq[] = array("Jak mogê zmieniæ lub usun±æ ankietê?", "Podobnie jak z postami, ankiety mog± byæ zmieniane jedynie przez ich twórców, moderatorów lub administratorów. Aby zmieniæ ankietê musisz zmieniæ pierwszy post w danym temacie (z którym zawsze zwi±zana jest ankieta). Je¿eli nikt jeszcze nie g³osowa³ u¿ytkownicy mog± usun±æ ankietê lub zmieniaæ któr±kolwiek z opcji, jednak¿e je¶li zosta³y ju¿ oddane g³osy tylko moderatorzy i administratorzy mog± ankietê zmieniæ lub usun±æ. Jest to ustawione w ten sposób aby zapobiec fa³szowaniu ankiet przez zmianê opcji w po³owie g³osowania.");
! $faq[] = array("Dlaczego nie mam dostêpu do forum?", "Nietóre fora mog± byæ przeznaczone dla konkretnych u¿ytkowników lub grup. Aby przegl±daæ, czytaæ, pisaæ itp. mo¿e byæ potrzebna spejalna autoryzacja. Dostêpu do nich mog± udzieliæ jedynie moderatorzy forum oraz administratorzy i z nimi powiniene¶ siê skontaktowaæ.");
$faq[] = array("Dlaczego nie mogê g³osowaæ w ankietach?", "Tylko zarejestrowani u¿ytkownicy mog± g³osowaæ w ankietach (aby zapobiec fa³szowaniu wyników). Je¿eli zarejestrowa³e¶ siê i nadal nie mo¿esz g³osowaæ, prawdopodobnie nie masz odpowiednich uprawnieñ.");
--- 55,59 ----
$faq[] = array("Jak mogê utworzyæ ankietê?", "Tworzenie ankiet jest proste, kiedy piszesz nowy temat (lub zmieniasz pierwszy post w temacie, je¶li masz do tego uprawnienia) powiniene¶ zobaczyæ formularz <i>Dodaj Ankietê</i> pod g³ównym polem wiadomo¶ci (je¿eli nie widzisz go, to prawdopodobnie nie masz uprawnieñ do tworzenia ankiet). Musisz wpisaæ tytu³ ankiety i podaæ przynajmniej dwie opcje (kolejne opcje mo¿esz dodawaæ przyciskiem <i>Dodaj opcjê</i>). Mo¿esz tak¿e wyznaczyæ limit czasowy dla ankiety, ustaw 0 dla niekoñcz±cej siê. Liczba mo¿liwych do ustawienia opcji jest okre¶lana przez administratora.");
$faq[] = array("Jak mogê zmieniæ lub usun±æ ankietê?", "Podobnie jak z postami, ankiety mog± byæ zmieniane jedynie przez ich twórców, moderatorów lub administratorów. Aby zmieniæ ankietê musisz zmieniæ pierwszy post w danym temacie (z którym zawsze zwi±zana jest ankieta). Je¿eli nikt jeszcze nie g³osowa³ u¿ytkownicy mog± usun±æ ankietê lub zmieniaæ któr±kolwiek z opcji, jednak¿e je¶li zosta³y ju¿ oddane g³osy tylko moderatorzy i administratorzy mog± ankietê zmieniæ lub usun±æ. Jest to ustawione w ten sposób aby zapobiec fa³szowaniu ankiet przez zmianê opcji w po³owie g³osowania.");
! $faq[] = array("Dlaczego nie mam dostêpu do forum?", "Nietóre fora mog± byæ przeznaczone dla konkretnych u¿ytkowników lub grup. Aby przegl±daæ, czytaæ, pisaæ itp. mo¿e byæ potrzebna specjalna autoryzacja. Dostêpu do nich mog± udzieliæ jedynie moderatorzy forum oraz administratorzy i z nimi powiniene¶ siê skontaktowaæ.");
$faq[] = array("Dlaczego nie mogê g³osowaæ w ankietach?", "Tylko zarejestrowani u¿ytkownicy mog± g³osowaæ w ankietach (aby zapobiec fa³szowaniu wyników). Je¿eli zarejestrowa³e¶ siê i nadal nie mo¿esz g³osowaæ, prawdopodobnie nie masz odpowiednich uprawnieñ.");
***************
*** 86,90 ****
//
$faq[] = array("--","Sprawy phpBB 2");
! $faq[] = array("Kto napisa³ ten skrypt?", "Ten program (w niezmodyfikowanej formie) zosta³ stworzony, opublikowany i jest w³asno¶ci± <a href=\"http://www.phpbb.com/\" target=\"_blank\">Grupy phpBB</a>. Jest udostêpniany na zasadach licencji GNU General Public Licence i mo¿e byæ dowolnie dystrybuowany. Wiêcej szczegó³ów pod odno¶nikiem");
$faq[] = array("Dlaczego funkcja X nie jest dostêpna?", "To oprogramowanie jest dzie³em i w³asno¶ci± Grupy phpBB. Je¿eli s±dzisz, ¿e jaka¶ funkcja powinna zostaæ do niego dodana odwied¼ stronê phpbb.com i zobacz co w tej sprawie ma do powiedzenia Grupa phpBB. Prosimy nie pisaæ pró¶b o nowe funkcje na forum z phpbb.com. Grupa wykorzystuje system SourceForge do zarz±dzania tymi pro¶bami. Poszukaj na forum opinii Grupy phpBB na temat danej funkcji, je¶li taka ju¿ tam siê znajduje, a w przeciwnym wypadku postêpuj zgodnie z podan± tam procedur± zg³aszania pro¶b.");
$faq[] = array("Z kim mam siê skontaktowaæ w sprawach nadu¿yæ i prawnych dotycz±cych tego forum?", "Powiniene¶ skontaktowaæ siê z administratorem forum. Je¿eli nie mo¿esz dowiedzieæ siê kto nim jest spróbuj skontaktowaæ siê z którym¶ z moderatorów forum i jego spytaæ do kogo siê zwróciæ. Je¿eli nadal nie dostaniesz odpowiedzi skontaktuj siê z w³a¶cicielem domeny (poszukaj go przez whois) lub, je¶li strona jest na serwerze darmowych kont (republika.pl, wp.pl, hg.pl, phg.pl itp.) skontaktuj siê z dzia³em nadu¿yæ firmy zarz±dzaj±cej serwerem. Pamiêtaj, ¿e Grupa phpBB nie ma ¿adnej kontroli i nie mo¿e byæ w ¿aden sposób odpowiedzialna za to jak, gdzie i przez kogo u¿ywane jest forum. Nie ma sensu kontaktowaæ siê z Grup± phpBB w sprawach prawnych nie zwi±zanych bezpo¶rednio ze stron± phpbb.com lub oprogramowaniem phpBB. Je¶li napiszesz do Grupy phpBB w sprawie wykorzystania skryptu przez osoby trzecie otrzymasz prawdopodobnie zwiêz³± odpowied¼ lub te¿ nie otrzymasz jej wcale.");
--- 86,90 ----
//
$faq[] = array("--","Sprawy phpBB 2");
! $faq[] = array("Kto napisa³ ten skrypt?", "Ten program (w niezmodyfikowanej formie) zosta³ stworzony, opublikowany i jest w³asno¶ci± <a href=\"http://www.phpbb.com/\" target=\"_blank\">Grupy phpBB</a>. Jest udostêpniany na zasadach licencji GNU General Public Licence i mo¿e byæ dowolnie dystrybuowany. Wiêcej szczegó³ów pod odno¶nikiem.");
$faq[] = array("Dlaczego funkcja X nie jest dostêpna?", "To oprogramowanie jest dzie³em i w³asno¶ci± Grupy phpBB. Je¿eli s±dzisz, ¿e jaka¶ funkcja powinna zostaæ do niego dodana odwied¼ stronê phpbb.com i zobacz co w tej sprawie ma do powiedzenia Grupa phpBB. Prosimy nie pisaæ pró¶b o nowe funkcje na forum z phpbb.com. Grupa wykorzystuje system SourceForge do zarz±dzania tymi pro¶bami. Poszukaj na forum opinii Grupy phpBB na temat danej funkcji, je¶li taka ju¿ tam siê znajduje, a w przeciwnym wypadku postêpuj zgodnie z podan± tam procedur± zg³aszania pro¶b.");
$faq[] = array("Z kim mam siê skontaktowaæ w sprawach nadu¿yæ i prawnych dotycz±cych tego forum?", "Powiniene¶ skontaktowaæ siê z administratorem forum. Je¿eli nie mo¿esz dowiedzieæ siê kto nim jest spróbuj skontaktowaæ siê z którym¶ z moderatorów forum i jego spytaæ do kogo siê zwróciæ. Je¿eli nadal nie dostaniesz odpowiedzi skontaktuj siê z w³a¶cicielem domeny (poszukaj go przez whois) lub, je¶li strona jest na serwerze darmowych kont (republika.pl, wp.pl, hg.pl, phg.pl itp.) skontaktuj siê z dzia³em nadu¿yæ firmy zarz±dzaj±cej serwerem. Pamiêtaj, ¿e Grupa phpBB nie ma ¿adnej kontroli i nie mo¿e byæ w ¿aden sposób odpowiedzialna za to jak, gdzie i przez kogo u¿ywane jest forum. Nie ma sensu kontaktowaæ siê z Grup± phpBB w sprawach prawnych nie zwi±zanych bezpo¶rednio ze stron± phpbb.com lub oprogramowaniem phpBB. Je¶li napiszesz do Grupy phpBB w sprawie wykorzystania skryptu przez osoby trzecie otrzymasz prawdopodobnie zwiêz³± odpowied¼ lub te¿ nie otrzymasz jej wcale.");
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/lang_main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lang_main.php 2002/01/01 14:11:08 1.1
--- lang_main.php 2002/01/03 14:59:39 1.2
***************
*** 122,126 ****
$lang['Reg_users_zero_total'] = "0 Zarejestrowanych, ";
$lang['Reg_users_total'] = "%d Zarejestrowanych, ";
! $lang['Reg_user_total'] = "%d Zarejestrowanych, ";
$lang['Hidden_users_zero_total'] = "0 Ukrytych i ";
$lang['Hidden_users_total'] = "%d Ukrytych i ";
--- 122,126 ----
$lang['Reg_users_zero_total'] = "0 Zarejestrowanych, ";
$lang['Reg_users_total'] = "%d Zarejestrowanych, ";
! $lang['Reg_user_total'] = "%d Zarejestrowany, ";
$lang['Hidden_users_zero_total'] = "0 Ukrytych i ";
$lang['Hidden_users_total'] = "%d Ukrytych i ";
***************
*** 520,524 ****
$lang['No_send_account_inactive'] = "Przepraszamy, ale Twoje has³o nie mo¿e byæ odzyskane gdy¿ Twoje konto jest obecnie nieaktywne. Skontaktuj siê z administratorem aby uzyskaæ wiêcej informacji";
! $lang['Always_smile'] = "Zawsze w³±czak U¶mieszki";
$lang['Always_html'] = "Zawsze w³±czaj HTML";
$lang['Always_bbcode'] = "Zawsze w³±czaj BBCode";
--- 520,524 ----
$lang['No_send_account_inactive'] = "Przepraszamy, ale Twoje has³o nie mo¿e byæ odzyskane gdy¿ Twoje konto jest obecnie nieaktywne. Skontaktuj siê z administratorem aby uzyskaæ wiêcej informacji";
! $lang['Always_smile'] = "Zawsze w³±czaj U¶mieszki";
$lang['Always_html'] = "Zawsze w³±czaj HTML";
$lang['Always_bbcode'] = "Zawsze w³±czaj BBCode";
***************
*** 544,548 ****
$lang['Avatar'] = "Emblemat";
! $lang['Avatar_explain'] = "Wy¶wietla ma³y obrazek pod informacjami o Tobie przy kazdym po¶cie. Tylko jeden obrazek mo¿e byæ wy¶wietlany, jego szeroko¶æ nie mo¿e byæ wiêksza ni¿ %d pikseli, wysoko¶æ nie wiêksza ni¿ %d pikseli, a rozmiar nie wiêkszy ni¿ %dkB.";
$lang['Upload_Avatar_URL'] = "Wy¶lij Emblemat z adresu";
$lang['Upload_Avatar_URL_explain'] = "Wpisz adres, pod którym zlokalizowany jest Twój Emblemat, zostanie on skopiowany na tê stronê.";
--- 544,548 ----
$lang['Avatar'] = "Emblemat";
! $lang['Avatar_explain'] = "Wy¶wietla ma³y obrazek pod informacjami o Tobie przy ka¿dym po¶cie. Tylko jeden obrazek mo¿e byæ wy¶wietlany, jego szeroko¶æ nie mo¿e byæ wiêksza ni¿ %d pikseli, wysoko¶æ nie wiêksza ni¿ %d pikseli, a rozmiar nie wiêkszy ni¿ %dkB.";
$lang['Upload_Avatar_URL'] = "Wy¶lij Emblemat z adresu";
$lang['Upload_Avatar_URL_explain'] = "Wpisz adres, pod którym zlokalizowany jest Twój Emblemat, zostanie on skopiowany na tê stronê.";
***************
*** 591,595 ****
$lang['Registration'] = "Warunki Rejestracji";
! $lang['Reg_agreement'] = "Administratorzy i moderatorzy podejm¹ starania maj¹ce na celu usuwanie wszelkich uznawanych za obraliwe materia³ów jak najszybciej, jednak¿e nie jest mo¿liwe przeczytanie ka¿dej wiadomoci. Zgadzasz siê wiêc, ¿e zawartoæ ka¿dego postu na tym forum wyra¿a pogl¹dy i opinie jego autora a nie administratorów, moderatorów czy webmasterów (poza wiadomociami pisanymi przez nich) i nie ponosz¹ oni za te treci odpowiedzialnoci.<br /><br />Zgadzasz siê nie pisaæ ¿adnych obraliwych, obscenicznych, wulgarnych, oszczerczych, nienawistnych, zawieraj¹cych groby i innych materia³ów, które mog¹ byæ sprzeczne z prawem. Z³amanie tej zasady mo¿e byæ przyczyn¹ natychmiastowego i trwa³ego usuniêcia z listy u¿ytkowników (wraz z powiadomieniem odpowiednich w³adz). Aby wspomóc te dzia³ania rejestrowane s¹ adresy IP autorów. Przyjmujesz do wiadomoci, ¿e webmaster, administrator i moderatorzy tego forum maj¹ prawdo do usuwania, zmiany lub zamykania ka¿dego w¹tku w ka¿dej chwili jeli zajdzie taka potrzeba. Jako u¿ytkownik zgadzasz siê, ¿e wszystkie informacje, które wpiszesz bêd¹ przechowywane w bazie danych. Informacje te nie bêd¹ podawane bez twojej zgody ¿adnym osobom ani podmiotom trzecim, jednak¿e webmaster, administrator i moderatorzy nie bêd¹ obarczeni odpowiedzialnoci¹ za w³amania hackerskie prowadz¹ce do pozyskania tych danych.<br /><br />Skrypt tego forum wykorzystuje cookies do przechowywania informacji na twoim komputerze. Te cookies nie zawieraj¹ ¿adnych informacji, które poda³e i s³u¿¹ jedynie u³atwieniu korzystania z forum. Adres email jest wykorzystywany jedynie dla potwierdzenia podanych informacji oraz has³a (i dla przes³ania nowego has³a, gdyby zapomnia³ stare).<br /><br />Klikaj¹c odnonik Rejestracja na dole zgadzasz siê na te warunki.";
$lang['Agree_under_13'] = "Zgadzam Siê na te warunki i mam <b>poni¿ej</b> 13 lat";
--- 591,595 ----
$lang['Registration'] = "Warunki Rejestracji";
! $lang['Reg_agreement'] = "Administratorzy i moderatorzy podejm± starania maj±ce na celu usuwanie wszelkich uznawanych za obra¼liwe materia³ów jak najszybciej, jednak¿e nie jest mo¿liwe przeczytanie ka¿dej wiadomo¶ci. Zgadzasz siê wiêc, ¿e zawarto¶æ ka¿dego postu na tym forum wyra¿a pogl±dy i opinie jego autora a nie administratorów, moderatorów czy webmasterów (poza wiadomo¶ciami pisanymi przez nich) i nie ponosz± oni za te tre¶ci odpowiedzialno¶ci.<br /><br />Zgadzasz siê nie pisaæ ¿adnych obra¼liwych, obscenicznych, wulgarnych, oszczerczych, nienawistnych, zawieraj±cych gro¼by i innych materia³ów, które mog± byæ sprzeczne z prawem. Z³amanie tej zasady mo¿e byæ przyczyn± natychmiastowego i trwa³ego usuniêcia z listy u¿ytkowników (wraz z powiadomieniem odpowiednich w³adz). Aby wspomóc te dzia³ania rejestrowane s± adresy IP autorów. Przyjmujesz do wiadomo¶ci, ¿e webmaster, administrator i moderatorzy tego forum maj± prawdo do usuwania, zmiany lub zamykania ka¿dego w±tku w ka¿dej chwili je¶li zajdzie taka potrzeba. Jako u¿ytkownik zgadzasz siê, ¿e wszystkie informacje, które wpiszesz bêd± przechowywane w bazie danych. Informacje te nie bêd± podawane bez twojej zgody ¿adnym osobom ani podmiotom trzecim, jednak¿e webmaster, administrator i moderatorzy nie bêd± obarczeni odpowiedzialno¶ci± za w³amania hackerskie prowadz±ce do pozyskania tych danych.<br /><br />Skrypt tego forum wykorzystuje cookies do przechowywania informacji na twoim komputerze. Te cookies nie zawieraj± ¿adnych informacji, które poda³e¶ i s³u¿± jedynie u³atwieniu korzystania z forum. Adres email jest wykorzystywany jedynie dla potwierdzenia podanych informacji oraz has³a (i dla przes³ania nowego has³a, gdyby¶ zapomnia³ stare).<br /><br />Klikaj±c odno¶nik Rejestracja na dole zgadzasz siê na te warunki.";
$lang['Agree_under_13'] = "Zgadzam Siê na te warunki i mam <b>poni¿ej</b> 13 lat";
***************
*** 710,714 ****
$lang['Search_keywords'] = "Szukaj S³ów Kluczowych";
! $lang['Search_keywords_explain'] = "Mo¿esz u¿ywaæ <u>AND</u> aby okre¶laæ, które s³owa musz± znale¶æ siê w wynikach, <u>OR</u> dla tych, które mog± siê tam znale¶æ i <u>NOT</u> dla tych, które nie mog± wyst±piæ. Znak * zastêpuje dowolny ci±g znaków. Aby szukaæ zwrotu umie¶æ go wewn±trz """;
$lang['Search_author'] = "Szukaj Autora";
$lang['Search_author_explain'] = "U¿yj * jako zamiennika dowolnego ci±gu znaków";
--- 710,714 ----
$lang['Search_keywords'] = "Szukaj S³ów Kluczowych";
! $lang['Search_keywords_explain'] = "Mo¿esz u¿ywaæ <u>AND</u> aby okre¶laæ, które s³owa musz± znale¼æ siê w wynikach, <u>OR</u> dla tych, które mog± siê tam znale¶æ i <u>NOT</u> dla tych, które nie mog± wyst±piæ. Znak * zastêpuje dowolny ci±g znaków. Aby szukaæ zwrotu umie¶æ go wewn±trz """;
$lang['Search_author'] = "Szukaj Autora";
$lang['Search_author_explain'] = "U¿yj * jako zamiennika dowolnego ci±gu znaków";
***************
*** 800,804 ****
//
$lang['Mod_CP'] = "Panel Kontrolny Moderacji";
! $lang['Mod_CP_explain'] = "Korzystaj±c z poni¿szego formularza mo¿esz przeprowadziæ zbiorow± moderacjê na tym forum. Mo¿esz blkowaæ, odblokowywaæ, przenosiæ i usuwaæ dowoln± ilo¶æ tematów. Je¿eli to forum jest ustawione jako prywatne mo¿esz tak¿e czê¶ciowo decydowaæ, którzy u¿ytkownicy mog± mieæ do niego dostêp.";
$lang['Select'] = "Wybierz";
--- 800,804 ----
//
$lang['Mod_CP'] = "Panel Kontrolny Moderacji";
! $lang['Mod_CP_explain'] = "Korzystaj±c z poni¿szego formularza mo¿esz przeprowadziæ zbiorow± moderacjê na tym forum. Mo¿esz blokowaæ, odblokowywaæ, przenosiæ i usuwaæ dowoln± ilo¶æ tematów. Je¿eli to forum jest ustawione jako prywatne mo¿esz tak¿e czê¶ciowo decydowaæ, którzy u¿ytkownicy mog± mieæ do niego dostêp.";
$lang['Select'] = "Wybierz";
***************
*** 904,908 ****
$lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon";
$lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, D¿akarta";
! $lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapur, Taipei";
$lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Jakuck";
$lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
--- 904,908 ----
$lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon";
$lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, D¿akarta";
! $lang['tz']['8'] = "(GMT +8:00 hours) Pekin, Hong Kong, Perth, Singapur, Taipei";
$lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Jakuck";
$lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
|
|
From: Bart v. B. <ba...@us...> - 2002-01-03 11:06:25
|
Update of /cvsroot/phpbb/phpBB2/develop
In directory usw-pr-cvs1:/tmp/cvs-serv25202/develop
Modified Files:
search_fill.php
Log Message:
Moved all search functions to includes/search.php Paul; please review
Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search_fill.php 2001/12/14 01:59:24 1.6
--- search_fill.php 2002/01/03 11:06:22 1.7
***************
*** 1,141 ****
<?php
- // Clean up an entry (posting), remove HTML, BBcode, stopwords, etc
- function clean_words($entry, &$search, &$replace)
- {
- // Weird, $init_match doesn't work with static when double quotes (") are used...
- static $init_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%');
- static $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
-
- static $later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
- static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ", " ", " ", " ");
-
- static $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
- static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
-
- static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
- static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
-
- $entry = " " . strip_tags(strtolower($entry)) . " ";
-
- $entry = str_replace($sgml_match, $sgml_match, $entry);
- $entry = str_replace($accent_match, $accent_replace, $entry);
-
- // Replace line endings by a space
- $entry = preg_replace("/[\n\r]/is", " ", $entry);
- // Remove URL's
- $entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
-
- // Filter out strange characters like ^, $, &, change "it's" to "its"
- // str_replace with arrays is buggy in some PHP versions so traverse the arrays manually ;(
- for($i = 0; $i < count($init_match); $i++)
- {
- $entry = str_replace($init_match[$i], $init_replace[$i], $entry);
- }
-
- // Quickly remove BBcode.
- $entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
- $entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
- $entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
- // URLs
- $entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
- $entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
- // Numbers
- $entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
- // HTML entities like &1234;
- $entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
- // 'words' that consist of <2 or >50 characters are removed.
- $entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
- $entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
-
- // Remove some more strange characters
- for($i = 0; $i < count($later_match); $i++)
- {
- $entry = str_replace($later_match[$i], $later_replace[$i], $entry);
- }
-
- // Remove stopwords
- $entry = preg_replace($search, $replace, $entry);
-
- return $entry;
- }
-
- function split_words(&$entry)
- {
- preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
-
- return $split_entries[1];
- }
-
- function remove_common($percent, $delete_common = 0)
- {
- global $db;
-
- $sql = "SELECT COUNT(DISTINCT post_id) as total_posts
- FROM " . SEARCH_MATCH_TABLE;
- $result = $db->sql_query($sql);
- if( !$result )
- {
- $error = $db->sql_error();
- die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']);
- }
- $total_posts = $db->sql_fetchrow($result);
- $total_posts = $total_posts['total_posts'];
-
- $common_threshold = floor($total_posts * ( $percent / 100 ));
-
- $sql = "SELECT word_id
- FROM " . SEARCH_MATCH_TABLE . "
- GROUP BY word_id
- HAVING count(word_id) > $common_threshold";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- $error = $db->sql_error();
- die("Couldn't obtain common word list :: " . $sql . " :: " . $error['message']);
- }
- $common_words = $db->sql_numrows($result);
-
- while($row = $db->sql_fetchrow($result))
- {
- $common_word_ids[] = $row['word_id'];
- }
- $db->sql_freeresult($result);
-
- if(count($common_word_ids) != 0)
- {
- $common_word_ids = implode(',',$common_word_ids);
- }
- else
- {
- // We didn't remove any common words
- return 0;
- }
-
- $sql = "UPDATE ". SEARCH_WORD_TABLE ."
- SET word_common = 1
- WHERE word_id IN ($common_word_ids)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- $error = $db->sql_error();
- die("Couldn't delete word list entry :: " . $sql . " :: " . $error['message']);
- }
-
- if( $delete_common)
- {
- $sql = "DELETE FROM ".SEARCH_MATCH_TABLE."
- WHERE word_id IN ($common_word_ids)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- $error = $db->sql_error();
- die("Couldn't delete word match entry :: " . $sql . " :: " . $error['message']);
- }
- }
-
- return $common_words;
- }
-
set_time_limit(0);
$common_percent = 40; // Percentage of posts in which a word has to appear to be marked as common
--- 1,4 ----
***************
*** 148,151 ****
--- 11,15 ----
include($phpbb_root_path . 'includes/db.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
+ include($phpbb_root_path . 'includes/search.'.$phpEx);
print "<html>\n<body>\n";
***************
*** 345,349 ****
print "<br>Removing common words (words that appear in more than $common_percent of the posts)<br>\n";
flush();
! print "Removed ". remove_common($common_percent, 1) ." words that where too common.<br>";
}
--- 209,213 ----
print "<br>Removing common words (words that appear in more than $common_percent of the posts)<br>\n";
flush();
! print "Removed ". remove_common_global($common_percent, 1) ." words that where too common.<br>";
}
|
|
From: Bart v. B. <ba...@us...> - 2002-01-03 11:06:25
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25202
Modified Files:
posting.php search.php upgrade.php
Log Message:
Moved all search functions to includes/search.php Paul; please review
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** posting.php 2001/12/30 13:33:34 1.134
--- posting.php 2002/01/03 11:06:22 1.135
***************
*** 26,378 ****
include($phpbb_root_path . 'includes/post.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
// -----------------------
// Page specific functions
//
- function clean_words($entry, &$stopword_list, &$synonym_list)
- {
- static $init_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%');
- static $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
-
- static $later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
- static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
-
- static $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
- static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
-
- static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
- static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
-
- $entry = " " . stripslashes(strip_tags(strtolower($entry))) . " ";
-
- $entry = str_replace($sgml_match, $sgml_match, $entry);
- $entry = str_replace($accent_match, $accent_replace, $entry);
-
- $entry = preg_replace("/[\n\r]/is", " ", $entry);
- $entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
-
- $entry = str_replace($init_match, $init_replace, $entry);
-
- $entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
- $entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
- $entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
- $entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
- $entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
- $entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
- $entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
- $entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
- $entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
-
- $entry = str_replace($later_match, $later_replace, $entry);
-
- if( !empty($stopword_list) )
- {
- for ($j = 0; $j < count($stopword_list); $j++)
- {
- $filter_word = trim(strtolower($stopword_list[$j]));
- $entry = preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry);
- }
- }
-
- if( !empty($synonym_list) )
- {
- for ($j = 0; $j < count($synonym_list); $j++)
- {
- list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
- $entry = preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
- }
- }
-
- return $entry;
- }
-
- function split_words(&$entry)
- {
- $split_entries = array();
- preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
-
- return $split_entries[1];
- }
-
- function remove_common($percent, $word_id_list = array())
- {
- global $db;
-
- // 0.01-0.06s
- $sql = "SELECT SUM(forum_posts) AS total_posts
- FROM " . FORUMS_TABLE ;
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
- }
-
- $row = $db->sql_fetchrow($result);
-
- if( $row['total_posts'] > 100 )
- {
- $common_threshold = floor($row['total_posts'] * $percent);
-
- $word_id_sql = "";
- if( count($word_id_list) )
- {
- $word_id_sql = "WHERE word_id IN (" . implode(", ", $word_id_list) . ") ";
- }
-
- // 0.020-0.024s
- $sql = "SELECT word_id
- FROM " . SEARCH_MATCH_TABLE . "
- $word_id_sql
- GROUP BY word_id
- HAVING COUNT(word_id) > $common_threshold";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
- }
-
- // No matches
- if( $word_count = $db->sql_numrows($result) )
- {
- $common_word_id_list = array();
- while( $row = $db->sql_fetchrow($result) )
- {
- $common_word_id_list[] = $row['word_id'];
- }
-
- $db->sql_freeresult($result);
-
- if( count($common_word_ids) != 0 )
- {
- $common_word_id_list = implode(", ", $common_word_id_list);
-
- $sql = "UPDATE " . SEARCH_WORD_TABLE . "
- SET word_common = " . TRUE . "
- WHERE word_id IN ($common_word_id_list)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
- }
-
- $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
- WHERE word_id IN ($common_word_id_list)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
- }
- }
- }
- }
-
- return $word_count;
- }
-
- function remove_unmatched_words()
- {
- global $db;
-
- switch(SQL_LAYER)
- {
- case 'postgresql':
- $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
- WHERE word_id NOT IN (
- SELECT word_id
- FROM " . SEARCH_MATCH_TABLE . "
- GROUP BY word_id)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
- }
-
- $unmatched_count = $db->sql_affectedrows();
-
- break;
-
- case 'oracle':
- $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
- WHERE word_id IN (
- SELECT w.word_id
- FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
- WHERE w.word_id = m.word_id(+)
- AND m.word_id IS NULL)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
- }
-
- $unmatched_count = $db->sql_affectedrows();
-
- break;
-
- case 'mssql':
- case 'msaccess':
- $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
- WHERE word_id IN (
- SELECT w.word_id
- FROM " . SEARCH_WORD_TABLE . " w
- LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id
- WHERE m.word_id IS NULL)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
- }
-
- $unmatched_count = $db->sql_affectedrows();
-
- break;
-
- case 'mysql':
- case 'mysql4':
- // 0.07s
- $sql = "SELECT w.word_id
- FROM " . SEARCH_WORD_TABLE . " w
- LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id
- WHERE m.word_id IS NULL";
- if( $result = $db->sql_query($sql) )
- {
- if( $unmatched_count = $db->sql_numrows($result) )
- {
- $rowset = array();
- while( $row = $db->sql_fetchrow($result) )
- {
- $rowset[] = $row['word_id'];
- }
-
- $word_id_sql = implode(", ", $rowset);
-
- if( $word_id_sql )
- {
- // 0.07s (about 15-20 words)
- $sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
- WHERE word_id IN ($word_id_sql)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
- }
- }
- else
- {
- return 0;
- }
- }
- else
- {
- return 0;
- }
- }
-
- break;
- }
-
- return $unmatched_count;
- }
-
- function add_search_words($post_id, $post_text, $post_title = "")
- {
- global $db, $phpbb_root_path, $board_config, $lang;
-
- $stopword_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
- $synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
-
- $search_text = clean_words($post_text, $stopword_array, $synonym_array);
- $search_matches = split_words($search_text);
-
- if( count($search_matches) )
- {
- $word = array();
- sort($search_matches);
-
- $word_text_sql = "";
- for ($i = 0; $i < count($search_matches); $i++)
- {
- $search_matches[$i] = trim($search_matches[$i]);
-
- if( $search_matches[$i] != "" && $search_matches[$i] != $search_matches[$i-1] )
- {
- $word[] = $search_matches[$i];
-
- if( $word_text_sql != "" )
- {
- $word_text_sql .= ", ";
- }
-
- $word_text_sql .= "'" . $search_matches[$i] . "'";
- }
- }
-
- $sql = "SELECT word_id, word_text, word_common
- FROM " . SEARCH_WORD_TABLE . "
- WHERE word_text IN ($word_text_sql)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
- }
-
- $check_words = array();
- $word_id_list = array();
- if( $word_check_count = $db->sql_numrows($result) )
- {
- while( $row = $db->sql_fetchrow($result) )
- {
- $check_words[$row['word_text']] = $row['word_common'];
- $word_id_list[] = $row['word_id'];
- }
- }
-
- $match_word = array();
- for ($i = 0; $i < count($word); $i++)
- {
- $new_match = true;
- $word_common = false;
-
- if( $word_check_count )
- {
- if( isset($check_words[$word[$i]]) )
- {
- $new_match = false;
- }
- }
-
- if( !$check_words[$word[$i]] )
- {
- $match_word[] = "'" . $word[$i] . "'";
- }
-
- if( $new_match )
- {
- $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common)
- VALUES ('". $word[$i] . "', 0)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
- }
- }
- }
-
- $word_sql_in = implode(", ", $match_word);
-
- $sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match)
- SELECT $post_id, word_id, 0
- FROM " . SEARCH_WORD_TABLE . "
- WHERE word_text IN ($word_sql_in)";
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
- }
- }
-
- remove_common(0.15, $word_id_list);
-
- return;
- }
function topic_review($topic_id, $is_inline_review)
--- 26,34 ----
include($phpbb_root_path . 'includes/post.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+ include($phpbb_root_path . 'includes/search.'.$phpEx);
// -----------------------
// Page specific functions
//
function topic_review($topic_id, $is_inline_review)
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** search.php 2001/12/30 13:31:34 1.53
--- search.php 2002/01/03 11:06:22 1.54
***************
*** 25,104 ****
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
!
! // -----------------------
! // Page specific functions
! //
! function clean_words_search($entry)
! {
!
! $char_match = array("^", "$", "&", "(", ")", "<", ">", "`", "'", "|", ",", "@", "_", "?", "%", "~", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "!");
! $char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
!
! $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
! $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
!
! $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
! $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
!
! $entry = " " . strip_tags(strtolower($entry)) . " ";
!
! $entry = str_replace("+", " and ", $entry);
! $entry = str_replace("-", " not ", $entry);
!
! $entry = str_replace($sgml_match, $sgml_match, $entry);
! $entry = str_replace($accent_match, $accent_replace, $entry);
! $entry = str_replace($char_match, $char_replace, $entry);
!
! $entry = preg_replace("/\b[0-9]+\b/", " ", $entry);
!
! return $entry;
! }
!
! function remove_stop_words($entry, &$stopword_list)
! {
!
! if( !empty($stopword_list) )
! {
! for ($j = 0; $j < count($stopword_list); $j++)
! {
! $filter_word = trim(strtolower($stopword_list[$j]));
! if( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" )
! {
! $entry = preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry);
! }
! }
! }
!
! return $entry;
! }
!
! function replace_synonyms($entry, &$synonym_list)
! {
! if( !empty($synonym_list) )
! {
! for ($j = 0; $j < count($synonym_list); $j++)
! {
! list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
!
! if( $match_synonym != "and" && $match_synonym != "or" && $match_synonym != "not" &&
! $replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" )
! {
! $entry = preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
! }
! }
! }
!
! return $entry;
! }
!
! function split_words(&$entry)
! {
! preg_match_all("/(\*?[a-z0-9]+\*?)|\b([a-z0-9]+)\b/is", $entry, $split_entries);
!
! return $split_entries[1];
! }
! //
! // End of functions defns
! // ----------------------
//
--- 25,29 ----
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
! include($phpbb_root_path . 'includes/search.'.$phpEx);
//
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** upgrade.php 2002/01/01 22:52:18 1.16
--- upgrade.php 2002/01/03 11:06:22 1.17
***************
*** 39,74 ****
include('includes/db.'.$phpEx);
include('includes/bbcode.'.$phpEx);
- //
- // Set smiley path, uncomment the following line to set the path manually
- //
- //$smiley_path = '/forums/images/smiles/';
- //
- /*
- if( !isset($smiley_path) )
- {
- // Did we get a path through the URL?
- if(isset($HTTP_GET_VARS['smiley_path']))
- {
- $smiley_path = $HTTP_GET_VARS['smiley_path'];
- }
- else
- {
- // Check the current directory name
- $base_dir = dirname($PHP_SELF);
- if ($base_dir != '/phpBB2' && $base_dir != '\phpBB2')
- {
- // User isn't installing in the default /phpBB2/ dir, probably installing in 1.4 dir?
- $smiley_path = $base_dir . '/images/smiles/';
- }
- else
- {
- // Fall back to the default 1.4 path
- $smiley_path = '/phpBB/images/smiles/';
- }
- }
- }
- */
-
set_time_limit(0); // Unlimited execution time
--- 39,44 ----
include('includes/db.'.$phpEx);
include('includes/bbcode.'.$phpEx);
+ include('includes/search.'.$phpEx);
set_time_limit(0); // Unlimited execution time
***************
*** 93,212 ****
// Begin functions
//
- function clean_words($entry, &$search, &$replace)
- {
- // Weird, $init_match doesn't work with static when double quotes (") are used...
- static $init_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%');
- static $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
-
- static $later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
- static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ", " ", " ", " ");
-
- static $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
- static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
-
- static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
- static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
-
- $entry = " " . strip_tags(strtolower($entry)) . " ";
-
- $entry = str_replace($sgml_match, $sgml_match, $entry);
- $entry = str_replace($accent_match, $accent_replace, $entry);
-
- // Replace line endings by a space
- $entry = preg_replace("/[\n\r]/is", " ", $entry);
- // Remove URL's
- $entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
-
- // Filter out strange characters like ^, $, &, change "it's" to "its"
- // str_replace with arrays is buggy in some PHP versions so traverse the arrays manually ;(
- for($i = 0; $i < count($init_match); $i++)
- {
- $entry = str_replace($init_match[$i], $init_replace[$i], $entry);
- }
-
- // Quickly remove BBcode.
- $entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
- $entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
- $entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
- // URLs
- $entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
- $entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
- // Numbers
- $entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
- // HTML entities like &1234;
- $entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
- // 'words' that consist of <2 or >50 characters are removed.
- $entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
- $entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
-
- // Remove some more strange characters
- for($i = 0; $i < count($later_match); $i++)
- {
- $entry = str_replace($later_match[$i], $later_replace[$i], $entry);
- }
-
- return $entry;
- }
-
- function split_words(&$entry)
- {
- preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
-
- return $split_entries[1];
- }
-
- function remove_common($percent, $delete_common = 0)
- {
- global $db;
-
- $sql = "SELECT COUNT(DISTINCT post_id) as total_posts
- FROM " . SEARCH_MATCH_TABLE;
- $result = query($sql, "Couldn't select post count");
-
- $total_posts = $db->sql_fetchrow($result);
-
- $total_posts = $total_posts['total_posts'];
-
- $common_threshold = floor($total_posts * ( $percent / 100 ));
-
- $sql = "SELECT word_id
- FROM " . SEARCH_MATCH_TABLE . "
- GROUP BY word_id
- HAVING count(word_id) > $common_threshold";
- $result = query($sql, "Couldn't select matches");
-
- $common_words = $db->sql_numrows($result);
-
- while($row = $db->sql_fetchrow($result))
- {
- $common_word_ids[] = $row['word_id'];
- }
- $db->sql_freeresult($result);
-
- if(count($common_word_ids) != 0)
- {
- $common_word_ids = implode(',',$common_word_ids);
- }
- else
- {
- // We didn't remove any common words
- return 0;
- }
-
- $sql = "UPDATE ". SEARCH_WORD_TABLE ."
- SET word_common = 1
- WHERE word_id IN ($common_word_ids)";
- $result = query($sql, "Couldn't update search_wordmatch table common word field");
-
- if( $delete_common)
- {
- $sql = "DELETE FROM ".SEARCH_MATCH_TABLE."
- WHERE word_id IN ($common_word_ids)";
- $result = query($sql, "Couldn't delete common words");
- }
-
- return $common_words;
- }
-
function common_header()
{
--- 63,66 ----
***************
*** 1790,1794 ****
print "<br>Removing common words (words that appear in more than $common_percent of the posts)<br>\n";
flush();
! print "Removed " . remove_common($common_percent, 1) . " words that where too common.<br>";
}
--- 1644,1648 ----
print "<br>Removing common words (words that appear in more than $common_percent of the posts)<br>\n";
flush();
! print "Removed " . remove_common_global($common_percent, 1) . " words that where too common.<br>";
}
***************
*** 1964,1966 ****
print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";
! ?>
\ No newline at end of file
--- 1818,1820 ----
print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";
! ?>
|
|
From: Bart v. B. <ba...@us...> - 2002-01-03 11:06:25
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv25202/includes
Added Files:
search.php
Log Message:
Moved all search functions to includes/search.php Paul; please review
--- NEW FILE ---
<?php
/***************************************************************************
* search.php
* -------------------
* begin : Wed Sep 05 2001
* copyright : (C) 2001 The phpBB Group
* email : su...@ph...
*
* $Id: search.php,v 1.1 2002/01/03 11:06:21 bartvb Exp $
*
****************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
function clean_words($entry, &$stopword_list, &$synonym_list)
{
// Weird, $init_match doesn't work with static when double quotes (") are used...
static $init_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%');
static $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
static $later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ", " ", " ", " ");
static $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
$entry = " " . strip_tags(strtolower($entry)) . " ";
$entry = str_replace($sgml_match, $sgml_match, $entry);
$entry = str_replace($accent_match, $accent_replace, $entry);
// Replace line endings by a space
$entry = preg_replace("/[\n\r]/is", " ", $entry);
// Remove URL's
$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
// Filter out strange characters like ^, $, &, change "it's" to "its"
// str_replace with arrays is buggy in some PHP versions so traverse the arrays manually ;(
for($i = 0; $i < count($init_match); $i++)
{
$entry = str_replace($init_match[$i], $init_replace[$i], $entry);
}
// Quickly remove BBcode.
$entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
$entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
$entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
// URLs
$entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
$entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
// Numbers
$entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
// HTML entities like &1234;
$entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
// 'words' that consist of <2 or >50 characters are removed.
$entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
$entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
// Remove some more strange characters
for($i = 0; $i < count($later_match); $i++)
{
$entry = str_replace($later_match[$i], $later_replace[$i], $entry);
}
if( !empty($stopword_list) )
{
for ($j = 0; $j < count($stopword_list); $j++)
{
$filter_word = trim(strtolower($stopword_list[$j]));
$entry = preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry);
}
}
if( !empty($synonym_list) )
{
for ($j = 0; $j < count($synonym_list); $j++)
{
list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
$entry = preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
}
}
return $entry;
}
function clean_words_search($entry)
{
$char_match = array("^", "$", "&", "(", ")", "<", ">", "`", "'", "|", ",", "@", "_", "?", "%", "~", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "!");
$char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
$sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
$sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
$accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
$accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
$entry = " " . strip_tags(strtolower($entry)) . " ";
$entry = str_replace("+", " and ", $entry);
$entry = str_replace("-", " not ", $entry);
$entry = str_replace($sgml_match, $sgml_match, $entry);
$entry = str_replace($accent_match, $accent_replace, $entry);
$entry = str_replace($char_match, $char_replace, $entry);
$entry = preg_replace("/\b[0-9]+\b/", " ", $entry);
return $entry;
}
function split_words(&$entry)
{
preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
return $split_entries[1];
}
//
// Check if specified words are too common now
//
function remove_common($percent, $word_id_list = array())
{
global $db;
// 0.01-0.06s
$sql = "SELECT SUM(forum_posts) AS total_posts
FROM " . FORUMS_TABLE ;
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
}
$row = $db->sql_fetchrow($result);
if( $row['total_posts'] > 100 )
{
$common_threshold = floor($row['total_posts'] * $percent);
$word_id_sql = "";
if( count($word_id_list) )
{
$word_id_sql = "WHERE word_id IN (" . implode(", ", $word_id_list) . ") ";
}
// 0.020-0.024s
$sql = "SELECT word_id
FROM " . SEARCH_MATCH_TABLE . "
$word_id_sql
GROUP BY word_id
HAVING COUNT(word_id) > $common_threshold";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
}
// No matches
if( $word_count = $db->sql_numrows($result) )
{
$common_word_id_list = array();
while( $row = $db->sql_fetchrow($result) )
{
$common_word_id_list[] = $row['word_id'];
}
$db->sql_freeresult($result);
if( count($common_word_ids) != 0 )
{
$common_word_id_list = implode(", ", $common_word_id_list);
$sql = "UPDATE " . SEARCH_WORD_TABLE . "
SET word_common = " . TRUE . "
WHERE word_id IN ($common_word_id_list)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
WHERE word_id IN ($common_word_id_list)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
}
}
}
}
return $word_count;
}
//
// Search complete wordlist for words that are too common
//
function remove_common_global($percent, $delete_common = 0)
{
global $db;
$sql = "SELECT COUNT(DISTINCT post_id) as total_posts
FROM " . SEARCH_MATCH_TABLE;
$result = $db->sql_query($sql);
if( !$result )
{
$error = $db->sql_error();
die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']);
}
$total_posts = $db->sql_fetchrow($result);
$total_posts = $total_posts['total_posts'];
$common_threshold = floor($total_posts * ( $percent / 100 ));
$sql = "SELECT word_id
FROM " . SEARCH_MATCH_TABLE . "
GROUP BY word_id
HAVING count(word_id) > $common_threshold";
$result = $db->sql_query($sql);
if( !$result )
{
$error = $db->sql_error();
die("Couldn't obtain common word list :: " . $sql . " :: " . $error['message']);
}
$common_words = $db->sql_numrows($result);
while($row = $db->sql_fetchrow($result))
{
$common_word_ids[] = $row['word_id'];
}
$db->sql_freeresult($result);
if(count($common_word_ids) != 0)
{
$common_word_ids = implode(',',$common_word_ids);
}
else
{
// We didn't remove any common words
return 0;
}
$sql = "UPDATE ". SEARCH_WORD_TABLE ."
SET word_common = 1
WHERE word_id IN ($common_word_ids)";
$result = $db->sql_query($sql);
if( !$result )
{
$error = $db->sql_error();
die("Couldn't delete word list entry :: " . $sql . " :: " . $error['message']);
}
if( $delete_common)
{
$sql = "DELETE FROM ".SEARCH_MATCH_TABLE."
WHERE word_id IN ($common_word_ids)";
$result = $db->sql_query($sql);
if( !$result )
{
$error = $db->sql_error();
die("Couldn't delete word match entry :: " . $sql . " :: " . $error['message']);
}
}
return $common_words;
}
function remove_unmatched_words()
{
global $db;
switch(SQL_LAYER)
{
case 'postgresql':
$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
WHERE word_id NOT IN (
SELECT word_id
FROM " . SEARCH_MATCH_TABLE . "
GROUP BY word_id)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
}
$unmatched_count = $db->sql_affectedrows();
break;
case 'oracle':
$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
WHERE word_id IN (
SELECT w.word_id
FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
WHERE w.word_id = m.word_id(+)
AND m.word_id IS NULL)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
}
$unmatched_count = $db->sql_affectedrows();
break;
case 'mssql':
case 'msaccess':
$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
WHERE word_id IN (
SELECT w.word_id
FROM " . SEARCH_WORD_TABLE . " w
LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id
WHERE m.word_id IS NULL)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete old words from word table", __LINE__, __FILE__, $sql);
}
$unmatched_count = $db->sql_affectedrows();
break;
case 'mysql':
case 'mysql4':
// 0.07s
$sql = "SELECT w.word_id
FROM " . SEARCH_WORD_TABLE . " w
LEFT JOIN " . SEARCH_MATCH_TABLE . " m ON m.word_id = w.word_id
WHERE m.word_id IS NULL";
if( $result = $db->sql_query($sql) )
{
if( $unmatched_count = $db->sql_numrows($result) )
{
$rowset = array();
while( $row = $db->sql_fetchrow($result) )
{
$rowset[] = $row['word_id'];
}
$word_id_sql = implode(", ", $rowset);
if( $word_id_sql )
{
// 0.07s (about 15-20 words)
$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "
WHERE word_id IN ($word_id_sql)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
}
}
else
{
return 0;
}
}
else
{
return 0;
}
}
break;
}
return $unmatched_count;
}
function add_search_words($post_id, $post_text, $post_title = "")
{
global $db, $phpbb_root_path, $board_config, $lang;
$stopword_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
$search_text = clean_words($post_text, $stopword_array, $synonym_array);
$search_matches = split_words($search_text);
if( count($search_matches) )
{
$word = array();
sort($search_matches);
$word_text_sql = "";
for ($i = 0; $i < count($search_matches); $i++)
{
$search_matches[$i] = trim($search_matches[$i]);
if( $search_matches[$i] != "" && $search_matches[$i] != $search_matches[$i-1] )
{
$word[] = $search_matches[$i];
if( $word_text_sql != "" )
{
$word_text_sql .= ", ";
}
$word_text_sql .= "'" . $search_matches[$i] . "'";
}
}
$sql = "SELECT word_id, word_text, word_common
FROM " . SEARCH_WORD_TABLE . "
WHERE word_text IN ($word_text_sql)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
}
$check_words = array();
$word_id_list = array();
if( $word_check_count = $db->sql_numrows($result) )
{
while( $row = $db->sql_fetchrow($result) )
{
$check_words[$row['word_text']] = $row['word_common'];
$word_id_list[] = $row['word_id'];
}
}
$match_word = array();
for ($i = 0; $i < count($word); $i++)
{
$new_match = true;
$word_common = false;
if( $word_check_count )
{
if( isset($check_words[$word[$i]]) )
{
$new_match = false;
}
}
if( !$check_words[$word[$i]] )
{
$match_word[] = "'" . $word[$i] . "'";
}
if( $new_match )
{
$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common)
VALUES ('". $word[$i] . "', 0)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
}
}
}
$word_sql_in = implode(", ", $match_word);
$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match)
SELECT $post_id, word_id, 0
FROM " . SEARCH_WORD_TABLE . "
WHERE word_text IN ($word_sql_in)";
$result = $db->sql_query($sql);
if( !$result )
{
message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
}
}
remove_common(0.15, $word_id_list);
return;
}
function remove_stop_words($entry, &$stopword_list)
{
if( !empty($stopword_list) )
{
for ($j = 0; $j < count($stopword_list); $j++)
{
$filter_word = trim(strtolower($stopword_list[$j]));
if( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" )
{
$entry = preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry);
}
}
}
return $entry;
}
function replace_synonyms($entry, &$synonym_list)
{
if( !empty($synonym_list) )
{
for ($j = 0; $j < count($synonym_list); $j++)
{
list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
if( $match_synonym != "and" && $match_synonym != "or" && $match_synonym != "not" &&
$replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" )
{
$entry = preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
}
}
}
return $entry;
}
?>
|
|
From: Bart v. B. <ba...@us...> - 2002-01-03 10:20:50
|
Update of /cvsroot/phpbb/phpBB2/language/lang_dutch In directory usw-pr-cvs1:/tmp/cvs-serv16577 Modified Files: lang_main.php Log Message: Keeping Dutch translation in sync with English Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/lang_main.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** lang_main.php 2002/01/02 19:08:26 1.10 --- lang_main.php 2002/01/03 10:20:45 1.11 *************** *** 331,334 **** --- 331,335 ---- $lang['Delete'] = "Verwijder"; $lang['Poll_for'] = "Poll blijft geldig voor"; //BVB + $lang['Days'] = "Dagen"; // This is used for the Run poll for ... Days + in admin_forums for pruning $lang['Poll_for_explain'] = "[ Leeg laten of 0 invullen voor geen einde ]"; //BVB $lang['Delete_poll'] = "Verwijder Poll"; *************** *** 671,674 **** --- 672,676 ---- $lang['Could_not_add_user'] = "De gebruiker die je opgaf bestaat niet"; + $lang['Could_not_anon_user'] = "Anonieme gebruikers kunnen geen lid worden van een groep"; $lang['Confirm_unsub'] = "Weet je zeker dat je je af wil melden van deze groep?"; |
|
From: Doug K. <dou...@us...> - 2002-01-03 02:27:34
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv23774/db/schemas
Modified Files:
mssql_basic.sql mssql_schema.sql mysql_basic.sql
mysql_schema.sql oracle_basic.sql oracle_schema.sql
postgres_basic.sql postgres_schema.sql
Log Message:
Fixes bug 498620, among others. A problem with a rank_max value still hanging around in SQL statements. It was still created by all the schema files, so I changed it there, too. If I end up creating more problems, I'll revert them to the old values... Actually, I think I'd better. Anyway, don't even ask why I updated Oracle. I felt like it, plus we may use it someday...
That's it for now! One bug fix... yeah!
Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mssql_basic.sql 2001/12/16 20:31:12 1.6
--- mssql_basic.sql 2002/01/03 02:27:31 1.7
***************
*** 97,101 ****
SET IDENTITY_INSERT phpbb_ranks ON;
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES (1, 'Site Admin', -1, -1, 1, '');
SET IDENTITY_INSERT phpbb_ranks OFF;
--- 97,101 ----
SET IDENTITY_INSERT phpbb_ranks ON;
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES (1, 'Site Admin', -1, 1, '');
SET IDENTITY_INSERT phpbb_ranks OFF;
Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** mssql_schema.sql 2001/12/20 00:45:41 1.16
--- mssql_schema.sql 2002/01/03 02:27:31 1.17
***************
*** 150,154 ****
[rank_title] [varchar] (50) NOT NULL ,
[rank_min] [int] NULL ,
- [rank_max] [int] NULL ,
[rank_special] [smallint] NULL ,
[rank_image] [varchar] (50) NULL
--- 150,153 ----
Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mysql_basic.sql 2001/12/16 20:31:12 1.7
--- mysql_basic.sql 2002/01/03 02:27:31 1.8
***************
*** 72,76 ****
# -- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, -1, 1, NULL);
--- 72,76 ----
# -- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, 1, NULL);
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** mysql_schema.sql 2001/12/20 00:45:41 1.11
--- mysql_schema.sql 2002/01/03 02:27:31 1.12
***************
*** 232,236 ****
rank_title varchar(50) NOT NULL,
rank_min mediumint(8) DEFAULT '0' NOT NULL,
- rank_max mediumint(8) DEFAULT '0' NOT NULL,
rank_special tinyint(1) DEFAULT '0',
rank_image varchar(255),
--- 232,235 ----
Index: oracle_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/oracle_basic.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** oracle_basic.sql 2001/11/20 22:28:41 1.1
--- oracle_basic.sql 2002/01/03 02:27:31 1.2
***************
*** 71,79 ****
-- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '-1', '1', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '2', 'Newbie', '0', '9', '0', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '5', 'Here Often', '10', '49', '0', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '6', 'Should Get Out More', '50', '199', '0', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '7', 'Has No Life', '200', '9999', '0', '');
--- 71,79 ----
-- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '1', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '2', 'Newbie', '0', '0', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '5', 'Here Often', '10', '0', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '6', 'Should Get Out More', '50', '0', '');
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '7', 'Has No Life', '200', '0', '');
Index: oracle_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/oracle_schema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** oracle_schema.sql 2001/12/10 21:53:27 1.3
--- oracle_schema.sql 2002/01/03 02:27:31 1.4
***************
*** 260,264 ****
rank_title varchar(50) DEFAULT '' NOT NULL,
rank_min number(4) DEFAULT '0' NOT NULL,
- rank_max number(4) DEFAULT '0' NOT NULL,
rank_special number(4) DEFAULT '0',
rank_image varchar(255),
--- 260,263 ----
Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** postgres_basic.sql 2001/12/16 20:31:12 1.7
--- postgres_basic.sql 2002/01/03 02:27:31 1.8
***************
*** 72,76 ****
-- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, -1, 1, NULL);
--- 72,76 ----
-- Ranks
! INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, 1, NULL);
Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** postgres_schema.sql 2001/12/20 00:45:41 1.13
--- postgres_schema.sql 2002/01/03 02:27:31 1.14
***************
*** 227,231 ****
rank_title varchar(50) DEFAULT '' NOT NULL,
rank_min int4 DEFAULT '0' NOT NULL,
- rank_max int4 DEFAULT '0' NOT NULL,
rank_special int2 DEFAULT '0',
rank_image varchar(255),
--- 227,230 ----
|
|
From: Doug K. <dou...@us...> - 2002-01-03 02:27:34
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23774/admin
Modified Files:
admin_ranks.php
Log Message:
Fixes bug 498620, among others. A problem with a rank_max value still hanging around in SQL statements. It was still created by all the schema files, so I changed it there, too. If I end up creating more problems, I'll revert them to the old values... Actually, I think I'd better. Anyway, don't even ask why I updated Oracle. I felt like it, plus we may use it someday...
That's it for now! One bug fix... yeah!
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_ranks.php 2001/12/24 13:17:45 1.8
--- admin_ranks.php 2002/01/03 02:27:31 1.9
***************
*** 165,169 ****
{
$sql = "UPDATE " . RANKS_TABLE . "
! SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_max = 0, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "'
WHERE rank_id = $rank_id";
--- 165,169 ----
{
$sql = "UPDATE " . RANKS_TABLE . "
! SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "'
WHERE rank_id = $rank_id";
***************
*** 172,177 ****
else
{
! $sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_max, rank_min, rank_image)
! VALUES ('" . str_replace("\'", "''", $rank_title) . "', $special_rank, 0, $min_posts, '" . str_replace("\'", "''", $rank_image) . "')";
$message = $lang['Rank_added'];
--- 172,177 ----
else
{
! $sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_min, rank_image)
! VALUES ('" . str_replace("\'", "''", $rank_title) . "', $special_rank, $min_posts, '" . str_replace("\'", "''", $rank_image) . "')";
$message = $lang['Rank_added'];
***************
*** 353,355 ****
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
--- 353,355 ----
include('page_footer_admin.'.$phpEx);
! ?>
|
|
From: Bart v. B. <ba...@us...> - 2002-01-02 19:55:49
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9338
Modified Files:
viewtopic.php viewforum.php
Log Message:
Allowing old style URLs
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -r1.160 -r1.161
*** viewtopic.php 2002/01/01 17:17:40 1.160
--- viewtopic.php 2002/01/02 19:55:44 1.161
***************
*** 33,36 ****
--- 33,41 ----
$topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]);
}
+ else if(isset($HTTP_GET_VARS['topic']))
+ {
+ $topic_id = intval($HTTP_GET_VARS['topic']);
+ }
+
if(isset($HTTP_GET_VARS[POST_POST_URL]))
{
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -r1.117 -r1.118
*** viewforum.php 2001/12/30 13:44:55 1.117
--- viewforum.php 2002/01/02 19:55:45 1.118
***************
*** 32,35 ****
--- 32,39 ----
$forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]);
}
+ else if( isset($HTTP_GET_VARS['forum']))
+ {
+ $forum_id = $HTTP_GET_VARS['forum'];
+ }
else
{
***************
*** 670,672 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
--- 674,676 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
|
|
From: Bart v. B. <ba...@us...> - 2002-01-02 19:09:53
|
Update of /cvsroot/phpbb/phpBB2/language/lang_dutch/email
In directory usw-pr-cvs1:/tmp/cvs-serv27965
Modified Files:
topic_notify.tpl
Log Message:
Forgot topic URL
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/topic_notify.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** topic_notify.tpl 2001/12/24 13:50:03 1.1
--- topic_notify.tpl 2002/01/02 19:09:50 1.2
***************
*** 7,10 ****
--- 7,12 ----
bekijkt.
+ {U_TOPIC}
+
Als je geen emals wil ontvangen kan je op "Geen abonnement meer op dit
onderwerp" klikken onderaan dat topic. Of klik op de volgende link:
|
|
From: Bart v. B. <ba...@us...> - 2002-01-02 19:08:30
|
Update of /cvsroot/phpbb/phpBB2/language/lang_dutch In directory usw-pr-cvs1:/tmp/cvs-serv27562 Modified Files: lang_main.php Log Message: Translated Agreement (Dutch) Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/lang_main.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** lang_main.php 2001/12/28 04:09:50 1.9 --- lang_main.php 2002/01/02 19:08:26 1.10 *************** *** 588,605 **** $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"; --- 588,592 ---- $lang['Registration'] = "Registratie Voorwaarden"; ! $lang['Reg_agreement'] = "De beheerders en modertors van dit forum zullen proberen ongewenst materiaal zo snel mogelijk te verwijderen van de site. Het is echter onmogelijk om ieder bericht te controleren. Door in te stemmen met de voorwaarden erken je dat alle berichten op dit forum de meningen en gezichtspunten van de gebruikers zijn en niet van de beheerders, moderators of webmaster (behalve bij de berichten die door deze mensen geplaatst zijn). Het beheer kan niet aansprakelijk gesteld worden voor de inhoud van berichten van gebruikers.<br /><br />Je geeft verder aan dat je geen kwetsende, obsene, vulgaire, lasterlijke, haatdragende, bedreigende, sexueel-georienteerde berichten plaatst. Verder die je je te houden aan de van toepassing zijnde wetten en regels. Als je je niet houdt aan deze voorwaarden of aanwijzingen van het beheer niet volgt kan je meteen en permanent gebanned worden en zal eventueel je service provider op de hoogte worden gesteld van je gedrag. Het IP adres van je computer wordt bij ieder bericht opgeslagen om het beheer van de site te vereenvoudigen. Verder bewaard het systeem cookies op jouw computer. Deze cookies bevatten geen van de gebruikers informatie die in het profiel opgegeven wordt. Door deze voorwaarden te accepteren stem je er in toe dat bovenstaande gegevens bijgehouden worden. Deze informatie zal niet bekend worden gemaakt aan derden zonder jouw toestemming. Het beheer van de site is niet aansprakelijk voor hack poginen die het gevolg zijn van het eventueel bekend worden van deze informatie.<br /><br />Het beheer van de site heeft het recht alle berichten te verwijderen, bewerken, verplaatsen en hebben het recht onderwerpen en forums te sluiten op het moment dat zij dit passend vinden. Het email adres dat je opgeeft wordt alleen gebrukt voor het bevestigen van je account en wachtwoord en voor het verzenden van een nieuw wachtwoord als je je wachtwoord vergeet.<br >"; $lang['Agree_under_13'] = "I stem toe met de voorwaarden en ben <b>jonger</b> dan 13 jaar"; |
|
From: Paul S. O. <ps...@us...> - 2002-01-02 15:40:57
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv31769/includes
Modified Files:
functions.php
Log Message:
Clean up display of languages, limit to directory names only
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -r1.99 -r1.100
*** functions.php 2001/12/22 11:18:08 1.99
--- functions.php 2002/01/02 15:40:53 1.100
***************
*** 741,747 ****
$lang_select = "<select name=\"$select_name\">";
! while ($file = readdir($dir))
{
! if (ereg("^lang_", $file))
{
$filename = str_replace("lang_", "", $file);
--- 741,747 ----
$lang_select = "<select name=\"$select_name\">";
! while($file = readdir($dir))
{
! if( ereg("^lang_", $file) && !is_file($dirname . $file) && !is_link($dirname . $file) )
{
$filename = str_replace("lang_", "", $file);
***************
*** 749,753 ****
$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
! $selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
$lang_select .= "<option value=\"$filename\"$selected>" . ucwords($displayname) . "</option>";
}
--- 749,753 ----
$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
! $selected = ( strtolower($default) == strtolower($filename) ) ? " selected=\"selected\"" : "";
$lang_select .= "<option value=\"$filename\"$selected>" . ucwords($displayname) . "</option>";
}
|
|
From: Paul S. O. <ps...@us...> - 2002-01-02 14:39:38
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16581
Modified Files:
profile.php
Log Message:
Fix bug #495335 by removing specialchars and strip_tags from password checks
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -r1.163 -r1.164
*** profile.php 2002/01/01 21:39:53 1.163
--- profile.php 2002/01/02 14:39:35 1.164
***************
*** 468,474 ****
$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars(str_replace(" ", " ",$HTTP_POST_VARS['email'])))) : "";
! $password_current = (!empty($HTTP_POST_VARS['cur_password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['cur_password']))) : "";
! $password = (!empty($HTTP_POST_VARS['new_password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['new_password']))) : "";
! $password_confirm = (!empty($HTTP_POST_VARS['password_confirm'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password_confirm']))) : "";
$icq = (!empty($HTTP_POST_VARS['icq'])) ? trim(strip_tags($HTTP_POST_VARS['icq'])) : "";
--- 468,474 ----
$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars(str_replace(" ", " ",$HTTP_POST_VARS['email'])))) : "";
! $password_current = (!empty($HTTP_POST_VARS['cur_password'])) ? trim($HTTP_POST_VARS['cur_password']) : "";
! $password = (!empty($HTTP_POST_VARS['new_password'])) ? trim($HTTP_POST_VARS['new_password']) : "";
! $password_confirm = (!empty($HTTP_POST_VARS['password_confirm'])) ? trim($HTTP_POST_VARS['password_confirm']) : "";
$icq = (!empty($HTTP_POST_VARS['icq'])) ? trim(strip_tags($HTTP_POST_VARS['icq'])) : "";
|
|
From: Paul S. O. <ps...@us...> - 2002-01-02 12:07:34
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images
In directory usw-pr-cvs1:/tmp/cvs-serv13287/templates/subSilver/images
Added Files:
icon_edit_french.gif icon_email_french.gif icon_pm_french.gif
icon_profile_french.gif icon_quote_french.gif
icon_search_french.gif post_french.gif reply-locked_french.gif
reply_french.gif
Log Message:
French image support
--- NEW FILE ---
GIF89a;
¬øê(q§ÚÆöyÌð¸|N Öã!ðä*jk
*{,?x' +_>> "/*§¨ e¥{}%!!4;=; $/[ª©ªË-e ²!'S=<!
=/=
,/Á33ëª0Í
ô/Ð{*;.²<zLA°íÉp{À
À0À xæà (ü© áBÁ5 2`` ) \h!Àÿ/d0@B
Ld8
--- NEW FILE ---
GIF89a;
r~`ØbÁÿ
]¸@! ! XÈÃ *¸ `Á$,TPi ÂÕ0 é¡ÃÞ
¨-ðâC*hpãb%&@õ1!*'4¸`q%V äàw5l =
--- NEW FILE ---
GIF89a;
Ê©ÎÍÑëÑw©| =Ë :¹,üZåY f2Z@!ÃÂ
,(H±Ç»e×<hôP¡ :
(v@®Sº2<QÇ2"°t¡
ZÄ JAÿ 8Tx Û"ÔØ°!ÄcÌØeÀ
,PPÖS*B¸N
--- NEW FILE ---
GIF89a;
AM¯Ûïø|~èX¼+
.,'/ ?}&p&3 55©«jomm;º 5 ¬ !j&*Ñ*6(¼°'Ü°/ 4¿5ÄÆÊì Í ô)!½3 ÆõQC¿ÂHP3_
®8X(ÂÏ `ÀVZPW±§EÿxÀÐp
--- NEW FILE ---
GIF89a;
4IØÙÙ^egÛè ¬±ØÖÌ
--- NEW FILE ---
GIF89a;
iéé馺û@
¥µÿÿÿ¾Øäíô÷ÍÔêÀÀÀ<n ¸øøø·ÍعÌÓýE{ÜãæÌþÔÅþÿÚÿÿ«ÅÒÓÓÓüüü±ÅÅÑ×ôÿÿ¾Þ ´¿6|£Þçï v¢¸ÒÞU
«¿È¶ÀÌÆÌЫÔz«ÅäêíØØØáìòÿ÷Öx¬ÜÒ×Ù³âþÐÞç³×
>~ Y!$
$¥¦¨%a2''¤¦$¢©¿¨:a!6($y6Ñ-=Ï¥$+Þ- ·¾-4è=#Ã7 < ',**=, £3 âüÑh¡ÏB f´ð7#?; 2px0F»B
J\¡AA)LX(`f(p8Ó)D0àâÿ &8`¡
b p1â¨
--- NEW FILE ---
GIF89aR
G
[_r
]%^i`£¤¥¦§¨©ª«¦y_'i'[%¬¹º»¬a¾a¢b~]Xµ'¼ÊË«¿¾bÐÐdÓd%r:ɦ
Y§4B4&8&4 â»äÑÒ¨x A _
r*`|åÀ$L?SäÂ
D û·Q`Çt ?üСg\ÔÐqª2ÁÜ Ä1þhvS]Î"}úÄÀ&<*2¥A)ATcDR:6ÿÜÂ/ 6(
TzèÑC] hÖ¼SF¼ ÁB £p¨è
Ù$0ü 7Cp'Ày¥LszÊ
!ñ/°Eÿ'P#>&°p 9I
Xo½r×}
¶Íc Ùc öÚ«Í
b|°2¦e
ðÁ`
ZðÌ`SÀÁzð ¡à\à]``&Ôm @0¡ gHÃÚð8!Np
--- NEW FILE ---
GIF89aR
má»ãÐѦ¥S·® D¾zåT)qF
QO¨~¥Æ
h.qL!"Hp¸ ¢E hÊ8*Ï`fà# ¢ß?Ó¨a
¨ðá` H2¬qá¢Â9~Z#E
Rò` ÿ¥
,È *ÿd()Ð"B5SAøÃ÷&DÒ A
SÊ£'$@¢F!2DB "0ó
ëLkC6ZPBÃ
]¾ tá¡·&p1¥BÊ"Nà2Es -Ì^`" R BRDØ®9Âï "h ©}ûAÖ °è
y¥ì(Ç @qÀ¡aÀepð&Dp
JøÁ
zèa A %XàAÿ x( (øL <á
eLWe
véñ]~,`ÁxøGG)S0Ñ°``LåjeÈ\$w].~@©]Tñp¼X¦6Ø}ÔzØeA)è°ÀTÐ
ZðL ð0Ä DX&þÀ
EB Àºð
0da fHÃÚð8Ì!ð!@ #ÌD¢ðÀPàHL¢ÈÄ&:ñI$ r
--- NEW FILE ---
GIF89aR
Ø
v?ɤ k 0w0J Ñê£ÓÔÖÙð
qK}
£ Ãðk ®vÖ®ÅÃ6¯!$!N)=kÊp`£;9
aÂ
9L
¤øp¤BE* Êb
=z¼¹¡ùH ÀM(Ô(zÊ(;`Ò (ÆÀhÂë;ȸ>!EîØÜØ~ý6øëXð
0H×AfÐÄ_¨6)<C,à'<qlxÂ=!Es<áÀ
àPBOC~QB
äÂ/°Á¬ ;P °Âÿ&ÄP|B 1`CA p` M\ LÂOx@Á°Pa ´X*h
m
et e%YFYI À$=;,ÐßÀ!ì0!TXBMP ñÆT10"LÀÄ®î¡ÅHñ#úh 0ÐÆ$aE#Ò+!@91
kðÁ$D;¤ÑATQEÿ.ÔP©UQÂop°Ç÷ñ¸ Ä[U|ñB/d°@ úºPqN `-hà
Øô1B
gHC:ð8Ì¡w¨Cú Áð9MüA ?XÂ@
(hàO¡HÅ*BQXÌ¢·ÈÅ.Î
F
|
|
From: James A. <th...@us...> - 2002-01-02 07:19:27
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv31699 Modified Files: install.php Log Message: Fixed parse error in install.php Index: install.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/install.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** install.php 2002/01/01 22:52:18 1.27 --- install.php 2002/01/02 07:19:23 1.28 *************** *** 756,760 **** $sql = "ALTER TABLE " . $table_prefix . "sessions TYPE=HEAP"; ! $db->sql_query($sql)) } } --- 756,760 ---- $sql = "ALTER TABLE " . $table_prefix . "sessions TYPE=HEAP"; ! $db->sql_query($sql); } } |
|
From: Paul S. O. <ps...@us...> - 2002-01-01 22:52:22
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11777
Modified Files:
install.php upgrade.php
Log Message:
Removed failure on session table type change to HEAP, no biggie if it doesn't work
Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** install.php 2001/12/24 16:41:28 1.26
--- install.php 2002/01/01 22:52:18 1.27
***************
*** 1,5 ****
<?php
/***************************************************************************
! * install.php
* -------------------
* begin : Tuesday, Sept 11, 2001
--- 1,5 ----
<?php
/***************************************************************************
! * install.php
* -------------------
* begin : Tuesday, Sept 11, 2001
***************
*** 752,763 ****
$version = $row['mysql_version'];
! if( preg_match("/^(3\.23|4\.)/", $version) )
{
$sql = "ALTER TABLE " . $table_prefix . "sessions
TYPE=HEAP";
! if( !$result = $db->sql_query($sql))
! {
! $error .= "Could not alter session table to HEAP type :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! }
}
}
--- 752,760 ----
$version = $row['mysql_version'];
! if( preg_match("/^(3\.23)|(4\.)/", $version) )
{
$sql = "ALTER TABLE " . $table_prefix . "sessions
TYPE=HEAP";
! $db->sql_query($sql))
}
}
***************
*** 779,783 ****
}
! if( !$reinstall && ! $upgrade_now )
{
$template->assign_block_vars("switch_common_install", array());
--- 776,780 ----
}
! if( !$reinstall && !$upgrade_now )
{
$template->assign_block_vars("switch_common_install", array());
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** upgrade.php 2002/01/01 15:46:59 1.15
--- upgrade.php 2002/01/01 22:52:18 1.16
***************
*** 1896,1904 ****
$version = $row['mysql_version'];
! if( preg_match("/^(3\.23|4\.)/", $version) )
{
$sql = "ALTER TABLE " . $table_prefix . "sessions
TYPE=HEAP";
! query($sql, "Couldn't alter sessions table type to HEAP");
}
--- 1896,1904 ----
$version = $row['mysql_version'];
! if( preg_match("/^(3\.23)|(4\.)/", $version) )
{
$sql = "ALTER TABLE " . $table_prefix . "sessions
TYPE=HEAP";
! $db->sql_query($sql);
}
|
|
From: Paul S. O. <ps...@us...> - 2002-01-01 21:39:56
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv30191
Modified Files:
profile.php
Log Message:
Added alt and title tags to rank image as per viewtopic
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -r1.162 -r1.163
*** profile.php 2001/12/28 15:43:33 1.162
--- profile.php 2002/01/01 21:39:53 1.163
***************
*** 291,303 ****
$poster_rank = "";
$rank_image = "";
-
if( $profiledata['user_rank'] )
{
! for($j = 0; $j < count($ranksrow); $j++)
{
! if( $profiledata['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'] )
{
! $poster_rank = $ranksrow[$j]['rank_title'];
! $rank_image = ($ranksrow[$j]['rank_image']) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\"><br />" : "";
}
}
--- 291,302 ----
$poster_rank = "";
$rank_image = "";
if( $profiledata['user_rank'] )
{
! for($i = 0; $i < count($ranksrow); $i++)
{
! if( $profiledata['user_rank'] == $ranksrow[$i]['rank_id'] && $ranksrow[$i]['rank_special'] )
{
! $poster_rank = $ranksrow[$i]['rank_title'];
! $rank_image = ( $ranksrow[$i]['rank_image'] ) ? '<img src="' . $ranksrow[$i]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : "";
}
}
***************
*** 305,318 ****
else
{
! for($j = 0; $j < count($ranksrow); $j++)
{
! if( $profiledata['user_posts'] > $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] )
{
! $poster_rank = $ranksrow[$j]['rank_title'];
! $rank_image = ( $ranksrow[$j]['rank_image'] ) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\"><br />" : "";
}
}
}
-
if( !empty($profiledata['user_icq']) )
--- 304,316 ----
else
{
! for($i = 0; $i < count($ranksrow); $i++)
{
! if( $profiledata['user_posts'] > $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] )
{
! $poster_rank = $ranksrow[$i]['rank_title'];
! $rank_image = ( $ranksrow[$i]['rank_image'] ) ? '<img src="' . $ranksrow[$i]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : "";
}
}
}
if( !empty($profiledata['user_icq']) )
|
|
From: Paul S. O. <ps...@us...> - 2002-01-01 20:57:02
|
Update of /cvsroot/phpbb/phpBB2/templates/Euclid
In directory usw-pr-cvs1:/tmp/cvs-serv22630/templates/Euclid
Modified Files:
agreement.tpl faq_body.tpl modcp_move.tpl overall_header.tpl
posting_body.tpl
Added Files:
posting_smilies.tpl
Log Message:
Various updates
--- NEW FILE ---
<script language="javascript" type="text/javascript">
<!--
function emoticon(text) {
text = ' ' + text + ' ';
if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) {
var caretPos = opener.document.forms['post'].message.caretPos;
caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text;
opener.document.forms['post'].message.focus();
} else {
opener.document.forms['post'].message.value += text;
opener.document.forms['post'].message.focus();
}
}
//-->
</script>
<table width="100%" border="0" cellspacing="0" cellpadding="10">
<tr>
<td><table width="100%" cellspacing="1" cellpadding="4" border="0">
<tr>
<th height="25">{L_EMOTICONS}</th>
</tr>
<tr>
<td><table width="100" border="0" cellspacing="0" cellpadding="5">
<!-- BEGIN smilies_row -->
<tr align="center" valign="middle">
<!-- BEGIN smilies_col -->
<td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
<!-- END smilies_col -->
</tr>
<!-- END smilies_row -->
<!-- BEGIN switch_smilies_extra -->
<tr align="center">
<td colspan="{S_SMILIES_COLSPAN}"><span class="gensmall"><a href="{U_MORE_SMILIES}" onclick="open_window('{U_MORE_SMILIES}', 250, 300);return false" target="_smilies">{L_MORE_SMILIES}</a></span></td>
</tr>
<!-- END switch_smilies_extra -->
</table></td>
</tr>
<tr>
<td align="center"><br /><span class="gensmall"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
</tr>
</table></td>
</tr>
</table>
Index: agreement.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/agreement.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** agreement.tpl 2001/12/10 13:14:25 1.2
--- agreement.tpl 2002/01/01 20:56:58 1.3
***************
*** 1,5 ****
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
</tr>
</table>
--- 1,6 ----
+
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
! <td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
</tr>
</table>
***************
*** 9,18 ****
<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
<tr>
! <td class="cat" width="100%" height="30" align="center"><span class="cattitle"><b>{SITENAME} - Forums Registration Agreement<b></span></td>
</tr>
<tr>
<td class="row1" width="100%"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td><span class="gen"><br />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.<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}">I Agree to these terms (and am over 13 years of age)</a><br /><br /><a href="{U_AGREE_UNDER13}">I Agree to these terms (and am <b>under</b> 13 years of age)</a><br /><br /><a href="{U_INDEX}">I do not agree to these terms</a></div><br /></span></td>
</tr>
</table></td>
--- 10,19 ----
<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
<tr>
! <td class="cat" width="100%" height="30" align="center"><span class="cattitle"><b>{SITENAME} - {REGISTRATION}<b></span></td>
</tr>
<tr>
<td class="row1" width="100%"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
! <td><span class="gen"><br />{AGREEMENT}<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}">{AGREE_OVER_13}</a><br /><br /><a href="{U_AGREE_UNDER13}">{AGREE_UNDER_13}</a><br /><br /><a href="{U_INDEX}">{DO_NOT_AGREE}</a></div><br /></span></td>
</tr>
</table></td>
Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/faq_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** faq_body.tpl 2001/12/10 13:14:25 1.2
--- faq_body.tpl 2002/01/01 20:56:58 1.3
***************
*** 50,54 ****
<!-- BEGIN faq_row -->
<tr>
! <td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="gen"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br /><br /><span class="gensmall">{faq_block.faq_row.FAQ_ANSWER}</span></td>
</tr>
<!-- END faq_row -->
--- 50,54 ----
<!-- BEGIN faq_row -->
<tr>
! <td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="gen"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br /><br /><span class="gensmall">{faq_block.faq_row.FAQ_ANSWER}</span><br /><br /><span class="gensmall"><a href="#Top" class="postlink">{L_BACK_TO_TOP}</a></span></td>
</tr>
<!-- END faq_row -->
Index: modcp_move.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/modcp_move.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** modcp_move.tpl 2001/12/10 13:45:48 1.2
--- modcp_move.tpl 2002/01/01 20:56:58 1.3
***************
*** 7,11 ****
</tr>
<tr>
! <td class="row2" align="center"><br /><span class="gen">{L_MOVE_TO_FORUM} {S_FORUM_BOX}<br /><br />{MESSAGE_TEXT}</span><br /><br />{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="confirm" value="{L_YES}" /> <input class="liteoptiontable" type="submit" name="cancel" value="{L_NO}" /><br /><br /></td>
</tr>
</table></td>
--- 7,11 ----
</tr>
<tr>
! <td class="row2" align="center"><br /><span class="gen">{L_MOVE_TO_FORUM} {S_FORUM_BOX}<br /><br />{MESSAGE_TEXT}<br /><br /><input type="checkbox" name="move_leave_shadow" checked="checked" />{L_LEAVESHADOW}</span><br /><br />{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="confirm" value="{L_YES}" /> <input class="liteoptiontable" type="submit" name="cancel" value="{L_NO}" /><br /><br /></td>
</tr>
</table></td>
Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/overall_header.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** overall_header.tpl 2001/12/14 00:47:29 1.4
--- overall_header.tpl 2002/01/01 20:56:58 1.5
***************
*** 1,5 ****
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
- <!-- ?xml version="1.0" encoding="UTF-8"? -->
- <!--DOCTYPE PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd" -->
<html>
<head>
--- 1,3 ----
***************
*** 10,14 ****
<style type="text/css">
<!--
-
BODY {background-color:{T_BODY_BGCOLOR};color:{T_BODY_TEXT};scrollbar-base-color:{T_TH_COLOR2};scrollbar-arrow-color:{T_TH_COLOR1}}
P {font-family:{T_FONTFACE1};font-size:10pt}
--- 8,11 ----
***************
*** 43,47 ****
@import url("templates/Euclid/ie_form_elements.css");
-
//-->
</style>
--- 40,43 ----
Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/posting_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** posting_body.tpl 2001/12/10 15:25:53 1.4
--- posting_body.tpl 2002/01/01 20:56:58 1.5
***************
*** 264,274 ****
<td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
! <td><span class="gensmall"> Font color:<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"><option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="gensmall">Default</option><option style="color:darkred; background-color: white" value="darkred" class="gensmall">Dark Red</option><option style="color:red; background-color: white" value="red" class="gensmall">Red</option><option style="color:orange; background-color: white" value="orange" class="gensmall">Orange</option><option style="color:brown; background-color: white" value="brown" class="gensmall">Brown</option><option style="color:yellow; background-color: white" value="yellow" class="gensmall">Yellow</option><option style="color:green; background-color: white" value="green" class="gensmall">Green</option><option style="color:olive; background-color: white" value="olive" class="gensmall">Olive</option><option style="color:cyan; background-color: white" value="cyan" class="gensmall">Cyan</option><option style="color:blue; background-color: white" value="blue" class="gensmall">Blue</option><option style="color:darkblue; background-color: white" value="darkblue" class="gensmall">Dark Blue</option><option style="color:indigo; background-color: white" value="indigo" class="gensmall">Indigo</option><option style="color:violet; background-color: white" value="violet" class="gensmall">Violet</option><option style="color:white; background-color: white" value="white" class="gensmall">White</option><option style="color:black; background-color: white" value="black" class="gensmall">Black</option></select> Font size: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"><option value="9" class="gensmall">Tiny</option><option value="10" class="gensmall">Small</option><option value="12" selected class="gensmall">Normal</option><option value="18" class="gensmall">Large</option><option value="24" class="gensmall">Huge</option></select></span></td>
! <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="gensmall" onMouseOver="helpline('a')">Close Tags</a></span></td>
</tr>
</table></td>
</tr>
<tr>
! <td colspan="9"><span class="gensmall"><input style="background-color: {T_TD_COLOR2}; border-style: none;" type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" value="Tip: Styles can be applied quickly to selected text" /></span></td>
</tr>
<tr>
--- 264,296 ----
<td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
! <td><span class="gensmall"> {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
! <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option>
! <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">{L_COLOR_DARK_RED}</option>
! <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">{L_COLOR_RED}</option>
! <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">{L_COLOR_ORANGE}</option>
! <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">{L_COLOR_BROWN}</option>
! <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">{L_COLOR_YELLOW}</option>
! <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">{L_COLOR_GREEN}</option>
! <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">{L_COLOR_OLIVE}</option>
! <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">{L_COLOR_CYAN}</option>
! <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">{L_COLOR_BLUE}</option>
! <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">{L_COLOR_DARK_BLUE}</option>
! <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">{L_COLOR_INDIGO}</option>
! <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
! <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option>
! <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option>
! </select> {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
! <option value="9" class="genmed">{L_FONT_TINY}</option>
! <option value="10" class="genmed">{L_FONT_SMALL}</option>
! <option value="12" selected="selected" class="genmed">{L_FONT_NORMAL}</option>
! <option value="18" class="genmed">{L_FONT_LARGE}</option>
! <option value="24" class="genmed">{L_FONT_HUGE}</option>
! </select></span></td>
! <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="gensmall" onMouseOver="helpline('a')">{L_BBCODE_CLOSE_TAGS}</a></span></td>
</tr>
</table></td>
</tr>
<tr>
! <td colspan="9"><span class="gensmall"><input style="background-color: {T_TD_COLOR2}; border-style: none;" type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" value="{L_STYLES_TIP}" /></span></td>
</tr>
<tr>
***************
*** 277,313 ****
</table></td>
<td width="50%" valign="middle"><table border="0" cellspacing="0" cellpadding="5" align="center">
! <tr align="center">
! <td colspan="4"><span class="gensmall"><b>Emoticons</b></span></td>
</tr>
! <tr align="center" valign="middle">
! <td><a href="javascript:emoticon(':)')"><img src="images/smiles/icon_smile.gif" width="15" height="15" border="0" alt="Smile"></a></td>
! <td><a href="javascript:emoticon(':D')"><img src="images/smiles/icon_biggrin.gif" width="15" height="15" border="0" alt="Big grin"></a></td>
! <td><a href="javascript:emoticon(':lol:')"> <img src="images/smiles/icon_lol.gif" width="15" height="15" border="0" alt="Laugh"></a></td>
! <td><a href="javascript:emoticon(';)')"><img src="images/smiles/icon_wink.gif" width="15" height="15" border="0" alt="Wink"></a></td>
! </tr>
! <tr align="center" valign="middle">
! <td><a href="javascript:emoticon(':|')"><img src="images/smiles/icon_neutral.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':shock:')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0"></a></td>
! </tr>
! <tr align="center" valign="middle">
! <td><a href="javascript:emoticon(':roll:')"><img src="images/smiles/icon_rolleyes.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon('8)')"><img src="images/smiles/icon_cool.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':p')"><img src="images/smiles/icon_razz.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':oops:')"><img src="images/smiles/icon_redface.gif" width="15" height="15" border="0"></a></td>
! </tr>
! <tr align="center" valign="middle">
! <td><a href="javascript:emoticon(':evil:')"><img src="images/smiles/icon_evil.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0"></a></td>
! </tr>
! <tr align="center" valign="middle">
! <td><a href="javascript:emoticon(':idea:')"><img src="images/smiles/icon_idea.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':?:')"><img src="images/smiles/icon_question.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':!:')"><img src="images/smiles/icon_exclaim.gif" width="15" height="15" border="0"></a></td>
! <td><a href="javascript:emoticon(':arrow:')"><img src="images/smiles/icon_arrow.gif" width="15" height="15" border="0"></a></td>
</tr>
</table></td>
</tr>
--- 299,317 ----
</table></td>
<td width="50%" valign="middle"><table border="0" cellspacing="0" cellpadding="5" align="center">
! <tr align="center">
! <td colspan="{S_SMILIES_COLSPAN}" class="gensmall"><b>{L_EMOTICONS}</b></td>
</tr>
! <!-- BEGIN smilies_row -->
! <tr align="center" valign="middle">
! <!-- BEGIN smilies_col -->
! <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
! <!-- END smilies_col -->
! </tr>
! <!-- END smilies_row -->
! <!-- BEGIN switch_smilies_extra -->
! <tr align="center">
! <td colspan="{S_SMILIES_COLSPAN}"><span class="gensmall"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></td>
</tr>
+ <!-- END switch_smilies_extra -->
</table></td>
</tr>
|
|
From: Paul S. O. <ps...@us...> - 2002-01-01 18:59:55
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1365/admin
Modified Files:
index.php
Log Message:
Possible fix for bug #496857
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** index.php 2001/12/21 01:28:58 1.30
--- index.php 2002/01/01 18:59:50 1.31
***************
*** 232,237 ****
if( preg_match("/^(3\.23|4\.)/", $version) )
{
$sql = "SHOW TABLE STATUS
! FROM " . $dbname;
if(!$result = $db->sql_query($sql))
{
--- 232,239 ----
if( preg_match("/^(3\.23|4\.)/", $version) )
{
+ $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)/", $version) ) ? "`$dbname`" : $dbname;
+
$sql = "SHOW TABLE STATUS
! FROM " . $db_name;
if(!$result = $db->sql_query($sql))
{
|
|
From: Paul S. O. <ps...@us...> - 2002-01-01 17:17:43
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16255
Modified Files:
viewtopic.php
Log Message:
Added alt and title tags to rank image output
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -r1.159 -r1.160
*** viewtopic.php 2001/12/24 18:11:20 1.159
--- viewtopic.php 2002/01/01 17:17:40 1.160
***************
*** 809,813 ****
{
$poster_rank = $ranksrow[$j]['rank_title'];
! $rank_image = ($ranksrow[$j]['rank_image']) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\" alt=\"\" border=\"0\" /><br />" : "";
}
}
--- 809,813 ----
{
$poster_rank = $ranksrow[$j]['rank_title'];
! $rank_image = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $ranksrow[$j]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : "";
}
}
***************
*** 820,824 ****
{
$poster_rank = $ranksrow[$j]['rank_title'];
! $rank_image = ($ranksrow[$j]['rank_image']) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\" alt=\"\" border=\"0\" /><br />" : "";
}
}
--- 820,824 ----
{
$poster_rank = $ranksrow[$j]['rank_title'];
! $rank_image = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $ranksrow[$j]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : "";
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-01-01 15:47:03
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv1308
Modified Files:
upgrade.php
Log Message:
Fix potential issue with themes table ... I knew Bart had a reason for dropping tables at the beginning :D
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** upgrade.php 2002/01/01 00:27:55 1.14
--- upgrade.php 2002/01/01 15:46:59 1.15
***************
*** 558,563 ****
{
case 'start':
-
case 'cleanstart':
end_step('mod_old_tables');
--- 558,570 ----
{
case 'start':
case 'cleanstart':
+ print "Dropping sessions and themes tables ... ";
+ flush();
+
+ query("DROP TABLE sessions", "Couldn't drop table 'sessions'");
+ query("DROP TABLE themes", "Couldn't drop table 'themes'");
+
+ print "Done<br />\n";
+
end_step('mod_old_tables');
***************
*** 1233,1237 ****
}
! print "Removed $users_removed Users ... Done<br />\n";
echo "<br />Complete<br />\n";
--- 1240,1244 ----
}
! print "Removed $users_removed non-existent user references ... Done<br />\n";
echo "<br />Complete<br />\n";
***************
*** 1938,1942 ****
print "Dropping unused tables ... <br />\n";
! $drop_tables = array('access', 'forum_access', 'forum_mods', 'headermetafooter', 'sessions', 'themes', 'whosonline', $table_prefix . 'old_config');
for($i = 0; $i < count($drop_tables); $i++)
--- 1945,1949 ----
print "Dropping unused tables ... <br />\n";
! $drop_tables = array('access', 'forum_access', 'forum_mods', 'headermetafooter', 'whosonline', $table_prefix . 'old_config');
for($i = 0; $i < count($drop_tables); $i++)
|
|
From: Paul S. O. <ps...@us...> - 2002-01-01 15:26:31
|
Update of /cvsroot/phpbb/phpBB2/db/schemas In directory usw-pr-cvs1:/tmp/cvs-serv30520/db/schemas Modified Files: ms_access_primer.zip Log Message: Fix bug #498301 Index: ms_access_primer.zip =================================================================== RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 Binary files /tmp/cvsHeO2sg and /tmp/cvs4f5mAo differ |
|
From: Paul S. O. <ps...@us...> - 2002-01-01 14:35:36
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv21741/db
Modified Files:
postgres7.php
Log Message:
Fix for bug #497093 + other updates
Index: postgres7.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres7.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** postgres7.php 2001/12/31 20:36:46 1.15
--- postgres7.php 2002/01/01 14:35:33 1.16
***************
*** 38,63 ****
// Constructor
//
! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency=true)
{
-
$this->connect_string = "";
! if($sqluser)
{
$this->connect_string .= "user=$sqluser ";
}
! if($sqlpassword)
{
$this->connect_string .= "password=$sqlpassword ";
}
! if($sqlserver)
{
! if(ereg(":",$sqlserver))
{
! list($sqlserver,$sqlport) = split(":",$sqlserver);
$this->connect_string .= "host=$sqlserver port=$sqlport ";
}
else
{
! if($sqlserver != "localhost")
{
$this->connect_string .= "host=$sqlserver ";
--- 38,65 ----
// Constructor
//
! function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
{
$this->connect_string = "";
!
! if( $sqluser )
{
$this->connect_string .= "user=$sqluser ";
}
!
! if( $sqlpassword )
{
$this->connect_string .= "password=$sqlpassword ";
}
!
! if( $sqlserver )
{
! if( ereg(":", $sqlserver) )
{
! list($sqlserver, $sqlport) = split(":", $sqlserver);
$this->connect_string .= "host=$sqlserver port=$sqlport ";
}
else
{
! if( $sqlserver != "localhost" )
{
$this->connect_string .= "host=$sqlserver ";
***************
*** 65,97 ****
}
}
! if($database)
{
$this->dbname = $database;
! $make_connect = $this->connect_string . "dbname=$database";
}
- else
- {
- $make_connect = $this->connect_string;
- }
$this->persistency = $persistency;
- if($this->persistency)
- {
- $this->db_connect_id = @pg_pconnect($make_connect);
- }
- else
- {
- $this->db_connect_id = @pg_connect($make_connect);
- }
! if($this->db_connect_id)
! {
! return $this->db_connect_id;
! }
! else
! {
! return false;
! }
}
//
// Other base methods
--- 67,84 ----
}
}
!
! if( $database )
{
$this->dbname = $database;
! $this->connect_string .= "dbname=$database";
}
$this->persistency = $persistency;
! $this->db_connect_id = ( $this->persistency ) ? pg_pconnect($this->connect_string) : pg_connect($this->connect_string);
!
! return ( $this->db_connect_id ) ? $this->db_connect_id : false;
}
+
//
// Other base methods
***************
*** 99,103 ****
function sql_close()
{
! if($this->db_connect_id)
{
//
--- 86,90 ----
function sql_close()
{
! if( $this->db_connect_id )
{
//
***************
*** 109,118 ****
}
! if($this->query_result)
{
@pg_freeresult($this->query_result);
}
! $result = @pg_close($this->db_connect_id);
! return $result;
}
else
--- 96,105 ----
}
! if( $this->query_result )
{
@pg_freeresult($this->query_result);
}
!
! return @pg_close($this->db_connect_id);
}
else
***************
*** 126,134 ****
// Query method
//
! function sql_query($query = "", $transaction = FALSE)
{
// Remove any pre-existing queries
unset($this->query_result);
! if($query != "")
{
$this->num_queries++;
--- 113,123 ----
// Query method
//
! function sql_query($query = "", $transaction = false)
{
+ //
// Remove any pre-existing queries
+ //
unset($this->query_result);
! if( $query != "" )
{
$this->num_queries++;
***************
*** 136,143 ****
$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2, \\1", $query);
! if($transaction == BEGIN_TRANSACTION)
{
$result = @pg_exec($this->db_connect_id, "BEGIN");
! if(!$result)
{
return false;
--- 125,132 ----
$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2, \\1", $query);
! if( $transaction == BEGIN_TRANSACTION )
{
$result = @pg_exec($this->db_connect_id, "BEGIN");
! if( !$result )
{
return false;
***************
*** 147,156 ****
$this->query_result = @pg_exec($this->db_connect_id, $query);
! if($this->query_result)
{
! if($transaction == END_TRANSACTION)
{
$result = @pg_exec($this->db_connect_id, "COMMIT");
! if(!$result)
{
@pg_exec($this->db_connect_id, "ROLLBACK");
--- 136,145 ----
$this->query_result = @pg_exec($this->db_connect_id, $query);
! if( $this->query_result )
{
! if( $transaction == END_TRANSACTION )
{
$result = @pg_exec($this->db_connect_id, "COMMIT");
! if( !$result )
{
@pg_exec($this->db_connect_id, "ROLLBACK");
***************
*** 170,174 ****
else
{
! if($this->in_transaction)
{
@pg_exec($this->db_connect_id, "ROLLBACK");
--- 159,163 ----
else
{
! if( $this->in_transaction )
{
@pg_exec($this->db_connect_id, "ROLLBACK");
***************
*** 181,188 ****
else
{
! if($transaction == END_TRANSACTION)
{
$result = @pg_exec($this->db_connect_id, "COMMIT");
! if(!$result)
{
@pg_exec($this->db_connect_id, "ROLLBACK");
--- 170,177 ----
else
{
! if( $transaction == END_TRANSACTION )
{
$result = @pg_exec($this->db_connect_id, "COMMIT");
! if( !$result )
{
@pg_exec($this->db_connect_id, "ROLLBACK");
***************
*** 195,198 ****
--- 184,188 ----
}
}
+
//
// Other query methods
***************
*** 200,312 ****
function sql_numrows($query_id = 0)
{
! if(!$query_id)
{
$query_id = $this->query_result;
- }
- if($query_id)
- {
- $result = @pg_numrows($query_id);
- return $result;
- }
- else
- {
- return false;
}
! }
! function sql_affectedrows($query_id = 0)
! {
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
! if($query_id)
! {
! $result = @pg_cmdtuples($query_id);
! return $result;
! }
! else
! {
! return false;
! }
}
function sql_numfields($query_id = 0)
{
! if(!$query_id)
{
$query_id = $this->query_result;
}
! if($query_id)
! {
! $result = @pg_numfields($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 = @pg_fieldname($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 = @pg_fieldtype($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)
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]);
! if($this->row)
{
$this->rownum[$query_id]++;
return $this->row;
}
- else
- {
- return false;
- }
}
! else
! {
! return false;
! }
}
function sql_fetchrowset($query_id = 0)
{
! if(!$query_id)
{
$query_id = $this->query_result;
}
! if($query_id)
{
unset($this->rowset[$query_id]);
--- 190,260 ----
function sql_numrows($query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
!
! return ( $query_id ) ? @pg_numrows($query_id) : false;
}
+
function sql_numfields($query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
!
! return ( $query_id ) ? @pg_numfields($query_id) : false;
}
+
function sql_fieldname($offset, $query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
+
+ return ( $query_id ) ? @pg_fieldname($query_id, $offset) : false;
}
+
function sql_fieldtype($offset, $query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
!
! return ( $query_id ) ? @pg_fieldtype($query_id, $offset) : false;
}
+
function sql_fetchrow($query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
+
if($query_id)
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]);
!
! if( $this->row )
{
$this->rownum[$query_id]++;
return $this->row;
}
}
!
! return false;
}
+
function sql_fetchrowset($query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
!
! if( $query_id )
{
unset($this->rowset[$query_id]);
***************
*** 314,338 ****
$this->rownum[$query_id] = 0;
! while($this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC))
{
$result[] = $this->rowset;
$this->rownum[$query_id]++;
}
return $result;
- }
- else
- {
- return false;
}
}
function sql_fetchfield($field, $row_offset=-1, $query_id = 0)
{
! if(!$query_id)
{
$query_id = $this->query_result;
}
! if($query_id)
{
! if($row_offset != -1)
{
$this->row = @pg_fetch_array($query_id, $row_offset, PGSQL_ASSOC);
--- 262,287 ----
$this->rownum[$query_id] = 0;
! while( $this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC) )
{
$result[] = $this->rowset;
$this->rownum[$query_id]++;
}
+
return $result;
}
+
+ return false;
}
+
function sql_fetchfield($field, $row_offset=-1, $query_id = 0)
{
! if( !$query_id )
{
$query_id = $this->query_result;
}
!
! if( $query_id )
{
! if( $row_offset != -1 )
{
$this->row = @pg_fetch_array($query_id, $row_offset, PGSQL_ASSOC);
***************
*** 340,344 ****
else
{
! if($this->rownum[$query_id])
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]-1, PGSQL_ASSOC);
--- 289,293 ----
else
{
! if( $this->rownum[$query_id] )
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]-1, PGSQL_ASSOC);
***************
*** 347,351 ****
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC);
! if($this->row)
{
$this->rownum[$query_id]++;
--- 296,301 ----
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC);
!
! if( $this->row )
{
$this->rownum[$query_id]++;
***************
*** 353,371 ****
}
}
return $this->row[$field];
}
! else
! {
! return false;
! }
}
! function sql_rowseek($offset, $query_id = 0){
if(!$query_id)
{
$query_id = $this->query_result;
}
! if($query_id)
{
! if($offset>-1)
{
$this->rownum[$query_id] = $offset;
--- 303,324 ----
}
}
+
return $this->row[$field];
}
!
! return false;
}
!
! function sql_rowseek($offset, $query_id = 0)
! {
!
if(!$query_id)
{
$query_id = $this->query_result;
}
!
! if( $query_id )
{
! if( $offset > -1 )
{
$this->rownum[$query_id] = $offset;
***************
*** 376,395 ****
return false;
}
- }
- else
- {
- return false;
}
}
! function sql_nextid($query_id = 0)
{
! if(!$query_id)
! {
! $query_id = $this->query_result;
! }
if($query_id && $this->last_query_text[$query_id] != "")
{
!
! if( preg_match("/^INSERT[ ]+INTO[ ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
{
$query = "SELECT last_value
--- 329,344 ----
return false;
}
}
+
+ return false;
}
!
! function sql_nextid()
{
! $query_id = $this->query_result;
!
if($query_id && $this->last_query_text[$query_id] != "")
{
! if( preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
{
$query = "SELECT last_value
***************
*** 402,445 ****
$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
! if($temp_result)
! {
! return $temp_result['last_value'];
! }
! else
! {
! return false;
! }
! }
! else
! {
! return false;
}
- }
- else
- {
- return false;
}
}
! function sql_freeresult($query_id = 0){
! if(!$query_id){
! $query_id = $this->query_result;
! }
! if($query_id)
{
! $result = @pg_freeresult($query_id);
! return $result;
}
! else
{
! return false;
}
}
function sql_error($query_id = 0)
{
! if(!$query_id){
$query_id = $this->query_result;
}
$result['message'] = @pg_errormessage($this->db_connect_id);
$result['code'] = -1;
return $result;
}
--- 351,392 ----
$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
!
! return ( $temp_result ) ? $temp_result['last_value'] : false;
}
}
+
+ return false;
}
!
! function sql_affectedrows($query_id = 0)
! {
! if( !$query_id )
{
! $query_id = $this->query_result;
}
!
! return ( $query_id ) ? @pg_cmdtuples($query_id) : false;
! }
!
! function sql_freeresult($query_id = 0)
! {
! if( !$query_id )
{
! $query_id = $this->query_result;
}
+
+ return ( $query_id ) ? @pg_freeresult($query_id) : false;
}
+
function sql_error($query_id = 0)
{
! if( !$query_id )
! {
$query_id = $this->query_result;
}
+
$result['message'] = @pg_errormessage($this->db_connect_id);
$result['code'] = -1;
+
return $result;
}
|
7 messages has been excluded from this view by a project administrator.
