added min album size

3 files changed, 60 insertions, 6 deletions

diff --git a/albums.php b/albums.php
index 35dd04c0..606104d7 100644
--- a/albums.php
+++ b/albums.php
@@ -30,6 +30,10 @@ if(isset($_REQUEST['match'])) $match = scrub_in($_REQUEST['match']);
 if(isset($_REQUEST['album'])) $album = scrub_in($_REQUEST['album']);
 if(isset($_REQUEST['artist'])) $artist = scrub_in($_REQUEST['artist']);
 $_REQUEST['artist_id'] = scrub_in($_REQUEST['artist_id']);
+$min_album_size = conf('min_album_size');
+if ($min_album_size == '') { 
+	$min_album_size = '0';
+}
 
 if ($_REQUEST['action'] === 'clear_art') { 
 	if (!$GLOBALS['user']->has_access('75')) { access_denied(); } 
@@ -158,31 +162,49 @@ else {
 			show_alphabet_list('albums','albums.php','show_all');
 			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
 			$offset_limit = 99999;
-			$sql = "SELECT id FROM album";
+                        $sql = "SELECT album.id FROM song,album ".
+                               " WHERE song.album=album.id ".
+                               "GROUP BY song.album ".
+                               "  HAVING COUNT(song.id) > $min_album_size ";
 			break;
                 case 'Show_missing_art':
                         show_alphabet_list('albums','albums.php','show_missing_art');
 			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
                         $offset_limit = 99999;
-                        $sql = "SELECT id FROM album where art is null";
+                        $sql = "SELECT album.id FROM song,album ".
+                               " WHERE song.album=album.id ".
+                               "   AND album.art is null ".
+                               "GROUP BY song.album ".
+                               "  HAVING COUNT(song.id) > $min_album_size ";
                         break; 
 		case 'Browse':
 		case 'show_albums':
 			show_alphabet_list('albums','albums.php','browse');
 			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
-			$sql = "SELECT id FROM album";
+                        $sql = "SELECT album.id FROM song,album ".
+                               " WHERE song.album=album.id ".
+                               "GROUP BY song.album ".
+                               "  HAVING COUNT(song.id) > $min_album_size ";
 			break;
 		case 'none':
 			show_alphabet_list('albums','albums.php','a');
 			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
-			$sql = "SELECT id FROM album WHERE name LIKE 'a%'";
+                        $sql = "SELECT album.id FROM song,album ".
+                               " WHERE song.album=album.id ".
+                               "   AND album.name LIKE 'a%'".
+                               "GROUP BY song.album ".
+                               "  HAVING COUNT(song.id) > $min_album_size ";
 			break;
 		default:
 			//FIXME: This is the old way of doing it, move this to browse 
 			show_alphabet_list('albums','albums.php',$match);
 			show_alphabet_form($match,_("Show Albums starting with"),"albums.php?action=match");
 			echo "<br /><br />";
-			$sql = "SELECT id FROM album WHERE name LIKE '$match%'";
+                        $sql = "SELECT album.id FROM song,album ".
+                               " WHERE song.album=album.id ".
+                               "   AND album.name LIKE '$match%'".
+                               "GROUP BY song.album ".
+                               "  HAVING COUNT(song.id) > $min_album_size ";
 	} // end switch
 
 	switch ($_REQUEST['type']) { 
@@ -193,7 +215,8 @@ else {
 			unset($_REQUEST['keep_view']);
 			$sql = "SELECT album.id, IF(COUNT(DISTINCT(song.artist)) > 1,'Various', artist.name) AS artist_name " . 
 				"FROM song,artist,album WHERE song.album=album.id AND song.artist=artist.id $match_string" . 
-				"GROUP BY album.name,album.year"; 
+				"GROUP BY album.name,album.year ".
+                                "HAVING COUNT(song.id) > $min_album_size ";
 			$sort_order = 'artist.name';
 		break;
 		default:
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 6521d6bd..8f2411ee 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.3.2
+	- Added Min Album size as preference, defaults to 0 (Thx Rubin)
 	- Fixed a problem with the automatic registration sorting on user
 		lists and admin notification of new users (Thx pb1dft)
 	- Fixed 'auto_user' config option on automatic registration it
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index a8da5062..e8de0190 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -276,6 +276,11 @@ class Update {
 
 		$version[] = array('version' => '332010','description' => $update_string);
 
+		$update_string = '- Add Min album size to preferences.';
+
+		$version[] = array('version' => '332011','description' => $update_string);
+
+
 		return $version;
 
 	} // populate_version
@@ -1600,5 +1605,30 @@ class Update {
 
 	} // update_332010
 
+        /**
+         * update_332011
+         *   Add min album size pref
+         */
+        function update_332011() {
+                /* Inser the new Localplay Controller */
+                $sql = "INSERT INTO preferences (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
+                        " VALUES ('min_album_size','0','Min Album Size','0','integer','interface')";
+                $db_results = mysql_query($sql, dbh());
+
+		/* Fix every users preferences */
+		$sql = "SELECT * FROM user";
+		$db_results = mysql_query($sql, dbh());
+
+		$user = new User();
+		$user->fix_preferences('-1');
+
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			$user->fix_preferences($r['username']);
+		} // while results
+
+                $this->set_version('db_version','332011');
+
+        } // update_332011
+
 } // end update class
 ?>