revert to old random methods for now

5 files changed, 163 insertions, 54 deletions

diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index 30efc8a7..2aac6d9d 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -316,7 +316,7 @@ function debug_result($comment,$status=false,$value=false) {
 		$value = $status ? 'OK' : 'ERROR'; 
 	} 
 
-	$final = '<span class="' . $class . '">' . scrub_out($value) . '</span> <em>' . scrub_out($comment) . '</em>'; 
+	$final = '<span class="' . $class . '">' . scrub_out($value) . '</span> <em>' . $comment . '</em>'; 
 
 	return $final;
 
diff --git a/random.php b/random.php
index 34ff7c26..fa626afb 100644
--- a/random.php
+++ b/random.php
@@ -36,7 +36,7 @@ switch ($_REQUEST['action']) {
 	case 'advanced':
 	default: 
 		require_once Config::get('prefix') . '/templates/show_random.inc.php';	
-		require_once Config::get('prefix') . '/templates/show_random_rules.inc.php';
+/*		require_once Config::get('prefix') . '/templates/show_random_rules.inc.php';*/
 
 	break;
 } // end switch 
diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php
new file mode 100644
index 00000000..ecef8904
--- /dev/null
+++ b/templates/show_dynamic.inc.php
@@ -0,0 +1,87 @@
+<?php
+/*
+
+ Copyright (c) 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.
+
+*/
+?>
+<?php show_box_top(_('Advanced Random Rules')); ?>
+<table class="tabledata" cellpadding="0" cellspacing="0">
+<colgroup>
+	<col id="col_field" />
+	<col id="col_operator" />
+	<col id="col_value" />
+	<col id="col_method" />
+</colgroup>
+<tr class="th-top">
+	<th class="col_field"><?php echo _('Field'); ?></th>
+	<th class="col_operator"><?php echo _('Operator'); ?></th>
+	<th class="col_value"><?php echo _('Value'); ?></th>
+	<th class="col_method"><?php echo _('Method'); ?></th>
+</tr>
+<tr>
+	<td valign="top">
+		<select name="field">
+		<?php 
+			$fields = Song::get_fields(); 
+			foreach ($fields as $key=>$value) { 
+				$name = ucfirst(str_replace('_',' ',$key));
+		?>
+			<option name="<?php echo scrub_out($key); ?>"><?php echo scrub_out($name); ?></option>
+		<?php } ?>
+		</select>
+	</td>
+	<td>
+		<select name="operator">
+			<option value="=">=</option>
+			<option value="!=">!=</option>
+			<option value=">">&gt;</option>
+			<option value=">=">&gt;=</option>
+			<option value="<">&lt;</option>
+			<option value="<=">&lt;=</option>
+			<option value="LIKE"><?php echo _('Like'); ?></option>
+		</select>
+	</td>
+	<td valign="top">
+		<input type="textbox" name="value" />
+	</td>
+	<td valign="top">
+		<select name="method">
+			<option value="OR"><?php echo _('OR'); ?></option>
+			<option value="AND"><?php echo _('AND'); ?></option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo Ajax::button('?page=random&action=add_rule','add',_('Add Rule'),'add_random_rule'); ?><?php echo _('Add Rule'); ?>
+	</td>
+	<td>
+		<?php echo Ajax::button('?page=random&action=save_rules','download',_('Save Rules As'),'save_random_rules'); ?><?php echo _('Save Rules As'); ?>
+	</td>
+	<td colspan="2">
+		<?php echo Ajax::button('?page=random&action=load_rules','cog',_('Load Saved Rules'),'load_random_rules'); ?><?php echo _('Load Saved Rules'); ?>
+	</td>
+	
+</tr>
+<tr>
+	<td colspan="4">
+		<div id="rule_status"></div>
+	</td>
+</tr>
+</table>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 1bdc164f..f3cfc842 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -43,21 +43,21 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
 <div class="np_group">
   <div class="np_cell cel_song">
   	<label><?php echo _('Song'); ?></label>
-  	<a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
+  	<a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&amp;song_id=<?php echo $media->id; ?>">
           <?php echo $title; ?>
   	</a>
   </div>
 
   <div class="np_cell cel_album">
   	<label><?php echo _('Album'); ?></label>
-  	<a title="<?php echo scrub_out($media->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
+  	<a title="<?php echo scrub_out($media->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $media->album; ?>">
           	<?php echo $album; ?>
   	</a>
   </div>
 
   <div class="np_cell cel_artist">
   	<label><?php echo _('Artist'); ?></label>
-  	<a title="<?php echo scrub_out($media->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
+  	<a title="<?php echo scrub_out($media->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $media->artist; ?>">
   	        <?php echo $artist; ?>
   	</a>
   </div>
@@ -66,8 +66,8 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
 <?php if (Config::get('show_album_art')) { ?>
 <div class="np_group">
   <div class="np_cell cel_albumart">
-      <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-        <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" />
+      <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
+        <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($media->f_album_full); ?>" title="<?php echo scrub_out($media->f_album_full); ?>" height="75" width="75" />
       </a>
   </div>
 </div>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index ecef8904..72094209 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -19,69 +19,91 @@
 
 */
 ?>
-<?php show_box_top(_('Advanced Random Rules')); ?>
-<table class="tabledata" cellpadding="0" cellspacing="0">
-<colgroup>
-	<col id="col_field" />
-	<col id="col_operator" />
-	<col id="col_value" />
-	<col id="col_method" />
-</colgroup>
-<tr class="th-top">
-	<th class="col_field"><?php echo _('Field'); ?></th>
-	<th class="col_operator"><?php echo _('Operator'); ?></th>
-	<th class="col_value"><?php echo _('Value'); ?></th>
-	<th class="col_method"><?php echo _('Method'); ?></th>
-</tr>
+<?php show_box_top(_('Play Random Selection')); ?>
+<form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced">
+<table class="table-data" cellspacing="0" cellpadding="3">
 <tr>
-	<td valign="top">
-		<select name="field">
-		<?php 
-			$fields = Song::get_fields(); 
-			foreach ($fields as $key=>$value) { 
-				$name = ucfirst(str_replace('_',' ',$key));
-		?>
-			<option name="<?php echo scrub_out($key); ?>"><?php echo scrub_out($name); ?></option>
-		<?php } ?>
-		</select>
-	</td>
+	<td><?php echo _('Item count'); ?></td>
 	<td>
-		<select name="operator">
-			<option value="=">=</option>
-			<option value="!=">!=</option>
-			<option value=">">&gt;</option>
-			<option value=">=">&gt;=</option>
-			<option value="<">&lt;</option>
-			<option value="<=">&lt;=</option>
-			<option value="LIKE"><?php echo _('Like'); ?></option>
+		<select name="random">
+		<option value="1">1</option>
+		<option value="5" selected="selected">5</option>
+		<option value="10">10</option>
+		<option value="20">20</option>
+		<option value="30">30</option>
+		<option value="50">50</option>
+		<option value="100">100</option>
+		<option value="500">500</option>
+		<option value="1000">1000</option>
+		<option value="-1"><?php echo _('All'); ?></option>
 		</select>
 	</td>
-	<td valign="top">
-		<input type="textbox" name="value" />
+	<td rowspan="5" valign="top"><?php echo  _('Tags'); ?></td>
+	<td rowspan="5">
 	</td>
-	<td valign="top">
-		<select name="method">
-			<option value="OR"><?php echo _('OR'); ?></option>
-			<option value="AND"><?php echo _('AND'); ?></option>
+</tr>
+<tr>
+	<td><?php echo _('Length'); ?></td>
+	<td>
+		<select name="length">
+			<option value="0"><?php echo _('Unlimited'); ?></option>
+			<option value="15"><?php printf(ngettext('%d minute','%d minutes',15), "15"); ?></option>
+			<option value="30"><?php printf(ngettext('%d minute','%d minutes',30), "30"); ?></option>
+			<option value="60"><?php printf(ngettext('%d hour','%d hours',1), "1"); ?></option>
+			<option value="120"><?php printf(ngettext('%d hour','%d hours',2), "2"); ?></option>
+			<option value="240"><?php printf(ngettext('%d hour','%d hours',4), "4"); ?></option>
+			<option value="480"><?php printf(ngettext('%d hour','%d hours',8), "8"); ?></option>
+			<option value="960"><?php printf(ngettext('%d hour','%d hours',16), "16"); ?></option>
 		</select>
 	</td>
 </tr>
 <tr>
+	<td><?php echo _('Type'); ?></td>
 	<td>
-		<?php echo Ajax::button('?page=random&action=add_rule','add',_('Add Rule'),'add_random_rule'); ?><?php echo _('Add Rule'); ?>
+		<select name="random_type">
+			<option value="normal"><?php echo _('Standard'); ?></option>
+			<option value="unplayed"><?php echo _('Less Played'); ?></option>
+			<option value="full_album"><?php echo _('Full Albums'); ?></option>
+			<option value="full_artist"><?php echo _('Full Artist'); ?></option>
+			<?php if (Config::get('ratings')) { ?>
+			<option value="high_rating"><?php echo _('Highest Rated'); ?></option>
+			<?php } ?>
+		</select>
 	</td>
+</tr>
+<tr>
+	<td nowrap="nowrap"><?php echo _('From catalog'); ?></td>
 	<td>
-		<?php echo Ajax::button('?page=random&action=save_rules','download',_('Save Rules As'),'save_random_rules'); ?><?php echo _('Save Rules As'); ?>
-	</td>
-	<td colspan="2">
-		<?php echo Ajax::button('?page=random&action=load_rules','cog',_('Load Saved Rules'),'load_random_rules'); ?><?php echo _('Load Saved Rules'); ?>
+	<?php show_catalog_select('catalog',''); ?>
 	</td>
-	
 </tr>
 <tr>
-	<td colspan="4">
-		<div id="rule_status"></div>
+	<td><?php echo _('Size Limit'); ?></td>
+	<td>
+		<select name="size_limit">
+			<option value="0"><?php echo _('Unlimited'); ?></option>
+			<option value="64">64MB</option>
+			<option value="128">128MB</option>
+			<option value="256">256MB</option>
+			<option value="512">512MB</option>
+			<option value="1024">1024MB</option>
+		</select>
 	</td>
 </tr>
 </table>
+<div class="formValidation">
+	<input type="submit" value="<?php echo _('Enqueue'); ?>" />
+</div>
+</form>
 <?php show_box_bottom(); ?>
+<div id="browse">
+<?php
+	if (is_array($object_ids)) { 
+		Browse::reset_filters(); 
+		Browse::set_type('song');
+		Browse::save_objects($object_ids); 
+		Browse::show_objects(); 
+		echo Ajax::observe('window','load',Ajax::action('?action=refresh_rightbar','playlist_refresh_load'));
+	}  
+?>	
+</div>