update mirror list

4 files changed, 62 insertions, 104 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index b602950fe..05ba8b30b 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -177,7 +177,7 @@ class Downloads
                     } else if ($mirrorlist) {
                         $test_file = $item['url'].'/distrib/7/x86_64/media/core/updates/repodata/repomd.xml';
                     } else {
-                        $test_file = $item['url'].'/iso/7/torrents/Mageia-7-x86_64.torrent';
+                        $test_file = $item['url'].'/iso/7.1/torrents/Mageia-7.1-x86_64.torrent';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 35e1b7653..348c71629 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -22,115 +22,73 @@
     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',
-    ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
-    ),
-    5 => 
+    2 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    6 => 
+    3 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    7 => 
+    4 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    8 => 
+    5 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    9 => 
+    6 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    7 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    11 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Chungli',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
-    ),
-    12 => 
+    8 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    13 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    14 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    15 => 
+    9 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    10 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -498,13 +456,6 @@
       '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,6 +497,13 @@
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
+      'url' => 'ftp://mirror.cedia.org.ec/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 7a905b817..8b05a2241 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -37,64 +37,64 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Chungli',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
-    ),
     11 => 
     array (
       'zone' => 'TW',
@@ -491,13 +491,6 @@
       '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,6 +539,13 @@
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
+      'url' => 'ftp://mirror.cedia.org.ec/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index fd6c567ce..fee771654 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -37,71 +37,71 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    11 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Chungli',
-      'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
-    ),
     12 => 
     array (
       'zone' => 'TW',
@@ -498,13 +498,6 @@
       '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',
     ),
   ),
@@ -553,6 +546,13 @@
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
+      'url' => 'ftp://mirror.cedia.org.ec/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'EC',
+      'country' => 'EC',
+      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),