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-05-16 11:02:22
|
Update of /cvsroot/phpbb/phpBB2/language/lang_italian
In directory usw-pr-cvs1:/tmp/cvs-serv10416/language/lang_italian
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
Various updates to 2.0.1
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/lang_admin.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** lang_admin.php 14 Feb 2002 16:01:29 -0000 1.4
--- lang_admin.php 16 May 2002 11:02:18 -0000 1.4.2.1
***************
*** 21,24 ****
--- 21,25 ----
***************************************************************************/
+
//
// Translation produced by tesno
***************
*** 26,29 ****
--- 27,31 ----
//
+
//
// Format is same as lang_main
***************
*** 82,86 ****
$lang['Avatar_dir_size'] = "Dimensione directory Avatar";
$lang['Database_size'] = "Dimensione Database";
! $lang['Gzip_compression'] = "Compressione Gzip";
$lang['Not_available'] = "Non disponibile";
--- 84,88 ----
$lang['Avatar_dir_size'] = "Dimensione directory Avatar";
$lang['Database_size'] = "Dimensione Database";
! $lang['Gzip_compression'] ="Gzip compression";
$lang['Not_available'] = "Non disponibile";
***************
*** 208,212 ****
$lang['Ban_username'] = "Disabilita uno o più utenti specifici";
- $lang['Ban_username_explain'] = "Puoi disabilitare più utenti con una sola operazione utilizzando l'appropriata combinazione di mouse e tastiera per il tuo computer e browser";
$lang['Ban_IP'] = "Disabilita uno o più indirizzi IP o hostname";
--- 210,213 ----
***************
*** 261,265 ****
$lang['Max_poll_options'] = "Numero massimo di opzioni per sondaggio";
$lang['Flood_Interval'] = "Intervallo del Flood";
! $lang['Flood_Interval_explain'] = "Numero di secondi di attesa tra ogni messaggio";
$lang['Board_email_form'] = "Messaggistica email attraverso il forum";
$lang['Board_email_form_explain'] = "Gli utenti possono inviarsi email a vicenda utilizzando il forum";
--- 262,266 ----
$lang['Max_poll_options'] = "Numero massimo di opzioni per sondaggio";
$lang['Flood_Interval'] = "Intervallo del Flood";
! $lang['Flood_Interval_explain'] = "Numero di secondi di attesa tra ogni messaggio";
$lang['Board_email_form'] = "Messaggistica email attraverso il forum";
$lang['Board_email_form_explain'] = "Gli utenti possono inviarsi email a vicenda utilizzando il forum";
***************
*** 313,316 ****
--- 314,321 ----
$lang['Use_SMTP_explain'] = "Rispondi sì se vuoi o devi inviare email attraverso un server specifico invece della funzione mail locale";
$lang['SMTP_server'] = "Indirizzo Server SMTP";
+ $lang['SMTP_username'] = "SMTP Username";
+ $lang['SMTP_username_explain'] = "Inserisci uno username solo se il tuo server smtp lo richiede";
+ $lang['SMTP_password'] = "SMTP Password";
+ $lang['SMTP_password_explain'] = "Inserisci una password solo se il tuo server smtp lo richiede";
$lang['Disable_privmsg'] = "Messaggi Privati";
***************
*** 321,329 ****
$lang['Cookie_settings'] = "Impostazioni Cookie";
$lang['Cookie_settings_explain'] = "Questo modulo controlla come vengono definiti i cookie inviati ai browser. In molti casi l'impostazione di default è sufficiente. Se devi cambiare queste impostazioni fallo con attenzione, le impostazioni non corrette possono impedire agli utenti di entrare.";
- $lang['Cookie_name'] = "Nome Cookie";
$lang['Cookie_domain'] = "Dominio Cookie";
$lang['Cookie_path'] = "Percorso Cookie";
- $lang['Session_length'] = "Lunghezza Sessione [ secondi ]";
$lang['Cookie_secure'] = "Cookie secure [ http ]";
--- 326,335 ----
$lang['Cookie_settings'] = "Impostazioni Cookie";
$lang['Cookie_settings_explain'] = "Questo modulo controlla come vengono definiti i cookie inviati ai browser. In molti casi l'impostazione di default è sufficiente. Se devi cambiare queste impostazioni fallo con attenzione, le impostazioni non corrette possono impedire agli utenti di entrare.";
$lang['Cookie_domain'] = "Dominio Cookie";
+ $lang['Cookie_name'] = "Nome Cookie";
$lang['Cookie_path'] = "Percorso Cookie";
$lang['Cookie_secure'] = "Cookie secure [ http ]";
+ $lang['Cookie_secure_explain'] = "Se il tuo server utilizza SSL selezionaquesto per abilitarlo, altrimenti lascialo disabilitato";
+ $lang['Session_length'] = "Lunghezza Sessione [ secondi ]";
***************
*** 358,362 ****
$lang['Forum_pruning'] = "Eliminazione Automatica";
! $lang['prune_freq'] = "Verifica l'età degli argomenti ogni";
$lang['prune_days'] = "Rimuovi gli argomenti che non hanno avuto risposte per";
$lang['Set_prune_data'] = "Hai attivato l'eliminazione automatica per questo forum ma non hai impostato la frequenza o il numero di giorni per il prune. Per favore torna indietro e fallo";
--- 364,368 ----
$lang['Forum_pruning'] = "Eliminazione Automatica";
! $lang['prune_freq'] = 'Check for topic age every';
$lang['prune_days'] = "Rimuovi gli argomenti che non hanno avuto risposte per";
$lang['Set_prune_data'] = "Hai attivato l'eliminazione automatica per questo forum ma non hai impostato la frequenza o il numero di giorni per il prune. Per favore torna indietro e fallo";
***************
*** 414,418 ****
// User Management
//
! $lang['User_admin'] = "Administrazione Utenti";
$lang['User_admin_explain'] = "Qui puoi cambiare le informazioni degli utenti e alcune opzioni specifiche. Per modificare il permessi degli utenti, per favore utilizza il modulo di Amministrazione dei Permessi per Utenti e Gruppi.";
--- 420,424 ----
// User Management
//
! $lang['User_admin'] = "Amministrazione Utenti";
$lang['User_admin_explain'] = "Qui puoi cambiare le informazioni degli utenti e alcune opzioni specifiche. Per modificare il permessi degli utenti, per favore utilizza il modulo di Amministrazione dei Permessi per Utenti e Gruppi.";
***************
*** 435,438 ****
--- 441,449 ----
$lang['User_special'] = "Campi speciali solo per l'amministratore";
$lang['User_special_explain'] = "Questi campi non possono essere modificati dagli utenti. Qui puoi impostare il loro stato e altre opzioni che non vengono date agli utenti.";
+ // Added for enhanced user management
+ $lang['User_lookup_explain'] = "Puoi controllare uno o più utenti utilizzando uno o più dei criteri qui sotto. Non servono abbreviazioni, verranno automaticamente aggiunte.";
+ $lang['One_user_found'] = "E' stato trovato un solo utente, stai per essere rediretto a quell'utente";
+ $lang['Click_goto_user'] = "Clicca %sQui%s per modificare il profilo di questi utenti";
+ $lang['User_joined_explain'] = "La sintassi utilizzata è identica alla funzione PHP <a href=\"http://www.php.net/strtotime\" target=\"_other\">strtotime()</a>";
***************
*** 467,471 ****
$lang['Select_group'] = "Seleziona un gruppo";
$lang['Look_up_group'] = "Controlla gruppo";
!
//
--- 478,482 ----
$lang['Select_group'] = "Seleziona un gruppo";
$lang['Look_up_group'] = "Controlla gruppo";
! $lang['No_group_action'] = 'No action was specified';
//
***************
*** 537,540 ****
--- 548,552 ----
$lang['Rank_added'] = "Il livello è stato aggiunto con successo";
$lang['Rank_removed'] = "Il livello è stato cancellato con seccesso";
+ $lang['No_update_ranks'] = "Il livello è stato cancellato. Comunque gli account degli utenti che utilizzavano questo livello non sono stati aggiornati. Devi cancellare manualmente i livelli su questi account.";
$lang['Click_return_rankadmin'] = "Clicca %squi%s per tornare al pannello Amministrazione Livelli";
***************
*** 676,679 ****
--- 688,693 ----
$lang['DB_Host'] = "Database Server Hostname / DSN";
$lang['DB_Name'] = "Nome del tuo Database";
+ $lang['DB_Username'] = "Username Database";
+ $lang['DB_Password'] = "Password Database";
$lang['Database'] = "Il tuo Database";
$lang['Install_lang'] = "Scegli una lingua per l'Installazione";
***************
*** 699,711 ****
$lang['ftp_password'] = "La tua Password FTP";
$lang['Transfer_config'] = "Inizio Trasferimento";
$lang['Install'] = "Installa";
$lang['Upgrade'] = "Aggiorna";
$lang['Install_Method'] = "Scegli un metodo di installazione";
! $lang['Install_No_Ext'] = "La configurazione php del tuo server non supporta il tipo di database che hai scelto";
- $lang['Install_No_PCRE'] = "phpBB2 Richiede il Perl-Compatible Regular Expressions Module per php che la tua configurazione php non sembra supportare!";
//
--- 713,728 ----
$lang['ftp_password'] = "La tua Password FTP";
$lang['Transfer_config'] = "Inizio Trasferimento";
+ $lang['NoFTP_config'] = "Il tentativo di modificare il file config via ftp è fallito. Per favore scarica il file config e caricalo via ftp manualmente";
$lang['Install'] = "Installa";
$lang['Upgrade'] = "Aggiorna";
+
$lang['Install_Method'] = "Scegli un metodo di installazione";
! $lang['Install_No_Ext'] = "La configurazione php del tuo server non supporta il tipo di database che hai scelto";
!
! $lang['Install_No_PCRE'] = "phpBB2 Richiede il Perl-Compatible Regular Expressions Module per php che la tua configurazione php non sembra supportare!";
//
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/lang_main.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** lang_main.php 6 Mar 2002 00:36:23 -0000 1.7
--- lang_main.php 16 May 2002 11:02:19 -0000 1.7.2.1
***************
*** 1,5 ****
<?php
/***************************************************************************
! * lang_main.php [English]
* -------------------
* begin : Sat Dec 16 2000
--- 1,5 ----
<?php
/***************************************************************************
! * lang_main.php [Italian]
* -------------------
* begin : Sat Dec 16 2000
***************
*** 26,29 ****
--- 26,41 ----
+ //
+ // The format of this file is:
+ //
+ // ---> $lang['message'] = "text";
+ //
+ // You should also try to set a locale and a character
+ // encoding (plus direction). The encoding and direction
+ // will be sent to the template. The locale may or may
+ // not work, it's dependent on OS support and the syntax
+ // varies ... give it your best guess!
+ //
+
//setlocale(LC_ALL, "en");
$lang['ENCODING'] = "iso-8859-1";
***************
*** 31,35 ****
$lang['LEFT'] = "left";
$lang['RIGHT'] = "right";
! $lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
--- 43,47 ----
$lang['LEFT'] = "left";
$lang['RIGHT'] = "right";
! $lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
***************
*** 116,130 ****
$lang['Registered_users'] = "Utenti registrati:";
$lang['Browsing_forum'] = "Utenti che stanno navigando nel forum:";
$lang['Online_users_total'] = "In totale ci sono <b>%d</b> utenti in linea :: ";
$lang['Online_user_total'] = "In totale c'è <b>%d</b> utente in linea :: ";
$lang['Reg_users_total'] = "%d Registrati, ";
$lang['Reg_user_total'] = "%d Registrato, ";
! $lang['Hidden_users_total'] = "%d Nascosti e ";
$lang['Hidden_user_total'] = "%d Nascosto e ";
$lang['Guest_users_total'] = "%d Ospiti";
$lang['Guest_user_total'] = "%d Ospite";
$lang['Record_online_users'] = "Il massimo numero di utenti in linea è stato <b>%s</b> il %s"; // first %s = number of users, second %s is the date.
! $lang['Admin_online_color'] = "%sAmministratore%s";
$lang['Mod_online_color'] = "%sModeratore%s";
--- 128,146 ----
$lang['Registered_users'] = "Utenti registrati:";
$lang['Browsing_forum'] = "Utenti che stanno navigando nel forum:";
+ $lang['Online_users_zero_total'] = "In totale ci sono <b>0</b> utenti in linea ::";
$lang['Online_users_total'] = "In totale ci sono <b>%d</b> utenti in linea :: ";
$lang['Online_user_total'] = "In totale c'è <b>%d</b> utente in linea :: ";
+ $lang['Reg_users_zero_total'] = "0 Registrati";
$lang['Reg_users_total'] = "%d Registrati, ";
$lang['Reg_user_total'] = "%d Registrato, ";
! $lang['Hidden_users_zero_total'] = "0 Nascosti e";
$lang['Hidden_user_total'] = "%d Nascosto e ";
+ $lang['Hidden_users_total'] = "%d Nascosti e ";
+ $lang['Guest_users_zero_total'] = "0 Ospiti";
$lang['Guest_users_total'] = "%d Ospiti";
$lang['Guest_user_total'] = "%d Ospite";
$lang['Record_online_users'] = "Il massimo numero di utenti in linea è stato <b>%s</b> il %s"; // first %s = number of users, second %s is the date.
! $lang['Admin_online_color'] = "%sAmministratore%s";
$lang['Mod_online_color'] = "%sModeratore%s";
***************
*** 133,138 ****
$lang['Search_new'] = "Guarda i messaggi dall'ultima visita";
- $lang['Admin_online_color'] = "%sAmministratore%s";
- $lang['Mod_online_color'] = "%sModeratore%s";
$lang['Search_your_posts'] = "Guarda i tuoi messaggi";
$lang['Search_unanswered'] = "Guarda i messaggi senza risposta";
--- 149,152 ----
***************
*** 154,161 ****
// Stats block text
//
! $lang['Posted_article_total'] = "I nostri utenti hanno inviato un totale di <b>%d</b> messaggio"; // Number of posts
$lang['Posted_articles_total'] = "I nostri utenti hanno inviato un totale di <b>%d</b> messaggi"; // Number of posts
! $lang['Registered_user_total'] = "Abbiamo <b>%d</b> utente registrato"; // # registered users
$lang['Registered_users_total'] = "Abbiamo <b>%d</b> utenti registrati"; // # registered users
$lang['Newest_user'] = "L'ultimo utente registrato è <b>%s%s%s</b>"; // a href, username, /a
--- 168,177 ----
// Stats block text
//
! $lang['Posted_articles_zero_total'] = "I nostri utenti hanno inviato un totale di <b>0</b> messaggi"; // Number of posts
$lang['Posted_articles_total'] = "I nostri utenti hanno inviato un totale di <b>%d</b> messaggi"; // Number of posts
! $lang['Posted_article_total'] = "I nostri utenti hanno inviato un totale di <b>%d</b> messaggio"; // Number of posts
! $lang['Registered_users_zero_total'] = "Abbiamo <b>0</b> utenti registrati"; // # registered users
$lang['Registered_users_total'] = "Abbiamo <b>%d</b> utenti registrati"; // # registered users
+ $lang['Registered_user_total'] = "Abbiamo <b>%d</b> utente registrato"; // # registered users
$lang['Newest_user'] = "L'ultimo utente registrato è <b>%s%s%s</b>"; // a href, username, /a
***************
*** 212,216 ****
$lang['Topic_Announcement'] = "<b>Annuncio:</b>";
! $lang['Topic_Sticky'] = "<b>Importante:</b>";
$lang['Topic_Moved'] = "<b>Spostato:</b>";
$lang['Topic_Poll'] = "<b>[ Sondaggio ]</b>";
--- 228,232 ----
$lang['Topic_Announcement'] = "<b>Annuncio:</b>";
! $lang['Topic_Sticky'] = "<b>Stiloso:</b>";
$lang['Topic_Moved'] = "<b>Spostato:</b>";
$lang['Topic_Poll'] = "<b>[ Sondaggio ]</b>";
***************
*** 239,243 ****
$lang['View_topic'] = "Guarda l'argomento";
! $lang['Guest'] = 'Ospite';
$lang['Post_subject'] = "Soggetto";
$lang['View_next_topic'] = "Argomento successivo";
--- 255,259 ----
$lang['View_topic'] = "Guarda l'argomento";
! $lang['Guest'] = 'Guest';
$lang['Post_subject'] = "Soggetto";
$lang['View_next_topic'] = "Argomento successivo";
***************
*** 259,263 ****
$lang['Read_profile'] = "Guarda il profilo dell'utente";
! $lang['Send_email'] = "Manda una e-mail all'utente";
$lang['Visit_website'] = "Visita il sito dell'autore del messaggio";
$lang['ICQ_status'] = "Stato ICQ";
--- 275,279 ----
$lang['Read_profile'] = "Guarda il profilo dell'utente";
! $lang['Send_email'] = "Invia email";
$lang['Visit_website'] = "Visita il sito dell'autore del messaggio";
$lang['ICQ_status'] = "Stato ICQ";
***************
*** 301,305 ****
$lang['Post_Announcement'] = "Annuncio";
! $lang['Post_Sticky'] = "Importante";
$lang['Post_Normal'] = "Normale";
--- 317,321 ----
$lang['Post_Announcement'] = "Annuncio";
! $lang['Post_Sticky'] = "Stiloso";
$lang['Post_Normal'] = "Normale";
***************
*** 312,316 ****
$lang['Forum_locked'] = "Questo forum è bloccato. Non puoi inserire, rispondere o modificare gli argomenti";
$lang['Topic_locked'] = "Questo argomento è bloccato. Non puoi modificare i messaggi o inserire una risposta";
! $lang['No_post_id'] = "Devi selezionare un messaggio da modificare";
$lang['No_topic_id'] = "Devi selezionare un argomento a cui rispondere";
$lang['No_valid_mode'] = "Puoi solo inviare, rispondere, modificare o citare messaggi, per favore torna indietro e prova di nuovo";
--- 328,332 ----
$lang['Forum_locked'] = "Questo forum è bloccato. Non puoi inserire, rispondere o modificare gli argomenti";
$lang['Topic_locked'] = "Questo argomento è bloccato. Non puoi modificare i messaggi o inserire una risposta";
! $lang['No_post_id'] = "Non è stato specificato nessun ID";
$lang['No_topic_id'] = "Devi selezionare un argomento a cui rispondere";
$lang['No_valid_mode'] = "Puoi solo inviare, rispondere, modificare o citare messaggi, per favore torna indietro e prova di nuovo";
***************
*** 337,340 ****
--- 353,359 ----
$lang['Delete_poll'] = "Cancella il sondaggio";
+ $lang['Already_voted'] = 'You have already voted in this poll';
+ $lang['No_vote_option'] = 'You must specify an option when voting';
+
$lang['Disable_HTML_post'] = "Disabilita HTML in questo messaggio";
$lang['Disable_BBCode_post'] = "Disabilita il BBCode in questo messaggio";
***************
*** 477,485 ****
$lang['Inbox_size'] = "Cartella di Posta in Arrivo piena per il %d%%"; // eg. Your Inbox is 50% full
! $lang['Sentbox_size'] = "Cartella di Posta in Uscita piena per il %d%%";
$lang['Savebox_size'] = "Cartella di Posta Salvata piena per il %d%%";
$lang['Click_view_privmsg'] = "Clicca %squi%s per andare alla cartella di Posta in Arrivo";
//
--- 496,513 ----
$lang['Inbox_size'] = "Cartella di Posta in Arrivo piena per il %d%%"; // eg. Your Inbox is 50% full
! $lang['Sentbox_size'] = "Cartella di Posta in Uscita piena per il %d%%";
$lang['Savebox_size'] = "Cartella di Posta Salvata piena per il %d%%";
$lang['Click_view_privmsg'] = "Clicca %squi%s per andare alla cartella di Posta in Arrivo";
+ $lang['Read_pm'] = 'Read message';
+ $lang['Post_new_pm'] = 'Post message';
+ $lang['Post_reply_pm'] = 'Reply to message';
+ $lang['Post_quote_pm'] = 'Quote message';
+ $lang['Edit_pm'] = 'Edit message';
+
+ $lang['Unread_message'] = 'Unread message';
+ $lang['Read_message'] = 'Read message';
+
//
***************
*** 498,508 ****
$lang['Website'] = "Sito web";
! $lang['Location'] = "Località";
! $lang['Contact'] = "Contatto";
$lang['Email_address'] = "Indirizzo Email";
$lang['Email'] = "Email";
$lang['Send_private_message'] = "Manda un messaggio privato";
$lang['Hidden_email'] = "[ Nascosto ]";
! $lang['Search_user_posts'] = "Cerca i messaggi di questo utente";
$lang['Interests'] = "Interessi";
$lang['Occupation'] = "Occupazione";
--- 526,536 ----
$lang['Website'] = "Sito web";
! $lang['Location'] = "Residenza";
! $lang['Contact'] = "Contatta";
$lang['Email_address'] = "Indirizzo Email";
$lang['Email'] = "Email";
$lang['Send_private_message'] = "Manda un messaggio privato";
$lang['Hidden_email'] = "[ Nascosto ]";
! $lang['Search_user_posts'] = "Trova tutti i messaggi di %s";
$lang['Interests'] = "Interessi";
$lang['Occupation'] = "Occupazione";
***************
*** 516,519 ****
--- 544,548 ----
$lang['No_user_id_specified'] = "Spiacenti, ma questo utente non esiste";
$lang['Wrong_Profile'] = "Non puoi modificare un profilo che non è il tuo";
+
$lang['Only_one_avatar'] = "Può essere specificato un solo tipo di avatar";
$lang['File_no_data'] = "Il file all'URL che hai fornito non contiene dati";
***************
*** 549,553 ****
$lang['Avatar'] = "Avatar";
$lang['Avatar_explain'] = "Mostra una piccola immagine grafica sotto i tuoi dettagli nel messaggio. Può essere mostrata una sola immagine alla volta, la sua larghezza massima è di %d pixels, l'altezza di %d pixels e il file deve essere più piccolo di %dkB.";
- $lang['Upload_Avatar_file'] = "Carica l'Avatar dal tuo computer";
$lang['Upload_Avatar_URL'] = "Carica l'Avatar da un URL";
$lang['Upload_Avatar_URL_explain'] = "Inserisci l'URL dell'Avatar, verrà copiato in questo sito.";
--- 578,581 ----
***************
*** 567,572 ****
$lang['Notify_on_privmsg'] = "Notifica sui nuovi Messaggi Privati";
! $lang['Popup_on_privmsg'] = "Finestra di Popup sul nuovo Messaggio Privato";
! $lang['Popup_on_privmsg_explain'] = "Alcuni modelli possono aprire una nuova finestra per informarti quando un nuovo messaggio arriva";
$lang['Hide_user'] = "Nascondi il tuo stato online";
--- 595,600 ----
$lang['Notify_on_privmsg'] = "Notifica sui nuovi Messaggi Privati";
! $lang['Popup_on_privmsg'] = "Finestra di Popup sul nuovo Messaggio Privato";
! $lang['Popup_on_privmsg_explain'] = "Alcuni modelli possono aprire una nuova finestra per informarti quando un nuovo messaggio arriva";
$lang['Hide_user'] = "Nascondi il tuo stato online";
***************
*** 588,591 ****
--- 616,620 ----
$lang['Avatar_filesize'] = "La grandezza del file dell'avatar deve essere inferiore a %d kB"; // The avatar image file size must be less than 6 kB
$lang['Avatar_imagesize'] = "L'avatar deve essere più piccolo di %d pixels di larghezza e di %d pixels di altezza";
+
$lang['Welcome_subject'] = "Benvenuto nel forum di %s"; // Welcome to my.com forums
$lang['New_account_subject'] = "Account Nuovo Utente";
***************
*** 597,600 ****
--- 626,630 ----
$lang['Account_active'] = "Il tuo account è stato attivato. Grazie per esserti registrato.";
$lang['Account_active_admin'] = "L'account è stato attivato.";
+ $lang['Already_activated'] = 'You have already activated your account';
$lang['Reactivate'] = "Riattiva il tuo account!";
$lang['COPPA'] = "Il tuo account è stato creato, ma deve essere approvato. Per favore controlla la tua email per ulteriori dettagli.";
***************
*** 676,683 ****
$lang['Group_hidden_members'] = "Questo gruppo è nascosto, non puoi vedere i suoi membri";
$lang['No_pending_group_members'] = "Questo gruppo non ha membri in attesa";
! $lang["Group_joined"] = "Ti sei iscritto a questo gruppo con succeso.<br />Sarai avvisato quando la tua iscrizione verrà approvata dal moderatore del gruppo.";
$lang['Group_request'] = "C'è una richiesta di iscrizione al tuo gruppo";
$lang['Group_approved'] = "La tua richiesta è stata approvata";
! $lang['Group_added'] = "Sei stato aggiunto a questa gruppo utenti";
$lang['Already_member_group'] = "Sei già un membro di questo gruppo";
$lang['User_is_member_group'] = "L'utente è già un membro di questo gruppo";
--- 706,713 ----
$lang['Group_hidden_members'] = "Questo gruppo è nascosto, non puoi vedere i suoi membri";
$lang['No_pending_group_members'] = "Questo gruppo non ha membri in attesa";
! $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notified when your subscription is approved by the group moderator";
$lang['Group_request'] = "C'è una richiesta di iscrizione al tuo gruppo";
$lang['Group_approved'] = "La tua richiesta è stata approvata";
! $lang['Group_added'] = "Sei stato aggiunto a questa gruppo utenti";
$lang['Already_member_group'] = "Sei già un membro di questo gruppo";
$lang['User_is_member_group'] = "L'utente è già un membro di questo gruppo";
***************
*** 685,688 ****
--- 715,719 ----
$lang['Could_not_add_user'] = "L'utente che hai selezionato non esiste";
+ $lang['Could_not_anon_user'] = "Non puoi fare membro di un gruppo un utente Anonimo";
$lang['Confirm_unsub'] = "Sei sicuro di volerti cancellare da questo gruppo?";
***************
*** 705,709 ****
$lang['Pending_this_group'] = "La tua iscrizione a questo gruppo è in attesa";
$lang['Are_group_moderator'] = "Sei il moderatore di questo gruppo";
! $lang['None'] = "Niente";
$lang['Subscribe'] = "Iscriviti";
--- 736,740 ----
$lang['Pending_this_group'] = "La tua iscrizione a questo gruppo è in attesa";
$lang['Are_group_moderator'] = "Sei il moderatore di questo gruppo";
! $lang['None'] = "Nessuno";
$lang['Subscribe'] = "Iscriviti";
***************
*** 725,731 ****
$lang['Search_for_any'] = "Cerca per ogni parola oppure usa la frase esatta";
$lang['Search_for_all'] = "Cerca tutti i termini";
- $lang['Search_title_msg'] = "Cerca nel titolo e nel testo";
- $lang['Search_msg_only'] = "Cerca solo nel testo";
$lang['Return_first'] = "Dai i primi"; // followed by xxx characters in a select box
$lang['characters_posts'] = "caratteri del messaggio";
--- 756,762 ----
$lang['Search_for_any'] = "Cerca per ogni parola oppure usa la frase esatta";
$lang['Search_for_all'] = "Cerca tutti i termini";
+ $lang['Search_title_msg'] = "Cerca nel titolo dell'argomento e nel testo del messaggio";
+ $lang['Search_msg_only'] = "Cerca solo nel testo del messaggio";
$lang['Return_first'] = "Dai i primi"; // followed by xxx characters in a select box
$lang['characters_posts'] = "caratteri del messaggio";
***************
*** 735,740 ****
$lang['Sort_by'] = "Ordina per";
$lang['Sort_Time'] = "Data messaggio";
- $lang['Search_title_msg'] = "Cerca nel titolo dell'argomento e nel testo del messaggio";
- $lang['Search_msg_only'] = "Cerca solo nel testo del messaggio";
$lang['Sort_Post_Subject'] = "Soggetto messaggio";
$lang['Sort_Topic_Title'] = "Titolo argomento";
--- 766,769 ----
***************
*** 758,768 ****
// Note the %s will be replaced with one of the following 'user' arrays
$lang['Sorry_auth_announce'] = "Spiacenti, ma solo %s possono inviare annunci in questo forum";
! $lang['Sorry_auth_sticky'] = "Spiacenti, ma solo %s possono inviare messaggi importanti in questo forum";
! $lang['Sorry_auth_read'] = "Spiacenti, ma solo %s possono leggere gli argomenti in questo forum";
$lang['Sorry_auth_post'] = "Spiacenti, ma solo %s possono inserire argomenti in questo forum";
$lang['Sorry_auth_reply'] = "Spiacenti, ma solo %s possono rispondere ai messaggi in questo forum";
! $lang['Sorry_auth_edit'] = "Spiacenti, ma solo %s possono modificare i messaggi in questo forum";
! $lang['Sorry_auth_delete'] = "Spiacenti, ma solo %s possono cancellare i messaggi in questo forum";
! $lang['Sorry_auth_vote'] = "Spiacenti, ma solo %s possono votare nei sondaggi in questo forum";
// These replace the %s in the above strings
--- 787,797 ----
// Note the %s will be replaced with one of the following 'user' arrays
$lang['Sorry_auth_announce'] = "Spiacenti, ma solo %s possono inviare annunci in questo forum";
! $lang['Sorry_auth_sticky'] = "Spiacenti, ma solo %s possono inviare messaggi importanti in questo forum";
! $lang['Sorry_auth_read'] = "Spiacenti, ma solo %s possono leggere gli argomenti in questo forum";
$lang['Sorry_auth_post'] = "Spiacenti, ma solo %s possono inserire argomenti in questo forum";
$lang['Sorry_auth_reply'] = "Spiacenti, ma solo %s possono rispondere ai messaggi in questo forum";
! $lang['Sorry_auth_edit'] = "Spiacenti, ma solo %s possono modificare i messaggi in questo forum";
! $lang['Sorry_auth_delete'] = "Spiacenti, ma solo %s possono cancellare i messaggi in questo forum";
! $lang['Sorry_auth_vote'] = "Spiacenti, ma solo %s possono votare nei sondaggi in questo forum";
// These replace the %s in the above strings
***************
*** 782,790 ****
// Viewonline
//
! $lang['Reg_user_online'] = "C'è %d Utente Registrato e "; // There ae 5 Registered and
$lang['Reg_users_online'] = "Ci sono %d Utenti Registrati e "; // There ae 5 Registered and
! $lang['Hidden_user_online'] = "%d Utente Nascosto in linea"; // 6 Hidden users online
$lang['Hidden_users_online'] = "%d Utenti Nascosti in linea"; // 6 Hidden users online
$lang['Guest_users_online'] = "Ci sono %d Ospiti in linea"; // There are 10 Guest users online
$lang['Guest_user_online'] = "C'è %d Ospite in linea"; // There is 1 Guest user online
$lang['No_users_browsing'] = "Al momento non ci sono utenti nel forum";
--- 811,822 ----
// Viewonline
//
! $lang['Reg_users_zero_online'] = "Ci sono 0 utenti Registrati e"; // There ae 5 Registered and
$lang['Reg_users_online'] = "Ci sono %d Utenti Registrati e "; // There ae 5 Registered and
! $lang['Reg_user_online'] = "C'è %d Utente Registrato e "; // There ae 5 Registered and
! $lang['Hidden_users_zero_online'] = "0 utenti Nascosti in linea"; // 6 Hidden users online
$lang['Hidden_users_online'] = "%d Utenti Nascosti in linea"; // 6 Hidden users online
+ $lang['Hidden_user_online'] = "%d Utente Nascosto in linea"; // 6 Hidden users online
$lang['Guest_users_online'] = "Ci sono %d Ospiti in linea"; // There are 10 Guest users online
+ $lang['Guest_users_zero_online'] = "Ci sono 0 Ospiti in linea"; // There are 10 Guest users online
$lang['Guest_user_online'] = "C'è %d Ospite in linea"; // There is 1 Guest user online
$lang['No_users_browsing'] = "Al momento non ci sono utenti nel forum";
***************
*** 796,807 ****
$lang['Forum_index'] = "Indice Forum";
! $lang['Logging_on'] = "Sta entrando";
! $lang['Posting_message'] = "Sta inviando un messaggio";
! $lang['Searching_forums'] = "Sta cercando nei forum";
! $lang['Viewing_profile'] = "Sta guardando il profilo";
! $lang['Viewing_online'] = "Sta guardando chi c'è in linea";
! $lang['Viewing_member_list'] = "Sta guardando la lista degli utenti";
! $lang['Viewing_priv_msgs'] = "Sta guardando i messaggi privati";
! $lang['Viewing_FAQ'] = "Sta guardando le FAQ";
--- 828,839 ----
$lang['Forum_index'] = "Indice Forum";
! $lang['Logging_on'] = "Entra";
! $lang['Posting_message'] = "Invia un messaggio";
! $lang['Searching_forums'] = "Cerca nei forum";
! $lang['Viewing_profile'] = "Guarda il profilo";
! $lang['Viewing_online'] = "Guarda chi c'è in linea";
! $lang['Viewing_member_list'] = "Guarda la lista degli utenti";
! $lang['Viewing_priv_msgs'] = "Guarda i messaggi privati";
! $lang['Viewing_FAQ'] = "Guarda le FAQ";
***************
*** 858,923 ****
$lang['-12'] = "GMT - 12 Ore";
! $lang['-11'] = "GMT - 11 ore";
! $lang['-10'] = "HST (Hawaii)";
$lang['-9'] = "GMT - 9 Ore";
! $lang['-8'] = "PST (U.S./Canada)";
! $lang['-7'] = "MST (U.S./Canada)";
! $lang['-6'] = "CST (U.S./Canada)";
! $lang['-5'] = "EST (U.S./Canada)";
$lang['-4'] = "GMT - 4 Ore";
! $lang['-3.5'] = "GMT - 3.5 Ore";
$lang['-3'] = "GMT - 3 Ore";
! $lang['-2'] = "Mid-Atlantic";
$lang['-1'] = "GMT - 1 Ora";
$lang['0'] = "GMT";
! $lang['1'] = "CET (Europa)";
! $lang['2'] = "EET (Europa)";
$lang['3'] = "GMT + 3 Ore";
! $lang['3.5'] = "GMT + 3.5 Ore";
$lang['4'] = "GMT + 4 Ore";
! $lang['4.5'] = "GMT + 4.5 Ore";
$lang['5'] = "GMT + 5 Ore";
! $lang['5.5'] = "GMT + 5.5 Ore";
$lang['6'] = "GMT + 6 Ore";
$lang['7'] = "GMT + 7 Ore";
! $lang['8'] = "WST (Australia)";
$lang['9'] = "GMT + 9 Ore";
$lang['9.5'] = "CST (Australia)";
! $lang['10'] = "EST (Australia)";
$lang['11'] = "GMT + 11 Ore";
$lang['12'] = "GMT + 12 Ore";
// These are displayed in the timezone select box
! $lang['tz']['-12'] = "(GMT -12:00 ore) Eniwetok, Kwajalein";
! $lang['tz']['-11'] = "(GMT -11:00 ore) Midway Island, Samoa";
! $lang['tz']['-10'] = "(GMT -10:00 ore) Hawaii";
! $lang['tz']['-9'] = "(GMT -9:00 ore) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 ore) Pacific Time (US & Canada), Tijuana";
! $lang['tz']['-7'] = "(GMT -7:00 ore) Mountain Time (US & Canada), Arizona";
! $lang['tz']['-6'] = "(GMT -6:00 ore) Central Time (US & Canada), Mexico City";
! $lang['tz']['-5'] = "(GMT -5:00 ore) Eastern Time (US & Canada), Bogota, Lima, Quito";
! $lang['tz']['-4'] = "(GMT -4:00 ore) Atlantic Time (Canada), Caracas, La Paz";
! $lang['tz']['-3.5'] = "(GMT -3:30 ore) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 ore) Brassila, Buenos Aires, Georgetown, Falkland Is";
! $lang['tz']['-2'] = "(GMT -2:00 ore) Mid-Atlantic, Ascension Is., St. Helena";
! $lang['tz']['-1'] = "(GMT -1:00 ora) Azores, Cape Verde Islands";
$lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 ora) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 ore) Cairo, Helsinki, Kaliningrad, South Africa";
! $lang['tz']['3'] = "(GMT +3:00 ore) Baghdad, Riyadh, Moscow, Nairobi";
! $lang['tz']['3.5'] = "(GMT +3:30 ore) Tehran";
! $lang['tz']['4'] = "(GMT +4:00 ore) Abu Dhabi, Baku, Muscat, Tbilisi";
! $lang['tz']['4.5'] = "(GMT +4:30 ore) Kabul";
! $lang['tz']['5'] = "(GMT +5:00 ore) Ekaterinburg, Islamabad, Karachi, Tashkent";
! $lang['tz']['5.5'] = "(GMT +5:30 ore) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 ore) Almaty, Colombo, Dhaka, Novosibirsk";
! $lang['tz']['6.5'] = "(GMT +6:30 ore) Rangoon";
! $lang['tz']['7'] = "(GMT +7:00 ore) Bangkok, Hanoi, Jakarta";
! $lang['tz']['8'] = "(GMT +8:00 ore) Beijing, Hong Kong, Perth, Singapore, Taipei";
! $lang['tz']['9'] = "(GMT +9:00 ore) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
! $lang['tz']['9.5'] = "(GMT +9:30 ore) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 ore) Canberra, Guam, Melbourne, Sydney, Vladivostok";
! $lang['tz']['11'] = "(GMT +11:00 ore) Magadan, New Caledonia, Solomon Islands";
! $lang['tz']['12'] = "(GMT +12:00 ore) Auckland, Wellington, Fiji, Marshall Island";
$lang['datetime']['Sunday'] = "Domenica";
--- 890,1019 ----
$lang['-12'] = "GMT - 12 Ore";
! $lang['-11'] = "GMT - 11 Ore";
! $lang['-10'] = "GMT - 10 Ore";
$lang['-9'] = "GMT - 9 Ore";
! $lang['-8'] = "GMT - 8 Ore";
! $lang['-7'] = "GMT - 7 Ore";
! $lang['-6'] = "GMT - 6 Ore";
! $lang['-5'] = "GMT - 5 Ore";
$lang['-4'] = "GMT - 4 Ore";
! $lang['-3.5'] = "GMT - 3.5 Hours";
$lang['-3'] = "GMT - 3 Ore";
! $lang['-2'] = "GMT - 2 Ore";
$lang['-1'] = "GMT - 1 Ora";
$lang['0'] = "GMT";
! $lang['1'] = "GMT + 1 Ora";
! $lang['2'] = "GMT + 2 Ore";
$lang['3'] = "GMT + 3 Ore";
! $lang['3.5'] = "GMT + 3.5 Hours";
$lang['4'] = "GMT + 4 Ore";
! $lang['4.5'] = "GMT + 4.5 Hours";
$lang['5'] = "GMT + 5 Ore";
! $lang['5.5'] = "GMT + 5.5 Hours";
$lang['6'] = "GMT + 6 Ore";
+ $lang['6.5'] = "GMT + 6.5 Hours";
$lang['7'] = "GMT + 7 Ore";
! $lang['8'] = "GMT + 8 Ore";
$lang['9'] = "GMT + 9 Ore";
$lang['9.5'] = "CST (Australia)";
! $lang['10'] = "GMT + 10 Ore";
$lang['11'] = "GMT + 11 Ore";
$lang['12'] = "GMT + 12 Ore";
// These are displayed in the timezone select box
! $lang['tz']['-12'] = "GMT -12:00 ore";
! $lang['tz']['-11'] = "GMT -11:00 ore";
! $lang['tz']['-10'] = "GMT -10:00 ore";
! $lang['tz']['-9'] = "GMT -9:00 ore";
! $lang['tz']['-8'] = "GMT -8:00 ore";
! $lang['tz']['-7'] = "GMT -7:00 ore";
! $lang['tz']['-6'] = "GMT -6:00 ore";
! $lang['tz']['-5'] = "GMT -5:00 ore";
! $lang['tz']['-4'] = "GMT -4:00 ore";
! $lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
! $lang['tz']['-3'] = "GMT -3:00 ore";
! $lang['tz']['-2'] = "GMT -2:00 ore";
! $lang['tz']['-1'] = "GMT -1:00 ora";
$lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 hours) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 hours) Cairo, Helsinki, Kaliningrad, South Africa";
! $lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
! $lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
! $lang['tz']['4'] = "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi";
! $lang['tz']['4.5'] = "(GMT +4:30 hours) Kabul";
! $lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
! $lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka, Novosibirsk";
! $lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon";
! $lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
! $lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
! $lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
! $lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 hours) Canberra, Guam, Melbourne, Sydney, Vladivostok";
! $lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
! $lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";$lang['-12'] = 'GMT - 12 Hours';
! $lang['-11'] = 'GMT - 11 Hours';
! $lang['-10'] = 'GMT - 10 Hours';
! $lang['-9'] = 'GMT - 9 Hours';
! $lang['-8'] = 'GMT - 8 Hours';
! $lang['-7'] = 'GMT - 7 Hours';
! $lang['-6'] = 'GMT - 6 Hours';
! $lang['-5'] = 'GMT - 5 Hours';
! $lang['-4'] = 'GMT - 4 Hours';
! $lang['-3.5'] = 'GMT - 3.5 Hours';
! $lang['-3'] = 'GMT - 3 Hours';
! $lang['-2'] = 'GMT - 2 Hours';
! $lang['-1'] = 'GMT - 1 Hours';
! $lang['0'] = 'GMT';
! $lang['1'] = 'GMT + 1 Hour';
! $lang['2'] = 'GMT + 2 Hours';
! $lang['3'] = 'GMT + 3 Hours';
! $lang['3.5'] = 'GMT + 3.5 Hours';
! $lang['4'] = 'GMT + 4 Hours';
! $lang['4.5'] = 'GMT + 4.5 Hours';
! $lang['5'] = 'GMT + 5 Hours';
! $lang['5.5'] = 'GMT + 5.5 Hours';
! $lang['6'] = 'GMT + 6 Hours';
! $lang['6.5'] = 'GMT + 6.5 Hours';
! $lang['7'] = 'GMT + 7 Hours';
! $lang['8'] = 'GMT + 8 Hours';
! $lang['9'] = 'GMT + 9 Hours';
! $lang['9.5'] = 'GMT + 9.5 Hours';
! $lang['10'] = 'GMT + 10 Hours';
! $lang['11'] = 'GMT + 11 Hours';
! $lang['12'] = 'GMT + 12 Hours';
!
! // These are displayed in the timezone select box
! $lang['tz']['-12'] = 'GMT - 12 Hours';
! $lang['tz']['-11'] = 'GMT - 11 Hours';
! $lang['tz']['-10'] = 'GMT - 10 Hours';
! $lang['tz']['-9'] = 'GMT - 9 Hours';
! $lang['tz']['-8'] = 'GMT - 8 Hours';
! $lang['tz']['-7'] = 'GMT - 7 Hours';
! $lang['tz']['-6'] = 'GMT - 6 Hours';
! $lang['tz']['-5'] = 'GMT - 5 Hours';
! $lang['tz']['-4'] = 'GMT - 4 Hours';
! $lang['tz']['-3.5'] = 'GMT - 3.5 Hours';
! $lang['tz']['-3'] = 'GMT - 3 Hours';
! $lang['tz']['-2'] = 'GMT - 2 Hours';
! $lang['tz']['-1'] = 'GMT - 1 Hours';
! $lang['tz']['0'] = 'GMT';
! $lang['tz']['1'] = 'GMT + 1 Hour';
! $lang['tz']['2'] = 'GMT + 2 Hours';
! $lang['tz']['3'] = 'GMT + 3 Hours';
! $lang['tz']['3.5'] = 'GMT + 3.5 Hours';
! $lang['tz']['4'] = 'GMT + 4 Hours';
! $lang['tz']['4.5'] = 'GMT + 4.5 Hours';
! $lang['tz']['5'] = 'GMT + 5 Hours';
! $lang['tz']['5.5'] = 'GMT + 5.5 Hours';
! $lang['tz']['6'] = 'GMT + 6 Hours';
! $lang['tz']['6.5'] = 'GMT + 6.5 Hours';
! $lang['tz']['7'] = 'GMT + 7 Hours';
! $lang['tz']['8'] = 'GMT + 8 Hours';
! $lang['tz']['9'] = 'GMT + 9 Hours';
! $lang['tz']['9.5'] = 'GMT + 9.5 Hours';
! $lang['tz']['10'] = 'GMT + 10 Hours';
! $lang['tz']['11'] = 'GMT + 11 Hours';
! $lang['tz']['12'] = 'GMT + 12 Hours';
$lang['datetime']['Sunday'] = "Domenica";
***************
*** 939,943 ****
$lang['datetime']['March'] = "Marzo";
$lang['datetime']['April'] = "Aprile";
! $lang['datetime']['May'] = "Maggio";
$lang['datetime']['June'] = "Giugno";
$lang['datetime']['July'] = "Luglio";
--- 1035,1039 ----
$lang['datetime']['March'] = "Marzo";
$lang['datetime']['April'] = "Aprile";
! $lang['datetime']['May'] = "Mag";
$lang['datetime']['June'] = "Giugno";
$lang['datetime']['July'] = "Luglio";
|
|
From: Paul S. O. <ps...@us...> - 2002-05-16 01:15:52
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv12733
Modified Files:
Tag: phpBB-2_0_0
update_to_201.php
Log Message:
Various updates ... still missing PostgreSQL user_timezone change ... it's a slight nightmare.
Index: update_to_201.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/Attic/update_to_201.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** update_to_201.php 14 May 2002 15:25:34 -0000 1.1.2.3
--- update_to_201.php 16 May 2002 01:15:48 -0000 1.1.2.4
***************
*** 1,5 ****
- <html>
- <body>
<?php
define('IN_PHPBB', 1);
--- 1,42 ----
<?php
+ /***************************************************************************
+ * update_to_xxx.php
+ * -------------------
[...1064 lines suppressed...]
! echo "<b>No errors</b>\n";
! }
!
! break;
!
! default:
! echo " No updates where required</b></p>\n";
! break;
}
+ echo "<h2>Update completed</h2>\n";
+ echo "\n<p>You should now visit the General Configuration settings page in the <a href=\"admin/\">Administration Panel</a> and check the General Configuration of the board. If you updated from versions prior to RC-3 you <b>must</b> update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!</p>\n";
?>
+
+ <br clear="all" />
+
</body>
! </html>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-05-14 17:27:25
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv23250/includes
Modified Files:
functions_post.php
Log Message:
Fix bad URL for topic notifications
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** functions_post.php 20 Apr 2002 22:56:09 -0000 1.11
--- functions_post.php 14 May 2002 17:27:20 -0000 1.12
***************
*** 650,654 ****
$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
! $script_name = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx;
$server_name = trim($board_config['server_name']);
$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
--- 650,654 ----
$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
! $script_name_f = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx;
$server_name = trim($board_config['server_name']);
$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
***************
*** 677,682 ****
'FORUM_NAME' => $forum_name,
! 'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id",
! 'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum")
);
--- 677,682 ----
'FORUM_NAME' => $forum_name,
! 'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name_f . '?' . POST_FORUM_URL . "=$forum_id",
! 'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name_f . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum")
);
***************
*** 713,717 ****
}
! $script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
--- 713,717 ----
}
! $script_name_t = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
***************
*** 736,741 ****
'TOPIC_TITLE' => $topic_title,
! 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_POST_URL . "=$post_id#$post_id",
! 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
);
--- 736,741 ----
'TOPIC_TITLE' => $topic_title,
! 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name_t . '?' . POST_POST_URL . "=$post_id#$post_id",
! 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name_t . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
);
|
|
From: Paul S. O. <ps...@us...> - 2002-05-14 15:25:37
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16332
Modified Files:
Tag: phpBB-2_0_0
update_to_201.php
Log Message:
oops, need to re-sync forums just in case too
Index: update_to_201.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/Attic/update_to_201.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** update_to_201.php 14 May 2002 15:19:20 -0000 1.1.2.2
--- update_to_201.php 14 May 2002 15:25:34 -0000 1.1.2.3
***************
*** 9,12 ****
--- 9,13 ----
include($phpbb_root_path . 'includes/constants.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
+ include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
include($phpbb_root_path . 'includes/db.'.$phpEx);
***************
*** 83,136 ****
FROM " . TOPICS_TABLE . "
WHERE topic_moved_id <> 0";
- if ( !($result = $db->sql_query($sql)) )
- {
- die("Couldn't update version info");
- }
-
- $topic_ary = array();
- while ( $row = $db->sql_fetchrow($result) )
- {
- $topic_ary[$row['topic_id']] = $row['topic_moved_id'];
- }
-
- while ( list($topic_id, $topic_moved_id) = each($topic_ary) )
- {
- $sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts
- FROM " . POSTS_TABLE . "
- WHERE topic_id = $topic_moved_id";
if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
}
! if ( $row = $db->sql_fetchrow($result) )
{
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . "
! WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);
}
}
}
- }
! unset($sql);
! $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.0.1'
! WHERE config_name = 'version'";
! if ( !($result = $db->sql_query($sql)) )
! {
! die("Couldn't update version info");
! }
! die("UPDATING COMPLETE -> 2.0.1 Final installed");
! break;
! default:
! die("NO UPDATES REQUIRED");
! break;
}
}
--- 84,139 ----
FROM " . TOPICS_TABLE . "
WHERE topic_moved_id <> 0";
if ( !($result = $db->sql_query($sql)) )
{
! die("Couldn't update version info");
! }
!
! $topic_ary = array();
! while ( $row = $db->sql_fetchrow($result) )
! {
! $topic_ary[$row['topic_id']] = $row['topic_moved_id'];
}
! while ( list($topic_id, $topic_moved_id) = each($topic_ary) )
{
! $sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts
! FROM " . POSTS_TABLE . "
! WHERE topic_id = $topic_moved_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
! }
!
! if ( $row = $db->sql_fetchrow($result) )
! {
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . "
! WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);
! }
}
}
}
! unset($sql);
! $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.0.1'
! WHERE config_name = 'version'";
! if ( !($result = $db->sql_query($sql)) )
! {
! die("Couldn't update version info");
! }
!
! sync('all forums');
! die("UPDATING COMPLETE -> 2.0.1 Final installed");
! break;
! default:
! die("NO UPDATES REQUIRED");
! break;
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-14 15:19:24
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv14054
Modified Files:
Tag: phpBB-2_0_0
update_to_201.php viewforum.php viewtopic.php
Log Message:
More fixes ... hopefully corrects for moved topic/pagination issues ... needs testing (run update_to_201.php ... if you are already running 2.0.1 you'll need to modify the case statements in update_to_201 or necessary checks won't complete)
Index: update_to_201.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/Attic/update_to_201.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** update_to_201.php 10 Apr 2002 12:22:53 -0000 1.1.2.1
--- update_to_201.php 14 May 2002 15:19:20 -0000 1.1.2.2
***************
*** 21,50 ****
if ( $row = $db->sql_fetchrow($result) )
{
! if ( $row['config_value'] == 'RC-3' || $row['config_value'] == 'RC-4' || $row['config_value'] == '.0.0' )
{
! if ( $row['config_value'] == 'RC-3' )
! {
$sql = array();
! switch ( SQL_LAYER )
{
! case 'mysql':
! case 'mysql4':
! $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP
! COLUMN user_autologin_key";
! break;
!
! case 'mssql-odbc':
! case 'mssql':
! case 'msaccess':
! $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP
! COLUMN user_autologin_key";
! break;
!
! case 'postgresql':
! $sql[] = "ALTER TABLE " . USERS_TABLE . " ALTER
! COLUMN user_autologin_key DROP";
! default:
! die("No DB LAYER found!");
! break;
}
--- 21,56 ----
if ( $row = $db->sql_fetchrow($result) )
{
! switch ( $row['config_value'] )
{
! case 'RC-3':
! case 'RC-4':
! case '.0.0':
$sql = array();
!
! switch ( $row['config_value'] )
{
! case 'RC-3':
! switch ( SQL_LAYER )
! {
! case 'mysql':
! case 'mysql4':
! $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP
! COLUMN user_autologin_key";
! break;
!
! case 'mssql-odbc':
! case 'mssql':
! case 'msaccess':
! $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP
! COLUMN user_autologin_key";
! break;
!
! case 'postgresql':
! $sql[] = "ALTER TABLE " . USERS_TABLE . " ALTER
! COLUMN user_autologin_key DROP";
! default:
! die("No DB LAYER found!");
! break;
! }
}
***************
*** 66,82 ****
}
}
- }
! unset($sql);
! $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.0.1'
! WHERE config_name = 'version'";
! if ( !($result = $db->sql_query($sql)) )
! {
! die("Couldn't update version info");
! }
! die("UPDATING COMPLETE -> 2.0.1 Final installed");
}
}
--- 72,136 ----
}
}
! unset($sql);
!
! switch ( $row['config_value'] )
! {
! case 'RC-3':
! case 'RC-4':
! case '.0.0':
! $sql = "SELECT topic_id, topic_moved_id
! FROM " . TOPICS_TABLE . "
! WHERE topic_moved_id <> 0";
! if ( !($result = $db->sql_query($sql)) )
! {
! die("Couldn't update version info");
! }
!
! $topic_ary = array();
! while ( $row = $db->sql_fetchrow($result) )
! {
! $topic_ary[$row['topic_id']] = $row['topic_moved_id'];
! }
!
! while ( list($topic_id, $topic_moved_id) = each($topic_ary) )
! {
! $sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts
! FROM " . POSTS_TABLE . "
! WHERE topic_id = $topic_moved_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
! }
!
! if ( $row = $db->sql_fetchrow($result) )
! {
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . "
! WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);
! }
! }
! }
! }
!
! unset($sql);
!
! $sql = "UPDATE " . CONFIG_TABLE . "
! SET config_value = '.0.1'
! WHERE config_name = 'version'";
! if ( !($result = $db->sql_query($sql)) )
! {
! die("Couldn't update version info");
! }
! die("UPDATING COMPLETE -> 2.0.1 Final installed");
! break;
! default:
! die("NO UPDATES REQUIRED");
! break;
}
}
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139.2.3
retrieving revision 1.139.2.4
diff -C2 -r1.139.2.3 -r1.139.2.4
*** viewforum.php 13 May 2002 13:18:18 -0000 1.139.2.3
--- viewforum.php 14 May 2002 15:19:20 -0000 1.139.2.4
***************
*** 103,107 ****
if ( !$userdata['session_logged_in'] )
{
! $redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" );
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
--- 103,107 ----
if ( !$userdata['session_logged_in'] )
{
! $redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : '' );
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186.2.5
retrieving revision 1.186.2.6
diff -C2 -r1.186.2.5 -r1.186.2.6
*** viewtopic.php 13 May 2002 13:18:18 -0000 1.186.2.5
--- viewtopic.php 14 May 2002 15:19:20 -0000 1.186.2.6
***************
*** 114,131 ****
}
! if ( !($row = $db->sql_fetchrow($result)) )
{
! if( $HTTP_GET_VARS['view'] == 'next' )
! {
! message_die(GENERAL_MESSAGE, 'No_newer_topics');
! }
! else
! {
! message_die(GENERAL_MESSAGE, 'No_older_topics');
! }
}
else
{
! $topic_id = $row['topic_id'];
}
}
--- 114,125 ----
}
! if ( $row = $db->sql_fetchrow($result) )
{
! $topic_id = $row['topic_id'];
}
else
{
! $message = ( $HTTP_GET_VARS['view'] == 'next' ) ? 'No_newer_topics' : 'No_older_topics';
! message_die(GENERAL_MESSAGE, $message);
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-14 15:19:24
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14054/includes
Modified Files:
Tag: phpBB-2_0_0
functions_admin.php functions_post.php usercp_sendpasswd.php
Log Message:
More fixes ... hopefully corrects for moved topic/pagination issues ... needs testing (run update_to_201.php ... if you are already running 2.0.1 you'll need to modify the case statements in update_to_201 or necessary checks won't complete)
Index: functions_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_admin.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** functions_admin.php 2 Apr 2002 14:53:40 -0000 1.5
--- functions_admin.php 14 May 2002 15:19:20 -0000 1.5.2.1
***************
*** 65,69 ****
$sql = "SELECT forum_id
FROM " . FORUMS_TABLE;
! if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not get forum IDs', '', __LINE__, __FILE__, $sql);
--- 65,69 ----
$sql = "SELECT forum_id
FROM " . FORUMS_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not get forum IDs', '', __LINE__, __FILE__, $sql);
***************
*** 79,83 ****
$sql = "SELECT topic_id
FROM " . TOPICS_TABLE;
! if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not get topic ID', '', __LINE__, __FILE__, $sql);
--- 79,83 ----
$sql = "SELECT topic_id
FROM " . TOPICS_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not get topic ID', '', __LINE__, __FILE__, $sql);
***************
*** 91,100 ****
case 'forum':
! $sql = "SELECT MAX(p.post_id) AS last_post, COUNT(p.post_id) AS total
! FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t
! WHERE p.forum_id = $id
! AND t.topic_id = p.topic_id
! AND t.topic_status <> " . TOPIC_MOVED;
! if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
--- 91,98 ----
case 'forum':
! $sql = "SELECT MAX(post_id) AS last_post, COUNT(post_id) AS total
! FROM " . POSTS_TABLE . "
! WHERE forum_id = $id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
***************
*** 114,120 ****
$sql = "SELECT COUNT(topic_id) AS total
FROM " . TOPICS_TABLE . "
! WHERE forum_id = $id
! AND topic_status <> " . TOPIC_MOVED;
! if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not get topic count', '', __LINE__, __FILE__, $sql);
--- 112,117 ----
$sql = "SELECT COUNT(topic_id) AS total
FROM " . TOPICS_TABLE . "
! WHERE forum_id = $id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not get topic count', '', __LINE__, __FILE__, $sql);
***************
*** 136,140 ****
FROM " . POSTS_TABLE . "
WHERE topic_id = $id";
! if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
--- 133,137 ----
FROM " . POSTS_TABLE . "
WHERE topic_id = $id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
***************
*** 143,149 ****
if ( $row = $db->sql_fetchrow($result) )
{
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . "
! WHERE topic_id = $id";
if ( !$db->sql_query($sql) )
{
--- 140,144 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $sql = ( $row['total_posts'] ) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = $id";
if ( !$db->sql_query($sql) )
{
***************
*** 151,155 ****
}
}
-
break;
}
--- 146,149 ----
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -r1.9.2.3 -r1.9.2.4
*** functions_post.php 13 May 2002 01:30:59 -0000 1.9.2.3
--- functions_post.php 14 May 2002 15:19:20 -0000 1.9.2.4
***************
*** 250,254 ****
if ( $result = $db->sql_query($sql) )
{
! if( $row = $db->sql_fetchrow($result) )
{
if ( $row['last_post_time'] > 0 && ( $current_time - $row['last_post_time'] ) < $board_config['flood_interval'] )
--- 250,254 ----
if ( $result = $db->sql_query($sql) )
{
! if ( $row = $db->sql_fetchrow($result) )
{
if ( $row['last_post_time'] > 0 && ( $current_time - $row['last_post_time'] ) < $board_config['flood_interval'] )
***************
*** 273,277 ****
}
! if( $mode == 'newtopic' )
{
$topic_id = $db->sql_nextid();
--- 273,277 ----
}
! if ( $mode == 'newtopic' )
{
$topic_id = $db->sql_nextid();
***************
*** 286,290 ****
}
! if( $mode != 'editpost' )
{
$post_id = $db->sql_nextid();
--- 286,290 ----
}
! if ( $mode != 'editpost' )
{
$post_id = $db->sql_nextid();
***************
*** 327,331 ****
$old_poll_result[$row['vote_option_id']] = $row['vote_result'];
! if( !isset($poll_options[$row['vote_option_id']]) )
{
$delete_option_sql .= ( $delete_option_sql != '' ) ? ', ' . $row['vote_option_id'] : $row['vote_option_id'];
--- 327,331 ----
$old_poll_result[$row['vote_option_id']] = $row['vote_result'];
! if ( !isset($poll_options[$row['vote_option_id']]) )
{
$delete_option_sql .= ( $delete_option_sql != '' ) ? ', ' . $row['vote_option_id'] : $row['vote_option_id'];
***************
*** 343,347 ****
while ( list($option_id, $option_text) = each($poll_options) )
{
! if( !empty($option_text) )
{
$option_text = str_replace("\'", "''", $option_text);
--- 343,347 ----
while ( list($option_id, $option_text) = each($poll_options) )
{
! if ( !empty($option_text) )
{
$option_text = str_replace("\'", "''", $option_text);
***************
*** 357,361 ****
}
! if( $delete_option_sql != '' )
{
$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
--- 357,361 ----
}
! if ( $delete_option_sql != '' )
{
$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
***************
*** 470,474 ****
$sql = "UPDATE " . TOPICS_TABLE . " SET
$topic_update_sql
! WHERE topic_id = $topic_id";
if ( !($result = $db->sql_query($sql)) )
{
--- 470,475 ----
$sql = "UPDATE " . TOPICS_TABLE . " SET
$topic_update_sql
! WHERE topic_id = $topic_id
! OR topic_moved_id = $topic_id";
if ( !($result = $db->sql_query($sql)) )
{
***************
*** 501,505 ****
include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
- $topic_update_sql = '';
if ( $mode != 'poll_delete' )
{
--- 502,505 ----
***************
*** 518,522 ****
}
- $topic_update_sql .= 'topic_replies = topic_replies - 1';
if ( $post_data['last_post'] )
{
--- 518,521 ----
***************
*** 544,548 ****
}
! if( $mode == 'poll_delete' || ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] ) && $post_data['has_poll'] && $post_data['edit_poll'] )
{
$sql = "DELETE FROM " . VOTE_DESC_TABLE . "
--- 543,547 ----
}
! if ( $mode == 'poll_delete' || ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] ) && $post_data['has_poll'] && $post_data['edit_poll'] )
{
$sql = "DELETE FROM " . VOTE_DESC_TABLE . "
***************
*** 568,596 ****
}
- //
- // Ok we set variables above that were intended to update the topics table
- // so let's go ahead and use it already :)
- //
- if( !empty($topic_update_sql) && !($post_data['first_post'] && $post_data['last_post']) )
- {
- $sql = 'UPDATE ' . TOPICS_TABLE . '
- SET ' . $topic_update_sql . "
- WHERE topic_id = $topic_id OR
- topic_moved_id = $topic_id";
- if ( !($db->sql_query($sql)) )
- {
- message_die(GENERAL_ERROR, 'Error in updating reply counts', '', __LINE__, __FILE__, $sql);
- }
- }
-
if ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] )
{
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_id) . '">';
$message = $lang['Deleted'];
}
else
{
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id) . '">';
! $message = ( ( $mode == "poll_delete" ) ? $lang['Poll_delete'] : $lang['Deleted'] ) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
}
--- 567,579 ----
}
if ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] )
{
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $forum_id) . '">';
$message = $lang['Deleted'];
}
else
{
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $topic_id) . '">';
! $message = ( ( $mode == 'poll_delete' ) ? $lang['Poll_delete'] : $lang['Deleted'] ) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
}
***************
*** 612,616 ****
if ( $mode == 'delete' )
{
! $delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : "";
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
if ( !($result = $db->sql_query($sql)) )
--- 595,599 ----
if ( $mode == 'delete' )
{
! $delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : '';
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
if ( !($result = $db->sql_query($sql)) )
***************
*** 664,668 ****
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
! $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$update_watched_sql = '';
--- 647,651 ----
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
! $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$update_watched_sql = '';
***************
*** 853,855 ****
}
! ?>
--- 836,838 ----
}
! ?>
\ No newline at end of file
Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** usercp_sendpasswd.php 12 May 2002 17:57:34 -0000 1.6.2.1
--- usercp_sendpasswd.php 14 May 2002 15:19:20 -0000 1.6.2.2
***************
*** 126,130 ****
'L_EMAIL_ADDRESS' => $lang['Email_address'],
'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'])
);
--- 126,132 ----
'L_EMAIL_ADDRESS' => $lang['Email_address'],
'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
!
! 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=sendpassword"))
);
|
|
From: Paul S. O. <ps...@us...> - 2002-05-14 00:06:21
|
Update of /cvsroot/phpbb/phpBB2/language/lang_spanish
In directory usw-pr-cvs1:/tmp/cvs-serv31226/language/lang_spanish
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_main.php
Log Message:
Updates to 2.0.1
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/lang_admin.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** lang_admin.php 18 Mar 2002 15:46:09 -0000 1.3
--- lang_admin.php 14 May 2002 00:06:17 -0000 1.3.2.1
***************
*** 203,207 ****
$lang['Ban_username'] = "Banear a uno o varios Usuarios";
! $lang['Ban_username_explain'] = "Usted puede banear múltiples Usuarios usando la combinación apropiada de mouse y teclado para su computadora y navegador";
$lang['Ban_IP'] = "Banear una o varias direcciones IP o HOSTNAMES";
--- 203,207 ----
$lang['Ban_username'] = "Banear a uno o varios Usuarios";
!
$lang['Ban_IP'] = "Banear una o varias direcciones IP o HOSTNAMES";
***************
*** 467,470 ****
--- 467,471 ----
$lang['Select_group'] = "Seleccione un Grupo";
$lang['Look_up_group'] = "Observar un Grupo";
+ $lang['No_group_action'] = 'No se especificó una acción';
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/lang_main.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** lang_main.php 1 Apr 2002 12:46:56 -0000 1.5
--- lang_main.php 14 May 2002 00:06:17 -0000 1.5.2.1
***************
*** 61,65 ****
$lang['Author'] = "Autor";
$lang['Time'] = "Horas";
! $lang['Hours'] = "Horas";
$lang['Message'] = "Mensaje";
--- 61,65 ----
$lang['Author'] = "Autor";
$lang['Time'] = "Horas";
! $lang['Horas'] = "Horas";
$lang['Message'] = "Mensaje";
***************
*** 102,106 ****
$lang['YIM'] = "Yahoo Messenger";
! $lang['Forum_Index'] = "%s Indice de Foros"; // eg. Nombre de Sitio Indice de Foros, %s se puede quitar si lo desea
$lang['Post_new_topic'] = "Publicar nuevo tema";
--- 102,107 ----
$lang['YIM'] = "Yahoo Messenger";
! //$lang['Forum_Index'] = "%s Indice de Foros"; // eg. Nombre de Sitio Indice de Foros, %s se puede quitar si lo desea
! $lang['Forum_Index'] = "Foros de discusión"; // eg. Nombre de Sitio Indice de Foros, %s se puede quitar si lo desea
$lang['Post_new_topic'] = "Publicar nuevo tema";
***************
*** 188,193 ****
//
$lang['Enter_password'] = "Por favor ingrese su nombre de usuario y contraseña para entrar";
! $lang['Login'] = "Entrar";
! $lang['Logout'] = "Salir";
$lang['Forgotten_password'] = "Olvidé mi contraseña";
--- 189,194 ----
//
$lang['Enter_password'] = "Por favor ingrese su nombre de usuario y contraseña para entrar";
! $lang['Login'] = "Login";
! $lang['Logout'] = "Logout";
$lang['Forgotten_password'] = "Olvidé mi contraseña";
***************
*** 349,352 ****
--- 350,355 ----
$lang['Poll_for_explain'] = "[ Escriba 0 o deje en blanco para que la encuesta no termine ]";
$lang['Delete_poll'] = "Borrar Encuesta";
+ $lang['Already_voted'] = 'Usted ya ha votado en este encuesta';
+ $lang['No_vote_option'] = 'Debe especificar una opción al votar';
$lang['Disable_HTML_post'] = "Deshabilitar HTML en este mensaje";
***************
*** 495,498 ****
--- 498,510 ----
$lang['Click_view_privmsg'] = "Click %saquí%s para visitar su Bandeja de Entrada";
+ $lang['Read_pm'] = 'Leer mensaje';
+ $lang['Post_new_pm'] = 'Enviar mensaje';
+ $lang['Post_reply_pm'] = 'Contestar mensaje';
+ $lang['Post_quote_pm'] = 'Citar mensaje';
+ $lang['Edit_pm'] = 'Editar mensaje';
+
+ $lang['Unread_message'] = 'Mensaje no leido';
+ $lang['Read_message'] = 'Mensaje leido';
+
//
***************
*** 610,613 ****
--- 622,626 ----
$lang['Account_inactive_admin'] = "Su cuenta ha sido creada. Sin embargo, este foro requiere activación del Administrador. Un email ha sido enviado al Administrador y Usted será informado cuando su cuenta haya sido activada";
$lang['Account_active'] = "Su cuenta ha sido activada. Gracias por registrarse";
+ $lang['Already_activated'] = 'Usted ya ha activado su cuenta';
$lang['Account_active_admin'] = "La cuenta ha sido activada";
$lang['Reactivate'] = "¡Reactive su cuenta!";
***************
*** 873,939 ****
$lang['All_times'] = "Todas las horas son %s"; // ej. Todas las horas son GMT - 12 Horas
- $lang['-12'] = "GMT - 12 Horas";
- $lang['-11'] = "GMT - 11 Horas";
- $lang['-10'] = "HST (Hawaii)";
- $lang['-9'] = "GMT - 9 Horas";
- $lang['-8'] = "PST (U.S./Canadá)";
- $lang['-7'] = "MST (U.S./Canadá)";
- $lang['-6'] = "CST (U.S./Canadá)";
- $lang['-5'] = "EST (Lima /U.S.A./Canadá)";
- $lang['-4'] = "GMT - 4 Horas";
- $lang['-3.5'] = "GMT - 3.5 Horas";
- $lang['-3'] = "GMT - 3 Horas";
- $lang['-2'] = "Mid-Atlantic";
- $lang['-1'] = "GMT - 1 Hora";
- $lang['0'] = "GMT";
- $lang['1'] = "CET (Europa)";
- $lang['2'] = "EET (Europa)";
- $lang['3'] = "GMT + 3 Horas";
- $lang['3.5'] = "GMT + 3.5 Horas";
- $lang['4'] = "GMT + 4 Horas";
- $lang['4.5'] = "GMT + 4.5 Horas";
- $lang['5'] = "GMT + 5 Horas";
- $lang['5.5'] = "GMT + 5.5 Horas";
- $lang['6'] = "GMT + 6 Horas";
- $lang['7'] = "GMT + 7 Horas";
- $lang['8'] = "WST (Australia)";
- $lang['9'] = "GMT + 9 Horas";
- $lang['9.5'] = "CST (Australia)";
- $lang['10'] = "EST (Australia)";
- $lang['11'] = "GMT + 11 Horas";
- $lang['12'] = "GMT + 12 Horas";
-
// Estos se muestran en la lista desplegable de zona horaria
! $lang['tz']['-12'] = "(GMT -12:00 horas) Eniwetok, Kwajalein";
! $lang['tz']['-11'] = "(GMT -11:00 horas) Midway Island, Samoa";
! $lang['tz']['-10'] = "(GMT -10:00 horas) Hawaii";
! $lang['tz']['-9'] = "(GMT -9:00 horas) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 horas) Pacific Time (US & Canada), Tijuana";
! $lang['tz']['-7'] = "(GMT -7:00 horas) Mountain Time (US & Canada), Arizona";
! $lang['tz']['-6'] = "(GMT -6:00 horas) Central Time (US & Canada), Mexico City";
! $lang['tz']['-5'] = "(GMT -5:00 horas) Lima, Bogotá, Quito, Eastern Time (US & Canada)";
! $lang['tz']['-4'] = "(GMT -4:00 horas) Atlantic Time (Canada), Caracas, La Paz";
! $lang['tz']['-3.5'] = "(GMT -3:30 horas) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 horas) Brassila, Buenos Aires, Georgetown, Falkland Is";
! $lang['tz']['-2'] = "(GMT -2:00 horas) Mid-Atlantic, Ascension Is., St. Helena";
! $lang['tz']['-1'] = "(GMT -1:00 horas) Azores, Cape Verde Islands";
! $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 horas) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 horas) Cairo, Helsinki, Kaliningrad, South Africa, Warsaw";
! $lang['tz']['3'] = "(GMT +3:00 horas) Baghdad, Riyadh, Moscow, Nairobi";
! $lang['tz']['3.5'] = "(GMT +3:30 horas) Tehran";
! $lang['tz']['4'] = "(GMT +4:00 horas) Abu Dhabi, Baku, Muscat, Tbilisi";
! $lang['tz']['4.5'] = "(GMT +4:30 horas) Kabul";
! $lang['tz']['5'] = "(GMT +5:00 horas) Ekaterinburg, Islamabad, Karachi, Tashkent";
! $lang['tz']['5.5'] = "(GMT +5:30 horas) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 horas) Almaty, Colombo, Dhaka, Novosibirsk";
! $lang['tz']['6.5'] = "(GMT +6:30 horas) Rangoon";
! $lang['tz']['7'] = "(GMT +7:00 horas) Bangkok, Hanoi, Jakarta";
! $lang['tz']['8'] = "(GMT +8:00 horas) Beijing, Hong Kong, Perth, Singapore, Taipei";
! $lang['tz']['9'] = "(GMT +9:00 horas) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
! $lang['tz']['9.5'] = "(GMT +9:30 horas) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 horas) Canberra, Guam, Melbourne, Sydney, Vladivostok";
! $lang['tz']['11'] = "(GMT +11:00 horas) Magadan, New Caledonia, Solomon Islands";
! $lang['tz']['12'] = "(GMT +12:00 horas) Auckland, Wellington, Fiji, Marshall Island";
$lang['datetime']['Sunday'] = "Domingo";
--- 886,954 ----
$lang['All_times'] = "Todas las horas son %s"; // ej. Todas las horas son GMT - 12 Horas
// Estos se muestran en la lista desplegable de zona horaria
! $lang['-12'] = 'GMT - 12 Horas';
! $lang['-11'] = 'GMT - 11 Horas';
! $lang['-10'] = 'GMT - 10 Horas';
! $lang['-9'] = 'GMT - 9 Horas';
! $lang['-8'] = 'GMT - 8 Horas';
! $lang['-7'] = 'GMT - 7 Horas';
! $lang['-6'] = 'GMT - 6 Horas';
! $lang['-5'] = 'GMT - 5 Horas';
! $lang['-4'] = 'GMT - 4 Horas';
! $lang['-3.5'] = 'GMT - 3.5 Horas';
! $lang['-3'] = 'GMT - 3 Horas';
! $lang['-2'] = 'GMT - 2 Horas';
! $lang['-1'] = 'GMT - 1 Horas';
! $lang['0'] = 'GMT';
! $lang['1'] = 'GMT + 1 Hora';
! $lang['2'] = 'GMT + 2 Horas';
! $lang['3'] = 'GMT + 3 Horas';
! $lang['3.5'] = 'GMT + 3.5 Horas';
! $lang['4'] = 'GMT + 4 Horas';
! $lang['4.5'] = 'GMT + 4.5 Horas';
! $lang['5'] = 'GMT + 5 Horas';
! $lang['5.5'] = 'GMT + 5.5 Horas';
! $lang['6'] = 'GMT + 6 Horas';
! $lang['6.5'] = 'GMT + 6.5 Horas';
! $lang['7'] = 'GMT + 7 Horas';
! $lang['8'] = 'GMT + 8 Horas';
! $lang['9'] = 'GMT + 9 Horas';
! $lang['9.5'] = 'GMT + 9.5 Horas';
! $lang['10'] = 'GMT + 10 Horas';
! $lang['11'] = 'GMT + 11 Horas';
! $lang['12'] = 'GMT + 12 Horas';
!
! // These are displayed in the timezone select box
! $lang['tz']['-12'] = 'GMT - 12 Horas';
! $lang['tz']['-11'] = 'GMT - 11 Horas';
! $lang['tz']['-10'] = 'GMT - 10 Horas';
! $lang['tz']['-9'] = 'GMT - 9 Horas';
! $lang['tz']['-8'] = 'GMT - 8 Horas';
! $lang['tz']['-7'] = 'GMT - 7 Horas';
! $lang['tz']['-6'] = 'GMT - 6 Horas';
! $lang['tz']['-5'] = 'GMT - 5 Horas';
! $lang['tz']['-4'] = 'GMT - 4 Horas';
! $lang['tz']['-3.5'] = 'GMT - 3.5 Horas';
! $lang['tz']['-3'] = 'GMT - 3 Horas';
! $lang['tz']['-2'] = 'GMT - 2 Horas';
! $lang['tz']['-1'] = 'GMT - 1 Horas';
! $lang['tz']['0'] = 'GMT';
! $lang['tz']['1'] = 'GMT + 1 Hora';
! $lang['tz']['2'] = 'GMT + 2 Horas';
! $lang['tz']['3'] = 'GMT + 3 Horas';
! $lang['tz']['3.5'] = 'GMT + 3.5 Horas';
! $lang['tz']['4'] = 'GMT + 4 Horas';
! $lang['tz']['4.5'] = 'GMT + 4.5 Horas';
! $lang['tz']['5'] = 'GMT + 5 Horas';
! $lang['tz']['5.5'] = 'GMT + 5.5 Horas';
! $lang['tz']['6'] = 'GMT + 6 Horas';
! $lang['tz']['6.5'] = 'GMT + 6.5 Horas';
! $lang['tz']['7'] = 'GMT + 7 Horas';
! $lang['tz']['8'] = 'GMT + 8 Horas';
! $lang['tz']['9'] = 'GMT + 9 Horas';
! $lang['tz']['9.5'] = 'GMT + 9.5 Horas';
! $lang['tz']['10'] = 'GMT + 10 Horas';
! $lang['tz']['11'] = 'GMT + 11 Horas';
! $lang['tz']['12'] = 'GMT + 12 Horas';
$lang['datetime']['Sunday'] = "Domingo";
|
|
From: Jonathan H. <the...@us...> - 2002-05-13 22:01:18
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8675
Modified Files:
Tag: phpBB-2_0_0
admin_db_utilities.php
Log Message:
Fix for not downloading additional_tables
Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
diff -C2 -r1.42.2.2 -r1.42.2.3
*** admin_db_utilities.php 12 May 2002 00:47:40 -0000 1.42.2.2
--- admin_db_utilities.php 13 May 2002 22:00:37 -0000 1.42.2.3
***************
*** 746,751 ****
$template->set_filenames(array(
"body" => "admin/db_utils_backup_body.tpl")
! );
!
$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
--- 746,750 ----
$template->set_filenames(array(
"body" => "admin/db_utils_backup_body.tpl")
! );
$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
***************
*** 773,776 ****
--- 772,779 ----
else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) )
{
+ if(is_array($additional_tables))
+ {
+ $additional_tables = implode(',', $additional_tables);
+ }
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
***************
*** 778,782 ****
$template->assign_vars(array(
! "META" => "<meta http-equiv=\"refresh\" content=\"0;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",
"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
--- 781,785 ----
$template->assign_vars(array(
! "META" => "<meta http-equiv=\"refresh\" content=\"2;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",
"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
***************
*** 809,813 ****
@ob_start();
@ob_implicit_flush(0);
! header("Content-Type: text/x-delimtext; name=\"phpbb_db_backup.sql.gz\"");
header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
}
--- 812,816 ----
@ob_start();
@ob_implicit_flush(0);
! header("Content-Type: application/x-gzip; name=\"phpbb_db_backup.sql.gz\"");
header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 13:27:15
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv2706/includes
Modified Files:
Tag: phpBB-2_0_0
functions_search.php
Log Message:
Minor reduction in search indexing to three letters ...
Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** functions_search.php 13 May 2002 01:30:59 -0000 1.8.2.4
--- functions_search.php 13 May 2002 13:27:12 -0000 1.8.2.5
***************
*** 58,63 ****
$entry = str_replace('*', ' ', $entry);
! // 'words' that consist of <=3 or >=20 characters are removed.
! $entry = preg_replace('/\b([a-z0-9]{1,3}|[a-z0-9]{21,})\b/',' ', $entry);
}
--- 58,63 ----
$entry = str_replace('*', ' ', $entry);
! // 'words' that consist of <3 or >20 characters are removed.
! $entry = preg_replace('/\b([a-z0-9]{1,2}|[a-z0-9]{21,})\b/',' ', $entry);
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 13:18:21
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28773
Modified Files:
Tag: phpBB-2_0_0
common.php groupcp.php install.php login.php modcp.php
privmsg.php upgrade.php viewforum.php viewtopic.php
Log Message:
Added exit's after those header location redirects without them
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.74.2.2
retrieving revision 1.74.2.3
diff -C2 -r1.74.2.2 -r1.74.2.3
*** common.php 12 May 2002 17:57:34 -0000 1.74.2.2
--- common.php 13 May 2002 13:18:17 -0000 1.74.2.3
***************
*** 102,117 ****
// URI params
//
! $board_config = Array();
! $userdata = Array();
! $theme = Array();
! $images = Array();
! $lang = Array();
$gen_simple_header = FALSE;
! @include($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
{
header("Location: install.$phpEx");
}
--- 102,118 ----
// URI params
//
! $board_config = array();
! $userdata = array();
! $theme = array();
! $images = array();
! $lang = array();
$gen_simple_header = FALSE;
! include($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
{
header("Location: install.$phpEx");
+ exit;
}
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.58.2.3
retrieving revision 1.58.2.4
diff -C2 -r1.58.2.3 -r1.58.2.4
*** groupcp.php 6 Apr 2002 02:28:54 -0000 1.58.2.3
--- groupcp.php 13 May 2002 13:18:17 -0000 1.58.2.4
***************
*** 160,163 ****
--- 160,164 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
***************
*** 209,212 ****
--- 210,214 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
***************
*** 310,317 ****
--- 312,321 ----
{
header($header_location . append_sid("groupcp.$phpEx", true));
+ exit;
}
elseif ( !$userdata['session_logged_in'] )
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
***************
*** 397,400 ****
--- 401,405 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
}
***************
*** 458,461 ****
--- 463,467 ----
{
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ exit;
}
Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C2 -r1.41 -r1.41.2.1
*** install.php 22 Mar 2002 14:30:05 -0000 1.41
--- install.php 13 May 2002 13:18:17 -0000 1.41.2.1
***************
*** 345,348 ****
--- 345,349 ----
{
header("Location: " . append_sid("index.$phpEx", true));
+ exit;
}
}
Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -C2 -r1.47 -r1.47.2.1
*** login.php 31 Mar 2002 00:06:33 -0000 1.47
--- login.php 13 May 2002 13:18:17 -0000 1.47.2.1
***************
*** 68,71 ****
--- 68,72 ----
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
else
***************
*** 82,89 ****
--- 83,92 ----
{
header($header_location . append_sid($HTTP_POST_VARS['redirect'], true));
+ exit;
}
else
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
}
***************
*** 130,137 ****
--- 133,142 ----
{
header($header_location . append_sid($HTTP_POST_VARS['redirect'], true));
+ exit;
}
else
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
}
***************
*** 141,148 ****
--- 146,155 ----
{
header($header_location . append_sid($HTTP_POST_VARS['redirect'], true));
+ exit;
}
else
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
}
***************
*** 225,228 ****
--- 232,236 ----
{
header($header_location . append_sid("index.$phpEx", true));
+ exit;
}
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.3
retrieving revision 1.71.2.4
diff -C2 -r1.71.2.3 -r1.71.2.4
*** modcp.php 12 May 2002 15:57:45 -0000 1.71.2.3
--- modcp.php 13 May 2002 13:18:17 -0000 1.71.2.4
***************
*** 175,178 ****
--- 175,179 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid($redirect, true));
+ exit;
}
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.5
retrieving revision 1.96.2.6
diff -C2 -r1.96.2.5 -r1.96.2.6
*** privmsg.php 12 May 2002 15:57:47 -0000 1.96.2.5
--- privmsg.php 13 May 2002 13:18:17 -0000 1.96.2.6
***************
*** 185,188 ****
--- 185,189 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true));
+ exit;
}
***************
*** 246,249 ****
--- 247,251 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
+ exit;
}
***************
*** 628,631 ****
--- 630,634 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
+ exit;
}
if ( isset($mark_list) && !is_array($mark_list) )
***************
*** 826,829 ****
--- 829,833 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
+ exit;
}
***************
*** 915,918 ****
--- 919,923 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
+ exit;
}
***************
*** 1264,1267 ****
--- 1269,1273 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
+ exit;
}
***************
*** 1303,1306 ****
--- 1309,1313 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
+ exit;
}
***************
*** 1634,1637 ****
--- 1641,1645 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
+ exit;
}
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -r1.27.2.1 -r1.27.2.2
*** upgrade.php 8 Apr 2002 01:11:06 -0000 1.27.2.1
--- upgrade.php 13 May 2002 13:18:18 -0000 1.27.2.2
***************
*** 38,42 ****
if( defined("PHPBB_INSTALLED") )
{
! header("Location: index.$phpEx");
exit;
}
--- 38,43 ----
if( defined("PHPBB_INSTALLED") )
{
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . " index.$phpEx");
exit;
}
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139.2.2
retrieving revision 1.139.2.3
diff -C2 -r1.139.2.2 -r1.139.2.3
*** viewforum.php 9 May 2002 18:54:49 -0000 1.139.2.2
--- viewforum.php 13 May 2002 13:18:18 -0000 1.139.2.3
***************
*** 106,109 ****
--- 106,110 ----
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true));
+ exit;
}
//
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186.2.4
retrieving revision 1.186.2.5
diff -C2 -r1.186.2.4 -r1.186.2.5
*** viewtopic.php 13 May 2002 01:30:59 -0000 1.186.2.4
--- viewtopic.php 13 May 2002 13:18:18 -0000 1.186.2.5
***************
*** 183,186 ****
--- 183,187 ----
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true));
+ exit;
}
***************
*** 300,303 ****
--- 301,305 ----
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true));
+ exit;
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 13:18:21
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv28773/admin
Modified Files:
Tag: phpBB-2_0_0
admin_styles.php pagestart.php
Log Message:
Added exit's after those header location redirects without them
Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -C2 -r1.27.2.2 -r1.27.2.3
*** admin_styles.php 12 May 2002 00:47:40 -0000 1.27.2.2
--- admin_styles.php 13 May 2002 13:18:17 -0000 1.27.2.3
***************
*** 53,57 ****
if( $cancel )
{
! header("Location: " . append_sid("admin_styles.$phpEx"));
}
--- 53,59 ----
if( $cancel )
{
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . append_sid("admin_styles.$phpEx"));
! exit;
}
Index: pagestart.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/pagestart.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pagestart.php 12 May 2002 00:47:40 -0000 1.1.2.1
--- pagestart.php 13 May 2002 13:18:17 -0000 1.1.2.2
***************
*** 40,44 ****
if( !$userdata['session_logged_in'] )
{
! header("Location: ../" . append_sid("login.$phpEx?redirect=admin/"));
}
else if( $userdata['user_level'] != ADMIN )
--- 40,46 ----
if( !$userdata['session_logged_in'] )
{
! $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . '../' . append_sid("login.$phpEx?redirect=admin/"));
! exit;
}
else if( $userdata['user_level'] != ADMIN )
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_portuguese_brazil
In directory usw-pr-cvs1:/tmp/cvs-serv17112
Added Files:
Tag: phpBB-2_0_0
icon_aim.gif icon_edit.gif icon_email.gif icon_icq_add.gif
icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif
icon_quote.gif icon_search.gif icon_www.gif icon_yim.gif
msg_newpost.gif post.gif reply-locked.gif reply.gif
Log Message:
Initial version
--- NEW FILE ---
GIF89aC
¨6Á%<tØè±gOb À CfÐ(`ÙÍj2©6+"
:}jÕ
@F7(@ÀRCýHEÓX`ÀÎÚ"PàvÃ[ó~d2!ØQ6@ ´¤6þÓ+V¯^ àÉ,ÐQfbpÃ/vÌóÑ ¼t( ¸té² R«^ͺµë×°WKã¢$íÛ¸sû*ð!
--- NEW FILE ---
GIF89aC
ÜL¬ï<Ù$àÓ zÈ$Òy8C$
7
m
r ¥U§
Ôÿl$¥¡ (\0à@ dâ ÜaÞ
ùìAþùý+pãF< Ì!|(aqr¸È 2@ð`äÈ
ôÐO¥ÊpE})æ
p8Ðf>Þ:<äPà
v<Ø ÚA &døj«Çl tØLD²o 4âPÁÏFh ·óçËL$Rß*d×ÜL$éäG ½Â
--- NEW FILE ---
GIF89aC
>>
k¢©¦© ÇKO· ³ Bs
^>§
I Þ
ã¤ÃÇìíÊ i Ó
Òt§ÁèLm° §P¹
'r0Á
&¹-»m)Rä¹ÓDmÓ¸s+þ¶ÀñjÖµe³ËM¼8a |©@¡ÀçÏ>½ºõëسkßn½
`"sO¾¼ù+^À
--- NEW FILE ---
GIF89aC
û´Èy«Ål¦ÆÖÿÿ±A
§
Ip& i@o
p
¦r®¯Jq2
mw¢ _
C\8 ¢LðáÕ3Q¡2bÀ!(0 àÀH@Åä@JÜ@{é1²4 `ÀÁA±
Ýrè?L´t£4T0pÐAY
l;\Ëk¼Î@1¢ÑÈÇh ßå¬ 4a |Q íÕ_ L9C` PsçÎ Mº´éÓ¨S6°GL.°cËåK!
--- NEW FILE ---
GIF89a
r¨d«©³ª4dº»¼A -113 !
--- NEW FILE ---
GIF89aC
JDÓ¬Z¯Ø¬võ, Ëa
P£²5TÍ°cÓÍÀÕQ;tÈ@·TÖ®®M¼¸$¾$-ºyiÒÐOKN½ºõëØ è ³÷ïàÁ{
--- NEW FILE ---
GIF89aC
Ñ4Vªtmßx
¶¹º»
dÈ÷ÂZT A«]4ÿP
½0Á
0=H8;Adz¶£öÑC© ´4õ׿^wÒpÖ'ÂCO$,x8ùé» òJà àÏÐ0!ÃA(p@:Ó2¦óÝ 8HHð©@
H( ¥@
6è |
--- NEW FILE ---
GIF89aC
¨ Su ²²·
¦ÂÃÃ\vË
t
f
Ó\º¦ÄÃèèÇuG¶| Û û§@0A
v1ãµz
PXÂL5wÎGt ÒÅÞL»¶¾
@ïÞ¾ÄfÙ0·³m+ßÁ<5ªHN½ºõëسk¯ áO)d ?Þ
--- NEW FILE ---
GIF89aC
¤óhh´²4 جvËíz¿ò¡< K Rx<nfÐ
wªÆ¬É
b£Á
Ü
ÈÉïïËxVÒøu@ @ÈÀÀÂV Úx`@àH<< ±(Bú I¢ «UÈ,då`Ô6\¨Hs"é!pP Ï ¬
--- NEW FILE ---
GIF89aC
cÀÏÅ ¿
Ä`²¡o èc Ã
Ü\wÎ
--- NEW FILE ---
GIF89aC
;p øÌ SÀ18 °¥Kp:@\àî
.£ÙÍ ÈplÀ !@®] 8TÑC¯
U
--- NEW FILE ---
GIF89aC
4ûÓÛåååL]¯ÅÏ|ÔÚÞÉ+Jãíòôëíùøøïïï쵿éÚÝÞèí{rtüîñèèéÿÿÿ!ù
{«@¢h·Ô 6ñµ3ÐΪª\·:ØË×k#
'n¦Á' À³WÏâ[L@xùjÞìwÑ
|Mxæ0aQß»gU;,ð { ølÞí g
WzN|øN $x¸u+l®vòÝÀ»º{°²µ)}7N¾ ræ
^½¼yäWõ °8{ðãËO¿¾ýûõ'xÁs ÿ
--- NEW FILE ---
GIF89a]
¡
yb ªc ¤7ªmº¼½d D q V¦§
T«b QM Npº½á¼«B
¡ ͧ«æ7¬ O ¾IîÁDP°`A
44¸¢@f=øáÐAÌ"P:Fh°À8ãÿª<xá°RA>%ãã R~Ögr $ýÐÀ\-
P
$H8äSOíp!Á$¸ÞP²9å è"¼Kù®D$
>u(¶AH ð@5 §Uì×
¬
xî ÓÍ ~Ãðç4
3Éwl`!/«é7 wÁ«]`!x \Ðß}%
--- NEW FILE ---
GIF89a]
uyC||~b E
A
f§~F £H] ¥¨ªÄÄ rC
´w¶B^ ] }§ÅãÄ
ÓA =ô'öA þùÐE × ppÁ8
!8 g
¢Ã
,x@ÁÃ(h±²3 lË@`BkG/lC@iF àÅtB«W<x +ÈÊD
hÜÖÁq/Æ9 X`¡Iw
p
w
ä@p@TF9pXTfà
--- NEW FILE ---
GIF89a]
z~~^p
f"C
Y¬ ¹ FB®F CÉËX³´·
h Æ
|D
ÌíI³µ¶Óº ÛûÙ ¤L d , 0H"º{è® º$ÀÁÞ0hàÀ¢ÄO .ÿrÔ#¾-4èp MP
¨`
&¾ªjÅÜ"Û¶m#¨ âáU
Àë Q B Qì"±
"Þ¾'XêÔ0<UzàâÓËn" 4èÕ4 1Vpèx $
Ñxð
--- NEW FILE ---
GIF89a]
E
Àíz¿à°xL.9è4{Ø°
4w±Ìø¼þ¬î§ $
_
С âjX`á
,#JÁßÈÒ¢ÂËÁDvH@@fÒ
Àè¢Q X.
±\'¾2gãSy;jË¢ÓÚ óÖ»ºPHôÉ ¢8Ü vc NÐÈU
¤V=:A9Ê W D§]7ÀÔxKÿ
jPȼ¸Òý6%b¢XiõMÒ´À,Ú Äõh\|i&¥;lÉ7ÐdÐ
YÐ`E
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 12:08:03
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_portuguese_brazil In directory usw-pr-cvs1:/tmp/cvs-serv17005/lang_portuguese_brazil Log Message: Directory /cvsroot/phpbb/phpBB2/templates/subSilver/images/lang_portuguese_brazil added to the repository --> Using per-directory sticky tag `phpBB-2_0_0' |
|
From: Paul S. O. <ps...@us...> - 2002-05-13 11:36:55
|
Update of /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil
In directory usw-pr-cvs1:/tmp/cvs-serv16408/language/lang_portuguese_brazil
Modified Files:
Tag: phpBB-2_0_0
lang_admin.php lang_bbcode.php lang_faq.php lang_main.php
Log Message:
Various updates
Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/Attic/lang_admin.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** lang_admin.php 5 May 2002 12:16:26 -0000 1.1.2.1
--- lang_admin.php 13 May 2002 11:36:47 -0000 1.1.2.2
***************
*** 29,45 ****
// in the modules[][] arrays in each module file
//
! $lang['General'] = "Admin Geral";
! $lang['Users'] = "Admin de Usuários";
! $lang['Groups'] = "Admin de Grupo";
! $lang['Forums'] = "Admin do Fórum";
! $lang['Styles'] = "Admin de Estilos";
$lang['Configuration'] = "Configuração";
$lang['Permissions'] = "Permissões";
[...1058 lines suppressed...]
+
//
// Install Process
***************
*** 657,663 ****
$lang['Welcome_install'] = "Bem-vindo à Instalação do phpBB 2";
$lang['Initial_config'] = "Configuração Básica";
! $lang['DB_config'] = "Configuração de Base de Dados";
! $lang['Admin_config'] = "Configuração de Admin";
! $lang['continue_upgrade'] = "Logo que tenha terminado o 'download' do arquivo de configuração para o computador poderá clique \"Continuar a Actualização\" abaixo para continuar o processo. Aguardar que seja feito o 'upload' do arquivo de configuração ate que o processo de actualização esteja completo.";
$lang['upgrade_submit'] = "Continuar a Atualização";
--- 707,713 ----
$lang['Welcome_install'] = "Bem-vindo à Instalação do phpBB 2";
$lang['Initial_config'] = "Configuração Básica";
! $lang['DB_config'] = "Configuração do Banco de Dados";
! $lang['Admin_config'] = "Configuração de Administração";
! $lang['continue_upgrade'] = "Logo que tenha terminado o download do arquivo de configuração para o seu computador poderá clicar em \"Continuar a Actualização\" abaixo para continuar o processo. Aguarde que seja feito o upload do arquivo de configuração até que o processo de atualização esteja completo.";
$lang['upgrade_submit'] = "Continuar a Atualização";
Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/Attic/lang_bbcode.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** lang_bbcode.php 5 May 2002 12:16:26 -0000 1.1.2.1
--- lang_bbcode.php 13 May 2002 11:36:47 -0000 1.1.2.2
***************
*** 1,5 ****
<?php
/***************************************************************************
! * lang_bbcode.php [portuguese_br]
* -------------------
* begin : Wednesday Oct 3, 2001
--- 1,5 ----
<?php
/***************************************************************************
! * lang_bbcode.php [portuguese_br]
* -------------------
* begin : Wednesday Oct 3, 2001
Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/Attic/lang_faq.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese_brazil/Attic/lang_main.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** lang_main.php 5 May 2002 12:16:26 -0000 1.1.2.1
--- lang_main.php 13 May 2002 11:36:47 -0000 1.1.2.2
***************
*** 1,5 ****
<?php
/***************************************************************************
! * lang_main.php [portuguese_br]
* -------------------
* begin : Sat Dec 16 2000
--- 1,5 ----
<?php
/***************************************************************************
! * lang_main.php [portuguese_br]
* -------------------
[...1568 lines suppressed...]
+ $lang['Ban_no_admin'] ="Esse Usuário é um ADMINISTRADOR e consequentemente não pode ser nem avisado nem expulso";
+ $lang['Rules_greencard_can'] = "Você <b>pode</b> reativar Usuários nesse fórum";
+ $lang['Rules_bluecard_can'] = "Você <b>pode</b> avisar tópicos ao moderador nesse fórum";
+ $lang['Give_b_card'] = "Avisar dessa mensagem aos moderadores desse fórum";
+ $lang['Clear_b_card'] = "Essa mensagem possui %d cartões azuis até o momento, Se você apertar esse botão você irá limpar esse contador";
+ $lang['No_moderators'] ="O fórum não possui moderadores, então nenhuma aviso será enviado!";
+ $lang['Post_repported'] ="Essa mensagem foi avisada a %d moderadores";
+ $lang['Post_repported_1'] ="Essa Mensagem foi avisada ao moderador";
+ $lang['Post_repport'] ="Aviso de Mensagem"; //Subject in email notification
+
+ // TELL A FRIEND
+ $lang['Tell_Friend'] = "Recomende a um Amigo.";
+ $lang['Tell_Friend_Sender_User'] = "Seu Nome:";
+ $lang['Tell_Friend_Sender_Email'] = "Seu Email:";
+ $lang['Tell_Friend_Reciever_User'] = "Nome do Amigo:";
+ $lang['Tell_Friend_Reciever_Email'] = "Email do Amigo:";
+ $lang['Tell_Friend_Msg'] = "Sua Mensagem:";
+ $lang['Tell_Friend_Title'] = "Recomende a um Amigo";
//
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 01:31:02
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv13533/includes
Modified Files:
Tag: phpBB-2_0_0
auth.php bbcode.php functions_post.php functions_search.php
Log Message:
More fixes and updates
Index: auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/auth.php,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -r1.37 -r1.37.2.1
*** auth.php 2 Apr 2002 14:03:58 -0000 1.37
--- auth.php 13 May 2002 01:30:59 -0000 1.37.2.1
***************
*** 159,174 ****
if ( $row = $db->sql_fetchrow($result) )
{
! if ( $forum_id != AUTH_LIST_ALL)
{
! $u_access[] = $row;
! }
! else
! {
! do
{
$u_access[$row['forum_id']][] = $row;
}
- while( $row = $db->sql_fetchrow($result) );
}
}
}
--- 159,174 ----
if ( $row = $db->sql_fetchrow($result) )
{
! do
{
! if ( $forum_id != AUTH_LIST_ALL)
! {
! $u_access[] = $row;
! }
! else
{
$u_access[$row['forum_id']][] = $row;
}
}
+ while( $row = $db->sql_fetchrow($result) );
}
}
Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -C2 -r1.36.2.5 -r1.36.2.6
*** bbcode.php 12 May 2002 00:47:40 -0000 1.36.2.5
--- bbcode.php 13 May 2002 01:30:59 -0000 1.36.2.6
***************
*** 607,611 ****
// xxxx can only be alpha characters.
// yyyy is anything up to the first space, newline, or comma.
! $ret = preg_replace("#([\n ])([a-z]+?)://([^,\t <\n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
--- 607,611 ----
// xxxx can only be alpha characters.
// yyyy is anything up to the first space, newline, or comma.
! $ret = preg_replace("#([\n ])([a-z]+?)://([^\t <\n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
***************
*** 615,619 ****
// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
! $ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^,\t <\n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
// matches an email@domain type address at the start of a line, or after a space.
--- 615,619 ----
// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
! $ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^\t <\n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
// matches an email@domain type address at the start of a line, or after a space.
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -r1.9.2.2 -r1.9.2.3
*** functions_post.php 3 May 2002 19:46:34 -0000 1.9.2.2
--- functions_post.php 13 May 2002 01:30:59 -0000 1.9.2.3
***************
*** 398,402 ****
$topic_update_sql .= "topic_replies = topic_replies - 1";
! $sql = "SELECT MAX(post_id) AS post_id
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
--- 398,402 ----
$topic_update_sql .= "topic_replies = topic_replies - 1";
! $sql = "SELECT MAX(post_id) AS last_post_id
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
***************
*** 408,412 ****
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_update_sql .= ', topic_last_post_id = ' . $row['post_id'];
}
}
--- 408,412 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_update_sql .= ', topic_last_post_id = ' . $row['last_post_id'];
}
}
***************
*** 414,418 ****
if ( $post_data['last_topic'] )
{
! $sql = "SELECT MAX(post_id) AS post_id
FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id";
--- 414,418 ----
if ( $post_data['last_topic'] )
{
! $sql = "SELECT MAX(post_id) AS last_post_id
FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id";
***************
*** 424,428 ****
if ( $row = $db->sql_fetchrow($result) )
{
! $forum_update_sql .= ( $row['post_id'] ) ? ', forum_last_post_id = ' . $row['post_id'] : ', forum_last_post_id = 0';
}
}
--- 424,428 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $forum_update_sql .= ( $row['last_post_id'] ) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
}
}
***************
*** 430,434 ****
else if ( $post_data['first_post'] )
{
! $sql = "SELECT MIN(post_id) AS post_id
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
--- 430,434 ----
else if ( $post_data['first_post'] )
{
! $sql = "SELECT MIN(post_id) AS first_post_id
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
***************
*** 440,444 ****
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['post_id'];
}
}
--- 440,444 ----
if ( $row = $db->sql_fetchrow($result) )
{
! $topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['first_post_id'];
}
}
***************
*** 518,528 ****
}
- $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
- WHERE post_id = $post_id";
- if ( !($db->sql_query($sql)) )
- {
- message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
- }
-
$topic_update_sql .= 'topic_replies = topic_replies - 1';
if ( $post_data['last_post'] )
--- 518,521 ----
***************
*** 547,550 ****
--- 540,545 ----
}
}
+
+ remove_search_post($post_id);
}
***************
*** 552,556 ****
{
$sql = "DELETE FROM " . VOTE_DESC_TABLE . "
! WHERE vote_id = $poll_id";
if ( !($db->sql_query($sql)) )
{
--- 547,551 ----
{
$sql = "DELETE FROM " . VOTE_DESC_TABLE . "
! WHERE topic_id = $topic_id";
if ( !($db->sql_query($sql)) )
{
***************
*** 573,577 ****
}
- remove_search_post($post_id);
//
// Ok we set variables above that were intended to update the topics table
--- 568,571 ----
Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** functions_search.php 12 May 2002 15:57:45 -0000 1.8.2.3
--- functions_search.php 13 May 2002 01:30:59 -0000 1.8.2.4
***************
*** 22,28 ****
function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
{
- // Weird, $init_match doesn't work with static when double quotes (") are used...
static $drop_char_match = array('^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
! static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ', ' ', ' ');
$entry = ' ' . strip_tags(strtolower($entry)) . ' ';
--- 22,27 ----
function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
{
static $drop_char_match = array('^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
! static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ', ' ', ' ');
$entry = ' ' . strip_tags(strtolower($entry)) . ' ';
***************
*** 43,53 ****
else if ( $mode == 'search' )
{
! $entry = str_replace('+', ' and ', $entry);
! $entry = str_replace('-', ' not ', $entry);
}
- // Replace numbers on their own
- $entry = preg_replace('/\b[0-9]+\b/', ' ', $entry);
-
//
// Filter out strange characters like ^, $, &, change "it's" to "its"
--- 42,49 ----
else if ( $mode == 'search' )
{
! $entry = str_replace(' +', ' and ', $entry);
! $entry = str_replace(' -', ' not ', $entry);
}
//
// Filter out strange characters like ^, $, &, change "it's" to "its"
***************
*** 62,67 ****
$entry = str_replace('*', ' ', $entry);
! // 'words' that consist of <=3 or >=25 characters are removed.
! $entry = preg_replace('/\b([a-z0-9]{1,3}|[a-z0-9]{20,})\b/',' ', $entry);
}
--- 58,63 ----
$entry = str_replace('*', ' ', $entry);
! // 'words' that consist of <=3 or >=20 characters are removed.
! $entry = preg_replace('/\b([a-z0-9]{1,3}|[a-z0-9]{21,})\b/',' ', $entry);
}
***************
*** 96,107 ****
function split_words(&$entry, $mode = 'post')
{
! if ( $mode == 'post' )
! {
! preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
! }
! else
! {
! preg_match_all('/(\*?[à-ÿa-z0-9]+\*?)|\b([à-ÿa-z0-9]+)\b/', $entry, $split_entries);
! }
return $split_entries[1];
--- 92,97 ----
function split_words(&$entry, $mode = 'post')
{
! $rex = ( $mode == 'post' ) ? "/\b(\w[\w']*\w+|\w+?)\b/" : '/(\*?[à-ÿa-z0-9]+\*?)|\b([à-ÿa-z0-9]+)\b/';
! preg_match_all($rex, $entry, $split_entries);
return $split_entries[1];
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 01:31:02
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13533/admin
Modified Files:
Tag: phpBB-2_0_0
admin_forumauth.php
Log Message:
More fixes and updates
Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -r1.23.2.2 -r1.23.2.3
*** admin_forumauth.php 12 May 2002 15:57:44 -0000 1.23.2.2
--- admin_forumauth.php 13 May 2002 01:30:59 -0000 1.23.2.3
***************
*** 101,106 ****
if(!empty($forum_id))
{
- $sql = "UPDATE " . FORUMS_TABLE . " SET ";
-
if(isset($HTTP_POST_VARS['simpleauth']))
{
--- 101,104 ----
***************
*** 109,113 ****
for($i = 0; $i < count($simple_ary); $i++)
{
! $sql .= ( ( $i < count($simple_ary) - 1 ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
}
--- 107,111 ----
for($i = 0; $i < count($simple_ary); $i++)
{
! $sql .= ( ( $sql != '' ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
}
***************
*** 128,136 ****
}
! $sql .= ( ( $i < count($forum_auth_fields) - 1 ) ? ', ' : '' ) .$forum_auth_fields[$i] . ' = ' . $value;
}
! $sql .= " WHERE forum_id = $forum_id";
!
}
--- 126,133 ----
}
! $sql .= ( ( $sql != '' ) ? ', ' : '' ) .$forum_auth_fields[$i] . ' = ' . $value;
}
! $sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id";
}
***************
*** 139,147 ****
if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update auth table!", "", __LINE__, __FILE__, $sql);
}
}
! $forum_sql = "";
$adv = 0;
}
--- 136,144 ----
if ( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, 'Could not update auth table', '', __LINE__, __FILE__, $sql);
}
}
! $forum_sql = '';
$adv = 0;
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-13 01:31:02
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv13533
Modified Files:
Tag: phpBB-2_0_0
search.php viewtopic.php
Log Message:
More fixes and updates
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.72.2.3
retrieving revision 1.72.2.4
diff -C2 -r1.72.2.3 -r1.72.2.4
*** search.php 7 Apr 2002 19:18:04 -0000 1.72.2.3
--- search.php 13 May 2002 01:30:59 -0000 1.72.2.4
***************
*** 119,122 ****
--- 119,127 ----
//
+ // encoding match for workaround
+ //
+ $multibyte_charset = 'utf-8, big5, shift_jis, euc-kr, gb2312';
+
+ //
// Begin core code
//
***************
*** 236,243 ****
$split_search = array();
! $cleaned_search = clean_words('search', stripslashes($search_keywords), $stopword_array, $synonym_array);
! $split_search = split_words($cleaned_search, 'search');
! $search_msg_only = ( !$search_fields ) ? "AND m.title_match = 0" : '';
$word_count = 0;
--- 241,247 ----
$split_search = array();
! $split_search = ( !strstr($multibyte_charset, $lang['ENCODING']) ) ? split_words(clean_words('search', stripslashes($search_keywords), $stopword_array, $synonym_array), 'search') : split(' ', $search_keywords);
! $search_msg_only = ( !$search_fields ) ? "AND m.title_match = 0" : ( ( strstr($multibyte_charset, $lang['ENCODING']) ) ? '' : '' );
$word_count = 0;
***************
*** 269,280 ****
}
! $match_word = str_replace('*', '%', $split_search[$i]);
!
! $sql = "SELECT m.post_id
! FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
! WHERE w.word_text LIKE '$match_word'
! AND m.word_id = w.word_id
! AND w.word_common <> 1
$search_msg_only";
if ( !($result = $db->sql_query($sql)) )
{
--- 273,295 ----
}
! if ( !strstr($multibyte_charset, $lang['ENCODING']) )
! {
! $match_word = str_replace('*', '%', $split_search[$i]);
! $sql = "SELECT m.post_id
! FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
! WHERE w.word_text LIKE '$match_word'
! AND m.word_id = w.word_id
! AND w.word_common <> 1
! $search_msg_only";
! }
! else
! {
! $match_word = addslashes('%' . str_replace('*', '', $split_search[$i]) . '%');
! $search_msg_only = ( $search_fields ) ? "OR post_subject LIKE '$match_word'" : '';
! $sql = "SELECT post_id
! FROM " . POSTS_TEXT_TABLE . "
! WHERE post_text LIKE '$match_word'
$search_msg_only";
+ }
if ( !($result = $db->sql_query($sql)) )
{
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.186.2.3
retrieving revision 1.186.2.4
diff -C2 -r1.186.2.3 -r1.186.2.4
*** viewtopic.php 12 May 2002 01:21:57 -0000 1.186.2.3
--- viewtopic.php 13 May 2002 01:30:59 -0000 1.186.2.4
***************
*** 141,147 ****
$count_sql = ( !isset($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
! $order_sql = ( !isset($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
! $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . "
WHERE $join_sql
--- 141,147 ----
$count_sql = ( !isset($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
! $order_sql = ( !isset($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
! $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . "
WHERE $join_sql
***************
*** 153,162 ****
}
! if ( !($forum_row = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
}
! $forum_id = $forum_row['forum_id'];
//
--- 153,162 ----
}
! if ( !($forum_topic_data = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
}
! $forum_id = $forum_topic_data['forum_id'];
//
***************
*** 173,177 ****
//
$is_auth = array();
! $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
if( !$is_auth['auth_view'] || !$is_auth['auth_read'] )
--- 173,177 ----
//
$is_auth = array();
! $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_topic_data);
if( !$is_auth['auth_view'] || !$is_auth['auth_read'] )
***************
*** 193,204 ****
//
! $forum_name = $forum_row['forum_name'];
! $topic_title = $forum_row['topic_title'];
! $topic_id = $forum_row['topic_id'];
! $topic_time = $forum_row['topic_time'];
if ( !empty($post_id) )
{
! $start = floor(($forum_row['prev_posts'] - 1) / $board_config['posts_per_page']) * $board_config['posts_per_page'];
}
--- 193,204 ----
//
! $forum_name = $forum_topic_data['forum_name'];
! $topic_title = $forum_topic_data['topic_title'];
! $topic_id = $forum_topic_data['topic_id'];
! $topic_time = $forum_topic_data['topic_time'];
if ( !empty($post_id) )
{
! $start = floor(($forum_topic_data['prev_posts'] - 1) / $board_config['posts_per_page']) * $board_config['posts_per_page'];
}
***************
*** 343,347 ****
else
{
! $total_replies = $forum_row['topic_replies'] + 1;
$limit_posts_time = '';
--- 343,347 ----
else
{
! $total_replies = $forum_topic_data['topic_replies'] + 1;
$limit_posts_time = '';
***************
*** 500,507 ****
);
! $reply_img = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new'];
! $reply_alt = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic'];
! $post_img = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'];
! $post_alt = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'];
//
--- 500,507 ----
);
! $reply_img = ( $forum_topic_data['forum_status'] == FORUM_LOCKED || $forum_topic_data['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new'];
! $reply_alt = ( $forum_topic_data['forum_status'] == FORUM_LOCKED || $forum_topic_data['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic'];
! $post_img = ( $forum_topic_data['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'];
! $post_alt = ( $forum_topic_data['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'];
//
***************
*** 568,572 ****
$topic_mod .= '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move"). '"><img src="' . $images['topic_mod_move'] . '" alt="' . $lang['Move_topic'] . '" title="' . $lang['Move_topic'] . '" border="0" /></a> ';
! $topic_mod .= ( $forum_row['topic_status'] == TOPIC_UNLOCKED ) ? '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock") . '"><img src="' . $images['topic_mod_lock'] . '" alt="' . $lang['Lock_topic'] . '" title="' . $lang['Lock_topic'] . '" border="0" /></a> ' : '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=unlock") . '"><img src="' . $images['topic_mod_unlock'] . '" alt="' . $lang['Unlock_topic'] . '" title="' . $lang['Unlock_topic'] . '" border="0" /></a> ';
$topic_mod .= '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=split") . '"><img src="' . $images['topic_mod_split'] . '" alt="' . $lang['Split_topic'] . '" title="' . $lang['Split_topic'] . '" border="0" /></a> ';
--- 568,572 ----
$topic_mod .= '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move"). '"><img src="' . $images['topic_mod_move'] . '" alt="' . $lang['Move_topic'] . '" title="' . $lang['Move_topic'] . '" border="0" /></a> ';
! $topic_mod .= ( $forum_topic_data['topic_status'] == TOPIC_UNLOCKED ) ? '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock") . '"><img src="' . $images['topic_mod_lock'] . '" alt="' . $lang['Lock_topic'] . '" title="' . $lang['Lock_topic'] . '" border="0" /></a> ' : '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=unlock") . '"><img src="' . $images['topic_mod_unlock'] . '" alt="' . $lang['Unlock_topic'] . '" title="' . $lang['Unlock_topic'] . '" border="0" /></a> ';
$topic_mod .= '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=split") . '"><img src="' . $images['topic_mod_split'] . '" alt="' . $lang['Split_topic'] . '" title="' . $lang['Split_topic'] . '" border="0" /></a> ';
***************
*** 647,651 ****
// Does this topic contain a poll?
//
! if ( !empty($forum_row['topic_vote']) )
{
$sql = "SELECT vd.vote_id, vd.vote_text, vd.vote_start, vd.vote_length, vr.vote_option_id, vr.vote_option_text, vr.vote_result
--- 647,651 ----
// Does this topic contain a poll?
//
! if ( !empty($forum_topic_data['topic_vote']) )
{
$sql = "SELECT vd.vote_id, vd.vote_text, vd.vote_start, vd.vote_length, vr.vote_option_id, vr.vote_option_text, vr.vote_result
***************
*** 690,694 ****
$poll_expired = ( $vote_info[0]['vote_length'] ) ? ( ( $vote_info[0]['vote_start'] + $vote_info[0]['vote_length'] < time() ) ? TRUE : 0 ) : 0;
! if ( $user_voted || $view_result || $poll_expired || !$is_auth['auth_vote'] || $forum_row['topic_status'] == TOPIC_LOCKED )
{
$template->set_filenames(array(
--- 690,694 ----
$poll_expired = ( $vote_info[0]['vote_length'] ) ? ( ( $vote_info[0]['vote_start'] + $vote_info[0]['vote_length'] < time() ) ? TRUE : 0 ) : 0;
! if ( $user_voted || $view_result || $poll_expired || !$is_auth['auth_vote'] || $forum_topic_data['topic_status'] == TOPIC_LOCKED )
{
$template->set_filenames(array(
***************
*** 988,992 ****
$ip = '';
! if ( $userdata['user_id'] == $poster_id && $is_auth['auth_delete'] && $i == $total_replies - 1 )
{
$temp_url = append_sid("posting.$phpEx?mode=delete&" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
--- 988,992 ----
$ip = '';
! if ( $userdata['user_id'] == $poster_id && $is_auth['auth_delete'] && $forum_topic_data['topic_last_post_id'] == $postrow[$i]['post_id'] )
{
$temp_url = append_sid("posting.$phpEx?mode=delete&" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 17:57:37
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv8432/includes
Modified Files:
Tag: phpBB-2_0_0
usercp_activate.php usercp_register.php usercp_sendpasswd.php
Log Message:
More fixes, addresses double activation attempt
Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** usercp_activate.php 12 May 2002 00:47:41 -0000 1.6.2.1
--- usercp_activate.php 12 May 2002 17:57:34 -0000 1.6.2.2
***************
*** 28,96 ****
}
! $sql = "SELECT user_id, user_email, user_newpasswd, user_lang
FROM " . USERS_TABLE . "
! WHERE user_actkey = '" . str_replace("\'", "''", $HTTP_GET_VARS['act_key']) . "'";
! if ( $result = $db->sql_query($sql) )
{
! if ( $row = $db->sql_fetchrow($result) )
{
! $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : "";
$sql = "UPDATE " . USERS_TABLE . "
SET user_active = 1, user_actkey = ''" . $sql_update_pass . "
! WHERE user_id = " . $row['user_id'];
! if ( $result = $db->sql_query($sql) )
{
! if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' )
! {
! include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! $emailer = new emailer($board_config['smtp_delivery']);
!
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
!
! $emailer->use_template('admin_welcome_activated', $row['user_lang']);
! $emailer->email_address($row['user_email']);
! $emailer->set_subject();//$lang['Account_activated_subject']
! $emailer->extra_headers($email_headers);
!
! $emailer->assign_vars(array(
! 'SITENAME' => $board_config['sitename'],
! 'USERNAME' => $username,
! 'PASSWORD' => $password_confirm,
! 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']))
! );
! $emailer->send();
! $emailer->reset();
!
! $template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
! );
!
! message_die(GENERAL_MESSAGE, $lang['Account_active_admin']);
! }
! else
! {
! $template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
! );
!
! $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated'];
! message_die(GENERAL_MESSAGE, $message);
! }
}
else
{
! message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update);
}
}
else
{
! message_die(GENERAL_MESSAGE, $lang['Wrong_activation']); //wrongactiv
}
}
else
{
! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
}
! ?>
--- 28,107 ----
}
! $sql = "SELECT user_active, user_id, user_email, user_newpasswd, user_lang, user_actkey
FROM " . USERS_TABLE . "
! WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]);
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
! }
!
! if ( $row = $db->sql_fetchrow($result) )
! {
! if ( $row['user_active'] && $row['user_actkey'] == '' )
{
! $template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
! );
!
! message_die(GENERAL_MESSAGE, $lang['Already_activated']);
! }
! else if ( $row['user_actkey'] == $HTTP_GET_VARS['act_key'] )
! {
! $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';
$sql = "UPDATE " . USERS_TABLE . "
SET user_active = 1, user_actkey = ''" . $sql_update_pass . "
! WHERE user_id = " . $row['user_id'];
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update);
! }
!
! if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' )
! {
! include($phpbb_root_path . 'includes/emailer.'.$phpEx);
! $emailer = new emailer($board_config['smtp_delivery']);
!
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
!
! $emailer->use_template('admin_welcome_activated', $row['user_lang']);
! $emailer->email_address($row['user_email']);
! $emailer->set_subject();//$lang['Account_activated_subject']
! $emailer->extra_headers($email_headers);
!
! $emailer->assign_vars(array(
! 'SITENAME' => $board_config['sitename'],
! 'USERNAME' => $username,
! 'PASSWORD' => $password_confirm,
! 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']))
! );
! $emailer->send();
! $emailer->reset();
!
! $template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
! );
!
! message_die(GENERAL_MESSAGE, $lang['Account_active_admin']);
}
else
{
! $template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
! );
!
! $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated'];
! message_die(GENERAL_MESSAGE, $message);
}
}
else
{
! message_die(GENERAL_MESSAGE, $lang['Wrong_activation']);
}
}
else
{
! message_die(GENERAL_MESSAGE, $lang['No_such_user']);
}
! ?>
\ No newline at end of file
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -C2 -r1.20.2.8 -r1.20.2.9
*** usercp_register.php 12 May 2002 15:57:45 -0000 1.20.2.8
--- usercp_register.php 12 May 2002 17:57:34 -0000 1.20.2.9
***************
*** 389,398 ****
if ( $mode == 'editprofile' )
{
! if ( $email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN )
{
$user_active = 0;
$user_actkey = gen_rand_string(true);
! $key_len = 54 - (strlen($server_url));
! $key_len = ($key_len > 6) ? $key_len : 6;
$user_actkey = substr($user_actkey, 0, $key_len);
--- 389,399 ----
if ( $mode == 'editprofile' )
{
! if ( $email != $userdata['user_email'] && $board_config['require_activation'] != USER_ACTIVATION_NONE && $userdata['user_level'] != ADMIN )
{
$user_active = 0;
+
$user_actkey = gen_rand_string(true);
! $key_len = 54 - ( strlen($server_url) );
! $key_len = ( $key_len > 6 ) ? $key_len : 6;
$user_actkey = substr($user_actkey, 0, $key_len);
***************
*** 436,440 ****
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
);
$emailer->send();
--- 437,441 ----
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
);
$emailer->send();
***************
*** 559,564 ****
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
- 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey,
-
'FAX_INFO' => $board_config['coppa_fax'],
'MAIL_INFO' => $board_config['coppa_mail'],
--- 560,563 ----
***************
*** 583,587 ****
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
);
}
--- 582,586 ----
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
);
}
***************
*** 601,605 ****
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
);
$emailer->send();
--- 600,604 ----
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
);
$emailer->send();
Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** usercp_sendpasswd.php 1 Apr 2002 19:19:49 -0000 1.6
--- usercp_sendpasswd.php 12 May 2002 17:57:34 -0000 1.6.2.1
***************
*** 47,50 ****
--- 47,51 ----
$username = $row['username'];
+ $user_id = $row['user_id'];
$user_actkey = gen_rand_string(true);
***************
*** 55,59 ****
$sql = "UPDATE " . USERS_TABLE . "
! SET user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey'
WHERE user_id = " . $row['user_id'];
if ( !$db->sql_query($sql) )
--- 56,60 ----
$sql = "UPDATE " . USERS_TABLE . "
! SET user_newpasswd = '" . md5($user_password) . "', user_actkey = '$user_actkey'
WHERE user_id = " . $row['user_id'];
if ( !$db->sql_query($sql) )
***************
*** 78,82 ****
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 79,83 ----
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
! 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
);
$emailer->send();
***************
*** 132,134 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 133,135 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 17:57:37
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv8432/language/lang_english
Modified Files:
Tag: phpBB-2_0_0
lang_main.php
Log Message:
More fixes, addresses double activation attempt
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.85.2.2
retrieving revision 1.85.2.3
diff -C2 -r1.85.2.2 -r1.85.2.3
*** lang_main.php 12 May 2002 15:33:28 -0000 1.85.2.2
--- lang_main.php 12 May 2002 17:57:34 -0000 1.85.2.3
***************
*** 624,627 ****
--- 624,628 ----
$lang['Account_active_admin'] = 'The account has now been activated';
$lang['Reactivate'] = 'Reactivate your account!';
+ $lang['Already_activated'] = 'You have already activated your account';
$lang['COPPA'] = 'Your account has been created but has to be approved, please check your email for details.';
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 17:57:37
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv8432
Modified Files:
Tag: phpBB-2_0_0
common.php
Log Message:
More fixes, addresses double activation attempt
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -C2 -r1.74.2.1 -r1.74.2.2
*** common.php 12 May 2002 00:47:40 -0000 1.74.2.1
--- common.php 12 May 2002 17:57:34 -0000 1.74.2.2
***************
*** 154,158 ****
if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
{
! $private_ip = array('/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
}
--- 154,158 ----
if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
{
! $private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:58:18
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv9802/includes
Modified Files:
Tag: phpBB-2_0_0
functions_search.php usercp_avatar.php usercp_register.php
Log Message:
Yep, more updates and fixes
Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
*** functions_search.php 30 Apr 2002 12:09:24 -0000 1.8.2.2
--- functions_search.php 12 May 2002 15:57:45 -0000 1.8.2.3
***************
*** 199,210 ****
case 'mysql':
case 'mysql4':
! $value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . '(\'' . $word[$i] . '\')';
break;
case 'mssql':
! $value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "'";
break;
default:
! $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text)
! VALUES ('" . $word[$i] . "')";
if( !$db->sql_query($sql) )
{
--- 199,210 ----
case 'mysql':
case 'mysql4':
! $value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . '(\'' . $word[$i] . '\', 0)';
break;
case 'mssql':
! $value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "', 0";
break;
default:
! $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common)
! VALUES ('" . $word[$i] . "', 0)";
if( !$db->sql_query($sql) )
{
***************
*** 222,230 ****
case 'mysql':
case 'mysql4':
! $sql = "INSERT IGNORE INTO " . SEARCH_WORD_TABLE . " (word_text)
VALUES $value_sql";
break;
case 'mssql':
! $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text)
$value_sql";
break;
--- 222,230 ----
case 'mysql':
case 'mysql4':
! $sql = "INSERT IGNORE INTO " . SEARCH_WORD_TABLE . " (word_text, word_common)
VALUES $value_sql";
break;
case 'mssql':
! $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common)
$value_sql";
break;
Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_avatar.php,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** usercp_avatar.php 12 May 2002 00:47:41 -0000 1.8.2.3
--- usercp_avatar.php 12 May 2002 15:57:45 -0000 1.8.2.4
***************
*** 163,167 ****
if ( $avatar_filesize <= $board_config['avatar_filesize'] && $avatar_filesize > 0 )
{
! preg_match("'image\/[x\-]*([a-z]+)'", $avatar_filetype, $avatar_filetype);
$avatar_filetype = $avatar_filetype[1];
}
--- 163,167 ----
if ( $avatar_filesize <= $board_config['avatar_filesize'] && $avatar_filesize > 0 )
{
! preg_match('#image\/[x\-]*([a-z]+)#', $avatar_filetype, $avatar_filetype);
$avatar_filetype = $avatar_filetype[1];
}
***************
*** 185,189 ****
if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $new_filename = ( ( $current_avatar != '' && $current_type == USER_AVATAR_UPLOAD ) && $mode != 'register' ) ? $current_avatar : uniqid($user_ip) . $imgtype;
if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
--- 185,189 ----
if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $new_filename = uniqid($user_ip) . $imgtype;
if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.7
retrieving revision 1.20.2.8
diff -C2 -r1.20.2.7 -r1.20.2.8
*** usercp_register.php 12 May 2002 00:47:41 -0000 1.20.2.7
--- usercp_register.php 12 May 2002 15:57:45 -0000 1.20.2.8
***************
*** 900,924 ****
// it works well :)
//
! if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
{
! $template->assign_block_vars('switch_avatar_block', array() );
!
! if ( $board_config['allow_avatar_upload'] && file_exists('./' . $board_config['avatar_path']) )
{
! if ( $form_enctype != '' )
{
! $template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array() );
}
- $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array() );
- }
! if ( $board_config['allow_avatar_remote'] )
! {
! $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array() );
! }
! if ( $board_config['allow_avatar_local'] && file_exists('./' . $board_config['avatar_gallery_path']) )
! {
! $template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array() );
}
}
--- 900,927 ----
// it works well :)
//
! if ( $mode != 'register' )
{
! if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
{
! $template->assign_block_vars('switch_avatar_block', array() );
!
! if ( $board_config['allow_avatar_upload'] && file_exists('./' . $board_config['avatar_path']) )
{
! if ( $form_enctype != '' )
! {
! $template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array() );
! }
! $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array() );
}
! if ( $board_config['allow_avatar_remote'] )
! {
! $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array() );
! }
! if ( $board_config['allow_avatar_local'] && file_exists('./' . $board_config['avatar_gallery_path']) )
! {
! $template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array() );
! }
}
}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:58:18
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv9802/admin
Modified Files:
Tag: phpBB-2_0_0
admin_forum_prune.php admin_forumauth.php admin_groups.php
admin_ranks.php admin_smilies.php admin_ug_auth.php
admin_user_ban.php admin_users.php admin_words.php
page_footer_admin.php page_header_admin.php
Log Message:
Yep, more updates and fixes
Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** admin_forum_prune.php 12 May 2002 00:47:40 -0000 1.22.2.1
--- admin_forum_prune.php 12 May 2002 15:57:44 -0000 1.22.2.2
***************
*** 179,182 ****
--- 179,183 ----
'FORUM_NAME' => $forum_name,
+ 'L_FORUM' => $lang['Forum'],
'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'],
Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -r1.23.2.1 -r1.23.2.2
*** admin_forumauth.php 12 May 2002 00:47:40 -0000 1.23.2.1
--- admin_forumauth.php 12 May 2002 15:57:44 -0000 1.23.2.2
***************
*** 35,39 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
--- 35,39 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = './../';
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
***************
*** 53,73 ****
);
! $simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . " [" . $lang['Hidden'] . "]", $lang['Private'], $lang['Private'] . " [" . $lang['Hidden'] . "]", $lang['Moderators'], $lang['Moderators'] . " [" . $lang['Hidden'] . "]");
! $forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce", "auth_vote", "auth_pollcreate");
$field_names = array(
! "auth_view" => $lang['View'],
! "auth_read" => $lang['Read'],
! "auth_post" => $lang['Post'],
! "auth_reply" => $lang['Reply'],
! "auth_edit" => $lang['Edit'],
! "auth_delete" => $lang['Delete'],
! "auth_sticky" => $lang['Sticky'],
! "auth_announce" => $lang['Announce'],
! "auth_vote" => $lang['Vote'],
! "auth_pollcreate" => $lang['Pollcreate']);
! $forum_auth_levels = array("ALL", "REG", "PRIVATE", "MOD", "ADMIN");
$forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN);
--- 53,73 ----
);
! $simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . ' [' . $lang['Hidden'] . ']', $lang['Private'], $lang['Private'] . ' [' . $lang['Hidden'] . ']', $lang['Moderators'], $lang['Moderators'] . ' [' . $lang['Hidden'] . ']');
! $forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate');
$field_names = array(
! 'auth_view' => $lang['View'],
! 'auth_read' => $lang['Read'],
! 'auth_post' => $lang['Post'],
! 'auth_reply' => $lang['Reply'],
! 'auth_edit' => $lang['Edit'],
! 'auth_delete' => $lang['Delete'],
! 'auth_sticky' => $lang['Sticky'],
! 'auth_announce' => $lang['Announce'],
! 'auth_vote' => $lang['Vote'],
! 'auth_pollcreate' => $lang['Pollcreate']);
! $forum_auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN');
$forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN);
***************
*** 80,84 ****
{
unset($forum_id);
! $forum_sql = "";
}
--- 80,84 ----
{
unset($forum_id);
! $forum_sql = '';
}
***************
*** 97,101 ****
if( isset($HTTP_POST_VARS['submit']) )
{
! $sql = "";
if(!empty($forum_id))
--- 97,101 ----
if( isset($HTTP_POST_VARS['submit']) )
{
! $sql = '';
if(!empty($forum_id))
***************
*** 109,117 ****
for($i = 0; $i < count($simple_ary); $i++)
{
! $sql .= $forum_auth_fields[$i] . " = " . $simple_ary[$i];
! if($i < count($simple_ary) - 1)
! {
! $sql .= ", ";
! }
}
--- 109,113 ----
for($i = 0; $i < count($simple_ary); $i++)
{
! $sql .= ( ( $i < count($simple_ary) - 1 ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
}
***************
*** 124,130 ****
$value = $HTTP_POST_VARS[$forum_auth_fields[$i]];
! if($forum_auth_fields[$i] == 'auth_vote')
{
! if( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
{
$value = AUTH_REG;
--- 120,126 ----
$value = $HTTP_POST_VARS[$forum_auth_fields[$i]];
! if ( $forum_auth_fields[$i] == 'auth_vote' )
{
! if ( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
{
$value = AUTH_REG;
***************
*** 132,140 ****
}
! $sql .= $forum_auth_fields[$i] . " = " . $value;
! if($i < count($forum_auth_fields) - 1)
! {
! $sql .= ", ";
! }
}
--- 128,132 ----
}
! $sql .= ( ( $i < count($forum_auth_fields) - 1 ) ? ', ' : '' ) .$forum_auth_fields[$i] . ' = ' . $value;
}
***************
*** 143,149 ****
}
! if($sql != "")
{
! if(!$db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't update auth table!", "", __LINE__, __FILE__, $sql);
--- 135,141 ----
}
! if ( $sql != '' )
{
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't update auth table!", "", __LINE__, __FILE__, $sql);
***************
*** 156,160 ****
$template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
);
$message = $lang['Forum_auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_forumauth'], '<a href="' . append_sid("admin_forumauth.$phpEx") . '">', "</a>");
--- 148,152 ----
$template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
);
$message = $lang['Forum_auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_forumauth'], '<a href="' . append_sid("admin_forumauth.$phpEx") . '">', "</a>");
***************
*** 188,192 ****
//
$template->set_filenames(array(
! "body" => "admin/auth_select_body.tpl")
);
--- 180,184 ----
//
$template->set_filenames(array(
! 'body' => 'admin/auth_select_body.tpl')
);
***************
*** 199,209 ****
$template->assign_vars(array(
! "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
! "L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_AUTH_SELECT" => $lang['Select_a_Forum'],
! "L_LOOK_UP" => $lang['Look_up_Forum'],
! "S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
! "S_AUTH_SELECT" => $select_list)
);
--- 191,201 ----
$template->assign_vars(array(
! 'L_AUTH_TITLE' => $lang['Auth_Control_Forum'],
! 'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'],
! 'L_AUTH_SELECT' => $lang['Select_a_Forum'],
! 'L_LOOK_UP' => $lang['Look_up_Forum'],
! 'S_AUTH_ACTION' => append_sid("admin_forumauth.$phpEx"),
! 'S_AUTH_SELECT' => $select_list)
);
***************
*** 216,220 ****
//
$template->set_filenames(array(
! "body" => "admin/auth_forum_body.tpl")
);
--- 208,212 ----
//
$template->set_filenames(array(
! 'body' => 'admin/auth_forum_body.tpl')
);
***************
*** 245,249 ****
// automatically switch into 'advanced' mode
//
! if(!isset($adv) && !$matched)
{
$adv = 1;
--- 237,241 ----
// automatically switch into 'advanced' mode
//
! if ( !isset($adv) && !$matched )
{
$adv = 1;
***************
*** 252,280 ****
$s_column_span == 0;
! if( empty($adv) )
{
! $simple_auth = "<select name=\"simpleauth\">";
for($j = 0; $j < count($simple_auth_types); $j++)
{
! if($matched_type == $j)
! {
! $simple_auth .= "<option value=\"$j\" selected>";
! $simple_auth .= $simple_auth_types[$j];
! $simple_auth .= "</option>";
! }
! else
! {
! $simple_auth .= "<option value=\"$j\">" . $simple_auth_types[$j] . "</option>";
! }
}
! $simple_auth .= "</select>";
! $template->assign_block_vars("forum_auth_titles", array(
! "CELL_TITLE" => $lang['Simple_mode'])
);
! $template->assign_block_vars("forum_auth_data", array(
! "S_AUTH_LEVELS_SELECT" => $simple_auth)
);
--- 244,264 ----
$s_column_span == 0;
! if ( empty($adv) )
{
! $simple_auth = '<select name="simpleauth">';
for($j = 0; $j < count($simple_auth_types); $j++)
{
! $selected = ( $matched_type == $j ) ? ' selected="selected"' : '';
! $simple_auth .= '<option value="' . $j . '"' . $selected . '>' . $simple_auth_types[$j] . '</option>';
}
! $simple_auth .= '</select>';
! $template->assign_block_vars('forum_auth_titles', array(
! 'CELL_TITLE' => $lang['Simple_mode'])
);
! $template->assign_block_vars('forum_auth_data', array(
! 'S_AUTH_LEVELS_SELECT' => $simple_auth)
);
***************
*** 289,316 ****
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $custom_auth[$j] = " <select name=\"" . $forum_auth_fields[$j] . "\">";
for($k = 0; $k < count($forum_auth_levels); $k++)
{
! if ( $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k] )
! {
! $custom_auth[$j] .= "<option value=\"" . $forum_auth_const[$k] . "\" selected>";
! $custom_auth[$j] .= $lang['Forum_' . $forum_auth_levels[$k]];
! $custom_auth[$j] .= "</option>";
! }
! else
! {
! $custom_auth[$j] .= "<option value=\"" . $forum_auth_const[$k] . "\">". $lang['Forum_' . $forum_auth_levels[$k]] . "</option>";
! }
}
! $custom_auth[$j] .= "</select> ";
$cell_title = $field_names[$forum_auth_fields[$j]];
! $template->assign_block_vars("forum_auth_titles", array(
! "CELL_TITLE" => $cell_title)
);
! $template->assign_block_vars("forum_auth_data", array(
! "S_AUTH_LEVELS_SELECT" => $custom_auth[$j])
);
--- 273,292 ----
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $custom_auth[$j] = ' <select name="' . $forum_auth_fields[$j] . '">';
for($k = 0; $k < count($forum_auth_levels); $k++)
{
! $selected = ( $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k] ) ? ' selected="selected"' : '';
! $custom_auth[$j] .= '<option value="' . $forum_auth_const[$k] . '"' . $selected . '>' . $lang['Forum_' . $forum_auth_levels[$k]] . '</option>';
}
! $custom_auth[$j] .= '</select> ';
$cell_title = $field_names[$forum_auth_fields[$j]];
! $template->assign_block_vars('forum_auth_titles', array(
! 'CELL_TITLE' => $cell_title)
);
! $template->assign_block_vars('forum_auth_data', array(
! 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j])
);
***************
*** 319,323 ****
}
! $adv_mode = (empty($adv)) ? "1" : "0";
$switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=". $adv_mode);
$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
--- 295,299 ----
}
! $adv_mode = ( empty($adv) ) ? '1' : '0';
$switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=". $adv_mode);
$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
***************
*** 327,342 ****
$template->assign_vars(array(
! "FORUM_NAME" => $forum_name,
! "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
! "L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "U_SWITCH_MODE" => $u_switch_mode,
!
! "S_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
! "S_COLUMN_SPAN" => $s_column_span,
! "S_HIDDEN_FIELDS" => $s_hidden_fields)
);
--- 303,319 ----
$template->assign_vars(array(
! 'FORUM_NAME' => $forum_name,
! 'L_FORUM' => $lang['Forum'],
! 'L_AUTH_TITLE' => $lang['Auth_Control_Forum'],
! 'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'],
! 'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
!
! 'U_SWITCH_MODE' => $u_switch_mode,
!
! 'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth.$phpEx"),
! 'S_COLUMN_SPAN' => $s_column_span,
! 'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
***************
*** 345,349 ****
include('./page_header_admin.'.$phpEx);
! $template->pparse("body");
include('./page_footer_admin.'.$phpEx);
--- 322,326 ----
include('./page_header_admin.'.$phpEx);
! $template->pparse('body');
include('./page_footer_admin.'.$phpEx);
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -C2 -r1.25.2.1 -r1.25.2.2
*** admin_groups.php 12 May 2002 00:47:40 -0000 1.25.2.1
--- admin_groups.php 12 May 2002 15:57:44 -0000 1.25.2.2
***************
*** 309,313 ****
else
{
! message_die(GENERAL_MESSAGE, $lang['Group_mode_not_selected']);
}
}
--- 309,313 ----
else
{
! message_die(GENERAL_MESSAGE, $lang['No_group_action']);
}
}
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** admin_ranks.php 12 May 2002 00:47:40 -0000 1.13.2.1
--- admin_ranks.php 12 May 2002 15:57:44 -0000 1.13.2.2
***************
*** 256,260 ****
"L_RANKS_TITLE" => $lang['Ranks_title'],
"L_RANKS_TEXT" => $lang['Ranks_explain'],
! "L_RANK" => $lang['Rank'],
"L_RANK_MINIMUM" => $lang['Rank_minimum'],
"L_SPECIAL_RANK" => $lang['Special_rank'],
--- 256,260 ----
"L_RANKS_TITLE" => $lang['Ranks_title'],
"L_RANKS_TEXT" => $lang['Ranks_explain'],
! "L_RANK" => $lang['Rank_title'],
"L_RANK_MINIMUM" => $lang['Rank_minimum'],
"L_SPECIAL_RANK" => $lang['Special_rank'],
Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** admin_smilies.php 12 May 2002 00:47:40 -0000 1.22.2.1
--- admin_smilies.php 12 May 2002 15:57:44 -0000 1.22.2.2
***************
*** 287,291 ****
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
"L_SMILEY_CODE" => $lang['smiley_code'],
"L_SMILEY_URL" => $lang['smiley_url'],
--- 287,291 ----
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smile_desc'],
"L_SMILEY_CODE" => $lang['smiley_code'],
"L_SMILEY_URL" => $lang['smiley_url'],
***************
*** 341,345 ****
if( !$result )
{
! message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
}
$smile_data = $db->sql_fetchrow($result);
--- 341,345 ----
if( !$result )
{
! message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql);
}
$smile_data = $db->sql_fetchrow($result);
Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** admin_ug_auth.php 12 May 2002 00:47:40 -0000 1.13.2.1
--- admin_ug_auth.php 12 May 2002 15:57:44 -0000 1.13.2.2
***************
*** 859,863 ****
$template->assign_vars(array(
'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
- 'L_USER_OR_GROUP' => ( $mode == 'user' ) ? $lang['User'] : $lang['Group'],
'L_AUTH_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
--- 859,862 ----
***************
*** 866,870 ****
'L_PERMISSIONS' => $lang['Permissions'],
'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"),
--- 865,870 ----
'L_PERMISSIONS' => $lang['Permissions'],
'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
! 'L_FORUM' => $lang['Forum'],
'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"),
***************
*** 923,927 ****
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
! $l_type = ( $mode == 'user' ) ? "USER" : "AUTH";
$template->assign_vars(array(
--- 923,927 ----
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
! $l_type = ( $mode == 'user' ) ? 'USER' : 'AUTH';
$template->assign_vars(array(
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** admin_user_ban.php 12 May 2002 00:47:40 -0000 1.21.2.1
--- admin_user_ban.php 12 May 2002 15:57:45 -0000 1.21.2.2
***************
*** 23,27 ****
define('IN_PHPBB', 1);
! if( !empty($setmodules) )
{
$filename = basename(__FILE__);
--- 23,27 ----
define('IN_PHPBB', 1);
! if ( !empty($setmodules) )
{
$filename = basename(__FILE__);
***************
*** 34,38 ****
// Load default header
//
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
--- 34,38 ----
// Load default header
//
! $phpbb_root_path = './../';
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
***************
*** 41,69 ****
// Start program
//
! if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = "";
! $email_bansql = "";
! $ip_bansql = "";
$user_list = array();
! if( isset($HTTP_POST_VARS['ban_user']) )
{
! $user_list_temp = $HTTP_POST_VARS['ban_user'];
!
! for($i = 0; $i < count($user_list_temp); $i++)
{
! $user_list[] = trim($user_list_temp[$i]);
}
}
$ip_list = array();
! if( isset($HTTP_POST_VARS['ban_ip']) )
{
! $ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
for($i = 0; $i < count($ip_list_temp); $i++)
{
! if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
{
//
--- 41,70 ----
// Start program
//
! if ( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = '';
! $email_bansql = '';
! $ip_bansql = '';
$user_list = array();
! if ( !empty($HTTP_POST_VARS['username']) )
{
! $this_userdata = get_userdata($HTTP_POST_VARS['username']);
! if( !$this_userdata )
{
! message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
}
+
+ $user_list[] = $this_userdata['user_id'];
}
$ip_list = array();
! if ( isset($HTTP_POST_VARS['ban_ip']) )
{
! $ip_list_temp = explode(',', $HTTP_POST_VARS['ban_ip']);
for($i = 0; $i < count($ip_list_temp); $i++)
{
! if ( preg_match('/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/', trim($ip_list_temp[$i]), $ip_range_explode) )
{
//
***************
*** 73,82 ****
$ip_1_end = $ip_range_explode[5];
! while($ip_1_counter <= $ip_1_end)
{
! $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
! $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
! if($ip_2_counter == 0 && $ip_2_end == 254)
{
$ip_2_counter = 255;
--- 74,83 ----
$ip_1_end = $ip_range_explode[5];
! while ( $ip_1_counter <= $ip_1_end )
{
! $ip_2_counter = ( $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[2] : 0;
! $ip_2_end = ( $ip_1_counter < $ip_1_end ) ? 254 : $ip_range_explode[6];
! if ( $ip_2_counter == 0 && $ip_2_end == 254 )
{
$ip_2_counter = 255;
***************
*** 86,95 ****
}
! while($ip_2_counter <= $ip_2_end)
{
! $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
! $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
! if($ip_3_counter == 0 && $ip_3_end == 254 )
{
$ip_3_counter = 255;
--- 87,96 ----
}
! while ( $ip_2_counter <= $ip_2_end )
{
! $ip_3_counter = ( $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[3] : 0;
! $ip_3_end = ( $ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end ) ? 254 : $ip_range_explode[7];
! if ( $ip_3_counter == 0 && $ip_3_end == 254 )
{
$ip_3_counter = 255;
***************
*** 99,108 ****
}
! while($ip_3_counter <= $ip_3_end)
{
! $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
! $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
! if($ip_4_counter == 0 && $ip_4_end == 254)
{
$ip_4_counter = 255;
--- 100,109 ----
}
! while ( $ip_3_counter <= $ip_3_end )
{
! $ip_4_counter = ( $ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[4] : 0;
! $ip_4_end = ( $ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end ) ? 254 : $ip_range_explode[8];
! if ( $ip_4_counter == 0 && $ip_4_end == 254 )
{
$ip_4_counter = 255;
***************
*** 112,116 ****
}
! while($ip_4_counter <= $ip_4_end)
{
$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
--- 113,117 ----
}
! while ( $ip_4_counter <= $ip_4_end )
{
$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
***************
*** 124,128 ****
}
}
! else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
--- 125,129 ----
}
}
! else if ( preg_match('/^([\w\-_]\.?){2,}$/is', trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
***************
*** 130,134 ****
for($j = 0; $j < count($ip); $j++)
{
! if( !empty($ip[$j]) )
{
$ip_list[] = encode_ip($ip[$j]);
--- 131,135 ----
for($j = 0; $j < count($ip); $j++)
{
! if ( !empty($ip[$j]) )
{
$ip_list[] = encode_ip($ip[$j]);
***************
*** 136,142 ****
}
}
! else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
{
! $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
}
}
--- 137,143 ----
}
}
! else if ( preg_match('/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/', trim($ip_list_temp[$i])) )
{
! $ip_list[] = encode_ip(str_replace('*', '255', trim($ip_list_temp[$i])));
}
}
***************
*** 144,150 ****
$email_list = array();
! if(isset($HTTP_POST_VARS['ban_email']))
{
! $email_list_temp = explode(",", $HTTP_POST_VARS['ban_email']);
for($i = 0; $i < count($email_list_temp); $i++)
--- 145,151 ----
$email_list = array();
! if ( isset($HTTP_POST_VARS['ban_email']) )
{
! $email_list_temp = explode(',', $HTTP_POST_VARS['ban_email']);
for($i = 0; $i < count($email_list_temp); $i++)
***************
*** 155,159 ****
// section)
//
! if( eregi("^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
--- 156,160 ----
// section)
//
! if ( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
***************
*** 164,168 ****
$sql = "SELECT *
FROM " . BANLIST_TABLE;
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
--- 165,169 ----
$sql = "SELECT *
FROM " . BANLIST_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
***************
*** 170,175 ****
$current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = "";
for($i = 0; $i < count($user_list); $i++)
{
--- 171,177 ----
$current_banlist = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
! $kill_session_sql = '';
for($i = 0; $i < count($user_list); $i++)
{
***************
*** 177,181 ****
for($j = 0; $j < count($current_banlist); $j++)
{
! if($user_list[$i] == $current_banlist[$j]['ban_userid'])
{
$in_banlist = true;
--- 179,183 ----
for($j = 0; $j < count($current_banlist); $j++)
{
! if ( $user_list[$i] == $current_banlist[$j]['ban_userid'] )
{
$in_banlist = true;
***************
*** 183,193 ****
}
! if(!$in_banlist)
{
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
VALUES (" . $user_list[$i] . ")";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
--- 185,195 ----
}
! if ( !$in_banlist )
{
! $kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . "session_user_id = " . $user_list[$i];
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
VALUES (" . $user_list[$i] . ")";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
***************
*** 201,205 ****
for($j = 0; $j < count($current_banlist); $j++)
{
! if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
{
$in_banlist = true;
--- 203,207 ----
for($j = 0; $j < count($current_banlist); $j++)
{
! if ( $ip_list[$i] == $current_banlist[$j]['ban_ip'] )
{
$in_banlist = true;
***************
*** 207,215 ****
}
! if(!$in_banlist)
{
! if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
{
! $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
}
else
--- 209,217 ----
}
! if ( !$in_banlist )
{
! if ( preg_match('/(ff\.)|(\.ff)/is', chunk_split($ip_list[$i], 2, '.')) )
{
! $kill_ip_sql = "session_ip LIKE '" . str_replace('.', '', preg_replace('/(ff\.)|(\.ff)/is', '%', chunk_split($ip_list[$i], 2, "."))) . "'";
}
else
***************
*** 218,226 ****
}
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
VALUES ('" . $ip_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
--- 220,228 ----
}
! $kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
VALUES ('" . $ip_list[$i] . "')";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
***************
*** 230,245 ****
//
! // Now we'll delete all entries from the
! // session table with any of the banned
! // user or IP info just entered into the
! // ban table ... this will force a session
! // initialisation resulting in an instant
! // ban
//
! if( $kill_session_sql != "" )
{
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE $kill_session_sql";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
--- 232,244 ----
//
! // Now we'll delete all entries from the session table with any of the banned
! // user or IP info just entered into the ban table ... this will force a session
! // initialisation resulting in an instant ban
//
! if ( $kill_session_sql != '' )
{
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE $kill_session_sql";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
***************
*** 252,256 ****
for($j = 0; $j < count($current_banlist); $j++)
{
! if( $email_list[$i] == $current_banlist[$j]['ban_email'] )
{
$in_banlist = true;
--- 251,255 ----
for($j = 0; $j < count($current_banlist); $j++)
{
! if ( $email_list[$i] == $current_banlist[$j]['ban_email'] )
{
$in_banlist = true;
***************
*** 258,266 ****
}
! if( !$in_banlist )
{
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
--- 257,265 ----
}
! if ( !$in_banlist )
{
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
***************
*** 269,275 ****
}
! $where_sql = "";
! if(isset($HTTP_POST_VARS['unban_user']))
{
$user_list = $HTTP_POST_VARS['unban_user'];
--- 268,274 ----
}
! $where_sql = '';
! if ( isset($HTTP_POST_VARS['unban_user']) )
{
$user_list = $HTTP_POST_VARS['unban_user'];
***************
*** 277,292 ****
for($i = 0; $i < count($user_list); $i++)
{
! if($user_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= ", ";
! }
! $where_sql .= $user_list[$i];
}
}
}
! if( isset($HTTP_POST_VARS['unban_ip']) )
{
$ip_list = $HTTP_POST_VARS['unban_ip'];
--- 276,287 ----
for($i = 0; $i < count($user_list); $i++)
{
! if ( $user_list[$i] != -1 )
{
! $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $user_list[$i];
}
}
}
! if ( isset($HTTP_POST_VARS['unban_ip']) )
{
$ip_list = $HTTP_POST_VARS['unban_ip'];
***************
*** 294,309 ****
for($i = 0; $i < count($ip_list); $i++)
{
! if($ip_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= ", ";
! }
! $where_sql .= $ip_list[$i];
}
}
}
! if( isset($HTTP_POST_VARS['unban_email']) )
{
$email_list = $HTTP_POST_VARS['unban_email'];
--- 289,300 ----
for($i = 0; $i < count($ip_list); $i++)
{
! if ( $ip_list[$i] != -1 )
{
! $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $ip_list[$i];
}
}
}
! if ( isset($HTTP_POST_VARS['unban_email']) )
{
$email_list = $HTTP_POST_VARS['unban_email'];
***************
*** 311,330 ****
for($i = 0; $i < count($email_list); $i++)
{
! if($email_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= ", ";
! }
! $where_sql .= $email_list[$i];
}
}
}
! if( $where_sql != "" )
{
$sql = "DELETE FROM " . BANLIST_TABLE . "
WHERE ban_id IN ($where_sql)";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
--- 302,317 ----
for($i = 0; $i < count($email_list); $i++)
{
! if ( $email_list[$i] != -1 )
{
! $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $email_list[$i];
}
}
}
! if ( $where_sql != '' )
{
$sql = "DELETE FROM " . BANLIST_TABLE . "
WHERE ban_id IN ($where_sql)";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
***************
*** 332,336 ****
}
! $message = $lang['Ban_update_sucessful'] . "<br /><br />" . sprintf($lang['Click_return_banadmin'], "<a href=\"" . append_sid("admin_user_ban.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
--- 319,323 ----
}
! $message = $lang['Ban_update_sucessful'] . '<br /><br />' . sprintf($lang['Click_return_banadmin'], '<a href="' . append_sid("admin_user_ban.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
***************
*** 355,380 ****
);
- $userban_count = 0;
-
- $sql = "SELECT user_id, username
- FROM " . USERS_TABLE . "
- WHERE user_id <> " . ANONYMOUS . "
- ORDER BY username ASC";
- if ( !($result = $db->sql_query($sql)) )
- {
- message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
- }
-
- $user_list = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
-
- $select_userlist = '';
- for($i = 0; $i < count($user_list); $i++)
- {
- $select_userlist .= '<option value="' . $user_list[$i]['user_id'] . '">' . $user_list[$i]['username'] . '</option>';
- $userban_count++;
- }
- $select_userlist = '<select name="ban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
-
$template->assign_vars(array(
'L_BAN_USER' => $lang['Ban_username'],
--- 342,345 ----
***************
*** 383,389 ****
'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'],
'L_BAN_EMAIL' => $lang['Ban_email'],
! 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'],
!
! 'S_BAN_USERLIST_SELECT' => $select_userlist)
);
--- 348,352 ----
'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'],
'L_BAN_EMAIL' => $lang['Ban_email'],
! 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'])
);
***************
*** 470,475 ****
'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'],
'L_UNBAN_EMAIL' => $lang['Unban_email'],
! 'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'],
'S_UNBAN_USERLIST_SELECT' => $select_userlist,
'S_UNBAN_IPLIST_SELECT' => $select_iplist,
--- 433,442 ----
'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'],
'L_UNBAN_EMAIL' => $lang['Unban_email'],
! 'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'],
! 'L_USERNAME' => $lang['Username'],
! 'L_LOOK_UP' => $lang['Look_up_User'],
! 'L_FIND_USERNAME' => $lang['Find_username'],
+ 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"),
'S_UNBAN_USERLIST_SELECT' => $select_userlist,
'S_UNBAN_IPLIST_SELECT' => $select_iplist,
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -C2 -r1.57.2.1 -r1.57.2.2
*** admin_users.php 12 May 2002 00:47:40 -0000 1.57.2.1
--- admin_users.php 12 May 2002 15:57:45 -0000 1.57.2.2
***************
*** 160,167 ****
{
unset($rename_user);
! if( !validate_username($username) )
{
$error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Invalid_username'];
}
else
--- 160,169 ----
{
unset($rename_user);
!
! $result = validate_username($username);
! if ( $result['error'] )
{
$error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
}
else
***************
*** 972,976 ****
'L_SPECIAL' => $lang['User_special'],
! 'L_SPECIAL_EXPLAIN' => $lang['User_specail_explain'],
'L_USER_ACTIVE' => $lang['User_status'],
'L_ALLOW_PM' => $lang['User_allowpm'],
--- 974,978 ----
'L_SPECIAL' => $lang['User_special'],
! 'L_SPECIAL_EXPLAIN' => $lang['User_special_explain'],
'L_USER_ACTIVE' => $lang['User_status'],
'L_ALLOW_PM' => $lang['User_allowpm'],
***************
*** 1036,1052 ****
// Default user selection box
//
- $sql = "SELECT user_id, username
- FROM " . USERS_TABLE . "
- WHERE user_id <> " . ANONYMOUS ."
- ORDER BY username";
- $result = $db->sql_query($sql);
-
- $select_list = '<select name="' . POST_USERS_URL . '">';
- while( $row = $db->sql_fetchrow($result) )
- {
- $select_list .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
- }
- $select_list .= '</select>';
-
$template->set_filenames(array(
'body' => 'admin/user_select_body.tpl')
--- 1038,1041 ----
***************
*** 1060,1064 ****
'L_FIND_USERNAME' => $lang['Find_username'],
! 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"),
'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
--- 1049,1053 ----
'L_FIND_USERNAME' => $lang['Find_username'],
! 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"),
'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
***************
*** 1071,1073 ****
include('./page_footer_admin.'.$phpEx);
! ?>
--- 1060,1062 ----
include('./page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
Index: admin_words.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_words.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -r1.10.2.1 -r1.10.2.2
*** admin_words.php 12 May 2002 00:47:40 -0000 1.10.2.1
--- admin_words.php 12 May 2002 15:57:45 -0000 1.10.2.2
***************
*** 173,177 ****
else
{
! message_die(GENERAL_MESSAGE, $lang['Must_specify_word']);
}
}
--- 173,177 ----
else
{
! message_die(GENERAL_MESSAGE, $lang['No_word_selected']);
}
}
Index: page_footer_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_footer_admin.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** page_footer_admin.php 4 Apr 2002 14:47:18 -0000 1.9.2.1
--- page_footer_admin.php 12 May 2002 15:57:45 -0000 1.9.2.2
***************
*** 63,67 ****
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo '\x1f\x8b\x08\x00\x00\x00\x00\x00';
echo $gzip_contents;
echo pack('V', $gzip_crc);
--- 63,67 ----
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
echo $gzip_contents;
echo pack('V', $gzip_crc);
Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_header_admin.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -r1.12.2.1 -r1.12.2.2
*** page_header_admin.php 12 May 2002 00:47:40 -0000 1.12.2.1
--- page_header_admin.php 12 May 2002 15:57:45 -0000 1.12.2.2
***************
*** 32,51 ****
//
$do_gzip_compress = FALSE;
! if($board_config['gzip_compress'])
{
$phpver = phpversion();
! if($phpver >= '4.0.4pl1')
{
! if(extension_loaded('zlib'))
{
ob_start('ob_gzhandler');
}
}
! else if($phpver > '4.0')
{
! if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
{
! if(extension_loaded('zlib'))
{
$do_gzip_compress = TRUE;
--- 32,51 ----
//
$do_gzip_compress = FALSE;
! if ( $board_config['gzip_compress'] )
{
$phpver = phpversion();
! if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
{
! if ( extension_loaded('zlib') )
{
ob_start('ob_gzhandler');
}
}
! else if ( $phpver > '4.0' )
{
! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
{
! if ( extension_loaded('zlib') )
{
$do_gzip_compress = TRUE;
***************
*** 73,100 ****
'L_ADMIN' => $lang['Admin'],
- 'L_USERNAME' => $lang['Username'],
- 'L_PASSWORD' => $lang['Password'],
'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
- 'L_REGISTER' => $lang['Register'],
- 'L_PROFILE' => $lang['Profile'],
- 'L_SEARCH' => $lang['Search'],
- 'L_PRIVATEMSGS' => $lang['Private_msgs'],
- 'L_MEMBERLIST' => $lang['Memberlist'],
'L_FAQ' => $lang['FAQ'],
- 'L_USERGROUPS' => $lang['Usergroups'],
- 'L_FORUM' => $lang['Forum'],
- 'L_TOPICS' => $lang['Topics'],
- 'L_REPLIES' => $lang['Replies'],
- 'L_VIEWS' => $lang['Views'],
- 'L_POSTS' => $lang['Posts'],
- 'L_LASTPOST' => $lang['Last_Post'],
- 'L_MODERATOR' => $lang['Moderator'],
- 'L_NONEWPOSTS' => $lang['No_new_posts'],
- 'L_NEWPOSTS' => $lang['New_posts'],
- 'L_POSTED' => $lang['Posted'],
- 'L_JOINED' => $lang['Joined'],
- 'L_AUTHOR' => $lang['Author'],
- 'L_MESSAGE' => $lang['Message'],
- 'L_BY' => $lang['by'],
'U_INDEX' => append_sid('../index.'.$phpEx),
--- 73,78 ----
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:57:52
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv9802/templates/subSilver
Modified Files:
Tag: phpBB-2_0_0
profile_add_body.tpl
Log Message:
Yep, more updates and fixes
Index: profile_add_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/profile_add_body.tpl,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** profile_add_body.tpl 12 May 2002 00:47:41 -0000 1.16.2.1
--- profile_add_body.tpl 12 May 2002 15:57:47 -0000 1.16.2.2
***************
*** 209,216 ****
</td>
</tr>
<tr>
<td class="catSides" colspan="2" height="28"> </td>
</tr>
- <!-- BEGIN switch_avatar_block -->
<tr>
<th class="thSides" colspan="2" height="12" valign="middle">{L_AVATAR_PANEL}</th>
--- 209,216 ----
</td>
</tr>
+ <!-- BEGIN switch_avatar_block -->
<tr>
<td class="catSides" colspan="2" height="28"> </td>
</tr>
<tr>
<th class="thSides" colspan="2" height="12" valign="middle">{L_AVATAR_PANEL}</th>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:57:50
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv9802/templates/subSilver/admin
Modified Files:
Tag: phpBB-2_0_0
user_ban_body.tpl
Log Message:
Yep, more updates and fixes
Index: user_ban_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_ban_body.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_ban_body.tpl 19 Nov 2001 19:06:35 -0000 1.4
--- user_ban_body.tpl 12 May 2002 15:57:47 -0000 1.4.2.1
***************
*** 4,14 ****
<p>{L_BAN_EXPLAIN}</p>
! <form method="post" action="{S_BANLIST_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_BAN_USER}</th>
</tr>
<tr>
! <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_BAN_USER_EXPLAIN}</span></td>
! <td class="row2">{S_BAN_USERLIST_SELECT}</td>
</tr>
<tr>
--- 4,14 ----
<p>{L_BAN_EXPLAIN}</p>
! <form method="post" name="post" action="{S_BANLIST_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" colspan="2">{L_BAN_USER}</th>
</tr>
<tr>
! <td class="row1">{L_USERNAME}:</td>
! <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS} <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
</tr>
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:57:50
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9802
Modified Files:
Tag: phpBB-2_0_0
modcp.php posting.php privmsg.php
Log Message:
Yep, more updates and fixes
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -C2 -r1.71.2.2 -r1.71.2.3
*** modcp.php 12 May 2002 00:47:40 -0000 1.71.2.2
--- modcp.php 12 May 2002 15:57:45 -0000 1.71.2.3
***************
*** 70,96 ****
//
- // Check if user did or did not confirm
- // If they did not, forward them to the last page they were on
- //
- if ( isset($HTTP_POST_VARS['cancel']) )
- {
- if ( $topic_id )
- {
- $redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
- }
- else if ( $forum_id )
- {
- $redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
- }
- else
- {
- $redirect = "index.$phpEx";
- }
-
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . append_sid($redirect, true));
- }
-
- //
// Continue var definitions
//
--- 70,73 ----
***************
*** 176,179 ****
--- 153,179 ----
// End session management
//
+
+ //
+ // Check if user did or did not confirm
+ // If they did not, forward them to the last page they were on
+ //
+ if ( isset($HTTP_POST_VARS['cancel']) )
+ {
+ if ( $topic_id )
+ {
+ $redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
+ }
+ else if ( $forum_id )
+ {
+ $redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
+ }
+ else
+ {
+ $redirect = "index.$phpEx";
+ }
+
+ $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+ header($header_location . append_sid($redirect, true));
+ }
//
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159.2.3
retrieving revision 1.159.2.4
diff -C2 -r1.159.2.3 -r1.159.2.4
*** posting.php 12 May 2002 01:21:57 -0000 1.159.2.3
--- posting.php 12 May 2002 15:57:46 -0000 1.159.2.4
***************
*** 70,73 ****
--- 70,82 ----
//
+ // Start session management
+ //
+ $userdata = session_pagestart($user_ip, PAGE_POSTING);
+ init_userprefs($userdata);
+ //
+ // End session management
+ //
+
+ //
// Was cancel pressed? If so then redirect to the appropriate
// page, no point in continuing with any further checks
***************
*** 97,112 ****
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . append_sid($redirect) . $post_append, true);
exit;
}
-
- //
- // Start session management
- //
- $userdata = session_pagestart($user_ip, PAGE_POSTING);
- init_userprefs($userdata);
- //
- // End session management
- //
//
--- 106,112 ----
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! header($header_location . append_sid($redirect, true) . $post_append);
exit;
}
//
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.4
retrieving revision 1.96.2.5
diff -C2 -r1.96.2.4 -r1.96.2.5
*** privmsg.php 12 May 2002 01:36:08 -0000 1.96.2.4
--- privmsg.php 12 May 2002 15:57:47 -0000 1.96.2.5
***************
*** 408,412 ****
$s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />';
! $page_title = $lang['Read_private_message'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 408,412 ----
$s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />';
! $page_title = $lang['Read_pm'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
***************
*** 441,444 ****
--- 441,445 ----
'BOX_NAME' => $l_box_name,
+ 'L_MESSAGE' => $lang['Message'],
'L_INBOX' => $lang['Inbox'],
'L_OUTBOX' => $lang['Outbox'],
***************
*** 1181,1185 ****
if ( $mode == 'post' )
{
! $page_title = $lang['Send_new_privmsg'];
$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
--- 1182,1186 ----
if ( $mode == 'post' )
{
! $page_title = $lang['Post_new_pm'];
$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
***************
*** 1188,1192 ****
else if ( $mode == 'reply' )
{
! $page_title = $lang['Reply_privmsg'];
$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
--- 1189,1193 ----
else if ( $mode == 'reply' )
{
! $page_title = $lang['Post_reply_pm'];
$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
***************
*** 1195,1199 ****
else if ( $mode == 'edit' )
{
! $page_title = $lang['Edit_privmsg'];
$sql = "SELECT u.user_id, u.user_sig
--- 1196,1200 ----
else if ( $mode == 'edit' )
{
! $page_title = $lang['Edit_pm'];
$sql = "SELECT u.user_id, u.user_sig
***************
*** 1210,1214 ****
if ( $userdata['user_id'] != $postrow['user_id'] )
{
! message_die(GENERAL_MESSAGE, $lang['Sorry_edit_own_posts']);
}
--- 1211,1215 ----
if ( $userdata['user_id'] != $postrow['user_id'] )
{
! message_die(GENERAL_MESSAGE, $lang['Edit_own_posts']);
}
***************
*** 1809,1813 ****
break;
case 'savebox':
! $l_box_name = $lang['Savedbox'];
break;
case 'sentbox':
--- 1810,1814 ----
break;
case 'savebox':
! $l_box_name = $lang['Savebox'];
break;
case 'sentbox':
|
7 messages has been excluded from this view by a project administrator.
