Commit 3f74b273 authored by Mike Sheldon's avatar Mike Sheldon

Merge branch 'master' of gitorious.org:foocorp/gnu-fm

parents d5d57312 c64f6478
<?php
/* GNUkebox -- a free software server for recording your listening habits
Copyright (C) 2009 Free Software Foundation, Inc
Copyright (C) 2009, 2011 Free Software Foundation, Inc
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
......@@ -28,11 +28,9 @@ require_once('temp-utils.php');
<html>
<head>
<title>GNUkebox</title>
<meta name="author" content="FooCorp catalogue number FOO200 and contributors" />
<meta http-equiv="refresh" content="180" />
</head>
<body>
<h2>Last 25 tracks received</h2>
<h2>Recent tracks</h2>
<?php
......@@ -40,7 +38,7 @@ require_once('temp-utils.php');
try {
$res = $adodb->CacheGetAll(60, 'SELECT artist, track, time FROM Scrobbles ORDER BY time DESC LIMIT 25');
$res = $adodb->CacheGetAll(300, 'SELECT artist, track, time FROM Scrobbles ORDER BY time DESC LIMIT 500');
} catch (Exception $e) {
die($e->getMessage());
......
<?php
/* GNUkebox -- a free software server for recording your listening habits
Copyright (C) 2009, 2011 Free Software Foundation, Inc
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/>.
*/
?>
<!DOCTYPE html>
<html>
<head>
<title>Please point your music player here!</title>
<style type="text/css">
html, body {background-color: #ccc; color: #111; font-family: sans-serif; font-size: 24px; text-align: center;}
</style>
</head>
<body>
<h1>Please point your music player here.</h1>
<p><img src="data:image/gif;base64,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
Ow==" alt="" />
<p>The Libre.fm wiki has a <a
href="http://bugs.foocorp.net/projects/librefm/wiki/Clients">good list
of players</a> that can be configured to support GNU FM servers, such
as this one.</p>
<p><small>Adding this information to your computer's hosts file often helps if you're totally stuck:</small></p>
<p><tt><?php echo $_SERVER['SERVER_ADDR'];?> <?php echo $_SERVER['SERVER_NAME']; ?></tt></p>
<p><a href="http://en.wikipedia.org/wiki/Hosts_%28file%29#Location_in_the_file_system">Where's my hosts file?</a></small>.</p>
</body>
</html>
\ No newline at end of file
......@@ -2,7 +2,7 @@
/* GNUkebox -- a free software server for recording your listening habits
Copyright (C) 2009 Free Software Foundation, Inc
Copyright (C) 2009, 2011 Free Software Foundation, Inc
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
......@@ -39,7 +39,7 @@ if (isset($_GET['hs']) && isset($_GET['p'])) {
} else {
//If we're not handshaking then just display some nice stats
if ($displaythings) {
require_once('display.php');
require_once('help.php');
} else {
echo '<h1>GNUkebox!</h1><p>Please configure your system for ' . $_SERVER['SERVER_NAME'] . '</p>';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment