Update list or mirror with currently mga6 sta2

to update in a few hours

4 files changed, 110 insertions, 748 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index b93736486..d9edd4611 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -177,7 +177,7 @@ class Downloads
                     } else if ($mirrorlist) {
                         $test_file = $item['url'].'/distrib/6/x86_64/media/core/updates/repodata/repomd.xml';
                     } else {
-                        $test_file = $item['url'].'/iso/5.1/torrents/Mageia-5.1-x86_64-DVD.torrent';
+                        $test_file = $item['url'].'/iso/cauldron/torrents/Mageia-6-sta2-x86_64-DVD.torrent';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index cd61bd911..1600cae01 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,671 +1,33 @@
 <?php $mirrors = array (
-  '_C:AF' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
-    ),
-  ),
-  '_C:AS' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'ftp://mirrors.yun-idc.com/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    8 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
-    ),
-    14 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Chungli',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
-    ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-    16 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Taipei',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
-    ),
-    18 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Taipei',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
-    ),
-  ),
   '_C:EU' => 
   array (
     0 => 
     array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'http://ftp.belnet.be/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'ftp://mirrors.netix.net/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'http://mirrors.netix.net/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    5 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    6 => 
-    array (
-      'zone' => 'CZ',
-      'country' => 'CZ',
-      'city' => 'Brno',
-      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'CZ',
-      'country' => 'CZ',
-      'city' => 'Brno',
-      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-    8 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '?',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '?',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '?',
-      'url' => 'http://srv3.tuxinator.org/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '?',
-      'url' => 'http://srv4.tuxinator.org/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Cologne',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Cologne',
-      'url' => 'http://mirror.netcologne.de/mageia',
-    ),
-    14 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Erlangen',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    15 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Erlangen',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    16 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Erlangen',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
-    ),
-    17 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    18 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    19 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein',
-      'url' => 'http://mirrors.cicku.me/mageia',
-    ),
-    20 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein',
-      'url' => 'https://mirrors.cicku.me/mageia',
-    ),
-    21 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    22 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    23 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Hermsdorf',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    24 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'freiburg',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    25 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'freiburg',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
-    ),
-    26 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU',
-      'url' => 'ftp://ftp.klid.dk/mageia',
-    ),
-    27 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    28 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Lyon',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    29 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Lyon',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
-    ),
-    30 => 
-    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    31 => 
+    1 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    32 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Paris',
-      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
-    ),
-    33 => 
+    2 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    3 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    35 => 
-    array (
-      'zone' => 'GB',
-      'country' => 'GB',
-      'city' => 'Canterbury',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    36 => 
-    array (
-      'zone' => 'GB',
-      'country' => 'GB',
-      'city' => 'Canterbury',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    37 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    38 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    39 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'ftp://vodka.sublink.org/mageia',
-    ),
-    40 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    41 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Roma',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    42 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Roma',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    43 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    44 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-    45 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    46 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://mageia.mirror.triple-it.nl',
-    ),
-    47 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Enschede',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    49 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Enschede',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    50 => 
-    array (
-      'zone' => 'PL',
-      'country' => 'PL',
-      'city' => 'Warszawa',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
-    ),
-    51 => 
-    array (
-      'zone' => 'PL',
-      'country' => 'PL',
-      'city' => 'Warszawa',
-      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
-    ),
-    52 => 
-    array (
-      'zone' => 'RU',
-      'country' => 'RU',
-      'city' => 'Moscow',
-      'url' => 'ftp://mirror.yandex.ru/mageia',
-    ),
-    53 => 
-    array (
-      'zone' => 'RU',
-      'country' => 'RU',
-      'city' => 'Moscow',
-      'url' => 'http://mirror.yandex.ru/mageia',
-    ),
-    54 => 
-    array (
-      'zone' => 'SE',
-      'country' => 'SE',
-      'city' => 'Umeå',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
-    ),
-    55 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    56 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-  ),
-  '_C:NA' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => '?',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Lenoir',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
-    8 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'lansing',
-      'url' => 'http://mirrors-usa.go-parts.com/mageia',
-    ),
-  ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-  ),
-  '_C:SA' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => '?',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => '?',
-      'url' => 'http://mageia.c3sl.ufpr.br',
-    ),
-    2 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
-    ),
-    3 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'http://mirror.cedia.org.ec/mageia',
-    ),
   ),
 ); ?>
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index aecb9787f..b486cd264 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -135,23 +135,30 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    19 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    20 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -312,262 +319,248 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein',
-      'url' => 'http://mirrors.cicku.me/mageia',
-    ),
-    22 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein',
-      'url' => 'https://mirrors.cicku.me/mageia',
-    ),
-    23 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    24 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    25 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Hermsdorf',
       'url' => 'ftp://mirror.tuxinator.org/mageia',
     ),
-    26 => 
+    24 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-    47 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    48 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    49 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.webconquest.com',
     ),
-    50 => 
+    48 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    50 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    51 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    52 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    53 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    54 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    58 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -665,16 +658,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    4 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index d76cd1d7b..bcd572ebc 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -135,23 +135,30 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    19 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    20 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -305,248 +312,234 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein',
-      'url' => 'http://mirrors.cicku.me/mageia',
-    ),
-    21 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein',
-      'url' => 'https://mirrors.cicku.me/mageia',
-    ),
-    22 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    24 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Hermsdorf',
       'url' => 'ftp://mirror.tuxinator.org/mageia',
     ),
-    25 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    26 => 
+    24 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.webconquest.com',
     ),
-    47 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    54 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    55 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -658,16 +651,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    4 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',