http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65644
Revision: 65644
Author: siebrand
Date: 2010-04-28 22:57:53 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
stylize.php, trailing whitespace removed
Modified Paths:
--------------
trunk/extensions/CheckUser/CheckUser.i18n.php
trunk/extensions/CheckUser/CheckUser.php
trunk/extensions/CheckUser/CheckUser_body.php
trunk/extensions/CheckUser/archives/patch-cu_changes_indexes.sql
trunk/extensions/CheckUser/archives/patch-cu_changes_indexes2.sql
trunk/extensions/CheckUser/checkuser.js
trunk/extensions/CheckUser/cu_changes.sql
trunk/extensions/CheckUser/cu_log.sql
trunk/extensions/CheckUser/cu_log_import.inc
trunk/extensions/CheckUser/importLog.php
trunk/extensions/CheckUser/install.inc
trunk/extensions/CheckUser/install.php
Modified: trunk/extensions/CheckUser/CheckUser.i18n.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser.i18n.php 2010-04-28 22:50:19 UTC
(rev 65643)
+++ trunk/extensions/CheckUser/CheckUser.i18n.php 2010-04-28 22:57:53 UTC
(rev 65644)
@@ -15,7 +15,7 @@
$messages['en'] = array(
'checkuser-summary' => 'This tool scans recent changes to
retrieve the IP addresses used by a user or show the edit/user data for an IP
address.
Users and edits by a client IP address can be retrieved via XFF headers by
appending the IP address with "/xff". IPv4 (CIDR 16-32) and IPv6 (CIDR 96-128)
are supported.
-No more than 5000 edits will be returned for performance reasons.
+No more than 5,000 edits will be returned for performance reasons.
Use this in accordance with policy.',
'checkuser-desc' => 'Grants users with the appropriate
permission the ability to check user\'s IP addresses and other information',
'checkuser-logcase' => 'The log search is case sensitive.',
@@ -56,7 +56,7 @@
'checkuser-wasblocked' => 'Previously blocked',
'checkuser-localonly' => 'Not unified',
'checkuser-massblock' => 'Block selected users',
- 'checkuser-massblock-text' => 'Selected accounts will be blocked
indefinitely, with autoblocking enabled and account creation disabled.
+ 'checkuser-massblock-text' => 'Selected accounts will be blocked
indefinitely, with autoblocking enabled and account creation disabled.
IP addresses will be blocked for 1 week for IP users only and with
account creation disabled.',
'checkuser-blocktag' => 'Replace user pages with:',
'checkuser-blocktag-talk' => 'Replace talk pages with:',
@@ -165,7 +165,7 @@
See screenshot
"[http://www.mediawiki.org/wiki/Extension:CheckUser#Basic_interface Example
log]".
Initiator means the CheckUser who checks someone\'s information.',
- 'checkuser-ipeditcount' => "This information is shown on the result
page of [[mw:Extension:CheckUser#Basic_interface|Special:CheckUser]] (when
doing the ''{{int:Checkuser-users}}'' check), next to the individual listed
IPs. See screenshot \"Example user name check\".
+ 'checkuser-ipeditcount' => "This information is shown on the result
page of [[mw:Extension:CheckUser#Basic_interface|Special:CheckUser]] (when
doing the ''{{int:Checkuser-users}}'' check), next to the individual listed
IPs. See screenshot \"Example user name check\".
\$1 is an estimate of the total number of edits from the respective IP (i.e.
the number of edits by all users, not only by the requested user). As the
comment in the code says: ''If we get some results, it helps to know if the IP
in general has a lot more edits, e.g. “tip of the iceberg”…''",
'checkuser-log-return' => 'Link label on log of CheckUser searches. See
screenshot "[http://www.mediawiki.org/wiki/Extension:CheckUser#Basic_interface
Example log]".',
@@ -449,7 +449,7 @@
*/
$messages['arz'] = array(
'checkuser-summary' => 'الوسيلة دى بتدور فى احدث التغييرات علشان ترجع
الايبيهات اللى استعملها يوزر او علشان تعرض بيانات التعديل/اليوزر لعنوان الاى بى.
-اليوزرز و التعديلات اللى اتعملت من أى بى عميل ممكن تترجع عن طريق عناوين XFF لو
زودت على الاى بى "/xff".
+اليوزرز و التعديلات اللى اتعملت من أى بى عميل ممكن تترجع عن طريق عناوين XFF لو
زودت على الاى بى "/xff".
IPv4 (CIDR 16-32) و IPv6 (CIDR 96-128) مدعومين.
مش اكتر من 5000 تعديل ممكن تتعرض بسبب الاداء.
استخدم دا بطريقة موافقة للسياسة.',
@@ -919,7 +919,7 @@
'checkuser-cidr-res' => 'Lijorenn CIDR boutin :',
'checkuser-empty' => "N'eus pennad ebet er marilh",
'checkuser-nomatch' => "N'eus bet kavet netra.",
- 'checkuser-nomatch-edits' => "Kenglot ebet kavet.
+ 'checkuser-nomatch-edits' => "Kenglot ebet kavet.
D'an $1 da $2 eo bet graet ar c'hemm diwezhañ.",
'checkuser-check' => 'Gwiriañ',
'checkuser-log-fail' => "Dibosupl ouzhpennañ ar moned d'ar marilh",
@@ -1476,7 +1476,7 @@
*/
$messages['diq'] = array(
'checkuser-summary' => 'Ena xacet vurnayişanê neweyî skan keno ke
adresanê IPyan reyan biyaro ke bimucne datayê karberî ser yew adresê IPyî.
-Karberan u vurnayîşan ke yew IPyê karberî kerd reyna yeno pê XFF u "/xff".
IPv4 (CIDR 16-32) u IPv6 (CIDR 96-128) rê zi destek beno.
+Karberan u vurnayîşan ke yew IPyê karberî kerd reyna yeno pê XFF u "/xff".
IPv4 (CIDR 16-32) u IPv6 (CIDR 96-128) rê zi destek beno.
5000 zafyer vurnayîşan sero netice nidano, qe performans hedi beno.
Ena politika ma ser kar bike.',
'checkuser-desc' => 'Karberan rê destur bide ke adresanê IPyan u
enformasyonê bînan kontrol bike',
@@ -1507,7 +1507,7 @@
'checkuser-cidr-res' => 'CIDRê muşterekî',
'checkuser-empty' => 'Ena log de çik çin o.',
'checkuser-nomatch' => 'Çik çin o.',
- 'checkuser-nomatch-edits' => 'Çik çin o.
+ 'checkuser-nomatch-edits' => 'Çik çin o.
Vurnayîşê tewr penî seet $1 u rocê $2 de biyo.',
'checkuser-check' => 'Kontrol bike',
'checkuser-log-fail' => 'Nieşkeno log debiker',
@@ -1648,7 +1648,7 @@
$messages['el'] = array(
'checkuser-summary' => 'Αυτό το εργαλείο σαρώνει τις πρόσφατες αλλαγές
για να ανακτήσει τις IP διευθύνσεις που χρησιμοποιούνται από ένα χρήστη ή για
να δείξει τα δεδομένα επεξεργασιών/χρηστών για μία IP.
Χρήστες και επεξεργασίες από μία σταθερή IP μπορούν να ανακτηθούν μέσω XFF
επικεφαλίδων προσαρτώντας "/xff" στην IP. Το IPv4 (CIDR 16-32) και το IPv6
(CIDR 96-128) υποστηρίζονται.
-Όχι περισσότερες από 5000 επεξεργασίες θα επιστραφούν για λόγους απόδοσης.
+Όχι περισσότερες από 5000 επεξεργασίες θα επιστραφούν για λόγους απόδοσης.
Χρησιμοποιήστε αυτό σύμφωνα με την πολιτική.',
'checkuser-desc' => 'Παρέχει στους χρήστες με την κατάλληλη άδεια την
ικανότητα να ελέγχουν τη διεύθυνση IP ενός χρήστη καθώς και άλλες πληροφορίες',
'checkuser-logcase' => 'Η αναζήτηση στο αρχείο καταγραφής διακρίνει
πεζά από κεφαλαία.',
@@ -1689,7 +1689,7 @@
'checkuser-wasblocked' => 'Προηγουμένως φραγμένος',
'checkuser-localonly' => 'Μη ενοποιημένο',
'checkuser-massblock' => 'Επιβολή φραγής στους επιλεγμένους χρήστες',
- 'checkuser-massblock-text' => "Οι επιλεγμένοι λογαριασμοί θα φραγούν
επ' αόριστον, με την αυτόματη φραγή ενεργοποιημένη και με αδύνατη τη δημιουργία
λογαριασμού.
+ 'checkuser-massblock-text' => "Οι επιλεγμένοι λογαριασμοί θα φραγούν
επ' αόριστον, με την αυτόματη φραγή ενεργοποιημένη και με αδύνατη τη δημιουργία
λογαριασμού.
Οι διευθύνσεις IP θα φραγούν για 1 εβδομάδα μόνο για τους χρήστες από IP και
με αδύνατη τη δημιουργία λογαριασμού.",
'checkuser-blocktag' => 'Αντικατάσταση των σελίδων των χρηστών με:',
'checkuser-blocktag-talk' => 'Αντικαταστήστε τις σελίδες συζήτησης με:',
@@ -1781,7 +1781,7 @@
'checkuser-block-noreason' => 'Vi devas doni kialon por la forbaroj.',
'checkuser-noreason' => 'Vi devas doni kialon por ĉi tiu informomendo.',
'checkuser-accounts' => '$1 {{PLURAL:$1|nova konto|novaj kontoj}}',
- 'checkuser-too-many' => 'Tro da rezultoj, laŭ taskoj de serĉomendo.
Bonvolu malvastigi la CIDR.
+ 'checkuser-too-many' => 'Tro da rezultoj, laŭ taskoj de serĉomendo.
Bonvolu malvastigi la CIDR.
Jen la IP-adresoj uzitaj (maksimume 5000, ordigita laŭ adresoj):',
'checkuser-user-nonexistent' => 'La donata uzanto ne ekzistas.',
'checkuser-search-form' => 'Trovi protokolerojn en kiu la $1 estas $2',
@@ -1864,7 +1864,7 @@
'checkuser-wasblocked' => 'Bloqueado anteriormente',
'checkuser-localonly' => 'No unificada',
'checkuser-massblock' => 'Bloquear usuarios seleccionados',
- 'checkuser-massblock-text' => 'Las cuentas seleccionadas serán
bloqueadas de forma indefinida, con el autobloqueo habilitado y la creación de
cuentas deshabilitada.
+ 'checkuser-massblock-text' => 'Las cuentas seleccionadas serán
bloqueadas de forma indefinida, con el autobloqueo habilitado y la creación de
cuentas deshabilitada.
Las direcciones IP serán bloqueadas durante una semana para usuarios anónimos
sólamente con la creación de cuentas deshabilitada.',
'checkuser-blocktag' => 'Reemplazar páginas del usuario con:',
'checkuser-blocktag-talk' => 'Reemplazar las páginas de discusión con:',
@@ -2464,7 +2464,7 @@
'checkuser-wasblocked' => 'Bloqueados anteriormente',
'checkuser-localonly' => 'Sen unificar',
'checkuser-massblock' => 'Bloquear os usuarios seleccionados',
- 'checkuser-massblock-text' => 'As contas seleccionadas serán bloqueadas
indefinidamente, co bloqueo automático permitido e a creación de contas
deshabilitada.
+ 'checkuser-massblock-text' => 'As contas seleccionadas serán bloqueadas
indefinidamente, co bloqueo automático permitido e a creación de contas
deshabilitada.
Os enderezos IP serán bloqueados cun tempo de duración dunha semana só para os
usuarios con IP e coa creación de contas deshabilitada.',
'checkuser-blocktag' => 'Substituír as páxinas de usuario por:',
'checkuser-blocktag-talk' => 'Substituír as conversas con:',
@@ -3289,7 +3289,7 @@
'checkuser-block-noreason' => 'È obbligatorio fornire una motivazione
per i blocchi.',
'checkuser-noreason' => 'È necessario fornire una motivazione per
questa query.',
'checkuser-accounts' => '$1 {{PLURAL:$1|nuovo|nuovi}} account',
- 'checkuser-too-many' => 'Troppi risultati (per la query), usa un CIDR
più ristretto.
+ 'checkuser-too-many' => 'Troppi risultati (per la query), usa un CIDR
più ristretto.
Di seguito sono indicati gli indirizzi IP utilizzati (fino a un massimo di
5000, ordinati per indirizzo):',
'checkuser-user-nonexistent' => "L'utente indicato non esiste.",
'checkuser-search-form' => 'Trova le voci del log per le quali $1 è $2',
@@ -3495,7 +3495,7 @@
'checkuser-block-limit' => 'Cacahing panganggo sing dipilih kakèhan.',
'checkuser-block-noreason' => 'Panjenengan kudu mènèhi alesan
pamblokiran',
'checkuser-accounts' => '$1 {{PLURAL:$1|akun|akun-akun}} anyar',
- 'checkuser-too-many' => 'Kakèhan pituwas (miturut estimasi piakonan),
tulung CIDR diciyutaké.
+ 'checkuser-too-many' => 'Kakèhan pituwas (miturut estimasi piakonan),
tulung CIDR diciyutaké.
Ing ngisor iki kapacak alamat-alamat IP sing dianggo (maks. 5.000, diurutaké
miturut alamat):',
'checkuser-user-nonexistent' => 'Panganggo iki ora ana.',
'checkuser-search-form' => 'Temokna cathetan log ing ngendi $1 iku $2',
@@ -3533,7 +3533,7 @@
'checkuser-gblocked' => 'გლობალურად ბლოკირებული',
'checkuser-locked' => 'დახურვა',
'checkuser-massblock' => 'დაბლოკეთ არჩეული მომხმარებლები',
- 'checkuser-massblock-text' => 'არჩეული ანგარიშები დაიბლოკება ახალი
ანგარიშების ნებართვის შექმნის გარეშე.
+ 'checkuser-massblock-text' => 'არჩეული ანგარიშები დაიბლოკება ახალი
ანგარიშების ნებართვის შექმნის გარეშე.
IP დაიბლოკება ერთი კვირით.',
'checkuser-blocktag' => 'ჩაანაცვლეთ მომხმარებლის გვერდები:',
'checkuser-blocktag-talk' => 'შეცვალეთ მომხმარებლის გვერდები:',
@@ -4244,7 +4244,7 @@
'checkuser-wasblocked' => 'Претходно блокиран',
'checkuser-localonly' => 'Необединета',
'checkuser-massblock' => 'Блокирај ги избраните корисници',
- 'checkuser-massblock-text' => 'Избраните сметки ќе бидат трајно
блокирани, со овозможено автоблокирање и оневозможено создавање на сметки.
+ 'checkuser-massblock-text' => 'Избраните сметки ќе бидат трајно
блокирани, со овозможено автоблокирање и оневозможено создавање на сметки.
IP адресите ќе бидат блокирани 1 недела за само за корисници со IP адреса, и
со оневозможено создавање на сметка.',
'checkuser-blocktag' => 'Замени ги корисничките страници со:',
'checkuser-blocktag-talk' => 'Замени ги страниците за разговор со:',
@@ -4336,7 +4336,7 @@
'checkuser-block-noreason' => 'തടയലിനു ഒരു കാരണം താങ്കൾ നൽകുക.',
'checkuser-noreason' => 'ഈ ചോദ്യത്തിനു താങ്കൾ നിർബന്ധമായും കാരണം
നൽകേണ്ടതാണ്.',
'checkuser-accounts' => 'പുതിയ {{PLURAL:$1|അംഗത്വം|$1അംഗത്വങ്ങൾ}}',
- 'checkuser-too-many' => 'വളരെയധികം ഫലങ്ങൾ (ലഭിച്ച ക്വറി അനുസരിച്ച്).
CIDR ചുരുക്കുക.
+ 'checkuser-too-many' => 'വളരെയധികം ഫലങ്ങൾ (ലഭിച്ച ക്വറി അനുസരിച്ച്).
CIDR ചുരുക്കുക.
ഉപയോഗിച്ച IPകൾ താഴെ പ്രദർശിപ്പിച്ചിരിക്കുന്നു (പരമാവധി 5000, വിലാസം അനുസരിച്ച്
ക്രമീകരിച്ചത്):',
'checkuser-user-nonexistent' => 'ഇങ്ങനൊരു ഉപയോക്താവ് വിക്കിയിൽ
നിലവിലില്ല.',
'checkuser-search-form' => '$1, $2 ആയ പ്രവർത്തനരേഖാ ഇനങ്ങൾ
കണ്ടെത്തുന്നു',
@@ -4738,7 +4738,7 @@
Brukarar og endringar frå ein klient-IP kan verta henta gjennom XFF ved å
leggja til «/xff» bak IP-en. IPv4 (CIDR 16-32) og IPv6 (CIDR 96-128) er støtta.
-Av yteårsaker vert høgst 5000 endringar viste.
+Av yteårsaker vert høgst 5000 endringar viste.
Nytt dette verktøyet i samsvar med retningsliner.',
'checkuser-desc' => 'Gjev brukarar med dei rette rettane moglegheita
til å sjekka IP-adressene til og annan informasjon om brukarar.',
'checkuser-logcase' => 'Loggsøket tek omsyn til små og store
bokstavar.',
@@ -5508,7 +5508,7 @@
'checkuser-wasblocked' => 'Blocări anterioare',
'checkuser-localonly' => 'Neunificat',
'checkuser-massblock' => 'Blochează utilizatorii aleşi',
- 'checkuser-massblock-text' => 'Conturile alese vor fi blocate
definitiv, cu blocarea automată activată şi crearea de conturi dezactivată.
+ 'checkuser-massblock-text' => 'Conturile alese vor fi blocate
definitiv, cu blocarea automată activată şi crearea de conturi dezactivată.
Adresele IP vor fi blocate timp de o săptămână şi crearea de conturi va fi
dezactivată.',
'checkuser-blocktag' => 'Înlocuieşte paginile de utilizator cu:',
'checkuser-blocktag-talk' => 'Înlocuieşte paginile de discuţii cu:',
@@ -5622,7 +5622,7 @@
$messages['ru'] = array(
'checkuser-summary' => "Данный инструмент может быть использован, чтобы
получить IP-адреса, использовавшиеся участником, либо чтобы показать
правки/участников, работавших с IP-адреса.
Правки и пользователи, которые правили с определённого IP-адреса, указанного в
X-Forwarded-For, можно получить, добавив постфикс <code>/xff</code> к
IP-адресу. Поддерживаемые версии IP: 4 (CIDR 16—32) и 6 (CIDR 96—128).
-Из соображений производительности будут показаны только первые 5000 правок.
+Из соображений производительности будут показаны только первые 5000 правок.
Используйте эту страницу '''только в соответствии с правилами'''.",
'checkuser-desc' => 'Предоставляет возможность проверять IP-адреса и
дополнительную информацию участников',
'checkuser-logcase' => 'Поиск по журналу чувствителен к регистру.',
@@ -5742,7 +5742,7 @@
'checkuser-wasblocked' => 'Урут бобуллубут',
'checkuser-localonly' => 'Биирдэһиллибит аан аат буолбатах',
'checkuser-massblock' => 'Талыллыбыт кыттааччылары боп',
- 'checkuser-massblock-text' => 'Талыллыбыт ааттар болдьоҕо суох
бобуллуохтара. Бу ааттар аптамаатынан бобуллуохтара, маннык ааты саҥаттан
оҥоруу эмиэ бобуллуо.
+ 'checkuser-massblock-text' => 'Талыллыбыт ааттар болдьоҕо суох
бобуллуохтара. Бу ааттар аптамаатынан бобуллуохтара, маннык ааты саҥаттан
оҥоруу эмиэ бобуллуо.
IP-аадырыстартан бэлиэтэммэккэ киирии уонна саҥа ааты оҥоруу 1 нэдиэлэҕэ
бобуллуо.',
'checkuser-blocktag' => 'Кыттааччылар сирэйдэрин манныкка уларыт:',
'checkuser-blocktag-talk' => 'Ырытыы сирэйдэрин манныкка уларыт:',
Modified: trunk/extensions/CheckUser/CheckUser.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser.php 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/CheckUser.php 2010-04-28 22:57:53 UTC (rev
65644)
@@ -303,7 +303,7 @@
}
}
}
- // We still have to test if the IP that sent
+ // We still have to test if the IP that sent
// this header is trusted to confirm results
if ( $client != $address && ( !$address || !wfIsTrustedProxy( $address
) ) ) {
$trusted = false;
Modified: trunk/extensions/CheckUser/CheckUser_body.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser_body.php 2010-04-28 22:50:19 UTC
(rev 65643)
+++ trunk/extensions/CheckUser/CheckUser_body.php 2010-04-28 22:57:53 UTC
(rev 65644)
@@ -6,7 +6,6 @@
}
class CheckUser extends SpecialPage {
-
/**
* Constructor -- set up the new special page
*/
@@ -34,7 +33,7 @@
wfMsgForContent( 'checkuser-log-subpage' ),
'Log'
);
-
+
foreach ( $logMatches as $log ) {
if ( str_replace( '_', ' ', $wgContLang->lc( $subpage )
)
== str_replace( '_ ', ' ', $wgContLang->lc(
$log ) ) ) {
@@ -344,9 +343,9 @@
# Ordering by the latest timestamp makes a small filesort on
the IP list
$cu_changes = $dbr->tableName( 'cu_changes' );
$use_index = $dbr->useIndexClause( 'cuc_user_ip_time' );
- $sql = "SELECT cuc_ip,cuc_ip_hex, COUNT(*) AS count,
- MIN(cuc_timestamp) AS first, MAX(cuc_timestamp) AS last
- FROM $cu_changes $use_index WHERE cuc_user = $user_id
AND $time_conds
+ $sql = "SELECT cuc_ip,cuc_ip_hex, COUNT(*) AS count,
+ MIN(cuc_timestamp) AS first, MAX(cuc_timestamp) AS last
+ FROM $cu_changes $use_index WHERE cuc_user = $user_id
AND $time_conds
GROUP BY cuc_ip,cuc_ip_hex ORDER BY last DESC LIMIT
5001";
$ret = $dbr->query( $sql, __METHOD__ );
@@ -499,9 +498,9 @@
if ( isset( $rangecount ) && $rangecount > 5000 ) {
$use_index = $dbr->useIndexClause( $index );
$sql = "SELECT cuc_ip_hex, COUNT(*) AS count,
- MIN(cuc_timestamp) AS first, MAX(cuc_timestamp)
AS last
+ MIN(cuc_timestamp) AS first, MAX(cuc_timestamp)
AS last
FROM $cu_changes $use_index
- WHERE $ip_conds AND $time_conds
+ WHERE $ip_conds AND $time_conds
GROUP BY cuc_ip_hex ORDER BY cuc_ip_hex LIMIT
5001";
$ret = $dbr->query( $sql, __METHOD__ );
# List out each IP that has edits
@@ -545,7 +544,7 @@
# OK, do the real query...
$use_index = $dbr->useIndexClause( $index );
$sql = "SELECT
cuc_namespace,cuc_title,cuc_user,cuc_user_text,cuc_comment,cuc_actiontext,
-
cuc_timestamp,cuc_minor,cuc_page_id,cuc_type,cuc_this_oldid,cuc_last_oldid,cuc_ip,cuc_xff,cuc_agent
+
cuc_timestamp,cuc_minor,cuc_page_id,cuc_type,cuc_this_oldid,cuc_last_oldid,cuc_ip,cuc_xff,cuc_agent
FROM $cu_changes $use_index WHERE $ip_conds AND
$time_conds ORDER BY cuc_timestamp DESC LIMIT 5001";
$ret = $dbr->query( $sql, __METHOD__ );
@@ -640,7 +639,7 @@
$wgOut->addHTML( wfMsgExt( 'checkuser-limited', array(
'parse' ) ) );
$use_index = $dbr->useIndexClause( 'cuc_user_ip_time' );
$sql = "SELECT * FROM $cu_changes $use_index
- WHERE $user_cond AND $time_conds
+ WHERE $user_cond AND $time_conds
ORDER BY cuc_ip ASC, cuc_timestamp DESC LIMIT
5000";
$ret = $dbr->query( $sql, __METHOD__ );
# Try to optimize this query
@@ -677,7 +676,7 @@
wfRestoreWarnings();
# OK, do the real query...
$use_index = $dbr->useIndexClause( 'cuc_user_ip_time' );
- $sql = "SELECT * FROM $cu_changes $use_index
+ $sql = "SELECT * FROM $cu_changes $use_index
WHERE $user_cond AND $time_conds ORDER BY cuc_timestamp
DESC LIMIT 5000";
$ret = $dbr->query( $sql, __METHOD__ );
@@ -761,8 +760,8 @@
if ( isset( $rangecount ) && $rangecount > 10000 ) {
$use_index = $dbr->useIndexClause( $index );
$sql = "SELECT cuc_ip_hex, COUNT(*) AS count,
- MIN(cuc_timestamp) AS first, MAX(cuc_timestamp)
AS last
- FROM $cu_changes $use_index WHERE $ip_conds AND
$time_conds
+ MIN(cuc_timestamp) AS first, MAX(cuc_timestamp)
AS last
+ FROM $cu_changes $use_index WHERE $ip_conds AND
$time_conds
GROUP BY cuc_ip_hex ORDER BY cuc_ip_hex LIMIT
5001";
$ret = $dbr->query( $sql, __METHOD__ );
# List out each IP that has edits
@@ -795,7 +794,7 @@
}
$s .= '</ol>';
$dbr->freeResult( $ret );
-
+
$wgOut->addHTML( $s );
return;
} elseif ( isset( $rangecount ) && !$rangecount ) {
@@ -807,8 +806,8 @@
global $wgMemc;
# OK, do the real query...
$use_index = $dbr->useIndexClause( $index );
- $sql = "SELECT cuc_user_text, cuc_timestamp, cuc_user, cuc_ip,
cuc_agent, cuc_xff
- FROM $cu_changes $use_index WHERE $ip_conds AND
$time_conds
+ $sql = "SELECT cuc_user_text, cuc_timestamp, cuc_user, cuc_ip,
cuc_agent, cuc_xff
+ FROM $cu_changes $use_index WHERE $ip_conds AND
$time_conds
ORDER BY cuc_timestamp DESC LIMIT 10000";
$ret = $dbr->query( $sql, __METHOD__ );
@@ -1342,8 +1341,8 @@
function __construct( $specialPage, $searchConds, $y, $m ) {
parent::__construct();
/*
- $this->messages = array_map( 'wfMsg',
- array( 'comma-separator', 'checkuser-log-userips',
'checkuser-log-ipedits', 'checkuser-log-ipusers',
+ $this->messages = array_map( 'wfMsg',
+ array( 'comma-separator', 'checkuser-log-userips',
'checkuser-log-ipedits', 'checkuser-log-ipusers',
'checkuser-log-ipedits-xff',
'checkuser-log-ipusers-xff' ) );*/
$this->getDateCond( $y, $m );
Modified: trunk/extensions/CheckUser/archives/patch-cu_changes_indexes.sql
===================================================================
--- trunk/extensions/CheckUser/archives/patch-cu_changes_indexes.sql
2010-04-28 22:50:19 UTC (rev 65643)
+++ trunk/extensions/CheckUser/archives/patch-cu_changes_indexes.sql
2010-04-28 22:57:53 UTC (rev 65644)
@@ -1,8 +1,8 @@
-- Improves indexes for better peformance with large result sets
-- vim: autoindent syn=mysql sts=2 sw=2
-- Replace /*$wgDBprefix*/ with the proper prefix
-
-ALTER TABLE /*$wgDBprefix*/cu_changes
+
+ALTER TABLE /*$wgDBprefix*/cu_changes
ADD INDEX cuc_ip_hex_time (cuc_ip_hex,cuc_timestamp),
ADD INDEX cuc_user_ip_time (cuc_user,cuc_ip,cuc_timestamp),
ADD INDEX cuc_xff_hex_time (cuc_xff_hex,cuc_timestamp),
Modified: trunk/extensions/CheckUser/archives/patch-cu_changes_indexes2.sql
===================================================================
--- trunk/extensions/CheckUser/archives/patch-cu_changes_indexes2.sql
2010-04-28 22:50:19 UTC (rev 65643)
+++ trunk/extensions/CheckUser/archives/patch-cu_changes_indexes2.sql
2010-04-28 22:57:53 UTC (rev 65644)
@@ -1,7 +1,7 @@
-- Improves indexes for better peformance with large result sets
-- vim: autoindent syn=mysql sts=2 sw=2
-- Replace /*$wgDBprefix*/ with the proper prefix
-
-ALTER TABLE /*$wgDBprefix*/cu_changes
+
+ALTER TABLE /*$wgDBprefix*/cu_changes
ADD INDEX cuc_user_ip_time (cuc_user,cuc_ip,cuc_timestamp),
DROP INDEX cuc_user_time;
Modified: trunk/extensions/CheckUser/checkuser.js
===================================================================
--- trunk/extensions/CheckUser/checkuser.js 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/checkuser.js 2010-04-28 22:57:53 UTC (rev
65644)
@@ -4,7 +4,7 @@
/*
* This function calculates the common range of a list of
-* IPs. It should be set to update on keyUp.
+* IPs. It should be set to update on keyUp.
*/
function updateCIDRresult() {
var form = document.getElementById( 'mw-checkuser-cidrform' );
Modified: trunk/extensions/CheckUser/cu_changes.sql
===================================================================
--- trunk/extensions/CheckUser/cu_changes.sql 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/cu_changes.sql 2010-04-28 22:57:53 UTC (rev
65644)
@@ -1,7 +1,7 @@
-- Tables for the CheckUser extension
-- vim: autoindent syn=mysql sts=2 sw=2
-- Replace /*$wgDBprefix*/ with the proper prefix
-
+
CREATE TABLE /*$wgDBprefix*/cu_changes (
-- Primary key
cuc_id INTEGER NOT NULL AUTO_INCREMENT,
@@ -9,11 +9,11 @@
-- When pages are renamed, their RC entries do _not_ change.
cuc_namespace int NOT NULL default '0',
cuc_title varchar(255) binary NOT NULL default '',
-
+
-- user.user_id
cuc_user INTEGER NOT NULL DEFAULT 0,
cuc_user_text VARCHAR(255) NOT NULL DEFAULT '',
-
+
-- Edit summary
cuc_actiontext varchar(255) binary NOT NULL default '',
cuc_comment varchar(255) binary NOT NULL default '',
@@ -23,34 +23,34 @@
-- This will keep links working after moves while
-- retaining the at-the-time name in the changes list.
cuc_page_id int(10) unsigned NOT NULL default '0',
-
+
-- rev_id of the given revision
cuc_this_oldid int(10) unsigned NOT NULL default '0',
-
+
-- rev_id of the prior revision, for generating diff links.
cuc_last_oldid int(10) unsigned NOT NULL default '0',
-
+
-- Edit/new/log
cuc_type tinyint(3) unsigned NOT NULL default '0',
-
+
-- Event timestamp
cuc_timestamp CHAR(14) NOT NULL default '',
-
+
-- IP address, visible
cuc_ip VARCHAR(255) NULL default '',
-
+
-- IP address as hexidecimal
cuc_ip_hex VARCHAR(255) default NULL,
-
+
-- XFF header, visible, all data
cuc_xff VARCHAR(255) BINARY NULL default '',
-
+
-- XFF header, last IP, as hexidecimal
cuc_xff_hex VARCHAR(255) default NULL,
-
+
-- User agent
cuc_agent VARCHAR(255) BINARY default NULL,
-
+
PRIMARY KEY cuc_id (cuc_id),
INDEX cuc_ip_hex_time (cuc_ip_hex,cuc_timestamp),
INDEX cuc_user_ip_time (cuc_user,cuc_ip,cuc_timestamp),
Modified: trunk/extensions/CheckUser/cu_log.sql
===================================================================
--- trunk/extensions/CheckUser/cu_log.sql 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/cu_log.sql 2010-04-28 22:57:53 UTC (rev
65644)
@@ -4,7 +4,7 @@
CREATE TABLE /*$wgDBprefix*/cu_log (
-- Unique identifier
cul_id int unsigned not null auto_increment,
-
+
-- Timestamp of CheckUser action
cul_timestamp binary(14) not null,
@@ -37,6 +37,4 @@
INDEX cul_type_target (cul_type,cul_target_id, cul_timestamp),
INDEX cul_target_hex (cul_target_hex, cul_timestamp),
INDEX cul_range_start (cul_range_start, cul_timestamp)
-
) /*$wgDBTableOptions*/;
-
Modified: trunk/extensions/CheckUser/cu_log_import.inc
===================================================================
--- trunk/extensions/CheckUser/cu_log_import.inc 2010-04-28 22:50:19 UTC
(rev 65643)
+++ trunk/extensions/CheckUser/cu_log_import.inc 2010-04-28 22:57:53 UTC
(rev 65644)
@@ -6,7 +6,7 @@
$rxTarget = '(?P<target>.*?)';
$rxWiki = '(?P<wiki>[^)]*?)';
$rxReason = '(?: \("(?P<reason>.*)"\))?';
-
+
// Strip nulls due to NFS write collisions
$line = str_replace( "\0", "", $line );
@@ -16,7 +16,7 @@
'ipusers-xff' => "!^<li>$rxTimestamp, $rxUser got users for XFF
$rxTarget on $rxWiki$rxReason</li>!",
'ipusers' => "!^<li>$rxTimestamp, $rxUser got users for" ."
$rxTarget on $rxWiki$rxReason</li>!",
'userips' => "!^<li>$rxTimestamp, $rxUser got IPs for". "
$rxTarget on $rxWiki$rxReason</li>!" );
-
+
foreach ( $regexes as $type => $regex ) {
$m = false;
if ( preg_match( $regex, $line, $m ) ) {
@@ -36,7 +36,7 @@
function import_cu_log( $db, $log ) {
global $wgDBname;
-
+
$file = fopen( $log, 'r' );
$matched = 0;
@@ -53,7 +53,7 @@
// Local wiki lookups...
$user = User::newFromName( $data['user'] );
-
+
list( $start, $end ) = IP::parseRange( $data['target']
);
if ( $start === false ) {
$targetUser = User::newFromName(
$data['target'] );
@@ -66,7 +66,7 @@
}
$targetID = 0;
}
-
+
if( $db ) {
$fields = array(
'cul_id' => $db->nextSequenceValue(
'cu_log_cul_id_seq' ),
@@ -83,7 +83,7 @@
$db->insert( 'cu_log', $fields, __METHOD__ );
}
-
+
$matched++;
}
$unmatched ++;
Modified: trunk/extensions/CheckUser/importLog.php
===================================================================
--- trunk/extensions/CheckUser/importLog.php 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/importLog.php 2010-04-28 22:57:53 UTC (rev
65644)
@@ -9,7 +9,7 @@
$matched = 0;
$unmatched = 0;
$badtime = 0;
-
+
$file = fopen( $log, 'r' );
while ( false !== ( $line = fgets( $file ) ) ) {
$found = false;
Modified: trunk/extensions/CheckUser/install.inc
===================================================================
--- trunk/extensions/CheckUser/install.inc 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/install.inc 2010-04-28 22:57:53 UTC (rev
65644)
@@ -10,7 +10,7 @@
$sourcefile = $wgDBtype === 'postgres' ? '/cu_changes.pg.sql' :
'/cu_changes.sql';
$db->sourceFile( dirname( __FILE__ ) . $sourcefile );
}
-
+
echo "...cu_changes table added.\n";
// Check if the table is empty
$rcRows = $db->selectField( 'recentchanges', 'COUNT(*)', false,
__FUNCTION__ );
@@ -18,7 +18,7 @@
echo "recentchanges is empty; nothing to add.\n";
return;
}
-
+
if( $cutoff ) {
// Something leftover... clear old entries to minimize dupes
$encCutoff = $db->addQuotes( $db->timestamp( $cutoff ) );
@@ -29,14 +29,14 @@
} else {
$cutoffCond = "";
}
-
+
$start = $db->selectField( 'recentchanges', 'MIN(rc_id)', false,
__FUNCTION__ );
$end = $db->selectField( 'recentchanges', 'MAX(rc_id)', false,
__FUNCTION__ );
# Do remaining chunk
$end += BATCH_SIZE - 1;
$blockStart = $start;
$blockEnd = $start + BATCH_SIZE - 1;
-
+
$db->begin();
while ( $blockStart <= $end ) {
echo "...doing rc_id from $blockStart to $blockEnd\n";
@@ -44,7 +44,7 @@
$res = $db->select( 'recentchanges', '*', $cond, __FUNCTION__ );
$batch = array();
while ( $row = $db->fetchObject( $res ) ) {
- $batch[] = array(
+ $batch[] = array(
'cuc_timestamp' => $row->rc_timestamp,
'cuc_user' => $row->rc_user,
'cuc_user_text' => $row->rc_user_text,
@@ -68,28 +68,27 @@
wfWaitForSlaves( 5 );
}
$db->commit();
-
+
echo "...cu_changes table added and populated.\n";
}
-
function create_cu_log( $db ) {
global $wgDBtype, $wgCheckUserLog, $wgDBname;
if( $db->tableExists( 'cu_log' ) ) {
echo "...cu_log already exists\n";
return;
}
-
+
$sourcefile = $wgDBtype === 'postgres' ? '/cu_log.pg.sql' :
'/cu_log.sql';
$db->sourceFile( dirname( __FILE__ ) . $sourcefile );
echo "...cu_log added\n";
-
+
if( empty( $wgCheckUserLog ) ) {
echo "...logging disabled, skipping log import.\n";
return;
}
-
+
if( !file_exists( $wgCheckUserLog ) ) {
echo "...log file missing, skipping log import.\n";
return;
Modified: trunk/extensions/CheckUser/install.php
===================================================================
--- trunk/extensions/CheckUser/install.php 2010-04-28 22:50:19 UTC (rev
65643)
+++ trunk/extensions/CheckUser/install.php 2010-04-28 22:57:53 UTC (rev
65644)
@@ -1,5 +1,4 @@
<?php
-
/*
* Makes the required database changes for the CheckUser extension
*/
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
