Resolve #401 new database update, reset album thumbs and use resized art...

7 files changed, 22 insertions, 5 deletions

diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index 0ce49909..373f662d 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -42,7 +42,9 @@ while ($i <= $rows) {
 				<br />
 				<p align="center">
 				<?php if (is_array($dimensions)) { ?>
-				[<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['heigh']); ?>] 
+				[<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['height']); ?>] 
+				<?php } else { ?>
+				<span class="error"><?php echo _('Invalid'); ?></span>
 				<?php } ?>
 				[<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo intval($_REQUEST['album_id']); ?>"><?php echo _('Select'); ?></a>]
 				</p>
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
index c6646fe4..000579d7 100644
--- a/templates/show_catalog_row.inc.php
+++ b/templates/show_catalog_row.inc.php
@@ -24,6 +24,7 @@ $web_path = Config::get('web_path');
 <td class="cel_path"><?php echo scrub_out($catalog->f_path); ?></td>
 <td class="cel_lastverify"><?php echo scrub_out($catalog->f_update); ?></td>
 <td class="cel_lastadd"><?php echo scrub_out($catalog->f_add); ?></td>
+<td class="cel_lastclean"><?php echo scrub_out($catalog->f_clean); ?></td>
 <td class="cel_action">
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a>
 	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php
index 44b233be..dedfa8f2 100644
--- a/templates/show_catalogs.inc.php
+++ b/templates/show_catalogs.inc.php
@@ -26,6 +26,7 @@
   <col id="col_path" />
   <col id="col_lastverify" />
   <col id="col_lastadd" />
+  <col id="col_lastclean" />
   <col id="col_action" />
 </colgroup>
 <tr class="th-top">
@@ -33,6 +34,7 @@
 	<th class="cel_path"><?php echo _('Path'); ?></th>
 	<th class="cel_lastverify"><?php echo _('Last Verify'); ?></th>
 	<th class="cel_lastadd"><?php echo _('Last Add'); ?></th>
+	<th class="cel_lastclean"><?php echo _('Last Clean'); ?></th>
 	<th class="cel_action"><?php echo _('Actions'); ?></th>
 </tr>
 <?php 
@@ -49,6 +51,7 @@
 	<th class="cel_path"><?php echo _('Path'); ?></th>
 	<th class="cel_lastverify"><?php echo _('Last Verify'); ?></th>
 	<th class="cel_lastadd"><?php echo _('Last Add'); ?></th>
+	<th class="cel_lastclean"><?php echo _('Last Clean'); ?></th>
 	<th class="cel_action"><?php echo _('Actions'); ?></th>
 </tr>
 </table>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 310be805..eff58442 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -51,6 +51,5 @@
 	Browse::set_type('playlist_song'); 
 	Browse::add_supplemental_object('playlist',$playlist->id); 
 	Browse::set_static_content(1);
-	Browse::save_objects($object_ids); 
 	Browse::show_objects($object_ids); 
 ?>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 7bef5db8..ecef8904 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -25,11 +25,13 @@
 	<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">
@@ -57,6 +59,12 @@
 	<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>
@@ -65,12 +73,13 @@
 	<td>
 		<?php echo Ajax::button('?page=random&action=save_rules','download',_('Save Rules As'),'save_random_rules'); ?><?php echo _('Save Rules As'); ?>
 	</td>
-	<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="3">
+	<td colspan="4">
 		<div id="rule_status"></div>
 	</td>
 </tr>
diff --git a/templates/show_random_rules.inc.php b/templates/show_random_rules.inc.php
index 4e9d30c3..4593ee82 100644
--- a/templates/show_random_rules.inc.php
+++ b/templates/show_random_rules.inc.php
@@ -25,12 +25,14 @@
 	<col id="col_field" />
 	<col id="col_operator" />
 	<col id="col_value" />
+	<col id="col_method" />
 	<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_method"><?php echo _('Method'); ?></th>
 	<th class="col_action"><?php echo _('Action'); ?></th>
 </tr>
 <tr>
@@ -38,6 +40,7 @@
 	<td></td>
 	<td></td>
 	<td></td>
+	<td></td>
 </tr>
 </table>
 <?php show_box_bottom(); ?>
diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
index a915d681..71dc4c0b 100644
--- a/templates/show_verify_catalog.inc.php
+++ b/templates/show_verify_catalog.inc.php
@@ -21,7 +21,7 @@
 
 show_box_top();
 printf(_('Updating the %s catalog'), "<strong>[ $catalog->name ]</strong>");
-echo "<br />\n" . $number . " " . _('songs found checking tag information.') . "<br />\n\n";
+echo "<br />\n" . $number . " " . _('items found checking tag information.') . "<br />\n\n";
 echo _('Verifed') . ":<span id=\"verify_count_$catalog_id\">$catalog_verify_found</span><br />"; 
 echo _('Reading') . ":<span id=\"verify_dir_$catalog_id\">$catalog_verify_directory</span><br />";
 show_box_bottom();