From addb6f957fd9fb06d2c90ba78bbd73e6f13e424f Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 10 Feb 2009 03:49:24 +0000
Subject: [PATCH] broke the advanced random stuff, only ui in place for new
 stuff...

---
 images/icon_thumb_down.png                 | Bin 601 -> 0 bytes
 images/icon_thumb_up.png                   | Bin 619 -> 0 bytes
 images/icon_tick.png                       | Bin 0 -> 537 bytes
 lib/class/song.class.php                   |  23 ++++
 random.php                                 |   2 +
 templates/show_democratic_playlist.inc.php |   6 +-
 templates/show_random.inc.php              | 117 ++++++++-------------
 templates/show_random_rules.inc.php        |  43 ++++++++
 8 files changed, 114 insertions(+), 77 deletions(-)
 delete mode 100644 images/icon_thumb_down.png
 delete mode 100644 images/icon_thumb_up.png
 create mode 100644 images/icon_tick.png
 create mode 100644 templates/show_random_rules.inc.php

diff --git a/images/icon_thumb_down.png b/images/icon_thumb_down.png
deleted file mode 100644
index 3c832d4c83cc0f7869a83f88833699daff52fcf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz>q$gGR5;6x
zld)?PVHk%KwHXvA{{RQkK^zqPQ*`Jo3NFS)5G+C!og7>$D6NEu!3M;jM7RtZQ)9g&
zq2Y3PT)1!{94U9^xG!8xj6)xXFPclGw!?4uK6oB}yu5D$NbE`yI1Hp{cTP^<iM=xa
zQIC=|1{W~BPdM%loi11{Fs(6$`4z*wk8Yetvlr0pg?WKCIz%J5M5_g12;&Ki#xNX#
z7=RyuZtP%MP&WmemNPHd9G#)v0Yw2-1<#X$Xb2*bl2FL_0lY5#m=}~ACF)xe2!#ZO
zBN)WsKtK>eKY;ujW&%y5(3%q}8&Iu+Z9^2vgn!@=`cv5NLoOc^Y;-QuG-PEVz;+}o
zcENrCULQOkUgTneivF3xTc}jz)O*_!j#u{k5_Y%2vSBq76X>=lfe@Sy)M^rlSN41<
zFBak9y3SHYoe91;AFxb0c`@LxEMB>3K(+u^@@dlfv)n11o(YQ9DYCV@ysWAe)bA*@
zA?~zt*M)Z<VJR~qy|&2pYI3hlOaez}1ji{^%UIvQ?LoN=x7VL>wRm*@RfYubyBDcy
zzi@ld(BZ+WEz+fP2fGEuIfi0A$28@nAFW2*$}b-Lm=yg4isoRq;qlX-+{iBf5B^t>
nvr??6H@Wu&uC1-?2Lp-UJe5p>RuR>I00000NkvXXu0mjfVs`!d

diff --git a/images/icon_thumb_up.png b/images/icon_thumb_up.png
deleted file mode 100644
index 2bd16ccf294bd944c6bf17fa0345885469980820..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz{YgYYR5;6(
zlR;|}Q4q%ywK*uB`~V(A58^?=k7B`|1LCO_4}zCs4T7aDg-Qh#6xy2?LjyqywQXvQ
z8xl6Gq05F18+Mmnc701Wq*CjlKM!whj5W|6=J4Lk|2H#l=B0qtk*RS8HF|(<f#xj_
z`9|3Ah2~wNX<NiS(9NHy&dlims<?m_yv6q+?ty0Zsk##<2S5rXy3KCu7f}~N0g9=z
z>EAdBAPt<OvwxAAGlT2MDr_6d)@wGr^P>T3aD}=*%{NbB*ZGcS?IC*5jinhDl=TC)
z^a(zA>EnR9^9j#^IEMZn^!id5#SnEtL|{9h>X0|4DCpP8H?Ix=ni&xHWU$qNT21yZ
z5^*RX2qmP^fMQ*vP*nzi&BkZ)YfvhI(E`_#urPuk5&HpnzVw-Gc(=*`uwjl<Z^+W4
zt_<kL65xm61>h!P+m)3pz5ENXE;8&W2W*v~T!vOF>0KmQeQ*+S#{tWRxh00jSgfv7
zu5dK}P{{s0ADkp>$Chu@w&3}~KY;h%H7W`eKSHG<MIw^f|A^ZiXtklK!{hlM!+;g{
z3@eR06bfJ%QXB{gGEDfQ!0h57xmn2OV(#Xw<E#A2NHbr*#oXF9Z&nX^u?*8s;Nhcv
z?oWN?-eivK<W0t(j*(p$`~P2%D}5Ho@NDsNavu4aegpALNqNzBB)0$n002ovPDHLk
FV1f!F7%cz*

diff --git a/images/icon_tick.png b/images/icon_tick.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9925a06ab02db30c1e7ead9c701c15bc63145cb
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybR5;7M
zli4mqVHAaX=Q!_TZq*o5LaK&TC+g@aMJbINs;8}1t3yf*$E6r*j>Hs{AQG2a)rMyf
zFQK~pm1x3+7!nu%-M`k}``c>^00{o_1pjWJUTfl8mg=3qGEl8H@}^@w`VUx0_$uy4
z2FhRqKX}xI*?Tv<H&*Dj)Tr<j*}f%KtVns|p$^k=7pCG)bZ)nz(p!uYhmcBtGG4MZ
zhBKz;vsk_?<x?$B#+(Sm9B-A&-Qq;?SOJwD!Fa)z^`0_M+_eepu5##IOknYS`&tC<
z#^ArRgWXi2%vG2uvgcE2i2di<+TKw6qc6;1IyMf?mMlSF4apWIQ-(bTzNj7ETMiu?
z3Y3nE5@K5(^<j-YCz?$CVH?a>1DJd8z#F#0c%*~rM30HE1@2o5m~}ZyoWhqv>ql{V
z1ZGE0lgcoK^lx+eqc*rAX1Ky;Xx3U%u#zG!m-;eD1Qsn@kf3|F9qz~|95=&g3(7!X
zB}JAT>RU;a%vaNOGnJ%e1=K6eAh43c(QN8RQ6~GP%O}Jju$~Ld*%`mO1p<rCAIZx2
bmuq|lzM`o-QVIh|00000NkvXXu0mjfO@{7Q

literal 0
HcmV?d00001

diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index bfe1e628..2fc034bb 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -353,6 +353,7 @@ class Song extends database_object implements media {
 		return $array;
 
 	} // compare_song_information
+	
 
 	/**
 	 * update
@@ -734,6 +735,28 @@ class Song extends database_object implements media {
 
 	} // format_pattern
 
+	/**
+	 * get_fields
+	 * This returns all of the 'data' fields for this object, we need to filter out some that we don't
+	 * want to present to a user, and add some that don't exist directly on the object but are related
+	 */
+	public static function get_fields() { 
+
+		$fields = get_class_vars('Song'); 
+
+		unset($fields['id'],$fields['_transcoded'],$fields['_fake'],$fields['cache_hit'],$fields['mime'],$fields['type']); 
+
+		// Some additional fields
+		$fields['tag'] = true; 
+		$fields['catalog'] = true; 
+//FIXME: These are here to keep the ideas, don't want to have to worry about them for now
+//		$fields['rating'] = true; 
+//		$fields['recently Played'] = true; 
+
+		return $fields; 
+
+	} // get_fields
+
 	/**
 	 * get_from_path
 	 * This returns all of the songs that exist under the specified path
diff --git a/random.php b/random.php
index ef488b76..34ff7c26 100644
--- a/random.php
+++ b/random.php
@@ -36,6 +36,8 @@ 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';
+
 	break;
 } // end switch 
 
diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php
index fe1113da..50fb5cdc 100644
--- a/templates/show_democratic_playlist.inc.php
+++ b/templates/show_democratic_playlist.inc.php
@@ -70,9 +70,9 @@ foreach($object_ids as $row_id=>$object_data) {
 <tr class="<?php echo flip_class(); ?>">
 	<td class="cel_action">
 	<?php if ($democratic->has_vote($song->id)) { ?>
-	<?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $row_id,'thumb_down',_('Remove Vote'),'remove_vote_' . $row_id); ?>
+	<?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $row_id,'delete',_('Remove Vote'),'remove_vote_' . $row_id); ?>
 	<?php } else { ?>
-	<?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $song->id . '&type=' . scrub_out($object_data['1']),'thumb_up',_('Add Vote'),'remove_vote_' . $row_id); ?>
+	<?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $song->id . '&type=' . scrub_out($object_data['1']),'tick',_('Add Vote'),'remove_vote_' . $row_id); ?>
 	<?php } ?>
 	</td>
 	<td class="cel_votes"><?php echo scrub_out($democratic->get_vote($row_id)); ?></td>
@@ -82,7 +82,7 @@ foreach($object_ids as $row_id=>$object_data) {
 	<td class="cel_time"><?php echo $song->f_time; ?></td>
 	<?php if ($GLOBALS['user']->has_access(100)) { ?>
 	<td class="cel_admin">
-	<?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $row_id,'delete',_('Delete'),'delete_row_' . $row_id); ?>
+	<?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $row_id,'disable',_('Delete'),'delete_row_' . $row_id); ?>
 	</td>
 	<?php } ?>
 </tr>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 72094209..e0dc3dfe 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -19,91 +19,60 @@
 
 */
 ?>
-<?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">
+<?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" />
+</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>
+</tr>
 <tr>
-	<td><?php echo _('Item count'); ?></td>
-	<td>
-		<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>
+	<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 rowspan="5" valign="top"><?php echo  _('Tags'); ?></td>
-	<td rowspan="5">
+	<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>
 </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>
+		<?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'),'save_random_rules'); ?><?php echo _('Save Rules As...'); ?>
+	</td>
+	<td>
+		<?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><?php echo _('Type'); ?></td>
-	<td>
-		<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 show_catalog_select('catalog',''); ?>
-	</td>
-</tr>
-<tr>
-	<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 colspan="3">
+		<div id="rule_status"></div>
 	</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>
diff --git a/templates/show_random_rules.inc.php b/templates/show_random_rules.inc.php
new file mode 100644
index 00000000..4e9d30c3
--- /dev/null
+++ b/templates/show_random_rules.inc.php
@@ -0,0 +1,43 @@
+<?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(_('Rules')); ?>
+<table class="tabledata" cellpadding="0" cellspacing="0">
+<colgroup>
+	<col id="col_field" />
+	<col id="col_operator" />
+	<col id="col_value" />
+	<col id="col_action" />
+</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_action"><?php echo _('Action'); ?></th>
+</tr>
+<tr>
+	<td></td>
+	<td></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+<?php show_box_bottom(); ?>