3 files changed, 106 insertions, 92 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index f144dbc70..145ecd6f3 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -22,29 +22,29 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
     2 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Shanghai',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Shanghai',
+      'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
     4 => 
     array (
@@ -99,24 +99,31 @@
     array (
       'zone' => 'TW',
       'country' => 'TW',
+      'city' => 'Chungli',
+      'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
+    ),
+    12 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    12 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    13 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    14 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -369,93 +376,86 @@
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    35 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    35 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    37 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    39 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    40 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    40 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    46 => 
+    45 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    47 => 
+    46 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -498,6 +498,13 @@
       'zone' => 'US',
       'country' => 'US',
       'city' => 'RICHMOND',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'RICHMOND',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
@@ -525,16 +532,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     2 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    3 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 92012617b..63ca9cf15 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -121,23 +121,16 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -390,93 +383,86 @@
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    35 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    35 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    37 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    39 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    40 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    40 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    46 => 
+    45 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    47 => 
+    46 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -512,6 +498,13 @@
       'zone' => 'US',
       'country' => 'US',
       'city' => 'RICHMOND',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'RICHMOND',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
@@ -546,16 +539,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     2 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    3 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index a3de8ed02..8ff993975 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -128,23 +128,16 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-    16 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -397,93 +390,86 @@
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
-    ),
-    35 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    35 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    37 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    39 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    40 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    40 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    46 => 
+    45 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    47 => 
+    46 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -526,6 +512,13 @@
       'zone' => 'US',
       'country' => 'US',
       'city' => 'RICHMOND',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'RICHMOND',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
@@ -560,16 +553,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     2 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    3 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',