From 2f1a0016e212b6feb9b64a141e0c2319a31f0e01 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Fri, 11 May 2012 10:45:35 +0000 Subject: use new code from lib: rewrite_city(), get_download_link() --- en/downloads/get/index.php | 63 +++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 23 deletions(-) (limited to 'en/downloads/get/index.php') diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php index 918885322..8a4eeed12 100644 --- a/en/downloads/get/index.php +++ b/en/downloads/get/index.php @@ -49,21 +49,16 @@ $js_redirect = null; $reason = null; try { + // TODO simplify and wrap all this in a single interface: + // list(dl_template, mirrors) = get_download_options_for(product) + include '../../../lib/Downloads.php'; $product = get_info_for_product($product); $all_mirrors = get_mirrors_for($product['file'], 'en', get('country')); $one_mirror = $all_mirrors[0]; $alt_mirrors = $all_mirrors[1]; - if ($torrent === true - && isset($product['torrent']) - && strlen($product['torrent']) > 0) { - - $path = $product['torrent']; - } else { - $path = $product['path'] . '/' . $product['file']; - } - - $download = $one_mirror['mirror_url'] . '/' . $path; + $download_tmpl = get_download_link($product, $torrent); + $download = str_replace('$MIRROR', $one_mirror['mirror_url'], $download_tmpl); // TODO do not redirect if it's a bot! $js_redirect = sprintf('', @@ -88,11 +83,11 @@ try { $mirs = array(); foreach ($mirrors2 as $m) { $pm = parse_url($m); - $alt_dl_link = $m . '/' . $path; + $alt_dl_link = str_replace('$MIRROR', $m, $download_tmpl); $mirs[] = sprintf('%s://%s', $pm['scheme'], $alt_dl_link, $pm['host']); } - $s[] = sprintf('%s%s', $city, implode(', ', $mirs)); + $s[] = sprintf('%s%s', rewrite_city($city), implode(', ', $mirs)); } $alternative_mirrors .= sprintf('%s%s', count($cities), $country, implode('', $s)); endforeach; @@ -100,7 +95,7 @@ try { $dl2_mirror_alt = sprintf($_t['dl_mirror_loc'], $one_mirror['mirror_url'], $one_mirror['mirror_host'], - $one_mirror['city'] . ', ' . $countries[$one_mirror['country']], + rewrite_city($one_mirror['city']) . ', ' . $countries[$one_mirror['country']], $one_mirror['country']) . ' ' . $_t['dl_alt_mirrors']; } @@ -111,7 +106,6 @@ catch (NoProductFoundError $e) { catch (NoMirrorFoundError $e) { // sorry, not mirror found. next time? $reason = 'No mirror found for this file to download.'; - } catch (Exception $e) { $reason = 'I do not know either!'; @@ -127,6 +121,9 @@ else { $title = $product['name']; } +if ($debug) + $js_redirect = null; + $_t['page_h1'] = sprintf($_t['page_h1'], '' . $title . ''); $_t['page_title'] = sprintf($_t['page_title'], '' . $title . ''); @@ -142,16 +139,13 @@ $_t['page_title'] = sprintf($_t['page_title'], '' . $title . ' - + +

-
Mageia -

- -
+

' . $product['name'] . '' . ($torrent ? ' (torrent)' : '')), @@ -189,11 +183,19 @@ $_t['page_title'] = sprintf($_t['page_title'], '' . $title . ' -

- ', ''); ?>

+
+
+
+
+
+
', ''); ?>
+
+
+ -
+

Sorry! :-(

@@ -218,5 +220,20 @@ document.getElementById("other_mirrors_btn").onclick = function () { el.style.display = (el.style.display != 'none' ? 'none' : '' ); }; +
+
+ Follow @mageia_org + +
+
+ +
+
+
+
+
+ -- cgit v1.2.1