From dfbe65e1bf0a4d7cff1e2d31a2ade18de6756196 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 3 Jan 2006 09:21:29 +0000
Subject: whole new playlists files new coolness supported but not implmented,
 playback works but playlist edit functions are still untested...

---
 templates/show_import_playlist.inc.php |  2 +-
 templates/show_playlists.inc.php       | 78 ++++++++++++++++++++++++++++
 templates/show_playlists.php.inc       | 78 ----------------------------
 templates/show_songs.inc               | 95 ++++++++++++++++++++--------------
 4 files changed, 134 insertions(+), 119 deletions(-)
 create mode 100644 templates/show_playlists.inc.php
 delete mode 100644 templates/show_playlists.php.inc

(limited to 'templates')

diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php
index 3ea6c8fb..1b5b979b 100644
--- a/templates/show_import_playlist.inc.php
+++ b/templates/show_import_playlist.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
new file mode 100644
index 00000000..34667734
--- /dev/null
+++ b/templates/show_playlists.inc.php
@@ -0,0 +1,78 @@
+<?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.
+
+*/
+/**
+ * Show Playlists
+ * This takes an array of playlists and displays them for the default view of
+ * /playlists.php $type is always passed
+ */
+?>
+<h3><?php echo $type . ' ' . _('Playlists'); ?></h3>
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header">
+	<th><?php echo _('Playlist Name'); ?></th>
+	<th><?php echo _('# Songs'); ?></th>
+	<th><?php echo _('Owner'); ?></th>
+	<th><?php echo _('Actions'); ?></th>
+</tr>
+<?php 
+	foreach ($playlists as $playlist) { 
+		$playlist_user = new User($playlist->user);
+		$count	= $playlist->get_song_count(); 
+?>
+<tr class="<?php echo flip_class(); ?>">
+	<td>
+		<a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+		<?php echo scrub_out($playlist->name); ?>
+		</a>
+	</td>
+	<td><?php echo $count; ?></td>
+	<td><?php echo scrub_out($playlist_user->fullname); ?></td>
+	<td>
+		| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+		<?php echo _('View'); ?>
+		</a>	
+		<?php if ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access(100)) { ?>
+			| <a href=<?php echo conf('web_path'); ?>/playlist.php?action=edit&amplplaylist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Edit'); ?>
+			</a>
+			| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_delete_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Delete'); ?>
+			</a>
+		<?php } ?>
+		<?php if ($count > 1) { ?>
+			| <a href="<?php echo conf('web_path'); ?>/song.php?action=playlist&playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Play'); ?>
+			</a>
+			| <a href="<?php echo conf('web_path'); ?>/song.php?action=playlist_random&playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Random'); ?>
+			</a>
+		<?php } ?>
+		<?php if (batch_ok()) { ?>
+			| <a href="<?php echo conf('web_path'); ?>/batch.php?action=pl&amp;id=<?php echo $playlist->id; ?>">
+			<?php echo _('Download'); ?>
+			</a>
+		<?php } ?>
+		|
+	</td>
+</tr>
+<?php } ?>
+</table>
diff --git a/templates/show_playlists.php.inc b/templates/show_playlists.php.inc
deleted file mode 100644
index 9bb54c29..00000000
--- a/templates/show_playlists.php.inc
+++ /dev/null
@@ -1,78 +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.
-
-*/
-/**
- * Show Playlists
- * This takes an array of playlists and displays them for the default view of
- * /playlists.php $type is always passed
- */
-?>
-<h3><?php echo $type; . ' ' . _('Playlists'); ?></h3>
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
-<tr class="table-header">
-	<th><?php echo _('Playlist Name'); ?></th>
-	<th><?php echo _('# Songs'); ?></th>
-	<th><?php echo _('Owner'); ?></th>
-	<th><?php echo _('Actions'); ?></th>
-</tr>
-<?php 
-	foreach ($playlists as $playlist) { 
-		$playlist_user = new User($playlist->user);
-		$count	= $playlist->get_song_count(); 
-?>
-<tr class="<?php echo flip_class(); ?>">
-	<td>
-		<a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
-		<?php echo scrub_out($playlist->name); ?>
-		</a>
-	</td>
-	<td><?php echo $count; ?></td>
-	<td><?php echo scrub_out($playlist_user->name); ?></td>
-	<td>
-		| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
-		<?php echo _('View'); ?>
-		</a>	
-		<?php if ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access(100)) { ?>
-			| <a href=<?php echo conf('web_path'); ?>/playlist.php?action=edit&amplplaylist_id=<?php echo $playlist->id; ?>">
-			<?php echo _('Edit'); ?>
-			</a>
-			| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_delete_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
-			<?php echo _('Delete'); ?>
-			</a>
-		<?php } ?>
-		<?php if ($count > 1) { ?>
-			| <a href="<?php echo conf('web_path'); ?>/song.php?action=playlist&playlist_id=<?php echo $playlist->id; ?>">
-			<?php echo _('Play'); ?>
-			</a>
-			| <a href="<?php echo conf('web_path'); ?>/song.php?action=playlist_random&playlist_id=<?php echo $playlist->id; ?>">
-			<?php echo _('Random'); ?>
-			</a>
-		<?php } ?>
-		<?php if (batch_ok()) { ?>
-			| <a href="<?php echo conf('web_path'); ?>/batch.php?action=pl&amp;id=<?php echo $playlist->id; ?>">
-			<?php echo _('Download'); ?>
-			</a>
-		<?php } ?>
-		|
-	</td>
-</tr>
-<?php } ?>
-</table>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index e3d1cae5..21c69525 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -21,38 +21,53 @@
 */
 $web_path = conf('web_path');
 
-show_clear();
-
 // Need to set the username for the song ratings.
-$username=$GLOBALS['user']->username;
+$username = $GLOBALS['user']->username;
+
+/* If it's a playlist and they've got rights */
+if (isset($playlist_id) && ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access('100'))) { 
+	$tab = 1;
+	$playlist_owner = true;
+}
 
 ?>
-<form name="songs" method="post" enctype="multipart/form-data" action="#">
-<table border="0">
-  <tr><td colspan="2">
-    <table class="border" cellspacing="0" cellpadding="0" border="0">
-    <tr class="table-header">
-            <th>&nbsp;&nbsp;<a href="#" onclick="check_songs(); return false;">Select</a></th>
-            <?php if (isset($playlist_id) && $playlist_id != 0 && ($user->username == $pluser->username || $user->has_access('100'))) { $tab = 1; ?> <th><?php echo _("Track"); ?></th> <?php } ?>
-            <th><?php echo _("Song title"); ?></th>
-            <th><?php echo _("Artist"); ?></th>
-            <th><?php echo _("Album"); ?></th>
-            <th><?php echo _("Track"); ?></th>
-            <th><?php echo _("Time"); ?></th>
-            <th><?php echo _("Size"); ?></th>
-            <th><?php echo _("Bitrate"); ?></th>
-            <th><?php echo _("Genre"); ?></th>
-            <th><?php echo _("Flag"); ?></th>
-            <th><?php echo _("Action"); ?></th>
-	    <?php if (conf('ratings') || conf('ratings')=="false") { ?>
-            <th><?php echo _("Rating"); ?></th>
-            <? } ?>            
-    </tr>
-    <?php
-    	/* FIXME: don't even get me started with how many things are wrong with this code */ 
+<form name="songs" method="post" enctype="multipart/form-data" action="#" style="Display:inline;">
+<table class="border" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header">
+	<th>&nbsp;&nbsp;<a href="#" onclick="check_songs(); return false;">Select</a></th>
+        <?php if ($playlist_owner) { ?> 
+		<th><?php echo _("Track"); ?></th> 
+	<?php } ?>
+	<th><?php echo _("Song title"); ?></th>
+        <th><?php echo _("Artist"); ?></th>
+        <th><?php echo _("Album"); ?></th>
+        <th><?php echo _("Track"); ?></th>
+        <th><?php echo _("Time"); ?></th>
+        <th><?php echo _("Size"); ?></th>
+        <th><?php echo _("Bitrate"); ?></th>
+        <th><?php echo _("Genre"); ?></th>
+        <th><?php echo _("Flag"); ?></th>
+        <th><?php echo _("Action"); ?></th>
+	<?php if (conf('ratings') || conf('ratings')=="false") { ?>
+        	<th><?php echo _("Rating"); ?></th>
+        <? } ?>            
+</tr>
+<?php
+	/* FIXME: don't even get me started with how many things are wrong with this code */ 
 	foreach ($song_ids as $song_id) {
-	
-		if (!is_object($song_id)) { 
+
+		/* Arr matey crapy code abounds! */
+		if ($playlist_owner) { 
+			if ($song_id['song']) { 
+				$song = new Song($song_id['song']);
+			}
+			else { 
+				$song = new Song();
+				$song->title = 'Dynamic Song';
+			}
+			$song_id = $song_id['id'];
+		} // end if playlist
+		elseif (!is_object($song_id)) { 
 			unset($text_class);
 			$song = new Song($song_id);
 		}
@@ -60,16 +75,18 @@ $username=$GLOBALS['user']->username;
 			$song = $song_id;
 		}
 
+
 		$song->format_song();
-            // Still needed crap
-            $totalsize += $song->size;
-            $totaltime += $song->time;
-	    if ($song->status == "disabled") { $text_class = "class=\"disabled\""; }
-    ?>
-    <tr class="<?php echo flip_class(); ?>">
-            <td align="center">
-              <input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" id="song_<?php echo $song->id; ?>" />
-            </td>
+		// Still needed crap
+		$totalsize += $song->size;
+		$totaltime += $song->time;
+		/* If it's disabled */
+		if ($song->status == "disabled") { $text_class = "class=\"disabled\""; }
+?>
+<tr class="<?php echo flip_class(); ?>">
+	<td align="center">
+        	<input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" id="song_<?php echo $song->id; ?>" />
+        </td>
         <?php
             if (isset($playlist_id) && $playlist_id != 0 && ($user->username == $pluser->username || $user->has_access('100'))) {
                     $tracknum = get_playlist_track_from_song($playlist_id, $song->id);
@@ -158,8 +175,6 @@ $username=$GLOBALS['user']->username;
       <td colspan="2"></td>
     </tr>
     </table>
-</td></tr>
-</table>
 <br />
 <?php show_play_selected(); ?>
 </form>
-- 
cgit