Implement download_links() function, refactor download page

diff --git a/common/download.inc b/common/download.inc
index fdc72160d6b2710545980c38aa65ca15dedc4456..9a765df28bdcb8de075cd9928bd24d69ab07c080 100644 (file)
--- a/common/download.inc
+++ b/common/download.inc
@@ -2,49 +2,15 @@
        <dt>
                <strong>ngIRCd Release 24</strong> (2017-01-20):
        </dt>
-       <dd>
-               Server: <em>ngircd.barton.de</em>
-               (<a href="https://ngircd.barton.de/pub/ngircd/">https</a>&thinsp;🔒):
-               <a href="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.gz">ngircd-24.tar.gz</a>
-               (<a href="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.gz.sig">Sig</a>),
-               <a href="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.xz">tar.xz</a>
-               (<a href="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.xz.sig">Sig</a>),
-               <a href="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.Z">tar.Z</a>
-               (<a href="https://ngircd.barton.de/pub/ngircd/ngircd-24.tar.Z.sig">Sig</a>)
-       </dd>
-       <dd>
-               Server: <em>ngircd.mirror.3rz.org</em>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/">https</a>&thinsp;🔒):
-               <a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-24.tar.gz">ngircd-24.tar.gz</a>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-24.tar.gz.sig">Sig</a>),
-               <a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-24.tar.xz">tar.xz</a>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-24.tar.xz.sig">Sig</a>),
-               <a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-24.tar.Z">tar.Z</a>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-24.tar.Z.sig">Sig</a>)
-       </dd>
+       <?php download_links("24", "ngircd.barton.de"); ?>
+       <?php download_links("24", "ngircd.mirror.3rz.org"); ?>
+       <?php download_links("24", "ngircd.sourceforge.net", "http"); ?>
 </dl>
 <dl>
        <dt>
                <strong>ngIRCd Release 25~rc1</strong> (2018-08-11):
        </dt>
-       <dd>
-               Server: <em>ngircd.barton.de</em>
-               (<a href="https://ngircd.barton.de/pub/ngircd/">https</a>&thinsp;🔒):
-               <a href="https://ngircd.barton.de/pub/ngircd/ngircd-25~rc1.tar.gz">ngircd-25~rc1.tar.gz</a>
-               (<a href="https://ngircd.barton.de/pub/ngircd/ngircd-25~rc1.tar.gz.sig">Sig</a>),
-               <a href="https://ngircd.barton.de/pub/ngircd/ngircd-25~rc1.tar.xz">tar.xz</a>
-               (<a href="https://ngircd.barton.de/pub/ngircd/ngircd-25~rc1.tar.xz.sig">Sig</a>),
-               <a href="https://ngircd.barton.de/pub/ngircd/ngircd-25~rc1.tar.Z">tar.Z</a>
-               (<a href="https://ngircd.barton.de/pub/ngircd/ngircd-25~rc1.tar.Z.sig">Sig</a>)
-       </dd>
-       <dd>
-               Server: <em>ngircd.mirror.3rz.org</em>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/">https</a>&thinsp;🔒):
-               <a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-25~rc1.tar.gz">ngircd-25~rc1.tar.gz</a>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-25~rc1.tar.gz.sig">Sig</a>),
-               <a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-25~rc1.tar.xz">tar.xz</a>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-25~rc1.tar.xz.sig">Sig</a>),
-               <a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-25~rc1.tar.Z">tar.Z</a>
-               (<a href="https://ngircd.mirror.3rz.org/pub/ngircd/ngircd-25~rc1.tar.Z.sig">Sig</a>)
-       </dd>
+       <?php download_links("25~rc1", "ngircd.barton.de"); ?>
+       <?php download_links("25~rc1", "ngircd.mirror.3rz.org"); ?>
+       <?php download_links("25~rc1", "ngircd.sourceforge.net", "http"); ?>
 </dl>

diff --git a/common/styles.css b/common/styles.css
index e2e945ca2594afff17cef96b5ae8a12239b0eaba..d772005a5cdf19773cc2a1e60f07a79004aa7fce 100644 (file)
--- a/common/styles.css
+++ b/common/styles.css
@@ -109,6 +109,10 @@ a:link, a:visited {
        color: #005555;
 }
 
+dd {
+       line-height: 150%;
+}
+
 div#vertical_slide {
        border: 1px solid gray;
        padding: 1em;
@@ -142,4 +146,3 @@ p#footer {
 }
 
 /* @end */
-

diff --git a/includes/common.php b/includes/common.php
index 2e9f2471c3ddd951ade0cbd170e585fed1fe65bf..e81644de7a5bac7a81283a69bdeaec1abd5e36c5 100644 (file)
--- a/includes/common.php
+++ b/includes/common.php
@@ -68,4 +68,27 @@ function end_page() {
        echo '</div></body></html>';
 }
 
+function download_links($rel, $server, $protocol = "https") {
+       echo "<dd>";
+       echo "Server: <em>$server</em>:";
+       /* Download folder */
+       echo "(<a href=\"$protocol://$server/pub/ngircd/\">$protocol</a>";
+       if ($protocol == "https")
+               echo "&thinsp;🔒";
+       echo "): ";
+       /* Archive files */
+       $count = 1;
+       foreach (array('tar.gz', 'tar.xz', 'tar.Z') as $suffix) {
+               if ($count > 1)
+                       echo ', ';
+               echo "<a href=\"$protocol://$server/pub/ngircd/ngircd-$rel.$suffix\">";
+               if ($suffix == "tar.gz")
+                       echo "ngircd-$rel.";
+               echo "$suffix</a> ";
+               echo "(<a href=\"$protocol://$server/pub/ngircd/ngircd-$rel.$suffix.sig\">Sig</a>)";
+               $count++;
+       }
+       echo "</dd>";
+}
+
 ?>