Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64253
Change subject: Remove Special:AutoLogin
......................................................................
Remove Special:AutoLogin
No longer used.
Change-Id: If81765b2cd05f69c649556133eeed91c216185fa
---
D 1x1.png
M CentralAuth.alias.php
M CentralAuth.i18n.php
M CentralAuth.php
D specials/SpecialAutoLogin.php
5 files changed, 1 insertion(+), 171 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/53/64253/1
diff --git a/1x1.png b/1x1.png
deleted file mode 100644
index b2eb48a..0000000
--- a/1x1.png
+++ /dev/null
Binary files differ
diff --git a/CentralAuth.alias.php b/CentralAuth.alias.php
index 8a9b60a..a024025 100644
--- a/CentralAuth.alias.php
+++ b/CentralAuth.alias.php
@@ -11,7 +11,6 @@
/** English (English) */
$specialPageAliases['en'] = array(
'CentralAuth' => array( 'CentralAuth' ),
- 'AutoLogin' => array( 'AutoLogin' ),
'CentralAutoLogin' => array( 'CentralAutoLogin' ),
'MergeAccount' => array( 'MergeAccount' ),
'GlobalGroupMembership' => array( 'GlobalUserRights',
'GlobalGroupMembership' ),
@@ -29,7 +28,6 @@
/** Arabic (العربية) */
$specialPageAliases['ar'] = array(
'CentralAuth' => array( 'تحقق_مركزي' ),
- 'AutoLogin' => array( 'دخول_تلقائي' ),
'MergeAccount' => array( 'دمج_حساب' ),
'GlobalGroupMembership' => array( 'صلاحيات_المستخدم_العامة',
'عضوية_المجموعة_العامة' ),
'GlobalGroupPermissions' => array( 'سماحات_المجموعة_العامة' ),
@@ -40,7 +38,6 @@
/** Egyptian Spoken Arabic (مصرى) */
$specialPageAliases['arz'] = array(
'CentralAuth' => array( 'تحقيق_مركزى' ),
- 'AutoLogin' => array( 'دخول_اوتوماتيكى' ),
'MergeAccount' => array( 'دمج_حساب' ),
'GlobalGroupMembership' => array( 'حقوق_اليوزر_العامه',
'عضوية_الجروپ_العامه' ),
'GlobalGroupPermissions' => array( 'اذن_الجروپ_العامه' ),
@@ -50,7 +47,6 @@
/** Assamese (অসমীয়া) */
$specialPageAliases['as'] = array(
- 'AutoLogin' => array( 'স্বয়ংক্ৰিয়_প্ৰৱেশ' ),
'MergeAccount' => array( 'একাউণ্ট_একত্ৰীকৰণ' ),
'GlobalGroupMembership' => array( 'গোলকীয়_সদস্যৰ_অধিকাৰসমূহ',
'গোলকীয়_গোটৰ_সদস্য' ),
'GlobalGroupPermissions' => array( 'গোলকীয়_গোটৰ_অনুমতি' ),
@@ -68,7 +64,6 @@
/** Bulgarian (български) */
$specialPageAliases['bg'] = array(
'CentralAuth' => array( 'Управление_на_единните_сметки' ),
- 'AutoLogin' => array( 'Автоматично_влизане' ),
'MergeAccount' => array( 'Обединяване_на_сметки' ),
'GlobalGroupMembership' => array( 'Глобални_потребителски_права' ),
'GlobalUsers' => array( 'Списък_на_глобалните_сметки' ),
@@ -77,7 +72,6 @@
/** Banjar (Bahasa Banjar) */
$specialPageAliases['bjn'] = array(
'CentralAuth' => array( 'Uturitas_pusat' ),
- 'AutoLogin' => array( 'Babuat_log_utumatis' ),
'MergeAccount' => array( 'Gabungakan_akun' ),
'GlobalGroupMembership' => array( 'Hak_pamakai_global' ),
'GlobalGroupPermissions' => array( 'Hak_galambang_global' ),
@@ -87,7 +81,6 @@
/** Breton (brezhoneg) */
$specialPageAliases['br'] = array(
- 'AutoLogin' => array( 'Emgevreañ' ),
'MergeAccount' => array( 'KendeuzKont' ),
'GlobalUsers' => array( 'ImplijerienHollek' ),
);
@@ -95,7 +88,6 @@
/** Bosnian (bosanski) */
$specialPageAliases['bs'] = array(
'CentralAuth' => array( 'SredisnjaAutent' ),
- 'AutoLogin' => array( 'AutoPrijava' ),
'MergeAccount' => array( 'UjediniRacune' ),
'GlobalGroupMembership' => array( 'GlobalnaKorisnicnaPrava' ),
'GlobalGroupPermissions' => array( 'GlobalneDozvoleGrupa' ),
@@ -112,7 +104,6 @@
/** German (Deutsch) */
$specialPageAliases['de'] = array(
'CentralAuth' => array( 'Verwaltung_Benutzerkonten-Zusammenführung' ),
- 'AutoLogin' => array( 'Automatische_Anmeldung' ),
'CentralAutoLogin' => array( 'Zentrale_automatische_Anmeldung' ),
'MergeAccount' => array( 'Benutzerkonten_zusammenführen' ),
'GlobalGroupMembership' => array( 'Globale_Benutzerzugehörigkeit' ),
@@ -125,7 +116,6 @@
/** Zazaki (Zazaki) */
$specialPageAliases['diq'] = array(
'CentralAuth' => array( 'MerkeziKimlikRaştkerdış' ),
- 'AutoLogin' => array( 'OtomatikCıkewtış' ),
'MergeAccount' => array( 'HesabJewkerdış' ),
'GlobalGroupMembership' => array( 'GlobalGrubaEzayan' ),
'GlobalGroupPermissions' => array( 'GlobalGrubaİcazeti' ),
@@ -136,7 +126,6 @@
/** Lower Sorbian (dolnoserbski) */
$specialPageAliases['dsb'] = array(
'CentralAuth' => array( 'Zjadnośenje_kontow' ),
- 'AutoLogin' => array( 'Awtomatiske_pśizjawjenje' ),
'MergeAccount' => array( 'Konta_zjadnośiś' ),
'GlobalGroupMembership' => array( 'Cłonkojstwo_w_globalnej_kupce' ),
'GlobalGroupPermissions' => array( 'Globalne_kupkowe_pšawa' ),
@@ -146,7 +135,6 @@
/** Greek (Ελληνικά) */
$specialPageAliases['el'] = array(
- 'AutoLogin' => array( 'ΑυτόματηΣύνδεση' ),
'MergeAccount' => array( 'ΣυγχώνευσηΛογαριασμού' ),
'GlobalGroupMembership' => array( 'ΚαθολικάΔικαιώματαΧρηστών' ),
'GlobalGroupPermissions' => array( 'ΚαθολικέςΆδειεςΧρηστών' ),
@@ -156,7 +144,6 @@
/** Esperanto (Esperanto) */
$specialPageAliases['eo'] = array(
'CentralAuth' => array( 'Centra_aŭtentigo' ),
- 'AutoLogin' => array( 'Aŭtomata_ensaluto' ),
'MergeAccount' => array( 'Unuigi_konton', 'Kunigi_konton' ),
'GlobalGroupMembership' => array( 'Ĝeneralaj_uzantorajtoj' ),
'GlobalGroupPermissions' => array( 'Ĝeneralaj_gruprajtoj' ),
@@ -165,7 +152,6 @@
/** Spanish (español) */
$specialPageAliases['es'] = array(
- 'AutoLogin' => array( 'Entrada_automática', 'Inicio_automático' ),
'MergeAccount' => array( 'Fusionar_cuenta_global',
'FusionarCuentaGlobal' ),
'GlobalGroupMembership' => array( 'Permisos_de_usuario_global',
'PermisosUsuarioGlobal' ),
'GlobalGroupPermissions' => array( 'Permisos_de_grupo_global',
'PermisosGrupoGlobal' ),
@@ -176,7 +162,6 @@
/** Estonian (eesti) */
$specialPageAliases['et'] = array(
'CentralAuth' => array( 'Kontode_ühendamine' ),
- 'AutoLogin' => array( 'Automaatne_sisselogimine' ),
'MergeAccount' => array( 'Kontode_ühendamise_seis' ),
'GlobalGroupMembership' => array( 'Globaalse_kasutaja_õigused' ),
'GlobalGroupPermissions' => array( 'Globaalse_rühma_haldamine' ),
@@ -187,7 +172,6 @@
/** Persian (فارسی) */
$specialPageAliases['fa'] = array(
'CentralAuth' => array( 'ورود_متمرکز' ),
- 'AutoLogin' => array( 'ورود_خودکار' ),
'MergeAccount' => array( 'ادغام_حساب' ),
'GlobalGroupMembership' => array( 'اختیارات_سراسری_کاربر' ),
'GlobalGroupPermissions' => array( 'اختیارات_سراسری_گروه' ),
@@ -198,14 +182,12 @@
/** Finnish (suomi) */
$specialPageAliases['fi'] = array(
'CentralAuth' => array( 'Keskitetty_varmennus' ),
- 'AutoLogin' => array( 'Automaattikirjautuminen' ),
'MergeAccount' => array( 'Yhdistä_tunnus' ),
'GlobalUsers' => array( 'Yhdistetyt_tunnukset' ),
);
/** French (français) */
$specialPageAliases['fr'] = array(
- 'AutoLogin' => array( 'Connexion_automatique', 'ConnexionAutomatique',
'ConnexionAuto', 'Login_automatique', 'LoginAutomatique', 'LoginAuto' ),
'MergeAccount' => array( 'Fusionner_le_compte', 'FusionnerLeCompte' ),
'GlobalGroupMembership' => array( 'Permissions_globales',
'PermissionGlobales' ),
'GlobalGroupPermissions' => array( 'Droits_des_groupes_globaux',
'DroitsDesGroupesGlobaux' ),
@@ -216,7 +198,6 @@
/** Franco-Provençal (arpetan) */
$specialPageAliases['frp'] = array(
'CentralAuth' => array( 'Administracion_des_comptos_fusionâs',
'AdministracionDesComptosFusionâs' ),
- 'AutoLogin' => array( 'Branchement_ôtomatico', 'BranchementÔtomatico' ),
'MergeAccount' => array( 'Fusionar_los_comptos', 'FusionarLosComptos' ),
'GlobalGroupMembership' => array( 'Pèrmissions_globâles',
'PèrmissionsGlobâles' ),
'GlobalGroupPermissions' => array( 'Drêts_a_les_tropes_globâles',
'DrêtsALesTropesGlobâles' ),
@@ -227,7 +208,6 @@
/** Galician (galego) */
$specialPageAliases['gl'] = array(
'CentralAuth' => array( 'Autenticación_central' ),
- 'AutoLogin' => array( 'Rexistro_automático' ),
'MergeAccount' => array( 'Fusionar_contas' ),
'GlobalGroupMembership' => array( 'Dereitos_globais' ),
'GlobalGroupPermissions' => array( 'Permisos_de_grupo_globais' ),
@@ -238,7 +218,6 @@
/** Swiss German (Alemannisch) */
$specialPageAliases['gsw'] = array(
'CentralAuth' => array( 'Verwaltig_Benutzerchonte-Zämmefierig' ),
- 'AutoLogin' => array( 'Automatischi_Aamäldig' ),
'MergeAccount' => array( 'Benutzerchonte_zämmefiere' ),
'GlobalGroupMembership' => array( 'Wältwyti_Benutzerrächt' ),
'GlobalGroupPermissions' => array( 'Wältwyti_Grupperächt' ),
@@ -249,7 +228,6 @@
/** Gujarati (ગુજરાતી) */
$specialPageAliases['gu'] = array(
'CentralAuth' => array( 'કેન્દ્રીયશપથ' ),
- 'AutoLogin' => array( 'સ્વયંભૂલોગીન' ),
'GlobalGroupMembership' => array( 'વૈશ્વિકસભ્યહક્કો' ),
'GlobalGroupPermissions' => array( 'વૈશ્વિકસમૂહપરવાનગી' ),
'GlobalUsers' => array( 'વૈશ્વિકસભ્ય' ),
@@ -258,7 +236,6 @@
/** Hebrew (עברית) */
$specialPageAliases['he'] = array(
'CentralAuth' => array( 'חשבון_משתמש_מאוחד' ),
- 'AutoLogin' => array( 'כניסה_אוטומטית' ),
'MergeAccount' => array( 'מיזוג_חשבונות' ),
'GlobalGroupMembership' => array( 'הרשאות_משתמש_כלליות',
'חברות_בקבוצות_כלליות' ),
'GlobalGroupPermissions' => array( 'הרשאות_קבוצות_כלליות' ),
@@ -268,7 +245,6 @@
/** Hindi (हिन्दी) */
$specialPageAliases['hi'] = array(
- 'AutoLogin' => array( 'स्वचालित_लॉगिन', 'स्वचालित_लौगिन',
'स्वचालित_सत्रारम्भ', 'स्वचालित_सत्रारंभ' ),
'MergeAccount' => array( 'खाता_विलय' ),
'GlobalGroupPermissions' => array( 'वैश्विक_समूह_अधिकार',
'केन्द्रीय_समूह_अधिकार', 'केंद्रीय_समूह_अधिकार' ),
'WikiSets' => array( 'विकिसेट' ),
@@ -278,7 +254,6 @@
/** Croatian (hrvatski) */
$specialPageAliases['hr'] = array(
'CentralAuth' => array( 'Središnja_prijava' ),
- 'AutoLogin' => array( 'AutoPrijava' ),
'MergeAccount' => array( 'Spoji_račun' ),
'GlobalGroupMembership' => array( 'Globalna_suradnička_prava' ),
'GlobalGroupPermissions' => array( 'Globalna_prava_skupina' ),
@@ -289,7 +264,6 @@
/** Upper Sorbian (hornjoserbsce) */
$specialPageAliases['hsb'] = array(
'CentralAuth' => array( 'Zjednoćenje_kontow' ),
- 'AutoLogin' => array( 'Awtomatiske_přizjewjenje' ),
'MergeAccount' => array( 'Konta_zjednoćić' ),
'GlobalGroupMembership' => array( 'Globalne_wužiwarske_prawa' ),
'GlobalGroupPermissions' => array( 'Globalne_skupinske_prawa' ),
@@ -300,7 +274,6 @@
/** 湘语 (湘语) */
$specialPageAliases['hsn'] = array(
'CentralAuth' => array( '中心认证' ),
- 'AutoLogin' => array( '自动登录' ),
'MergeAccount' => array( '合并账户' ),
'GlobalGroupMembership' => array( '全局用户权限' ),
'GlobalGroupPermissions' => array( '全局群组权限' ),
@@ -311,7 +284,6 @@
/** Haitian (Kreyòl ayisyen) */
$specialPageAliases['ht'] = array(
'CentralAuth' => array( 'OtoriteSantral' ),
- 'AutoLogin' => array( 'OtoKoneksyon' ),
'MergeAccount' => array( 'FizyoneKont' ),
'GlobalGroupMembership' => array( 'DwaItilizatèGlobal',
'FèPatiGwoupGlobal' ),
'GlobalGroupPermissions' => array( 'PèmisyonGwoupGlobal' ),
@@ -322,7 +294,6 @@
/** Hungarian (magyar) */
$specialPageAliases['hu'] = array(
'CentralAuth' => array( 'Központi_azonosítás' ),
- 'AutoLogin' => array( 'Automatikus_bejelentkezés' ),
'MergeAccount' => array( 'Szerkesztői_fiókok_egyesítése',
'Felhasználói_fiókok_egyesítése' ),
'GlobalGroupMembership' => array( 'Globális_szerkesztői_jogok',
'Globális_felhasználói_jogok' ),
'GlobalGroupPermissions' => array( 'Globális_szerkesztői_engedélyek',
'Globális_felhasználói_engedélyek' ),
@@ -333,7 +304,6 @@
/** Interlingua (interlingua) */
$specialPageAliases['ia'] = array(
'CentralAuth' => array( 'Auth_central' ),
- 'AutoLogin' => array( 'Autosession', 'AutoSession' ),
'MergeAccount' => array( 'Fusionar_conto' ),
'GlobalGroupMembership' => array( 'Membrato_global_de_gruppos' ),
'GlobalGroupPermissions' => array( 'Permissiones_global_de_gruppos' ),
@@ -344,7 +314,6 @@
/** Indonesian (Bahasa Indonesia) */
$specialPageAliases['id'] = array(
'CentralAuth' => array( 'Otoritas_pusat', 'OtoritasPusat' ),
- 'AutoLogin' => array( 'Masuk_log_otomatis', 'MasukLogOtomatis' ),
'MergeAccount' => array( 'Gabungkan_akun', 'GabungkanAkun' ),
'GlobalGroupMembership' => array( 'Hak_pengguna_global',
'HakPenggunaGlobal' ),
'GlobalGroupPermissions' => array( 'Hak_kelompok_global',
'HakKelompokGlobal' ),
@@ -355,7 +324,6 @@
/** Italian (italiano) */
$specialPageAliases['it'] = array(
'CentralAuth' => array( 'UtenzaGlobale', 'LoginUnificato' ),
- 'AutoLogin' => array( 'LoginAutomatico' ),
'MergeAccount' => array( 'UnificaUtenze' ),
'GlobalGroupMembership' => array( 'PermessiUtenteGlobale' ),
'GlobalGroupPermissions' => array( 'PermessiGruppoGlobale' ),
@@ -366,7 +334,6 @@
/** Japanese (日本語) */
$specialPageAliases['ja'] = array(
'CentralAuth' => array( 'アカウント統一管理', '統一ログインの管理' ),
- 'AutoLogin' => array( '自動ログイン' ),
'MergeAccount' => array( 'アカウント統合' ),
'GlobalGroupMembership' => array( 'グローバル利用者権限', 'グローバルグループへの所属' ),
'GlobalGroupPermissions' => array( 'グローバルグループ権限', 'グローバルグループパーミッション' ),
@@ -377,21 +344,18 @@
/** Georgian (ქართული) */
$specialPageAliases['ka'] = array(
- 'AutoLogin' => array( 'ავტომატური_შესვლა' ),
'GlobalGroupMembership' => array( 'გლობალურ_მომხმარებელთა_უფლებები' ),
'GlobalUsers' => array( 'გლობალური_მომხმარებლები' ),
);
/** Khmer (ភាសាខ្មែរ) */
$specialPageAliases['km'] = array(
- 'AutoLogin' => array( 'កត់ឈ្មោះចូលដោយស្វ័យប្រវត្តិ' ),
'MergeAccount' => array( 'ច្របាច់បញ្ចូលគណនី' ),
);
/** Korean (한국어) */
$specialPageAliases['ko'] = array(
'CentralAuth' => array( '통합계정관리' ),
- 'AutoLogin' => array( '자동로그인' ),
'MergeAccount' => array( '계정합치기', '사용자합치기' ),
'GlobalGroupMembership' => array( '공통권한조정' ),
'GlobalGroupPermissions' => array( '전체그룹권한' ),
@@ -402,7 +366,6 @@
/** Colognian (Ripoarisch) */
$specialPageAliases['ksh'] = array(
- 'AutoLogin' => array( 'AutomatteschEnlogge' ),
'GlobalGroupMembership' => array( 'JemeinsamMetmaacherJroppeRääschte' ),
'GlobalGroupPermissions' => array( 'JemeinsamJroppe' ),
'WikiSets' => array( 'WikiJroppe' ),
@@ -411,7 +374,6 @@
/** Cornish (kernowek) */
$specialPageAliases['kw'] = array(
- 'AutoLogin' => array( 'AwtoOmgelmy' ),
'MergeAccount' => array( 'KesunyaAcont' ),
'GlobalGroupMembership' => array( 'GwiryowDevnydhyoryonOllvysel' ),
'GlobalGroupPermissions' => array( 'CumyasowBagasowOllvysel' ),
@@ -421,7 +383,6 @@
/** Ladino (Ladino) */
$specialPageAliases['lad'] = array(
'CentralAuth' => array( 'CentralOtan' ),
- 'AutoLogin' => array( 'EntradaOtomatika' ),
'MergeAccount' => array( 'AjuntarCuentoGlobbal' ),
'GlobalGroupMembership' => array( 'Permessos_de_usador_globbal' ),
'GlobalGroupPermissions' => array( 'Permessos_de_grupo_globbal' ),
@@ -432,7 +393,6 @@
/** Luxembourgish (Lëtzebuergesch) */
$specialPageAliases['lb'] = array(
'CentralAuth' => array(
'Verwaltung_vun_der_Benotzerkonten-Zesummeféierung' ),
- 'AutoLogin' => array( 'Automatesch_Umeldung' ),
'MergeAccount' => array( 'Benotzerkonten_zesummeféieren' ),
'GlobalGroupMembership' => array( 'Member_vu_globale_Benotzerrechter' ),
'GlobalGroupPermissions' => array( 'Global_Grupperechter' ),
@@ -442,13 +402,11 @@
/** Lithuanian (lietuvių) */
$specialPageAliases['lt'] = array(
- 'AutoLogin' => array( 'Automatinis_prisijungimas' ),
'MergeAccount' => array( 'Sujungti_sąskaitas' ),
);
/** Malagasy (Malagasy) */
$specialPageAliases['mg'] = array(
- 'AutoLogin' => array( 'Fidirana_ho_azy' ),
'MergeAccount' => array( 'Hampiray_ny_kaonty' ),
'GlobalGroupMembership' => array( 'Fahafahana_amin\'ny_sehatra_rehetra'
),
'GlobalGroupPermissions' => array(
'Fahafahan\'ny_vondrona_amin\'ny_sehatra_rehetra' ),
@@ -457,7 +415,6 @@
/** Macedonian (македонски) */
$specialPageAliases['mk'] = array(
'CentralAuth' => array( 'ЦентралноПотврдување' ),
- 'AutoLogin' => array( 'АвтоматскоНајавување' ),
'MergeAccount' => array( 'СпојувањеНаСметки' ),
'GlobalGroupMembership' => array( 'ПраваНаГлобаленКорисник',
'ЧленствоВоГлобалнаГрупа' ),
'GlobalGroupPermissions' => array( 'ДозволиНаГлобалнаГрупа' ),
@@ -469,7 +426,6 @@
/** Malayalam (മലയാളം) */
$specialPageAliases['ml'] = array(
'CentralAuth' => array( 'കേന്ദ്രീകൃത_അംഗീകാരം' ),
- 'AutoLogin' => array( 'സ്വയംപ്രവേശനം' ),
'MergeAccount' => array( 'അംഗത്വസംയോജനം' ),
'GlobalGroupMembership' => array( 'ആഗോള_ഉപയോക്തൃ_അവകാശങ്ങൾ',
'ആഗോള_ഉപയോക്തൃ_അംഗത്വം' ),
'GlobalGroupPermissions' => array( 'ആഗോള_അംഗത്വാനുമതികൾ' ),
@@ -480,7 +436,6 @@
/** Marathi (मराठी) */
$specialPageAliases['mr'] = array(
'CentralAuth' => array( 'मध्यवर्तीअधिकारी' ),
- 'AutoLogin' => array( 'स्वयंप्रवेश' ),
'MergeAccount' => array( 'खातेविलीनीकरण' ),
'GlobalGroupMembership' => array( 'वैश्विकसदस्याधिकार',
'वैश्विकगटसदस्यता' ),
'GlobalGroupPermissions' => array( 'वैश्विकगटपरवानग्या' ),
@@ -499,7 +454,6 @@
/** Maltese (Malti) */
$specialPageAliases['mt'] = array(
- 'AutoLogin' => array( 'LoginAwtomatiku', 'DħulAwtomatiku' ),
'MergeAccount' => array( 'WaħħadKont' ),
'GlobalUsers' => array( 'UtentiGlobali' ),
);
@@ -512,7 +466,6 @@
/** Norwegian Bokmål (norsk bokmål) */
$specialPageAliases['nb'] = array(
'CentralAuth' => array( 'Enhetlig_innlogging' ),
- 'AutoLogin' => array( 'Automatisk_innlogging' ),
'MergeAccount' => array( 'Kontosammenslåing' ),
'GlobalGroupMembership' => array( 'Globale_brukerrettigheter' ),
'GlobalGroupPermissions' => array( 'Globale_gruppetillatelser' ),
@@ -523,7 +476,6 @@
/** Low Saxon (Netherlands) (Nedersaksies) */
$specialPageAliases['nds-nl'] = array(
'CentralAuth' => array( 'Sentraal_anmelden' ),
- 'AutoLogin' => array( 'Automaties_anmelden' ),
'MergeAccount' => array( 'Gebruker_samenvoegen' ),
'GlobalGroupMembership' => array( 'Globale_gebrukersrechten' ),
'GlobalGroupPermissions' => array( 'Globale_groepsrechten' ),
@@ -534,7 +486,6 @@
/** Dutch (Nederlands) */
$specialPageAliases['nl'] = array(
'CentralAuth' => array( 'CentraalAanmelden' ),
- 'AutoLogin' => array( 'AutomatischAanmelden', 'AutoAanmelden' ),
'CentralAutoLogin' => array( 'CentraalAutomatischAanmelden' ),
'MergeAccount' => array( 'GebruikerSamenvoegen' ),
'GlobalGroupMembership' => array( 'GlobaalGroepslidmaatschap' ),
@@ -553,7 +504,6 @@
/** Occitan (occitan) */
$specialPageAliases['oc'] = array(
- 'AutoLogin' => array( 'Login_Automatic', 'LoginAutomatic', 'LoginAuto'
),
'MergeAccount' => array( 'Fusionar_lo_compte', 'FusionarLoCompte' ),
'GlobalGroupMembership' => array( 'Permissions_globalas',
'PermissionGlobalas' ),
'GlobalGroupPermissions' => array( 'Dreches_dels_gropes_globals',
'DrechesDelsGropesGlobals' ),
@@ -563,7 +513,6 @@
/** Punjabi (ਪੰਜਾਬੀ) */
$specialPageAliases['pa'] = array(
- 'AutoLogin' => array( 'ਖੁਦਕਾਰ_ਲਾਗਇਨ' ),
'MergeAccount' => array( 'ਖਾਤਾ_ਰਲਾਓ' ),
'GlobalGroupMembership' => array( 'ਗਲੋਬਲ_ਵਰਤੋਂਕਾਰ_ਹੱਕ',
'ਗਲੋਬਲ_ਗਰੁੱਪ_ਮੈਂਬਰਸ਼ਿੱਪ' ),
'GlobalGroupPermissions' => array( 'ਗਲੋਬਲ_ਗਰੁੱਪ_ਇਜਾਜ਼ਤਾਂ' ),
@@ -573,7 +522,6 @@
/** Polish (polski) */
$specialPageAliases['pl'] = array(
'CentralAuth' => array( 'Zarządzanie_kontem_uniwersalnym' ),
- 'AutoLogin' => array( 'Automatyczne_logowanie' ),
'MergeAccount' => array( 'Łączenie_kont', 'Konto_uniwersalne' ),
'GlobalGroupMembership' => array( 'Globalne_uprawnienia' ),
'GlobalGroupPermissions' => array( 'Globalne_uprawnienia_grup' ),
@@ -589,7 +537,6 @@
/** Portuguese (português) */
$specialPageAliases['pt'] = array(
'CentralAuth' => array( 'Administração_de_contas_globais',
'Administração_global_de_contas' ),
- 'AutoLogin' => array( 'Autenticação_automática' ),
'MergeAccount' => array( 'Fundir_conta' ),
'GlobalGroupMembership' => array( 'Grupos_globais' ),
'GlobalGroupPermissions' => array( 'Privilégios_globais_de_grupo' ),
@@ -599,7 +546,6 @@
/** Brazilian Portuguese (português do Brasil) */
$specialPageAliases['pt-br'] = array(
'CentralAuth' => array( 'Administração_global_de_contas',
'Administração_de_contas_globais' ),
- 'AutoLogin' => array( 'Login_automático' ),
'MergeAccount' => array( 'Mesclar_conta' ),
'GlobalUsers' => array( 'Usuários_globais' ),
);
@@ -607,7 +553,6 @@
/** Romanian (română) */
$specialPageAliases['ro'] = array(
'CentralAuth' => array( 'Autentificare_centrală' ),
- 'AutoLogin' => array( 'Autentificare_automată' ),
'MergeAccount' => array( 'Unește_conturi' ),
'GlobalGroupMembership' => array( 'Drepturi_globale_utilizator',
'Membru_global_grup' ),
'GlobalGroupPermissions' => array( 'Permisiuni_grup_globale' ),
@@ -617,7 +562,6 @@
/** Russian (русский) */
$specialPageAliases['ru'] = array(
- 'AutoLogin' => array( 'Автоматический_вход' ),
'MergeAccount' => array( 'Объединение_учётных_записей' ),
'GlobalGroupMembership' => array( 'Глобальные_права_участника',
'Глобальное_членство' ),
'GlobalGroupPermissions' => array( 'Права_глобальных_групп' ),
@@ -628,7 +572,6 @@
/** Sanskrit (संस्कृतम्) */
$specialPageAliases['sa'] = array(
'CentralAuth' => array( 'मध्यवर्तीप्रामान्य' ),
- 'AutoLogin' => array( 'स्वयमेवप्रवेश' ),
'MergeAccount' => array( 'उपयोजकसंज्ञासंयोग' ),
'GlobalGroupMembership' => array( 'वैश्विकसदस्याधिकार' ),
'GlobalGroupPermissions' => array( 'वैश्विकगटसंमती' ),
@@ -639,7 +582,6 @@
/** Sicilian (sicilianu) */
$specialPageAliases['scn'] = array(
'CentralAuth' => array( 'LoginUnificato' ),
- 'AutoLogin' => array( 'LoginAutomatico' ),
'MergeAccount' => array( 'UnificaUtenze' ),
'GlobalGroupMembership' => array( 'PermessiUtenteGlobale' ),
'GlobalGroupPermissions' => array( 'PermessiGruppoGlobale' ),
@@ -650,7 +592,6 @@
/** Serbo-Croatian (srpskohrvatski / српскохрватски) */
$specialPageAliases['sh'] = array(
'CentralAuth' => array( 'Centralna_prijava' ),
- 'AutoLogin' => array( 'Auto_prijava' ),
'MergeAccount' => array( 'Spoji_račun' ),
'GlobalGroupMembership' => array( 'Globalna_korisnička_prava' ),
'GlobalGroupPermissions' => array( 'Globalna_prava_grupa' ),
@@ -661,14 +602,12 @@
/** Sinhala (සිංහල) */
$specialPageAliases['si'] = array(
'CentralAuth' => array( 'මධ්යඅවසර' ),
- 'AutoLogin' => array( 'ස්වයංක්රීයපිවිසුම' ),
'MergeAccount' => array( 'ගිණුමඑක්කරන්න' ),
);
/** Slovak (slovenčina) */
$specialPageAliases['sk'] = array(
'CentralAuth' => array( 'CentrálneOverenie' ),
- 'AutoLogin' => array( 'AutomatickéPrihlasovanie' ),
'MergeAccount' => array( 'ZlúčenieÚčtov' ),
'GlobalGroupMembership' => array( 'GlobálnePrávaPoužívateľa' ),
'GlobalGroupPermissions' => array( 'GlobálneSkupinovéOprávnenia' ),
@@ -684,21 +623,18 @@
/** Swedish (svenska) */
$specialPageAliases['sv'] = array(
'CentralAuth' => array( 'Gemensam_inloggning' ),
- 'AutoLogin' => array( 'Automatisk_inloggning' ),
'MergeAccount' => array( 'Slå_ihop_konton' ),
'GlobalUsers' => array( 'Globala_användare' ),
);
/** Swahili (Kiswahili) */
$specialPageAliases['sw'] = array(
- 'AutoLogin' => array( 'IngiaEFnyewe' ),
'MergeAccount' => array( 'KusanyaAkaunti' ),
);
/** Tagalog (Tagalog) */
$specialPageAliases['tl'] = array(
'CentralAuth' => array( 'Lundayan_ng_pahintulot' ),
- 'AutoLogin' => array( 'Kusang_paglagda' ),
'MergeAccount' => array( 'Pagsanibin_ang_akawnt' ),
'GlobalGroupMembership' => array(
'Mga_karapatan_ng_pandaigdigang_tagagamit', 'Kasapian_sa_pandaigdigang_pangkat'
),
'GlobalGroupPermissions' => array(
'Mga_kapahintulutan_ng_pandaigdigang_pangkat' ),
@@ -709,7 +645,6 @@
/** Turkish (Türkçe) */
$specialPageAliases['tr'] = array(
'CentralAuth' => array( 'MerkeziKimlikDoğrulama' ),
- 'AutoLogin' => array( 'OtomatikOturumAçma' ),
'MergeAccount' => array( 'HesapBirleştir', 'HesapBirleştirme' ),
'GlobalGroupMembership' => array( 'KüreselGrupÜyeliği' ),
'GlobalGroupPermissions' => array( 'KüreselGrupİzinleri' ),
@@ -724,7 +659,6 @@
/** Ukrainian (українська) */
$specialPageAliases['uk'] = array(
- 'AutoLogin' => array( 'Автоматичний_вхід' ),
'MergeAccount' => array( 'Об\'єднання_облікових_записів' ),
'GlobalGroupMembership' => array( 'Глобальні_права' ),
'WikiSets' => array( 'Набори_вікі' ),
@@ -734,7 +668,6 @@
/** Urdu (اردو) */
$specialPageAliases['ur'] = array(
'CentralAuth' => array( 'اختیار_مرکزی' ),
- 'AutoLogin' => array( 'خودکار_داخل_نوشتگی' ),
'MergeAccount' => array( 'ضم_کھاتہ' ),
'GlobalUsers' => array( 'عالمی_صارفین' ),
);
@@ -750,7 +683,6 @@
/** Vietnamese (Tiếng Việt) */
$specialPageAliases['vi'] = array(
'CentralAuth' => array( 'Thành_viên_toàn_cục', 'Thành_viên_toàn_cầu',
'Người_dùng_toàn_cục', 'Người_dùng_toàn_cầu' ),
- 'AutoLogin' => array( 'Đăng_nhập_tự_động' ),
'MergeAccount' => array( 'Hợp_nhất_tài_khoản' ),
'GlobalGroupMembership' => array( 'Quyền_thành_viên_toàn_cục' ),
'GlobalGroupPermissions' => array( 'Quyền_nhóm_toàn_cục' ),
@@ -766,7 +698,6 @@
/** Simplified Chinese (中文（简体）) */
$specialPageAliases['zh-hans'] = array(
'CentralAuth' => array( '中央认证' ),
- 'AutoLogin' => array( '自动登录' ),
'MergeAccount' => array( '整合账户' ),
'GlobalGroupMembership' => array( '全域组成员资格' ),
'GlobalGroupPermissions' => array( '全域组权限' ),
@@ -778,7 +709,6 @@
/** Traditional Chinese (中文（繁體）) */
$specialPageAliases['zh-hant'] = array(
'CentralAuth' => array( '中央認證' ),
- 'AutoLogin' => array( '自動登錄' ),
'MergeAccount' => array( '整合賬戶' ),
'GlobalGroupMembership' => array( '全域用戶權利', '全域組成員資格', '全域用戶權限' ),
'GlobalGroupPermissions' => array( '全域組權限' ),
@@ -790,4 +720,4 @@
/** Chinese (Hong Kong) (中文（香港）) */
$specialPageAliases['zh-hk'] = array(
'GlobalGroupMembership' => array( '全域用戶權限' ),
-);
\ No newline at end of file
+);
diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php
index 5cd4d82..868ceca 100644
--- a/CentralAuth.i18n.php
+++ b/CentralAuth.i18n.php
@@ -295,12 +295,6 @@
'centralauth-rightslog-set-optin' => 'opt-in based',
'centralauth-rightslog-set-optout' => 'opt-out based',
- // Autologin
- 'autologin' => 'Automatic login',
- 'centralauth-autologin-desc' => 'This special page is used internally
by MediaWiki.
-When you [[Special:UserLogin|log in]], the central login system instructs your
browser to request this page from all linked domains, using image links.
-You have requested this page without providing any authentication data, so it
does nothing.',
-
// Central login
'centralautologin' => 'Central login',
'centralauth-centralautologin-desc' => 'This special page is used
internally by MediaWiki.
@@ -831,9 +825,6 @@
* {{msg-mw|Centralauth-rightslog-set-optout}}',
'centralauth-rightslog-set-optout' => 'See also:
* {{msg-mw|Centralauth-rightslog-set-optin}}',
- 'autologin' => '{{doc-special|AutoLogin|unlisted=1}}
-See example: [[w:Special:Autologin]].',
- 'centralauth-autologin-desc' => 'This is the text shown on
[[Special:AutoLogin]] when this page is requested by a user, not by the
automatic global login system.',
'centralautologin' => '{{doc-special|CentralAutoLogin|unlisted=1}}
See example: [[w:Special:CentralAutoLogin]].',
'centralauth-centralautologin-desc' => 'This is the text shown on
[[Special:CentralAutoLogin]] when this page is requested by a user, not by the
automatic global login system.',
diff --git a/CentralAuth.php b/CentralAuth.php
index 6b0676b..636939c 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -118,12 +118,6 @@
$wgCentralAuthAutoLoginWikis = array();
/**
- * Local filesystem path to the icon returned by Special:AutoLogin
- * Should be a 20x20px PNG.
- */
-$wgCentralAuthLoginIcon = false;
-
-/**
* Specify a P3P header value to be used when setting CentralAuth cookies on
* the login wiki ($wgCentralAuthLoginWiki).
*
@@ -195,7 +189,6 @@
$wgAutoloadClasses['CentralAuthHooks'] = "$caBase/CentralAuthHooks.php";
$wgAutoloadClasses['CentralAuthSuppressUserJob'] =
"$caBase/SuppressUserJob.php";
$wgAutoloadClasses['WikiSet'] = "$caBase/WikiSet.php";
-$wgAutoloadClasses['SpecialAutoLogin'] =
"$caBase/specials/SpecialAutoLogin.php";
$wgAutoloadClasses['SpecialCentralAutoLogin'] =
"$caBase/specials/SpecialCentralAutoLogin.php";
$wgAutoloadClasses['CentralAuthUserArray'] =
"$caBase/CentralAuthUserArray.php";
$wgAutoloadClasses['CentralAuthUserArrayFromResult'] =
"$caBase/CentralAuthUserArray.php";
@@ -270,7 +263,6 @@
$wgSpecialPages['CentralAuth'] = 'SpecialCentralAuth';
$wgSpecialPages['CentralLogin'] = 'SpecialCentralLogin';
-$wgSpecialPages['AutoLogin'] = 'SpecialAutoLogin';
$wgSpecialPages['CentralAutoLogin'] = 'SpecialCentralAutoLogin';
$wgSpecialPages['MergeAccount'] = 'SpecialMergeAccount';
$wgSpecialPages['GlobalGroupMembership'] = 'SpecialGlobalGroupMembership';
diff --git a/specials/SpecialAutoLogin.php b/specials/SpecialAutoLogin.php
deleted file mode 100644
index 87b08a2..0000000
--- a/specials/SpecialAutoLogin.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Unlisted Special page to set requisite cookies for being logged into this
wiki.
- *
- * @ingroup Extensions
- */
-class SpecialAutoLogin extends UnlistedSpecialPage {
- function __construct() {
- parent::__construct( 'AutoLogin' );
- }
-
- function execute( $par ) {
- global $wgMemc;
-
- $tempToken = $this->getRequest()->getVal( 'token' );
- $logout = $this->getRequest()->getBool( 'logout' );
-
- # Don't cache error messages
- $this->getOutput()->enableClientCache( false );
-
- if ( strlen( $tempToken ) == 0 ) {
- $this->setHeaders();
- $this->getOutput()->addWikiMsg(
'centralauth-autologin-desc' );
- return;
- }
-
- $key = CentralAuthUser::memcKey( 'login-token', $tempToken );
- $data = $wgMemc->get( $key );
- $wgMemc->delete( $key );
-
- if ( !$data ) {
- $msg = 'Token is invalid or has expired';
- wfDebug( __METHOD__ . ": $msg\n" );
- $this->setHeaders();
- $this->getOutput()->addWikiText( $msg );
- return;
- }
-
- $userName = $data['userName'];
- $token = $data['token'];
- $remember = $data['remember'];
-
- if ( $data['wiki'] != wfWikiID() ) {
- $msg = 'Bad token (wrong wiki)';
- wfDebug( __METHOD__ . ": $msg\n" );
- $this->setHeaders();
- $this->getOutput()->addWikiText( $msg );
- return;
- }
-
- $centralUser = new CentralAuthUser( $userName );
- $loginResult = $centralUser->authenticateWithToken( $token );
-
- if ( $loginResult != 'ok' ) {
- $msg = "Bad token: $loginResult";
- wfDebug( __METHOD__ . ": $msg\n" );
- $this->setHeaders();
- $this->getOutput()->addWikiText( $msg );
- return;
- }
-
- // Auth OK.
- if ( $logout ) {
- $centralUser->deleteGlobalCookies();
- } else {
- $centralUser->setGlobalCookies( $remember );
- }
-
- $this->getOutput()->disable();
-
- wfResetOutputBuffers();
- header( 'Cache-Control: no-cache' );
- header( 'Content-Type: image/png' );
-
- global $wgCentralAuthLoginIcon;
- if ( $wgCentralAuthLoginIcon ) {
- readfile( $wgCentralAuthLoginIcon );
- } else {
- readfile( __DIR__ . '/1x1.png' );
- }
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/64253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If81765b2cd05f69c649556133eeed91c216185fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
