diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-12-28 22:56:55 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-12-28 22:56:55 +0000 |
| commit | d6e28b752f3f04e418a4c27f37fa67b76596d5ec (patch) | |
| tree | 7425e8a886db303672c97ccebc3d145bf5fa8b5d /templates | |
| parent | 223143ed3a95ad59ff2945f6746da73992012354 (diff) | |
| download | ampache-d6e28b752f3f04e418a4c27f37fa67b76596d5ec.tar.gz ampache-d6e28b752f3f04e418a4c27f37fa67b76596d5ec.tar.bz2 ampache-d6e28b752f3f04e418a4c27f37fa67b76596d5ec.zip | |
* Added new Snoopy, fixes some minor bugs
* Rewrote Album Art collection, fixing tons of logic flaws, single album art find is currently broken
might even be a little faster now when using folder and id3 methods at the same time
* Fixed some issues with FastCGI installs
* Removed another upload file that wasn't used anymore
* Tweaked Recently Played to show 'played XXX ago'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/list_header.inc | 10 | ||||
| -rw-r--r-- | templates/show_album_art.inc.php | 5 | ||||
| -rw-r--r-- | templates/show_recently_played.inc.php | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/templates/list_header.inc b/templates/list_header.inc index 58c7fa61..257c5220 100644 --- a/templates/list_header.inc +++ b/templates/list_header.inc @@ -88,8 +88,16 @@ while ($page <= $pages) { ksort($page_data['up']); ksort($page_data['down']); -/* Take the script name and passed action and setup the next action */ +/* Detect the current script, this take a little work because we have to + * account for FastCGI + */ preg_match("/.*\/(.+\.php)$/", $_SERVER['SCRIPT_NAME'], $matches); +// Must be running Fast CGI or something similar +if (!isset($matches['1'])) { + // Try PHP_SELF + preg_match("/.*\/(.+\.php)$/",$_SERVER['PHP_SELF'],$matches); +} + $action = "action=" . scrub_in($_REQUEST['action']); $script = conf('web_path') . "/" . $admin_menu . $matches[1]; diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php index a386b353..102a2698 100644 --- a/templates/show_album_art.inc.php +++ b/templates/show_album_art.inc.php @@ -5,9 +5,8 @@ All rights reserved. This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License v2 + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index 3693dc27..e30ee53e 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -35,7 +35,7 @@ $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days a <?php foreach ($data as $row) { $row_user = new User($row['user']); $song = new Song($row['object_id']); - $amount = intval(time() - $row['date']); + $amount = intval(time() - $row['date']+2); $time_place = '0'; while ($amount >= 1) { |