update mirror lists for Mageia 8 alpha1

4 files changed, 184 insertions, 135 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index f4b21f85f..a27757ec6 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -219,7 +219,7 @@ class Downloads
                     } else if ($mirrorlist) {
                         $test_file = $item['url'].'/distrib/7/x86_64/media/core/updates/repodata/repomd.xml';
                     } else {
-                        $test_file = $item['url'].'/iso/7.1/torrents/Mageia-7.1-x86_64.torrent';
+                        $test_file = $item['url'].'/iso/cauldron/mageia8-alpha1/torrents/Mageia-8-alpha1-x86_64.torrent';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 391de643e..fb8ef49a8 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -36,94 +36,108 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -275,200 +289,179 @@
     ),
     20 => 
     array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU, Lyngby',
-      'url' => 'ftp://ftp.klid.dk/mageia',
-    ),
-    21 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU, Lyngby',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    22 => 
-    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    23 => 
+    21 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    24 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    25 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    26 => 
+    24 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+    ),
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    27 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    28 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://magie.remi.lu',
     ),
-    29 => 
+    28 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    29 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    31 => 
+    30 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    31 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    33 => 
+    32 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    34 => 
+    33 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    35 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    36 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    37 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    40 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    40 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    46 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    47 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
   ),
   '_C:NA' => 
   array (
@@ -550,12 +543,19 @@
     ),
     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',
     ),
-    3 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 65e2121f9..5c2491bb5 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -36,94 +36,108 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -320,155 +334,169 @@
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
     27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://magie.remi.lu',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
     29 => 
     array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://magie.remi.lu',
+    ),
+    30 => 
+    array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    31 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    31 => 
+    32 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    33 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
+    49 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'https://mageia.ip-connect.vn.ua',
+    ),
   ),
   '_C:NA' => 
   array (
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index de809760a..c4b079719 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -36,101 +36,115 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -327,149 +341,156 @@
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
     27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://magie.remi.lu',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
     29 => 
     array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://magie.remi.lu',
+    ),
+    30 => 
+    array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    31 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    31 => 
+    32 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    33 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',