optimise mirror db cache size (half in size)

+ with added benefit of cleaner git diff
+ verbosity improvements of mirror db cache generate tool

3 files changed, 834 insertions, 2284 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index 8b7a74fce..b69bafaea 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -86,6 +86,41 @@ class Downloads
     }
 
     /**
+     * Sort 2D array by multiple associative or numeric keys.
+     * $sorted_array = self::sort_2d_array_by_multiple_keys($unsorted_array, 'first key', 'second', ...);
+     *
+     * based on SortArray http://php.net/manual/en/function.usort.php#42535
+     *
+     * @param array $unsorted_array
+     *
+     * @param string first key to order by
+     *
+     * @param string second key to order by
+     *
+     * @param string add as many keys to order by as needed
+     *
+     * @return array $sorted_array
+    */
+    public static function sort_2d_array_by_multiple_keys()
+    {
+        $arguments = func_get_args();
+        $array = $arguments[0];
+        $anonymous_function = '';
+        $num_of_arguments = count($arguments);
+        for ($cur_argument = 1; $cur_argument < $num_of_arguments; $cur_argument++) {
+            $anonymous_function .= "if (\$first['$arguments[$cur_argument]'] != \$second['$arguments[$cur_argument]']) {";
+            $anonymous_function .= "    \$compare_result = strcoll(\$first['$arguments[$cur_argument]'], \$second['$arguments[$cur_argument]']);";
+            $anonymous_function .= "    if (0 == \$compare_result) { return 0; };";
+            $anonymous_function .= "    return ((0 > \$compare_result) ? -1 : 1);";
+            $anonymous_function .= "}";
+        }
+        $anonymous_function .= "return 0;";
+        $compare_function = create_function("\$first, \$second", $anonymous_function);
+        usort($array, $compare_function);
+        return $array;
+    }
+
+    /**
      * Get mirrors list from mirrors.mageia.org,
      * store/cache it in a different key/value format
      * (keys are: "$country" and "_C:$continent"),
@@ -110,6 +145,8 @@ class Downloads
         } else {
             $data    = file('http://mirrors.mageia.org/api/mageia.5.i586.list');
             $mirrors = array();
+            $num_up  = 0;
+            $num_dn  = 0;
             foreach ($data as $line) {
                 $line = explode(',', trim($line));
                 $m    = array();
@@ -122,9 +159,9 @@ class Downloads
                 $pu = parse_url($m['url']);
                 if (in_array($pu['scheme'], array('http', 'https', 'ftp'))) {
                     $item = array(
+                        'zone'      => isset($m['zone']) ? $m['zone'] : '?',
+                        'country'   => isset($m['country']) ? $m['country'] : '?',
                         'city'      => isset($m['city']) ? $m['city'] : '?',
-                        'continent' => isset($m['continent']) ? $m['continent'] : '?',
-                        'zone'      => $m['zone'],
                         // BEWARE of the path substitution here. Must match.
                         'url'       => str_replace('/distrib/5/i586', '', $m['url'])
                     );
@@ -134,16 +171,24 @@ class Downloads
                     } else {
                         $test_file = $item['url'].'/iso/5/torrents/Mageia-5-LiveDVD-KDE4-x86_64-DVD.torrent';
                     }
-                    if (false === file_get_contents($test_file)) {
-                        echo "down $test_file \n";
+                    if (false === @file_get_contents($test_file)) {
+                        $num_dn++;
+                        echo "Down ($num_dn) $test_file \n";
                     } else {
-                        echo "Up $test_file \n";
-                        $mirrors[$m['country']][]           = $item;
+                        $num_up++;
+                        echo "Up ($num_up) $test_file \n";
+//                         $mirrors[$m['country']][]           = $item;
                         $mirrors['_C:' . $m['continent']][] = $item;
                     }
                 }
             }
+            ksort($mirrors);
+            foreach ($mirrors as &$continent) {
+                $continent = self::sort_2d_array_by_multiple_keys($continent, 'zone', 'country', 'city', 'url');
+            }
+            unset($continent);
 
+            echo "\nThere are $num_up servers with the file and $num_dn with some kind of issue.\n";
             file_put_contents($cache_file,
                 sprintf('<?php $mirrors = %s; ?>' . PHP_EOL, var_export($mirrors, true)));
         }
@@ -152,10 +197,10 @@ class Downloads
     }
 
     /**
-     * Get mirrors from stored dictionary and find:
-     * - best matching country
-     * - or best matching continent
-     * - or random
+     * Get mirrors from stored dictionary and find best matching mirror:
+     * - if it exists in the country otherwise
+     * - on continent if it exists otherwise
+     * - random mirror
      *
      * @param string $country
      * @param string $continent
@@ -167,27 +212,45 @@ class Downloads
         $mirs      = self::get_all_mirrors();
         $continent = '_C:' . $continent;
 
-        if (array_key_exists($country, $mirs))
-        {
-            $mirs_tmp = $mirs[$country];
-            if ($country == 'FR')
+        $mirrors = array();
+        $fr_mirr_asist = array();
+        foreach ($mirs as $curr_continent => $continent_mirrors) {
+            if (!is_null($continent) && $continent != $curr_continent)
             {
-                $mirs_tmp = array_merge($mirs_tmp, $mirs['DE']);
+                continue;
+            }
+            foreach ($continent_mirrors as $mirror) {
+                // keep assisting the french mirrors with german ones
+                if ($mirror['country'] == 'DE')
+                {
+                    $fr_mirr_asist[] = $mirror;
+                }
+                // only add german mirrors when french are on turn
+                // sorting of mirror db cache must be kept to work properly
+                if ($country == 'FR' && $mirror['country'] == 'FR' && count($fr_mirr_asist) > 0)
+                {
+                    $mirrors[$continent] = $fr_mirr_asist;
+                    $fr_mirr_asist = array();
+                }
+                if ($mirror['country'] == $country)
+                {
+                    $mirrors[$continent][] = $mirror;
+                }
             }
-            $mirs = $mirs_tmp;
-        }
-        elseif (array_key_exists($continent, $mirs)) {
-            $mirs = $mirs[$continent];
         }
-        else
+        if (count($mirrors) > 0)
         {
-            shuffle($mirs);
-            $mirs = array_shift($mirs);
+            $mirs = $mirrors;
         }
 
         shuffle($mirs);
+        $mirr_continent = $mirs[0];
+        $mirs = array_shift($mirs);
+        shuffle($mirs);
+        $one_mirror = array_shift($mirs);
+        $one_mirror['continent'] = $mirr_continent;
 
-        return array_shift($mirs);
+        return $one_mirror;
     }
 
     function prepare_download($force = false, $country = null)
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 6ca5a5375..63287c759 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,1417 +1,636 @@
 <?php $mirrors = array (
-  'GR' => 
+  '_C:AF' => 
   array (
     0 => 
     array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
     1 => 
     array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
   ),
-  '_C:EU' => 
+  '_C:AS' => 
   array (
     0 => 
     array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     1 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     2 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     3 => 
     array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
     ),
     4 => 
     array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://vodka.sublink.org/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     5 => 
     array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
     6 => 
     array (
-      'city' => 'Moscow',
-      'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Tsukuba',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
     7 => 
     array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'ftp://mirror.rise.ph/mageia',
     ),
     8 => 
     array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'http://mirror.rise.ph/mageia',
     ),
     9 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'http://ftp.belnet.be/mageia',
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     10 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'http://ftp.linux.org.tr/mageia',
     ),
     11 => 
     array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Chungli',
+      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
     12 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     13 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     14 => 
     array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
     ),
     15 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
     16 => 
     array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
-    ),
-    17 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    18 => 
-    array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    19 => 
-    array (
-      'city' => 'geneva',
-      'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
-    ),
-    20 => 
-    array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    21 => 
+  ),
+  '_C:EU' => 
+  array (
+    0 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
       'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
       'url' => 'ftp://ftp.belnet.be/mirror/mageia',
     ),
-    22 => 
-    array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
-    ),
-    23 => 
-    array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
-    24 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://mageia.mirror.triple-it.nl',
-    ),
-    25 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    26 => 
+    1 => 
     array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
+      'url' => 'http://ftp.belnet.be/mageia',
     ),
-    27 => 
+    2 => 
     array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
       'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    28 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    29 => 
+    3 => 
     array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
       'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    30 => 
-    array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    31 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-    32 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    33 => 
-    array (
-      'city' => 'Brno',
-      'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-    34 => 
-    array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    35 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    36 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    37 => 
-    array (
-      'city' => 'Brno',
-      'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-    38 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    39 => 
-    array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    40 => 
+    4 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
       'zone' => 'BY',
+      'country' => 'BY',
+      'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    41 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
-    ),
-    42 => 
-    array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    43 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    44 => 
-    array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
-    ),
-    45 => 
-    array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    46 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    47 => 
-    array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    48 => 
-    array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    49 => 
-    array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-  ),
-  'AR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Buenos Aires',
-      'continent' => 'SA',
-      'zone' => 'AR',
-      'url' => 'http://mageia.xfree.com.ar',
-    ),
-  ),
-  '_C:SA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Buenos Aires',
-      'continent' => 'SA',
-      'zone' => 'AR',
-      'url' => 'http://mageia.xfree.com.ar',
-    ),
-    1 => 
-    array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
-      'zone' => 'EC',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
-    ),
-    4 => 
-    array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
     5 => 
     array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
-      'zone' => 'EC',
-      'url' => 'http://mirror.cedia.org.ec/mageia',
-    ),
-    6 => 
-    array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
-    ),
-    7 => 
-    array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
-    ),
-    8 => 
-    array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-  ),
-  'US' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Fremont',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.easthsia.com/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'lansing',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors-usa.go-parts.com/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
+      'zone' => 'BY',
+      'country' => 'BY',
+      'city' => 'Minsk',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     6 => 
     array (
-      'city' => 'Durham',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
+      'zone' => 'CH',
+      'country' => 'CH',
+      'city' => 'geneva',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
     7 => 
     array (
-      'city' => 'lansing',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirrors-usa.go-parts.com/mageia',
-    ),
-    8 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    9 => 
-    array (
+      'zone' => 'CZ',
+      'country' => 'CZ',
       'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-  ),
-  '_C:NA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Fremont',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.easthsia.com/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'lansing',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors-usa.go-parts.com/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
-    ),
-    6 => 
-    array (
-      'city' => 'Durham',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
-    ),
-    7 => 
-    array (
-      'city' => 'lansing',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirrors-usa.go-parts.com/mageia',
+      'url' => 'http://mageia.supp.name',
     ),
     8 => 
     array (
-      'city' => 'Montréal',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.balinor.net',
-    ),
-    9 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-    10 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    11 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    12 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-  ),
-  'CZ' => 
-  array (
-    0 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
-    ),
-    1 => 
-    array (
+      'country' => 'CZ',
       'city' => 'Brno',
-      'continent' => 'EU',
-      'zone' => 'CZ',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    2 => 
+    9 => 
     array (
-      'city' => 'Brno',
-      'continent' => 'EU',
       'zone' => 'CZ',
+      'country' => 'CZ',
+      'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-  ),
-  'DE' => 
-  array (
-    0 => 
+    10 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
-    1 => 
+    11 => 
     array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
-    2 => 
+    12 => 
     array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'http://srv3.tuxinator.org/mageia',
     ),
-    3 => 
+    13 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'http://srv4.tuxinator.org/mageia',
     ),
-    4 => 
+    14 => 
     array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
+      'country' => 'DE',
+      'city' => 'Cologne',
+      'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    5 => 
+    15 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => 'Erlangen',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    6 => 
+    16 => 
     array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    7 => 
-    array (
+      'country' => 'DE',
       'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    8 => 
+    17 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    9 => 
-    array (
+      'country' => 'DE',
       'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    10 => 
+    18 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => 'Esslingen',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    11 => 
+    19 => 
     array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'country' => 'DE',
+      'city' => 'Esslingen',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    12 => 
+    20 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => 'Göttingen',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    13 => 
+    21 => 
     array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    14 => 
-    array (
+      'country' => 'DE',
       'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-  ),
-  'IT' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://vodka.sublink.org/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-  ),
-  'NL' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://mageia.mirror.triple-it.nl',
-    ),
-    4 => 
-    array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-  ),
-  'RU' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Moscow',
-      'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
-    ),
-  ),
-  'CN' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.yun-idc.com/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-  ),
-  '_C:AS' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    1 => 
+    22 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'freiburg',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    2 => 
+    23 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'freiburg',
+      'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    3 => 
+    24 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU',
+      'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    4 => 
+    25 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU',
+      'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    5 => 
+    26 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Lyon',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    6 => 
+    27 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Lyon',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    7 => 
+    28 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    8 => 
+    29 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    9 => 
+    30 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    10 => 
+    31 => 
     array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'zone' => 'GB',
+      'country' => 'GB',
+      'city' => 'Canterbury',
+      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    11 => 
+    32 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.yun-idc.com/mageia',
+      'zone' => 'GB',
+      'country' => 'GB',
+      'city' => 'Canterbury',
+      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    12 => 
+    33 => 
     array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'ftp://mirror.rise.ph/mageia',
+      'zone' => 'GR',
+      'country' => 'GR',
+      'city' => 'Heraklion',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    13 => 
+    34 => 
     array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'http://mirror.rise.ph/mageia',
+      'zone' => 'GR',
+      'country' => 'GR',
+      'city' => 'Heraklion',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    14 => 
+    35 => 
     array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Milan',
+      'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    15 => 
+    36 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Milan',
+      'url' => 'http://vodka.sublink.org/mageia',
     ),
-    16 => 
+    37 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Roma',
+      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    17 => 
+    38 => 
     array (
-      'city' => 'Tsukuba',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Roma',
+      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    18 => 
+    39 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-  ),
-  'BE' => 
-  array (
-    0 => 
+    40 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'http://ftp.belnet.be/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    1 => 
+    41 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-  ),
-  'ZA' => 
-  array (
-    0 => 
+    42 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    1 => 
+    43 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-  ),
-  '_C:AF' => 
-  array (
-    0 => 
+    44 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Warszawa',
+      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    1 => 
+    45 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Warszawa',
+      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-  ),
-  'FR' => 
-  array (
-    0 => 
+    46 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Moscow',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    1 => 
+    47 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Moscow',
+      'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    2 => 
+    48 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'SE',
+      'country' => 'SE',
+      'city' => 'Umeå',
+      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    3 => 
+    49 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    4 => 
+    50 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
     ),
   ),
-  'TW' => 
+  '_C:NA' => 
   array (
     0 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'CA',
+      'country' => 'CA',
+      'city' => 'Montréal',
+      'url' => 'http://mageia.balinor.net',
     ),
     1 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
+      'zone' => 'CA',
+      'country' => 'CA',
+      'city' => 'Toronto',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
     2 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'CA',
+      'country' => 'CA',
+      'city' => 'Toronto',
+      'url' => 'http://mageia.webconquest.com',
     ),
     3 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => '?',
+      'url' => 'http://mirrors.kernel.org/mageia',
     ),
     4 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Durham',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     5 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Fremont',
+      'url' => 'http://mirror.easthsia.com/mageia',
     ),
     6 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-  ),
-  'TR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    1 => 
+    7 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Southfeild',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
-  ),
-  'BY' => 
-  array (
-    0 => 
+    8 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Southfeild',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
-    1 => 
+    9 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-  ),
-  'AU' => 
-  array (
-    0 => 
+    10 => 
     array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
   '_C:OC' => 
   array (
     0 => 
     array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
       'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
-  'BR' => 
+  '_C:SA' => 
   array (
     0 => 
     array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
+      'country' => 'BR',
+      'city' => '?',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     1 => 
     array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
+      'country' => 'BR',
+      'city' => '?',
+      'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     2 => 
     array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
     ),
     3 => 
     array (
-      'city' => '?',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
-    ),
-    4 => 
-    array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
-    ),
-    5 => 
-    array (
+      'country' => 'BR',
       'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-  ),
-  'SE' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
-    ),
-  ),
-  'PL' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
     ),
-  ),
-  'EC' => 
-  array (
-    0 => 
+    4 => 
     array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
       'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    1 => 
+    5 => 
     array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
       'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),
-  'CH' => 
-  array (
-    0 => 
-    array (
-      'city' => 'geneva',
-      'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
-    ),
-  ),
-  'BG' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
-      'zone' => 'BG',
-      'url' => 'ftp://mirrors.netix.net/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
-      'zone' => 'BG',
-      'url' => 'http://mirrors.netix.net/mageia',
-    ),
-  ),
-  'UA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-  ),
-  'GB' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-  ),
-  'CA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Montréal',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.balinor.net',
-    ),
-    1 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-    2 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-  ),
-  'PH' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-  ),
-  'JP' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Tsukuba',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-  ),
 ); ?>
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 1e78442c7..2eb473654 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -1,1375 +1,643 @@
 <?php $mirrors = array (
-  'GR' => 
+  '_C:AF' => 
   array (
     0 => 
     array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
     1 => 
     array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
   ),
-  '_C:EU' => 
+  '_C:AS' => 
   array (
     0 => 
     array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     1 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     2 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     3 => 
     array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
     ),
     4 => 
     array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://vodka.sublink.org/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     5 => 
     array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
     6 => 
     array (
-      'city' => 'Moscow',
-      'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Tsukuba',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
     7 => 
     array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'ftp://mirror.rise.ph/mageia',
     ),
     8 => 
     array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'http://mirror.rise.ph/mageia',
     ),
     9 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'http://ftp.belnet.be/mageia',
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     10 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'http://ftp.linux.org.tr/mageia',
     ),
     11 => 
     array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Chungli',
+      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
     12 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Chungli',
+      'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
     13 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     14 => 
     array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     15 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
     ),
     16 => 
     array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
     17 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    18 => 
-    array (
-      'city' => 'geneva',
-      'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
-    ),
-    19 => 
-    array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+  ),
+  '_C:EU' => 
+  array (
+    0 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
       'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
       'url' => 'ftp://ftp.belnet.be/mirror/mageia',
     ),
-    21 => 
-    array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
-    ),
-    22 => 
-    array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
-    23 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://mageia.mirror.triple-it.nl',
-    ),
-    24 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    25 => 
+    1 => 
     array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
+      'url' => 'http://ftp.belnet.be/mageia',
     ),
-    26 => 
+    2 => 
     array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
       'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    27 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    28 => 
+    3 => 
     array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
       'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    29 => 
-    array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    30 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-    31 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    32 => 
-    array (
-      'city' => 'Brno',
-      'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-    33 => 
-    array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    34 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    35 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    36 => 
-    array (
-      'city' => 'Brno',
-      'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-    37 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    38 => 
-    array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    39 => 
+    4 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
       'zone' => 'BY',
+      'country' => 'BY',
+      'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    40 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
-    ),
-    41 => 
-    array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    42 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    43 => 
-    array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
-    ),
-    44 => 
-    array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    45 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    46 => 
-    array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    47 => 
-    array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    48 => 
-    array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-  ),
-  'AR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Buenos Aires',
-      'continent' => 'SA',
-      'zone' => 'AR',
-      'url' => 'http://mageia.xfree.com.ar',
-    ),
-  ),
-  '_C:SA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Buenos Aires',
-      'continent' => 'SA',
-      'zone' => 'AR',
-      'url' => 'http://mageia.xfree.com.ar',
-    ),
-    1 => 
-    array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
-      'zone' => 'EC',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
-    ),
-    4 => 
-    array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
     5 => 
     array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
-      'zone' => 'EC',
-      'url' => 'http://mirror.cedia.org.ec/mageia',
+      'zone' => 'BY',
+      'country' => 'BY',
+      'city' => 'Minsk',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     6 => 
     array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'zone' => 'CH',
+      'country' => 'CH',
+      'city' => 'geneva',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
     7 => 
     array (
+      'zone' => 'CZ',
+      'country' => 'CZ',
       'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
-    ),
-    8 => 
-    array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-  ),
-  'US' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Fremont',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.easthsia.com/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    6 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-  ),
-  '_C:NA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Fremont',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.easthsia.com/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'glen allen',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Montréal',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.balinor.net',
-    ),
-    6 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-    7 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.nexcess.net/mageia',
+      'url' => 'http://mageia.supp.name',
     ),
     8 => 
     array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    9 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-  ),
-  'CZ' => 
-  array (
-    0 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
-    ),
-    1 => 
-    array (
+      'country' => 'CZ',
       'city' => 'Brno',
-      'continent' => 'EU',
-      'zone' => 'CZ',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    2 => 
+    9 => 
     array (
-      'city' => 'Brno',
-      'continent' => 'EU',
       'zone' => 'CZ',
+      'country' => 'CZ',
+      'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-  ),
-  'AU' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Adelaide',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-  ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Adelaide',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-  ),
-  'DE' => 
-  array (
-    0 => 
+    10 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
-    1 => 
+    11 => 
     array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
-    2 => 
+    12 => 
     array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'http://srv3.tuxinator.org/mageia',
     ),
-    3 => 
+    13 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => '?',
+      'url' => 'http://srv4.tuxinator.org/mageia',
     ),
-    4 => 
+    14 => 
     array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
+      'country' => 'DE',
+      'city' => 'Cologne',
+      'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    5 => 
+    15 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => 'Erlangen',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    6 => 
+    16 => 
     array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    7 => 
-    array (
+      'country' => 'DE',
       'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    8 => 
+    17 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    9 => 
-    array (
+      'country' => 'DE',
       'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    10 => 
+    18 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => 'Esslingen',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    11 => 
+    19 => 
     array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'country' => 'DE',
+      'city' => 'Esslingen',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    12 => 
+    20 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'country' => 'DE',
+      'city' => 'Göttingen',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    13 => 
+    21 => 
     array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    14 => 
-    array (
+      'country' => 'DE',
       'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-  ),
-  'IT' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://vodka.sublink.org/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Roma',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-  ),
-  'NL' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Amsterdam',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://mageia.mirror.triple-it.nl',
-    ),
-    3 => 
-    array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-  ),
-  'RU' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Moscow',
-      'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
-    ),
-  ),
-  'CN' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.yun-idc.com/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-  ),
-  '_C:AS' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    1 => 
+    22 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'freiburg',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    2 => 
+    23 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'freiburg',
+      'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    3 => 
+    24 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU',
+      'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    4 => 
+    25 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU',
+      'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    5 => 
+    26 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Lyon',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    6 => 
+    27 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Lyon',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    7 => 
+    28 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    8 => 
+    29 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    9 => 
+    30 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    10 => 
+    31 => 
     array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'zone' => 'GB',
+      'country' => 'GB',
+      'city' => 'Canterbury',
+      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    11 => 
+    32 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://mirrors.yun-idc.com/mageia',
+      'zone' => 'GB',
+      'country' => 'GB',
+      'city' => 'Canterbury',
+      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    12 => 
+    33 => 
     array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'ftp://mirror.rise.ph/mageia',
+      'zone' => 'GR',
+      'country' => 'GR',
+      'city' => 'Heraklion',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    13 => 
+    34 => 
     array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'http://mirror.rise.ph/mageia',
+      'zone' => 'GR',
+      'country' => 'GR',
+      'city' => 'Heraklion',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    14 => 
+    35 => 
     array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Milan',
+      'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    15 => 
+    36 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Milan',
+      'url' => 'http://vodka.sublink.org/mageia',
     ),
-    16 => 
+    37 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Roma',
+      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    17 => 
+    38 => 
     array (
-      'city' => 'Tsukuba',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+      'zone' => 'IT',
+      'country' => 'IT',
+      'city' => 'Roma',
+      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    18 => 
+    39 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-  ),
-  'BE' => 
-  array (
-    0 => 
+    40 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'http://ftp.belnet.be/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    1 => 
+    41 => 
     array (
-      'city' => 'Brussels',
-      'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-  ),
-  'ZA' => 
-  array (
-    0 => 
+    42 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    1 => 
+    43 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-  ),
-  '_C:AF' => 
-  array (
-    0 => 
+    44 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Warszawa',
+      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    1 => 
+    45 => 
     array (
-      'city' => 'Stellenbosch',
-      'continent' => 'AF',
-      'zone' => 'ZA',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Warszawa',
+      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-  ),
-  'FR' => 
-  array (
-    0 => 
+    46 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Moscow',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    1 => 
+    47 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Moscow',
+      'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    2 => 
+    48 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'SE',
+      'country' => 'SE',
+      'city' => 'Umeå',
+      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    3 => 
+    49 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    4 => 
+    50 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
     ),
   ),
-  'TW' => 
+  '_C:NA' => 
   array (
     0 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'CA',
+      'country' => 'CA',
+      'city' => 'Montréal',
+      'url' => 'http://mageia.balinor.net',
     ),
     1 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
+      'zone' => 'CA',
+      'country' => 'CA',
+      'city' => 'Toronto',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
     2 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'CA',
+      'country' => 'CA',
+      'city' => 'Toronto',
+      'url' => 'http://mageia.webconquest.com',
     ),
     3 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => '?',
+      'url' => 'http://mirrors.kernel.org/mageia',
     ),
     4 => 
     array (
-      'city' => 'Chungli',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Fremont',
+      'url' => 'http://mirror.easthsia.com/mageia',
     ),
     5 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
     ),
     6 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Southfeild',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
-  ),
-  'TR' => 
-  array (
-    0 => 
+    7 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Southfeild',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
-    1 => 
+    8 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    9 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
-  'BY' => 
+  '_C:OC' => 
   array (
     0 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Adelaide',
+      'url' => 'http://mirror.internode.on.net/pub/mageia',
     ),
     1 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
-  'BR' => 
+  '_C:SA' => 
   array (
     0 => 
     array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
+      'country' => 'BR',
+      'city' => '?',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     1 => 
     array (
-      'city' => 'Brasilia',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
+      'country' => 'BR',
+      'city' => '?',
+      'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     2 => 
     array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
     ),
     3 => 
     array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
-    ),
-    4 => 
-    array (
-      'city' => '?',
-      'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
-    ),
-    5 => 
-    array (
+      'country' => 'BR',
       'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-  ),
-  'SE' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
-    ),
-  ),
-  'PL' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Warszawa',
-      'continent' => 'EU',
-      'zone' => 'PL',
-      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
     ),
-  ),
-  'EC' => 
-  array (
-    0 => 
+    4 => 
     array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
       'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    1 => 
+    5 => 
     array (
-      'city' => 'Cuenca',
-      'continent' => 'SA',
       'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),
-  'CH' => 
-  array (
-    0 => 
-    array (
-      'city' => 'geneva',
-      'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
-    ),
-  ),
-  'BG' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
-      'zone' => 'BG',
-      'url' => 'ftp://mirrors.netix.net/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
-      'zone' => 'BG',
-      'url' => 'http://mirrors.netix.net/mageia',
-    ),
-  ),
-  'UA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Vinnytsia',
-      'continent' => 'EU',
-      'zone' => 'UA',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-  ),
-  'GB' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-  ),
-  'CA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Montréal',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.balinor.net',
-    ),
-    1 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-    2 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-  ),
-  'PH' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Cebu',
-      'continent' => 'AS',
-      'zone' => 'PH',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-  ),
-  'JP' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Tsukuba',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-  ),
 ); ?>