adding missing mga10b1 pieces + cache update

4 files changed, 255 insertions, 185 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index 989930608..291adb4c7 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -242,7 +242,7 @@ class Downloads
                         $test_file = $item['url'].'/distrib/10/x86_64/media/core/updates/repodata/repomd.xml'; // when changing, please change $common_patern too
                         $test_file = $item['url'].'/distrib/10/x86_64/media/core/release/x11-apps-1.0.0-21.mga10.noarch.rpm'; // when changing, please change $common_patern too
                     } else {
-                        $test_file = $item['url'].'/iso/10/Mageia-10-alpha1-x86_64/DATE.txt';
+                        $test_file = $item['url'].'/iso/10/Mageia-10-beta1-x86_64/DATE.txt';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 82a8787ae..4d04c201e 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -121,6 +121,20 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    15 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    16 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
   ),
@@ -145,366 +159,373 @@
       'zone' => 'BE',
       'country' => 'BE',
       'city' => 'Leuven',
-      'url' => 'http://mageia.mirror-services.net/pub',
+      'url' => 'ftp://mageia.mirror-services.net/mageia',
     ),
     3 => 
     array (
       'zone' => 'BE',
       'country' => 'BE',
       'city' => 'Leuven',
-      'url' => 'https://mageia.mirror-services.net/pub',
+      'url' => 'http://mageia.mirror-services.net/pub',
     ),
     4 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'https://mageia.mirror-services.net/pub',
+    ),
+    5 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.neterra.net/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.neterra.net/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.neterra.net/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    10 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    11 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    12 => 
+    13 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    13 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    14 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    15 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    16 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    17 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    18 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    19 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    21 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    22 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    23 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    24 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    25 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    26 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    27 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    28 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    29 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    31 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'https://mageia.mirror.garr.it/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' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'http://distrohub.kyiv.ua/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'https://distrohub.kyiv.ua/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    54 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index bb14dba40..764eec5e5 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -128,13 +128,27 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+    ),
+    17 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    18 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
   ),
@@ -159,387 +173,394 @@
       'zone' => 'BE',
       'country' => 'BE',
       'city' => 'Leuven',
-      'url' => 'http://mageia.mirror-services.net/pub',
+      'url' => 'ftp://mageia.mirror-services.net/mageia',
     ),
     3 => 
     array (
       'zone' => 'BE',
       'country' => 'BE',
       'city' => 'Leuven',
-      'url' => 'https://mageia.mirror-services.net/pub',
+      'url' => 'http://mageia.mirror-services.net/pub',
     ),
     4 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'https://mageia.mirror-services.net/pub',
+    ),
+    5 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.neterra.net/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.neterra.net/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.neterra.net/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    10 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    11 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    12 => 
+    13 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    13 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    14 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    15 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    16 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    17 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    18 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    19 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    21 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    22 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    23 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    24 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    25 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    26 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    27 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    28 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    29 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    31 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'https://mageia.mirror.garr.it/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' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'http://distrohub.kyiv.ua/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'https://distrohub.kyiv.ua/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    54 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    55 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    56 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    57 => 
+    58 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -567,17 +588,24 @@
     array (
       'zone' => 'US',
       'country' => 'US',
+      'city' => 'Las Vegas',
+      'url' => 'http://ftp.mageia-highland.us/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
       'city' => 'Portland',
       'url' => 'https://us.mirrors.cicku.me/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 23f2f928f..50d29e03a 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -22,91 +22,98 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'IN',
       'country' => 'IN',
       'city' => 'Jaipur',
       'url' => 'http://mirrors.nju.edu.cn/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'IN',
       'country' => 'IN',
       'city' => 'Jaipur',
       'url' => 'https://mirrors.nju.edu.cn/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Yonezawa',
       'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Yonezawa',
       'url' => 'https://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    10 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    11 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
+    11 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
     12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    13 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
   ),
@@ -131,387 +138,394 @@
       'zone' => 'BE',
       'country' => 'BE',
       'city' => 'Leuven',
-      'url' => 'http://mageia.mirror-services.net/pub',
+      'url' => 'ftp://mageia.mirror-services.net/mageia',
     ),
     3 => 
     array (
       'zone' => 'BE',
       'country' => 'BE',
       'city' => 'Leuven',
-      'url' => 'https://mageia.mirror-services.net/pub',
+      'url' => 'http://mageia.mirror-services.net/pub',
     ),
     4 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'https://mageia.mirror-services.net/pub',
+    ),
+    5 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.neterra.net/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.neterra.net/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.neterra.net/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    10 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    11 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    12 => 
+    13 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    13 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    14 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    15 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    16 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    17 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    18 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    19 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    21 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    22 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    23 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    24 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    25 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    26 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    27 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    28 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    29 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    31 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'https://mageia.mirror.garr.it/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' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'http://distrohub.kyiv.ua/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'https://distrohub.kyiv.ua/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    54 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    55 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    56 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    57 => 
+    58 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -553,17 +567,24 @@
     array (
       'zone' => 'US',
       'country' => 'US',
+      'city' => 'Las Vegas',
+      'url' => 'http://ftp.mageia-highland.us/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
       'city' => 'Portland',
       'url' => 'https://us.mirrors.cicku.me/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',