removed some unused files, and tweaked the style of a few pages

8 files changed, 22 insertions, 259 deletions

diff --git a/templates/catalog.inc b/templates/catalog.inc
deleted file mode 100644
index 1ed89ce5..00000000
--- a/templates/catalog.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2006 Ampache.org
- 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 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
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-/**
- * Catalog Display
- * This template displays all of the catalogs... Currently it's a little cluttered
- * It would be great if someone cleaned this up
- */
-$web_path = conf('web_path');
-$tools = array( _("Add a catalog") => $web_path . "/admin/catalog.php?action=show_add_catalog",
-		_("Access Lists") => $web_path . "/admin/access.php",
-		_("Show Duplicate Songs") => $web_path . "/admin/duplicates.php",
-		_("Show Disabled Songs") => $web_path . "/admin/catalog.php?action=show_disabled",
-		_("Clear Catalog Stats") => $web_path . "/admin/catalog.php?action=clear_stats",
-		_("Clear Now Playing")   => $web_path . "/admin/catalog.php?action=clear_now_playing",
-		_("Dump Album Art")   => $web_path . "/admin/catalog.php?action=dump_album_art", 
-		_("Gather Album Art") => $web_path . "/admin/catalog.php?action=gather_album_art",
-		_("View flagged songs") => $web_path . "/admin/flags.php");
-?>
-
-<br />
-<?php  if (!function_exists('iconv')) { ?>
-        <div class="fatalerror"><?php echo  _("Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting ICONV"); ?></div>
-<?php  } ?>
-<table cellpadding="5" border="0" cellspacing="0"> 
-<tr>
-	<td valign="top"><?php show_local_catalog_info(); ?></td>
-	<td valign="top">
-		<form name="catalog" method="post" action="<?php echo  $web_path; ?>/admin/catalog.php" enctype="multipart/form-data">
-		<table class="tabledata" cellspacing="1" cellpadding="3">
-		<tr class="table-header" align="center">
-			<td colspan="4"><?php echo  _("Update Catalogs"); ?></td>
-		</tr>
-		<?php
-		$catalogs = $catalog->get_catalogs();
-		if ($catalogs) {
-			foreach ($catalogs as $catalog) {
-				print("<tr class=\"even\"><td>".
-				"<input type=\"checkbox\" name=\"catalogs[]\" value=\"$catalog->id\"></input></td>".
-				"<td>".
-				"<a href=\"". $web_path ."/admin/catalog.php?action=show_customize_catalog&amp;catalog_id=$catalog->id\">".
-				"$catalog->path".
-				"</a>".
-				"</td>".
-				"<td>".
-				date("H:i - m/d/y",$catalog->last_update).
-				"</td>".
-				"<td>".
-				"<a href=\"" . $web_path . "/admin/catalog.php?action=show_delete_catalog&amp;catalog_id=$catalog->id\">" . _("Delete") . "</a>".
-				"</td></tr>\n");
-			} // end foreach
-		?>
-			<tr>
-				<td class="even" colspan="4">
-					<input class="button" type="submit" name="action" value="<?php echo  _("Add to Catalog(s)"); ?>" />&nbsp;&nbsp;&nbsp;
-					<input class="button" type="submit" name="action" value="<?php echo  _("Add to all Catalogs"); ?>" /><br />
-					<?php echo  _("Fast Add"); ?>:<input type="checkbox" name="update_type" value="fast_add" /><br />
-				</td>
-			</tr>
-			<tr>
-				<td class="even" colspan="4">
-					<input class="button" type="submit" name="action" value="<?php echo  _("Update Catalog(s)"); ?>" />&nbsp;&nbsp;&nbsp;
-					<input class="button" type="submit" name="action" value="<?php echo  _("Update All Catalogs"); ?>" /><br />
-					<?php echo  _("Fast Update"); ?>:<input type="checkbox" name="update_type" value="fast_update" /><br />
-				</td>
-			</tr>
-			<tr>
-				<td class="even" colspan="4">
-					<input class="button" type="submit" name="action" value="<?php echo  _("Clean Catalog(s)"); ?>" />&nbsp;&nbsp;&nbsp;
-					<input class="button" type="submit" name="action" value="<?php echo  _("Clean All Catalogs"); ?>" /><br />
-				</td>
-			</tr>
-		<?php 
-		} // end if catalogs
-		else {
-			print("<tr class=\"even\"><td colspan=\"4\" >" . _("You don't have any catalogs.") . "</td></tr>");
-		} // end else
-		?>
-		</table>
-		</form>
-	</td>
-	<td valign="top">
-		<?php show_tool_box(_("Catalog Tools"), $tools); ?>
-	</td>
-</tr>
-</table>
diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index 459355fd..8816937c 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.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
@@ -33,9 +32,6 @@ $songs = $catalog->get_disabled(10);
 
 <?php show_box_top(_('Last Ten Flagged Records')); ?>
 	<?php require (conf('prefix') . '/templates/show_flagged.inc.php'); ?>
-	<div class="text-action">
-	<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"><?php echo _('Show All'); ?>...</a>
-	</div>
 <?php show_box_bottom(); ?>
 
 <?php show_box_top(_('Disabled Songs')); ?>
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index 5513d74f..b604ae32 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -22,7 +22,6 @@
 $web_path 	= conf('web_path');
 $catalog	= new Catalog(); 
 $catalogs 	= $catalog->get_catalogs();
-$users		= $GLOBALS['user']->get_recent(10);
 
 ?>
 <?php show_box_top(_('Catalogs')); ?>
@@ -83,9 +82,3 @@ $users		= $GLOBALS['user']->get_recent(10);
 <!--	<a href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo _('Check for New Version'); ?></a>-->
 </div>
 <?php show_box_bottom(); ?>
-<?php show_box_top(_('User Activity')); ?>
-        <?php require (conf('prefix') . '/templates/show_users_info.inc.php'); ?>
-        <div class="text-action">
-        <a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Show All'); ?>...</a>
-        </div>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index 4337c644..4d65d8ac 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.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
@@ -21,7 +20,6 @@
 */
 
 $web_path = conf('web_path');
-
 ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
 <tr class="table-header">
@@ -52,4 +50,13 @@ $web_path = conf('web_path');
 	<td colspan="4" class="error"><?php echo _('No Records Found'); ?></td>
 </tr>
 <?php } ?>
+<?php if ($total_flagged > count($flagged)) { ?>
+<tr class="<?php echo flip_class(); ?>">
+	<td colspan="4">
+		<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged">
+			<?php echo _('Show All'); ?>...
+		</a>
+	</td>
+</tr>
+<?php } ?>
 </table>
diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php
index a3afad34..164d797b 100644
--- a/templates/show_recently_played.inc.php
+++ b/templates/show_recently_played.inc.php
@@ -33,7 +33,11 @@
 	$song->format_song(); 
 ?>
 <tr>
-	<td><?php echo scrub_out($row_user->fullname); ?></td>
+	<td>
+		<a href="<?php echo conf('web_path'); ?>/stats.php?action=user_stats&amp;user_id=<?php echo scrub_out($row_user->id); ?>">
+		<?php echo scrub_out($row_user->fullname); ?>
+		</a>
+	</td>
 	<td><?php echo $song->f_link; ?></td>
 	<td><?php echo $song->f_album_link; ?></td>
 	<td><?php echo $song->f_artist_link; ?></td>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index 8e3c0247..3f97552f 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -133,9 +133,9 @@ foreach ($song_ids as $song_id) {
 			<?php echo get_user_icon('flag'); ?>
 		</a>
 		<?php if ($GLOBALS['user']->has_access('100')) { ?>
-				| <a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_song&amp;song=<?php echo $song->id; ?>">
+				<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_song&amp;song=<?php echo $song->id; ?>">
 					<?php echo get_user_icon('edit'); ?>
-				</a> | 
+				</a>
 				<?php if ($song->enabled) { ?>
 				<a href="<?php echo $web_path; ?>/admin/flag.php?action=disable&amp;song_ids=<?php echo $song->id; ?>">
 					<?php echo get_user_icon('disable'); ?>
@@ -147,12 +147,12 @@ foreach ($song_ids as $song_id) {
 				<?php } //status ?>
 		<?php } //access ?>
 		<?php if ($GLOBALS['user']->prefs['download']) { ?>
-			| <a href="<?php echo $web_path; ?>/download/index.php?action=download&amp;song_id=<?php echo $song->id; ?>&amp;sid=<?php echo scrub_out(session_id()); ?>&amp;fn=<?php echo rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); ?>">
+			<a href="<?php echo $web_path; ?>/download/index.php?action=download&amp;song_id=<?php echo $song->id; ?>&amp;sid=<?php echo scrub_out(session_id()); ?>&amp;fn=<?php echo rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); ?>">
 				<?php echo get_user_icon('download'); ?>	
 			</a>
 		<?php } ?>
 		<?php if ($GLOBALS['user']->prefs['direct_link']) { ?>
-			| <a href="<?php echo scrub_out($song->get_url()); ?>">
+			<a href="<?php echo scrub_out($song->get_url()); ?>">
 				<?php echo get_user_icon('link'); ?>
 			</a>
 		<?php } ?>
diff --git a/templates/show_users_info.inc.php b/templates/show_users_info.inc.php
deleted file mode 100644
index 3a854d04..00000000
--- a/templates/show_users_info.inc.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2006 Ampache.org
- 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.
-
- 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-$web_path = conf('web_path');
-?>
-<table class="tabledata" cellpadding="0" cellspacing="0" border="0">
-<tr class="table-header">
-	<th align="center"><?php echo _('Fullname'); ?> (<?php echo _('Username'); ?>)</th>
-        <th align="center"><?php echo _('Last Seen'); ?></th>
-        <th align="center"><?php echo _('Activity'); ?></th>
-        <th align="center"><?php echo _('Action'); ?></th>
-</tr>
-<?php foreach ($users as $user_id) { $data = new User($user_id); $data->format_user(); ?>
-<tr class="<?php echo flip_class(); ?>">
-	<td>
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&amp;user=<?php echo scrub_out($data->id); ?>">
-		<?php echo scrub_out($data->fullname); ?> (<?php echo scrub_out($data->username); ?>)</a>
-	</td>
-        <td align="center">
-		<?php echo scrub_out($data->f_last_seen); ?>
-	</td>
-	<td>
-		<?php echo scrub_out($data->f_useage); ?>
-	</td>
-        <td>
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=edit&amp;user=<?php echo scrub_out($data->id); ?>">
-			<?php echo _('Edit'); ?>
-		</a>
-	</td>
-</tr>
-<?php } if (!count($users)) { ?>
-<tr>
-	<td colspan="4"><?php echo _('No Records Found'); ?></td>
-</tr>
-<?php } ?>
-</table>
diff --git a/templates/song_edit.inc b/templates/song_edit.inc
deleted file mode 100644
index 7eac7f90..00000000
--- a/templates/song_edit.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2006 Ampache.org
- 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.
-
- 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-preg_match("/^.*\/(.*?)$/",$song->file, $short);
-$filename = scrub_out($short[1]);
-$target = conf('web_path').'/admin/flags.php';
-?>
-
-<form name="update_song" method="post" action="<?php echo $target; ?>">
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
-<tr>
-	<td>File:</td>
-	<td colspan="2"><?php echo $filename; ?></td>
-</tr>
-<tr>
-	<td>Title:</td>
-	<td><input type="text" name="title" size="60" value="<?php echo $song->title; ?>"></input></td>
-</tr>
-<tr>
-	<td>Artist:</td>
-	<td><?php show_artist_pulldown($song->artist); ?></td>
-	<td>or <input type="text" name="new_artist" size="30" value=""></input></td>
-</tr>
-<tr>
-	<td>Album:</td>
-	<td><?php show_album_select('album',$song->album); ?></td>
-	<td>or <input type="text" name="new_album" size="30" value=""></input></td>
-</tr>
-<tr>
-	<td>Track:</td>
-	<td><input type="text" size="4" maxlength="4" name="track" value="<?php echo $song->track;?>"></input></td>
-</tr>
-<tr>
-	<td>Genre:</td>
-	<td><?php show_genre_pulldown('genre',$song-genre); ?></td>
-</tr>
-<tr>
-	<td><input type="text" size="4" maxlength="4" name="year" value="<?php echo $song->year;?>"></input></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td><input type="checkbox" name="update_id3" value="yes" checked="checked">&nbsp;Update id3 tags</input></td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td> &nbsp; </td>
-	<td>
-		<input type="hidden" name="song" value="<?php echo $song->id;?>"></input>
-		<input type="hidden" name="flag" value="<?php echo $flagid;?>"></input>
-		<input type="hidden" name="current_artist_id" value="<?php echo $song->artist;?>"></input>
-	<?php if (count($_SESSION['edit_queue'])){ ?>
-		<input type="submit" name="action" value="Next"></input>
-		<input type="submit" name="action" value="Skip"></input>
-		<input type="submit" name="action" value="Clear Edit List"></input></td>
-	<?php } else { ?>
-		<input type="submit" name="action" value="Done"></input></td>
-	<?php } ?>
-</tr>
-</table>
-</form>
-