Reworked search

Still has tentacles and should have been integrated into the existing
API/Browse implementation better, but it's functional.

1 files changed, 27 insertions, 118 deletions

diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php
index 47c3085f..18992b16 100644
--- a/templates/show_search.inc.php
+++ b/templates/show_search.inc.php
@@ -37,130 +37,39 @@
  */
 ?>
 <?php show_box_top(_('Search Ampache') . "..."); ?>
-<form name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
+<form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline">
 <table class="tabledata" cellpadding="3" cellspacing="0">
-<tr class="<?php echo flip_class(); ?>">
-        <td><?php echo _('Keywords') ?></td>
+	<tr>
+		<td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=song"><?php echo _('Songs'); ?></a><?php } else { echo _('Songs'); } ?></td>
+		<td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=album"><?php echo _('Albums'); ?></a><?php } else { echo _('Albums'); } ?></td>
+		<td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=artist"><?php echo _('Artists'); ?></a><?php } else { echo _('Artists'); } ?></td>
+		<td><?php if ($_REQUEST['type'] != 'video') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=video"><?php echo _('Videos'); ?></a><?php } else { echo _('Videos'); } ?></td>
+	</tr>
+	<tr><td>&nbsp;</td></tr>
+</table>
+<table class="tabledata" cellpadding="3" cellspacing="0">
+	<tr>
+	<td><?php echo _('Maximum Results'); ?></td>
         <td>
-            <input type="text" id="s_all" name="s_all" value="<?php echo scrub_out($_REQUEST['s_all']); ?>"/>
+                <select name="limit">
+                        <option value="0"><?php echo _('Unlimited'); ?></option>
+                        <option value="25" <?php if($_REQUEST['limit']=="25") echo "selected=\"selected\""?>>25</option>
+                        <option value="50" <?php if($_REQUEST['limit']=="50") echo "selected=\"selected\""?>>50</option>
+                        <option value="100" <?php if($_REQUEST['limit']=="100") echo "selected=\"selected\""?>>100</option>
+                        <option value="500" <?php if($_REQUEST['limit']=="500") echo "selected=\"selected\""?>>500</option>
+                </select>
         </td>
-	<td><?php echo _('Comment'); ?></td>
-        <td>
-		<input type="text" id="s_comment" name="s_comment" value="<?php echo scrub_out($_REQUEST['s_comment']); ?>" />
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Title'); ?></td>
-	<td>
-		<input type="text" id="s_title" name="s_title" value="<?php echo scrub_out($_REQUEST['s_title']); ?>"  />
-	</td>
-	<td><?php echo _('Artist'); ?></td>
-	<td>
-		<input type="text" id="s_artist" name="s_artist" value="<?php echo scrub_out($_REQUEST['s_artist']); ?>"  />
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Album'); ?></td>
-	<td>
-		<input type="text" id="s_album" name="s_album" value="<?php echo scrub_out($_REQUEST['s_album']); ?>" />
-	</td>
-	<td><?php echo _('Tag'); ?></td>
-	<td>
-		<input type="text" id="s_tag" name="s_tag" value="<?php echo scrub_out($_REQUEST['s_tag']); ?>" />
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Year'); ?></td>
-	<td>
-		<input type="text" id="s_year" name="s_year" size="5" value="<?php echo scrub_out($_REQUEST['s_year']); ?>" />
-		-
-		<input type="text" id="s_year2" name="s_year2" size="5" value="<?php echo scrub_out($_REQUEST['s_year2']); ?>" />
-	</td>
-	<td><?php echo _('Filename'); ?></td>
-	<td>
-		<input type="text" id="s_filename" name="s_filename" value="<?php echo scrub_out($_REQUEST['s_filename']); ?>" />
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Time'); ?></td>
-	<td>
-		<input type="text" id="s_time" name="s_time" size="3" value="<?php echo scrub_out($_REQUEST['s_time']); ?>" />
-		-
-		<input type="text" id="s_time2" name="s_time2" size="3" value="<?php echo scrub_out($_REQUEST['s_time2']); ?>" />
-		<?php echo _('minutes'); ?>
-	</td>
-	<td><?php echo _('Codec'); ?></td>
-	<td>
-		<input type="text" id="s_codec" name="s_codec" size="5" value="<?php echo scrub_out($_REQUEST['s_codec']); ?>" />
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Played'); ?></td>
-	<td>
-		<select id="s_played" name="s_played" >
-			<option value="">&nbsp;</option>
-			<option value="1" <?php if($_REQUEST['s_played']=="1") echo "selected=\"selected\""?>><?php echo _('Yes'); ?></option>
-			<option value="0" <?php if($_REQUEST['s_played']=="0") echo "selected=\"selected\""?>><?php echo _('No'); ?></option>
-		</select>
-	</td>
-	<td><?php echo _('Min Bitrate'); ?></td>
-	<td>
-		<select id="s_minbitrate" name="s_minbitrate" >
-			<option value="">&nbsp;</option>
-                 <?php foreach(array(32,40,48,56,64,80,96,112,128,160,192,224,256,320) as $val) { ?>
-                            <option value="<?php echo $val?>" <?php if($_REQUEST['s_minbitrate']==$val) echo "selected=\"selected\""?>><?php echo $val?></option>
-                 <?php  } ?>
-		</select>
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Rating'); ?></td>
-	<td>
-		<select id="s_rating_operator" name="s_rating_operator">
-			<option value="0" <?php if($_REQUEST['s_rating_operator']=="0") echo "selected=\"selected\""?>><?php echo _('>='); ?></option>
-			<option value="1" <?php if($_REQUEST['s_rating_operator']=="1") echo "selected=\"selected\""?>><?php echo _('<='); ?></option>
-			<option value="2" <?php if($_REQUEST['s_rating_operator']=="2") echo "selected=\"selected\""?>><?php echo _('='); ?></option>
-		</select>
-		<select id="s_rating" name="s_rating">
-			<option value="">&nbsp;</option>
-			<option value="1" <?php if($_REQUEST['s_rating']=="1") echo "selected=\"selected\""?>><?php echo _('One Star'); ?></option>
-			<option value="2" <?php if($_REQUEST['s_rating']=="2") echo "selected=\"selected\""?>><?php echo _('Two Stars'); ?></option>
-			<option value="3" <?php if($_REQUEST['s_rating']=="3") echo "selected=\"selected\""?>><?php echo _('Three Stars'); ?></option>
-			<option value="4" <?php if($_REQUEST['s_rating']=="4") echo "selected=\"selected\""?>><?php echo _('Four Stars'); ?></option>
-			<option value="5" <?php if($_REQUEST['s_rating']=="5") echo "selected=\"selected\""?>><?php echo _('Five Stars'); ?></option>
-		</select>
-	</td>
-	<td><?php echo _('Operator'); ?></td>
-	<td>
-		<select name="operator">
-			<option value="and" <?php if($_REQUEST['operator']=="and") echo "selected=\"selected\""?>><?php echo _('AND'); ?></option>
-			<option value="or"  <?php if($_REQUEST['operator']=="or") echo "selected=\"selected\""?>><?php echo _('OR'); ?></option>
-		</select>
-	</td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
-	<td><?php echo _('Method'); ?></td>
-	<td>
-		<select name="method">
-			<option value="fuzzy" <?php if($_REQUEST['method']=="fuzzy") echo "selected=\"selected\""?>><?php echo _('Fuzzy'); ?></option>
-			<option value="exact" <?php if($_REQUEST['method']=="exact") echo "selected=\"selected\""?>><?php echo _('Exact'); ?></option>
-		</select>
-	</td>
-	<td><?php echo _('Maximum Results'); ?></td>
-	<td>
-		<select name="limit">
-			<option value="0"><?php echo _('Unlimited'); ?></option>
-			<option value="25" <?php if($_REQUEST['limit']=="25") echo "selected=\"selected\""?>>25</option>
-			<option value="50" <?php if($_REQUEST['limit']=="50") echo "selected=\"selected\""?>>50</option>
-			<option value="100" <?php if($_REQUEST['limit']=="100") echo "selected=\"selected\""?>>100</option>
-			<option value="500" <?php if($_REQUEST['limit']=="500") echo "selected=\"selected\""?>>500</option>
-		</select>
-	</td>
-</tr>
+	</tr>
 </table>
+
+<?php require Config::get('prefix') . '/templates/show_rules.inc.php'; ?>
+
 <div class="formValidation">
 	        <input class="button" type="submit" value="<?php echo _('Search'); ?>" />&nbsp;&nbsp;
-	        <input type="hidden" name="action" value="search" />
+<?php if ($_REQUEST['type'] == 'song' || ! $_REQUEST['type']) { ?>
+		<input id="savesearchbutton" class="button" type="submit" value="<?php echo _('Save as Smart Playlist'); ?>" onClick="$('hiddenaction').setValue('save_as_smartplaylist');" />&nbsp;&nbsp;
+<?php } ?>
+	        <input type="hidden" id="hiddenaction" name="action" value="search" />
 </div>
 </form>
 <?php show_box_bottom(); ?>