Update mirrors cache

4 files changed, 86 insertions, 410 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index dd68c2a66..9fea1cea0 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -149,7 +149,7 @@ class Downloads
             require $cache_file;
 
         } else {
-            $data    = file('http://mirrors.mageia.org/api/mageia.7.i586.list');
+            $data    = file('http://mirrors.mageia.org/api/mageia.8.i586.list');
             $mirrors = array();
             $num_up  = 0;
             $num_dn  = 0;
@@ -186,7 +186,7 @@ class Downloads
                         'country'   => isset($m['country']) ? $m['country'] : '?',
                         'city'      => isset($m['city']) ? $m['city'] : '-',
                         // BEWARE of the path substitution here. Must match.
-                        'url'       => str_replace('/distrib/7/i586', '', $m['url'])
+                        'url'       => str_replace('/distrib/8/i586', '', $m['url'])
                     );
                     if ($refresh_country_and_city_arrays == true) {
                         // prepare details for i18n
@@ -217,9 +217,9 @@ class Downloads
                     if ($documentation) {
                         $test_file = $item['url'].'/doc/mga7/date.txt';
                     } else if ($mirrorlist) {
-                        $test_file = $item['url'].'/distrib/7/x86_64/media/core/updates/repodata/repomd.xml';
+                        $test_file = $item['url'].'/distrib/8/x86_64/media/core/updates/repodata/repomd.xml';
                     } else {
-                        $test_file = $item['url'].'/iso/cauldron/torrents/Mageia-8-rc-Live-Xfce-i586.torrent';
+                        $test_file = $item['url'].'/iso/8/torrents/Mageia-8-Live-Xfce-i586.torrent';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 0916c255b..b480aac40 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -83,103 +83,61 @@
     ),
     8 => 
     array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'KR',
-      'country' => 'KR',
-      'city' => 'Ulsan',
-      'url' => 'ftp://mirror.krmir.org/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'KR',
-      'country' => 'KR',
-      'city' => 'Ulsan',
-      'url' => 'https://mirror.krmir.org/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-    14 => 
-    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    16 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    17 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    19 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    20 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
-    21 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    22 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -474,134 +432,99 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'url' => 'http://mageia.mirror.triple-it.nl',
     ),
     41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'city' => 'Den Haag',
+      'url' => 'http://mirror.serverion.com/mageia',
     ),
     42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://mageia.mirror.triple-it.nl',
+      'city' => 'Den Haag',
+      'url' => 'https://mirror.serverion.com/mageia',
     ),
     43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    45 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'https://mirror.serverion.com/mageia',
-    ),
-    46 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    55 => 
+    53 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    57 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-    58 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.vn.ua',
-    ),
   ),
   '_C:NA' => 
   array (
@@ -630,52 +553,31 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
-    ),
-    8 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    9 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'http://mageia.jameswhitby.net',
     ),
-    10 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -683,23 +585,6 @@
       'url' => 'https://mageia.jameswhitby.net',
     ),
   ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
-    ),
-  ),
   '_C:SA' => 
   array (
     0 => 
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 4e6c95860..f2662bc44 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -69,103 +69,61 @@
     ),
     6 => 
     array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    8 => 
-    array (
-      'zone' => 'KR',
-      'country' => 'KR',
-      'city' => 'Ulsan',
-      'url' => 'ftp://mirror.krmir.org/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'KR',
-      'country' => 'KR',
-      'city' => 'Ulsan',
-      'url' => 'https://mirror.krmir.org/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 => 
+    7 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    8 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    9 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    10 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
-    19 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -460,135 +418,114 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    41 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    42 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    43 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    44 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    45 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    46 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    53 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    58 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    59 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -637,31 +574,17 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'http://mageia.jameswhitby.net',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -669,30 +592,6 @@
       'url' => 'https://mageia.jameswhitby.net',
     ),
   ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Adelaide',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
-    ),
-  ),
   '_C:SA' => 
   array (
     0 => 
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index ba4c9e07a..6f507a715 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -83,103 +83,61 @@
     ),
     8 => 
     array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'KR',
-      'country' => 'KR',
-      'city' => 'Ulsan',
-      'url' => 'ftp://mirror.krmir.org/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'KR',
-      'country' => 'KR',
-      'city' => 'Ulsan',
-      'url' => 'https://mirror.krmir.org/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-    14 => 
-    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    16 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    17 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    19 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    20 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
-    21 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    22 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -474,135 +432,114 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    41 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    42 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    43 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    44 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    45 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    46 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    53 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    58 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    59 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -637,52 +574,31 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
-    ),
-    8 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    9 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'http://mageia.jameswhitby.net',
     ),
-    10 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -690,30 +606,6 @@
       'url' => 'https://mageia.jameswhitby.net',
     ),
   ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Adelaide',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
-    ),
-  ),
   '_C:SA' => 
   array (
     0 =>