diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-05 01:54:51 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-05 01:54:51 +0000 |
| commit | 7b89ee50023a4a8ea60e9bc1789072d6a1db91e9 (patch) | |
| tree | 811719b74a218c711bd6a5d9de2b744cabd04801 | |
| parent | 805d273b0f41ba55027babaeff01845d7bd04d64 (diff) | |
| download | ampache-7b89ee50023a4a8ea60e9bc1789072d6a1db91e9.tar.gz ampache-7b89ee50023a4a8ea60e9bc1789072d6a1db91e9.tar.bz2 ampache-7b89ee50023a4a8ea60e9bc1789072d6a1db91e9.zip | |
fixed album/artist/whateva editing, fixing stats, fixed search...
| -rw-r--r-- | lib/class/catalog.class.php | 6 | ||||
| -rw-r--r-- | server/ajax.server.php | 2 | ||||
| -rw-r--r-- | templates/show_search.inc.php | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 943f18f4..4b8a854d 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -237,17 +237,17 @@ class Catalog { $time = $data['1']; $size = $data['2']; - $sql = "SELECT COUNT(`album`) FROM `song` $catalog_search GROUP BY `album`"; + $sql = "SELECT COUNT(DISTINCT(`album`)) FROM `song` $catalog_search"; $db_results = Dba::query($sql); $data = Dba::fetch_row($db_results); $albums = $data['0']; - $sql = "SELECT COUNT(`artist`) FROM `song` $catalog_search GROUP BY `artist`"; + $sql = "SELECT COUNT(DISTINCT(`artist`)) FROM `song` $catalog_search"; $db_results = Dba::query($sql); $data = Dba::fetch_row($db_results); $artists = $data['0']; - $sql = "SELECT COUNT(`genre`) FROM `song` $catalog_search GROUP BY `genre`"; + $sql = "SELECT COUNT(DISTINCT(`genre`)) FROM `song` $catalog_search"; $db_results = Dba::query($sql); $data = Dba::fetch_row($db_results); $genres = $data['0']; diff --git a/server/ajax.server.php b/server/ajax.server.php index b8b71aae..5c3537be 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -117,7 +117,7 @@ switch ($_REQUEST['action']) { $level = '50'; - if ($_POST['type'] = 'playlist') { + if ($_POST['type'] == 'playlist') { $playlist = new Playlist($_POST['id']); if ($GLOBALS['user']->id == $playlist->user) { $level = '25'; diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index c97f7535..0dda6a47 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -139,12 +139,4 @@ </tr> </table> </form> - -<?php if ($_REQUEST['action'] == 'search' || $_REQUEST['action'] == 'quick_search') { ?> -<br /> -<form method="post" action="<?php echo Config::get('web_path'); ?>/playlist.php?action=add_dyn_song"> -<?php echo _('Save Search As Track on'); ?>: -<?php show_playlist_select($_SESSION['data']['playlist_id'],'dynamic'); ?> -<input class="button" type="submit" value="<?php echo _('Save'); ?>" /></form> -<?php } ?> <?php show_box_bottom(); ?> |