diff options
| -rw-r--r-- | site/download/index.php | 49 | ||||
| -rw-r--r-- | site/download/oldtorrent/index.php | 118 | ||||
| -rw-r--r-- | site/functions.php | 30 | ||||
| -rw-r--r-- | site/index.php | 3 | ||||
| -rw-r--r-- | site/torrents.template.php | 143 | ||||
| -rw-r--r-- | site/variables.template.php | 52 |
6 files changed, 60 insertions, 335 deletions
diff --git a/site/download/index.php b/site/download/index.php index 461cc95..ef3398e 100644 --- a/site/download/index.php +++ b/site/download/index.php @@ -19,7 +19,6 @@ ?> <?php include_once "../variables.php"; - include_once "../torrents.php"; include_once "../functions.php"; ?> <!DOCTYPE html> @@ -52,13 +51,7 @@ A copy of /docs/ can also be found in the release archives. </p> - <!-- <p> - TODO: set up RSS and Atom feeds for the bittorrent links (but not the HTTP mirrors). - The main gitweb page (for the main git repository) already generates atom/rss feeds. - </p> --> - <ul class="ulnav"> - <!-- <li><a href="#torrent">Bittorrent</a></li> --> <li><a href="#http">HTTP mirrors</a></li> <li><a href="#git">Git repositories (development)</a></li> </ul> @@ -86,50 +79,22 @@ </p> </div> - -<!-- - <div class="section" id="torrent"> - - <p><b>Torrent links do not work yet. Use the HTTP downloads.</b></p> - - <h1>Bittorrent</h1> - - <?php - /* Show current version */ - echo torrent_list($lbTorrentLink, 0, 1); - ?> - - <?php - /* Link to old releases */ - if (count($lbTorrentLink)>1) { - ?> - <p> - Torrents for older releases can be found at <a href="oldtorrent/">oldtorrent/</a>. - </p> -<?php - } -?> - - <p><b>Torrent links do not work yet. Use the HTTP downloads.</b></p> - - </div> ---> <div class="section" id="http"> <h1>HTTP mirrors</h1> -<!-- - <p> - These mirrors are intended mainly for those who cannot use - bittorrent. Otherwise, the <a href="#torrent">torrent links</a> - are highly recommended. - </p> ---> <p> Download libreboot from one of these mirrors. </p> + <p> + <b> + The latest release has a version number of <?php echo $lbRelease[0][0][0]; ?>, + and was released on <?php echo $lbRelease[0][0][1]; ?>. + </b> + </p> + <?php /* show HTTP mirrors */ echo list_items($lbHttpMirror,"HTTP mirrors not added yet.",0,count($lbHttpMirror)); diff --git a/site/download/oldtorrent/index.php b/site/download/oldtorrent/index.php deleted file mode 100644 index ad1ee76..0000000 --- a/site/download/oldtorrent/index.php +++ /dev/null @@ -1,118 +0,0 @@ -<?php -/* - Download page (old releases) - Copyright (C) 2015 Francis Rowe <info@gluglug.org.uk> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -?> -<?php - include_once "../../variables.php"; - include_once "../../torrents.php"; - include_once "../../functions.php"; -?> -<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - - <link rel="stylesheet" type="text/css" href="../../css/main.css" /> - - <title>Download <?php echo $lbProjectName; ?> (old)</title> - -</head> - -<body> - - <div class="contain"> - - <div id="libreboot" class="section intro"> - - <p> - <a href="../../images/welcome_screen.png"><img class="homepage_logo" src="../../images/welcome_screen_small.jpg" alt="" title="<?php include "../../images/welcome_screen.png.license.txt"; ?>" /></a> - </p> - - <h1>Download <?php echo $lbProjectName; ?> (old)</h1> - - <p> - This page is for old releases, distributed via the bittorrent network. - </p> - - <p> - Information about these releases can be found at <a href="../../docs/release.html">../../docs/release.html</a>. - Documentation for a given release can be found under /docs/ in that release archive. The same documentation - can also be found in the <a href="../#git">git repository</a> by reverting to the tag used for that release. - </p> - - <!-- <p> - TODO: set up RSS and Atom feeds for the bittorrent links (but not the HTTP mirrors). - The main gitweb page (for the main git repository) already generates atom/rss feeds. - </p> --> - - <p> - <a href="../">Back to main download page</a> - </p> - - </div> - - <div class="section" id="gpg"> - - <h1 id="gpg">GPG signing key</h1> - - <p> - <?php echo $lbProjectGpgKeyInfo; ?> - </p> - <p> - Download the key:<br/> - $ <b>gpg --recv-keys <?php echo $lbProjectGpgKeyID; ?></b> - </p> - <p> - You can verify the downloaded archives as follows:<br/> - $ <b>for signature in $(ls *.sig); do gpg --verify $signature; done</b> - </p> - - </div> - - <div class="section" id="torrent"> - - <p><b>Torrent links do not work yet. Use the HTTP downloads.</b></p> - - <h1>Bittorrent</h1> - <p> - The following is a list of links to old releases. - </p> - - <?php - /* Show all versions before the current stable release */ - echo torrent_list($lbTorrentLink, 1, count($lbTorrentLink)); - ?> - - <p><b>Torrent links do not work yet. Use the HTTP downloads.</b></p> - - </div> - - <div class="section footer"> - -<?php - include "../../footer.php"; -?> - - </div> - - </div> - -</body> -</html> - diff --git a/site/functions.php b/site/functions.php index e930638..689326a 100644 --- a/site/functions.php +++ b/site/functions.php @@ -20,36 +20,6 @@ <?php /* Functions */ - - /* Generic function for showing a list of torrents */ - function torrent_list($arrayTorrentLink, $forIndexStart, $forIndexBelow) { - - if ((count($arrayTorrentLink)>=($forIndexStart+1)) && (count($arrayTorrentLink)>=$forIndexBelow)) { - for ($release=$forIndexStart; $release<$forIndexBelow; $release++) { -?> - <h2><?php echo $arrayTorrentLink[$release][0][0]; ?></h2> - <p> - Released on <?php echo $arrayTorrentLink[$release][0][1]; ?>. - </p> - <ul> -<?php - for ($archive=1; $archive<count($arrayTorrentLink[$release]); $archive++) { -?> - <li><a href="<?php echo $arrayTorrentLink[$release][$archive][1]; ?>"><?php echo $arrayTorrentLink[$release][$archive][0]; ?></a></li> -<?php - } -?> - </ul> -<?php - } - } else { -?> - <p>No torrents found.</p> -<?php - } - - return; - } /* Generic function for showing a list of URLs */ function list_items($arrayMirrors,$strNotFoundMessage,$forIndexStart,$forIndexbelow) { diff --git a/site/index.php b/site/index.php index d6aeb8f..7ac762a 100644 --- a/site/index.php +++ b/site/index.php @@ -19,7 +19,6 @@ ?> <?php include_once "variables.php"; - include_once "torrents.php"; ?> <!DOCTYPE html> <html> @@ -86,7 +85,7 @@ <li><a href="docs/index.html">General documentation</a></li> </ul> <p> - The latest release is from <?php echo $lbTorrentLink[0][0][1]; ?>. + The latest release is from <?php echo $lbRelease[0][0][1]; ?>. </p> </div> <div class="section unstable"> diff --git a/site/torrents.template.php b/site/torrents.template.php deleted file mode 100644 index e15f0ee..0000000 --- a/site/torrents.template.php +++ /dev/null @@ -1,143 +0,0 @@ -<?php -/* - Template file: list of torrent links to the release archives - Copyright (C) 2015 Francis Rowe <info@gluglug.org.uk> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - - /* Copy this to torrents.php, and adapt for your needs */ - - /* - * Torrent links (for release archives) - * Latest releases listed first, earlier releases listed last. MAKE SURE TO PUT THEM IN THIS ORDER. - * Format of the array entries should be, for instance: - * $lbTorrentLink = array ( - * array ( - * array("version number (eg Libreboot rYYYYMMDD)", "release date (YYYY-MM-DD)"), - * array("archive name plus version", "torrent_magnet_link_goes_here"), - * ), - * array ( - * array("Libreboot rYYYYMMDD", "YYYY-MM-DD"), - * array("Libreboot rYYYYMMDD Source code", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD Utilities", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD Documentation", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD ROM images (ThinkPad X60)", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD ROM images (ThinkPad T60)", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD ROM images (ThinkPad X200)", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD ROM images (ThinkPad R400)", "torrent_magnet_link_goes_here"), - * array("Libreboot rYYYYMMDD ROM images (MacBook2,1)", "torrent_magnet_link_goes_here") - * ), - * array ( - * array("Libreboot r20150208", "2015-02-08"), - * array("Libreboot r20150208 Source code", "torrent_magnet_link_goes_here"), - * array("Libreboot r20150208 Binaries", "torrent_magnet_link_goes_here") - * ), - * array ( - * array("Libreboot r20150126", "2015-01-26"), - * array("Libreboot r20150126 Source code", "torrent_magnet_link_goes_here"), - * array("Libreboot r20150126 Binaries", "torrent_magnet_link_goes_here") - * ) - * ); - * You should not specify $lbProjectName here, because these entries related - * specifically to this version of the project. - */ - $lbTorrentLink = array ( - array ( - array("Libreboot r20150208", "2015-02-08"), - array("Libreboot r20150208 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20150208 Binaries", "torrent_magnet_link_goes_here") - ), - array ( - array("Libreboot r20150126", "2015-01-26"), - array("Libreboot r20150126 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20150126 Binaries", "torrent_magnet_link_goes_here") - ), - array ( - array("Libreboot r20150124", "2015-01-24"), - array("Libreboot r20150124 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20150124 Binaries", "torrent_magnet_link_goes_here") - ), - array ( - array("Libreboot r20141015", "2014-10-15"), - array("Libreboot r20151015 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20151015 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 7 */ - array("Libreboot r20140911", "2014-09-11"), - array("Libreboot r20140911 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140911 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 6 */ - array("Libreboot r20140903", "2014-09-03"), - array("Libreboot r20140903 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140903 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 5 */ - array("Libreboot r20140811", "2014-08-11"), - array("Libreboot r20140811 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140811 Binaries", "torrent_magnet_link_goes_here"), - array("Libreboot r20140811 Metadata", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 4 */ - array("Libreboot r20140729", "2014-07-29"), - array("Libreboot r20140729 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140729 Binaries", "torrent_magnet_link_goes_here"), - array("Libreboot r20140729 Metadata", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 3 */ - array("Libreboot r20140720", "2014-07-20"), - array("Libreboot r20140720 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140720 Binaries", "torrent_magnet_link_goes_here"), - array("Libreboot r20140720 Metadata", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 2 */ - array("Libreboot r20140716", "2014-07-16"), - array("Libreboot r20140716 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140716 Binaries", "torrent_magnet_link_goes_here"), - array("Libreboot r20140716 Metadata", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 6, beta 1 */ - array("Libreboot r20140711", "2014-07-11"), - array("Libreboot r20140711 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140711 Binaries", "torrent_magnet_link_goes_here"), - array("Libreboot r20140711 Metadata", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 5 */ - array("Libreboot r20140622", "2014-06-22"), - array("Libreboot r20140622 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140622 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 4 */ - array("Libreboot r20140221", "2014-02-21"), - array("Libreboot r20140221 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20140221 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 3 */ - array("Libreboot r20131214", "2013-12-14"), - array("Libreboot r20131214 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20131214 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 2 */ - array("Libreboot r20131213", "2013-12-13"), - array("Libreboot r20131213 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20131213 Binaries", "torrent_magnet_link_goes_here") - ), - array ( /* old name: Release 1 */ - array("Libreboot r20131212", "2013-12-12"), - array("Libreboot r20131212 Source code", "torrent_magnet_link_goes_here"), - array("Libreboot r20131212 Binaries", "torrent_magnet_link_goes_here") - ) - ); -?> diff --git a/site/variables.template.php b/site/variables.template.php index de1424a..87aaa9e 100644 --- a/site/variables.template.php +++ b/site/variables.template.php @@ -89,4 +89,56 @@ $lbProjectGpgKeyInfo = "pub 4096R/656F212E 2014-07-04 Libreboot Releases (signing key) <releases@libreboot.org><br/>Fingerprint=C923 4BA3 200C F688 9CC0 764D 6E97 D575 656F 212E "; $lbProjectGpgKeyID = "0x656F212E"; + + /* release list. format is: version number, then date of release */ + $lbRelease = array ( + array ( + array("20150208", "2015-02-08") + ), + array ( + array("20150126", "2015-01-26") + ), + array ( + array("20150124", "2015-01-24") + ), + array ( + array("20141015", "2014-10-15") + ), + array ( /* old name: Release 6, beta 7 */ + array("20140911", "2014-09-11") + ), + array ( /* old name: Release 6, beta 6 */ + array("20140903", "2014-09-03") + ), + array ( /* old name: Release 6, beta 5 */ + array("20140811", "2014-08-11") + ), + array ( /* old name: Release 6, beta 4 */ + array("20140729", "2014-07-29") + ), + array ( /* old name: Release 6, beta 3 */ + array("20140720", "2014-07-20") + ), + array ( /* old name: Release 6, beta 2 */ + array("20140716", "2014-07-16") + ), + array ( /* old name: Release 6, beta 1 */ + array("20140711", "2014-07-11") + ), + array ( /* old name: Release 5 */ + array("20140622", "2014-06-22") + ), + array ( /* old name: Release 4 */ + array("20140221", "2014-02-21") + ), + array ( /* old name: Release 3 */ + array("20131214", "2013-12-14") + ), + array ( /* old name: Release 2 */ + array("20131213", "2013-12-13") + ), + array ( /* old name: Release 1 */ + array("20131212", "2013-12-12") + ) + ); ?> |