From 70c2fedd2992bc2bf5309a9afcc8b810aa7f80ce Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Mon, 13 Nov 2006 06:04:12 +0000
Subject: final commit before alpha2 release

---
 admin/catalog.php                    |   2 +-
 docs/CHANGELOG                       |   4 +++-
 docs/README                          |  10 +++++++---
 lib/debug.lib.php                    |   7 +------
 lib/init.php                         |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 37285 -> 37337 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |   8 ++++----
 server/ajax.server.php               |  24 +++++++++++++++++++++++-
 templates/default.css                |  12 +++++-------
 templates/show_tv.inc.php            |  33 +++++++++++++++++++++++++++++----
 templates/show_tv_nowplaying.inc.php |  23 ++++++++++++++++++++++-
 templates/show_tv_playlist.inc.php   |  27 ++++++++++++++++++++++++---
 12 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/admin/catalog.php b/admin/catalog.php
index 7f65767b..bc189220 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -54,7 +54,7 @@ switch ($_REQUEST['action']) {
 			foreach ($_REQUEST['catalogs'] as $catalog_id) {
 				echo "<div class=\"confirmation-box\">";
 				$catalog = new Catalog($catalog_id);
-				$catalog->add_to_catalog($_REQUEST['update_type']);
+				$catalog->add_to_catalog('fast_add');
 				echo "</div>";
 			}
 	       	}
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index f69a18ea..f3c30090 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,7 +3,9 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
-  v.3.3.3-Alpha2
+  v.3.3.3-Alpha2 11/12/2006
+	- Fixed some Ajax Issues, added Now Playing to TV page
+	- Fixed album art search on every Catalog Add
 	- Added exception to MPD controller, forces HTTP play regardless
 	- Added From File: option to album art (Thx pb1dft)
 	- Updated French Translation (Thx charrea)
diff --git a/docs/README b/docs/README
index aad2cabf..601e5257 100755
--- a/docs/README
+++ b/docs/README
@@ -57,13 +57,16 @@ Contents:
 		- standard pls
 		- ASX
 		- RAM
+		- XSPF
 	- Realtime Downsampled
+	- XSPF Based Flash Player
 	- Automatic Downsampling based on load
 	- On the Fly Transcoding
 	- Localplay
 		- Music Player Daemon (MPD)
 		- Xbox Media Center (XMBC)
 		- Icecast2
+	- Democratic Vote based play
 	
   C) Current Translations
 
@@ -110,7 +113,8 @@ Contents:
   	PHP4-Mysql
 	PHP4-Session
 	PHP4-gd (recommended)
-	PHP4 ICONV & ZLIB support (recommended)
+	PHP4 ICONV 
+	PHP4  ZLIB support (recommended)
   MySQL >= 4.x http://www.mysql.com
   16MB of Ram
 
@@ -132,7 +136,7 @@ Contents:
 
 4. License
 
-  This Application falls under the Standard GPL. See Licence 
+  This Application falls under the Standard GPL v2. See Licence 
   included with this tar file
 
 4a. Donations
@@ -151,7 +155,7 @@ Contents:
   Public SVN: https://svn.ampache.org/
   IRC: irc.ampache.org #ampache (Freenode)
   Forums: http://ampache.org/forums
-  Bugs: https://ampache.bountysource.com
+  Bugs: https://ampache.bountysource.com/development/
   Wiki: https://ampache.bountysource.com/wiki/
   Demo: http://ampache.org/demo
 
diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index 08cf7d6d..04e77887 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -355,12 +355,7 @@ function check_putenv() {
 	if (!ini_set(memory_limit,$new_limit)) { 
 		return false; 
 	}
-
-	/* Check and see if we can up the post limit */
-	if (!ini_set(post_max_size,'8M')) { 
-		return false; 
-	}
-
+	
 	/* Check if safe mode is on */
 	if (ini_get('safe_mode')) { 
 		return false; 
diff --git a/lib/init.php b/lib/init.php
index b6826943..a74d9ac4 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -67,7 +67,7 @@ if (!$results = read_config($configfile,0)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.3-Alpha2 Build (004)';
+$results['version']		= '3.3.3-Alpha2';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index bbf80684..e6def3b2 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 25515443..76c2bbdb 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -523,10 +523,6 @@ msgstr "Erreur, acc&egrave;s interdit"
 msgid "Browse"
 msgstr "Parcourir"
 
-#: ../../lib/ui.lib.php:196
-msgid "Show w/o art"
-msgstr ""
-
 #: ../../lib/ui.lib.php:199
 msgid "Show all"
 msgstr "Montrer tout"
@@ -3192,6 +3188,10 @@ msgstr "Sauver la recherche comme un morceau sur"
 msgid "Save"
 msgstr "Sauver"
 
+#: ../../lib/ui.lib.php:196
+msgid "Show w/o art"
+msgstr "Afficher sans jaquette"
+
 #~ msgid "Opened for writing"
 #~ msgstr "Ouvert en &eacute;criture"
 
diff --git a/server/ajax.server.php b/server/ajax.server.php
index 7787fac1..244679e1 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -72,7 +72,7 @@ switch ($action) {
 		$xml_doc = xml_from_array($results);
 		echo $xml_doc;
 	break;
-	/* For changing the current play type */
+	/* For changing the current play type FIXME:: need to allow select of any type  */
 	case 'change_play_type':
 		$_SESSION['data']['old_play_type'] = conf('play_type'); 
 		$pref_id = get_preference_id('play_type');
@@ -98,6 +98,27 @@ switch ($action) {
 		$xml_doc = xml_from_array($results);
 		echo $xml_doc;
 	break;
+	/* Reloading of the TV Now Playing, formated differently */
+	case 'reload_np_tv':
+
+		/* Update the Now Playing */
+		ob_start();
+		require_once(conf('prefix') . '/templates/show_tv_nowplaying.inc.php');
+		$results = array();
+		$results['tv_np'] = ob_get_contents(); 
+		ob_end_clean(); 
+
+		/* Update the Playlist */
+		ob_start();
+		$tmp_playlist = get_democratic_playlist(-1);
+                $songs = $tmp_playlist->get_items();
+                require_once(conf('prefix') . '/templates/show_tv_playlist.inc.php');
+                $results['tv_playlist'] = ob_get_contents();
+                ob_end_clean();
+		
+		$xml_doc = xml_from_array($results);
+		echo $xml_doc;
+	break;
 	/* Setting ratings */
 	case 'set_rating':
 		ob_start(); 
@@ -110,6 +131,7 @@ switch ($action) {
 		$xml_doc = xml_from_array($results);
 		echo $xml_doc;
 	break;
+	/* Activate the Democratic Instance */
 	case 'tv_activate':
 		if (!$GLOBALS['user']->has_access(100)) { break; } 
 		$tmp_playlist = new tmpPlaylist();
diff --git a/templates/default.css b/templates/default.css
index 663ced0b..d746e7f8 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -639,16 +639,14 @@ li.current-rating{
 
 
 /* TV Page Related Styles */
-#tv_control { 
-	float:left;
-} 
-
 #tv_np {
 	float:right;
 }
-
-#tv_playlist {
-	clear: both;
+#tv_np .box {
+	aligh:right;
+}
+#tv_left { 
+	float:left;
 }
 /* User Online/Offline style, used in users.php */
 td.user_online {
diff --git a/templates/show_tv.inc.php b/templates/show_tv.inc.php
index fd29bff7..8ca3b075 100644
--- a/templates/show_tv.inc.php
+++ b/templates/show_tv.inc.php
@@ -36,6 +36,25 @@ $location = get_location();
 <body>
 <script src="<?php echo $web_path; ?>/lib/javascript-base.js" language="javascript" type="text/javascript"></script>
 <script src="<?php echo $web_path; ?>/modules/kajax/ajax.js" language="javascript" type="text/javascript"></script>
+<?php 
+
+/**
+ * Check for the refresh mojo, if it's there then require the
+ * refresh_javascript include. Must be greater then 5, I'm not
+ * going to let them break their servers
+ */
+if (conf('refresh_limit') > 5) {
+        $ajax_url = conf('ajax_url') . '?action=reload_np_tv' . conf('ajax_info');
+        /* Can't have the &amp; stuff in the Javascript */
+        $ajax_url = str_replace("&amp;","&",$ajax_url);
+        require_once(conf('prefix') . '/templates/javascript_refresh.inc.php');
+}
+
+?>
+<!-- Left Col -->
+<div id="tv_left">
+<?php show_box_top(_('Controls')); ?>
+<a href="<?php echo conf('web_path'); ?>/index.php"><?php echo _('Home'); ?></a>
 <!-- Control DIV -->
 <div id="tv_control">
 <?php 
@@ -49,10 +68,16 @@ else {
 } 
 ?>
 </div>
-<!-- End Control Div -->
-<div id="tv_np">
-<?php require_once(conf('prefix') . '/templates/show_tv_nowplaying.inc.php'); ?>
-</div>
+<?php show_box_bottom(); ?>
+<?php show_box_top(_('Current Playlist')); ?>
 <div id="tv_playlist">
 <?php require_once(conf('prefix') . '/templates/show_tv_playlist.inc.php'); ?>
 </div>
+<?php show_box_bottom(); ?>
+<!-- End of Left -->
+</div>
+<?php show_box_top(_('Now Playing')); ?>
+<div id="tv_np">
+<?php require_once(conf('prefix') . '/templates/show_tv_nowplaying.inc.php'); ?>
+</div>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_tv_nowplaying.inc.php b/templates/show_tv_nowplaying.inc.php
index 5823f537..930d5444 100644
--- a/templates/show_tv_nowplaying.inc.php
+++ b/templates/show_tv_nowplaying.inc.php
@@ -6,7 +6,7 @@
 
  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
+ 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
@@ -18,4 +18,25 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+/* Pull the Now Playing Information */
+$results = get_now_playing(); 
 ?>
+<table cellpadding="0">
+<?php 
+foreach ($results as $row) { 
+	$title = scrub_out(truncate_with_ellipse($row['song']->title,'25'));
+	$album = scrub_out(truncate_with_ellipse($row['song']->f_album_full,'25'));
+	$artist = scrub_out(truncate_with_ellipse($row['song']->f_artist_full,'25'));
+?>
+<tr>
+	<td>
+		<a target="_blank" href="<?php echo $web_path; ?>/albumart.php?id=<?php echo $row['song']->album; ?>&amp;type=popup" onclick="popup_art('<?php echo $web_path; ?>/albumart.php?id=<?php echo $row['song']->album; ?>&amp;type=popup'); return false;">
+		<img align="middle" border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $row['song']->album; ?>&amp;fast=1" />
+		</a>
+	</td>
+</tr>
+<tr>
+	<td><?php echo $title; ?> - (<?php echo $album; ?> / <?php echo $artist; ?> )</td>
+</tr>
+<?php } // end foreach ?>
+</table>
diff --git a/templates/show_tv_playlist.inc.php b/templates/show_tv_playlist.inc.php
index 150b0b05..94bb1c7b 100644
--- a/templates/show_tv_playlist.inc.php
+++ b/templates/show_tv_playlist.inc.php
@@ -21,19 +21,37 @@
 /* Some defaults */
 $web_path = conf('web_path'); 
 ?>
-<h3><?php echo _('Current Playlist'); ?></h3>
 <table cellspacing="0">
+<?php
+if (!count($songs)) { 
+	$playlist = new Playlist($tmp_playlist->base_playlist);
+?>
+<tr>
+	<td>
+		<?php echo _('Playing from base Playlist'); ?>: 
+		<a href="<?php echo $web_path; ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+		<?php echo scrub_out($playlist->name); ?>
+		</a>
+	</td>
+</tr>
+<?php
+} // if no songs
+/* Else we have songs */
+else {
+?>
 <tr class="table-header">
 	<td><?php echo _('Action'); ?></td>
 	<td><?php echo _('Votes'); ?></td>
 	<td><?php echo _('Song'); ?></td>
 </tr>
 <?php 
+
+
 foreach($songs as $row_id=>$song_id) { 
 	$song = new Song($song_id);
 	$song->format_song();
 ?>
-<tr>
+<tr class="<?php echo flip_class(); ?>">
 	<td>
 	<?php if ($tmp_playlist->has_vote($song_id)) { ?>
 		<input class="button" type="button" value="-" onclick="ajaxPut('<?php echo conf('ajax_url'); ?>?action=vote&amp;object_id=<?php echo $song_id; ?>&amp;vote=-1<?php echo conf('ajax_info'); ?>')" />
@@ -44,5 +62,8 @@ foreach($songs as $row_id=>$song_id) {
 	<td><?php echo scrub_out($tmp_playlist->get_vote($row_id)); ?></td>
 	<td><?php echo scrub_out($song->title . ' / ' . $song->get_album_name()); ?></td>
 </tr>
-<?php } ?>
+<?php 
+	} // end foreach 
+} // end else
+?>
 </table>
-- 
cgit