diff options
| -rw-r--r-- | admin/catalog.php | 2 | ||||
| -rw-r--r-- | bin/write_tags.inc | 6 | ||||
| -rw-r--r-- | browse.php | 3 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 3 | ||||
| -rw-r--r-- | genre.php | 6 | ||||
| -rw-r--r-- | lib/class/browse.class.php | 4 | ||||
| -rw-r--r-- | lib/class/dba.class.php | 2 | ||||
| -rw-r--r-- | lib/init.php | 2 | ||||
| -rw-r--r-- | lib/preferences.php | 2 | ||||
| -rw-r--r-- | search.php | 4 | ||||
| -rw-r--r-- | templates/show_album.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_artist.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_playlist.inc.php | 2 |
13 files changed, 18 insertions, 22 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index 64a09333..9e82268f 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -209,6 +209,8 @@ switch ($_REQUEST['action']) { case 'show_catalogs': $catalog_ids = Catalog::get_catalogs(); Browse::set_type('catalog'); + Browse::set_static_content(1); + Browse::save_objects($catalog_ids); Browse::show_objects($catalog_ids); break; case 'show_add_catalog': diff --git a/bin/write_tags.inc b/bin/write_tags.inc index ef5152e5..90eb95ad 100644 --- a/bin/write_tags.inc +++ b/bin/write_tags.inc @@ -1,7 +1,7 @@ <?php /* - Copyright 2001 - 2006 Ampache.org + Copyright 2001 - 2007 Ampache.org All Rights Reserved This program is free software; you can redistribute it and/or @@ -31,6 +31,10 @@ $path = dirname(__FILE__); $prefix = realpath($path . '/../'); require_once $prefix . '/lib/init.php'; +// This is all broken currently so just jump ship +echo "Writting of Tags to files is not currently supported by Getid3() exiting...\n"; +exit; + // Include getID3 libs, including the ability to write tags $getID3 = new getID3(); getid3_lib::IncludeDependency(GETID3_INCLUDEPATH . "write.php", __FILE__); @@ -36,7 +36,6 @@ require_once 'lib/init.php'; /* Display the headers and menus */ show_header(); -echo '<div id="browse_content">'; switch($_REQUEST['action']) { case 'file': @@ -98,8 +97,6 @@ switch($_REQUEST['action']) { break; } // end Switch $action -echo '</div>'; - /* Show the Footer */ show_footer(); ?> diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 864d78c2..5702ecb1 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,9 @@ -------------------------------------------------------------------------- v.3.4-Beta2 + - Fixed issue with page-a-nation on show catalogs page + - Fixed removal of rating from db when 'unrating' the object + - Fixed Itunes Export (Thx flashk) - Fixed session start failure when use_auth is off and you have no pre-existing cookie - Fixed print_tags.inc file to catalog matching, now fuzzy like it @@ -34,14 +34,12 @@ switch($_REQUEST['action']) { $genre = new Genre($_REQUEST['genre_id']); show_genre($_REQUEST['genre_id']); $object_ids = $genre->get_songs(); - echo "<div id=\"browse_content\">"; Browse::reset_filters(); Browse::set_type('song'); Browse::set_sort('name','ASC'); Browse::set_static_content(1); Browse::save_objects($object_ids); Browse::show_objects($object_ids); - echo "</div>"; break; case 'show_genre': default: @@ -49,27 +47,23 @@ switch($_REQUEST['action']) { $genre = new Genre($_REQUEST['genre_id']); show_genre($_REQUEST['genre_id']); $object_ids = $genre->get_albums(); - echo "<div id=\"browse_content\">"; Browse::reset_filters(); Browse::set_type('album'); Browse::set_sort('name','ASC'); Browse::set_static_content(1); Browse::save_objects($object_ids); Browse::show_objects($object_ids); - echo "</div>"; break; case 'show_artists': $genre = new Genre($_REQUEST['genre_id']); show_genre($_REQUEST['genre_id']); $object_ids = $genre->get_artists(); - echo "<div id=\"browse_content\">"; Browse::reset_filters(); Browse::set_type('artist'); Browse::set_sort('name','ASC'); Browse::set_static_content(1); Browse::save_objects($object_ids); Browse::show_objects($object_ids); - echo "</div>"; break; } // action diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index 2e65a783..ae82d271 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -619,6 +619,8 @@ class Browse { ${$class_name} = new $class_name($id); } + Ajax::start_container('browse_content'); + // Switch on the type of browsing we're doing switch ($_SESSION['browse']['type']) { case 'song': @@ -676,6 +678,8 @@ class Browse { break; } // end switch on type + Ajax::end_container(); + } // show_object /** diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php index 3facabd3..3a348a46 100644 --- a/lib/class/dba.class.php +++ b/lib/class/dba.class.php @@ -56,6 +56,7 @@ class Dba { // Run the query $resource = mysql_query($sql,self::dbh()); + debug_event('Query',$sql,'6'); // Save the query, to make debug easier self::$_sql = $sql; @@ -85,7 +86,6 @@ class Dba { public static function fetch_assoc($resource) { $result = mysql_fetch_assoc($resource); - debug_event('Assoc',self::$_sql,'6'); if (!$result) { return array(); diff --git a/lib/init.php b/lib/init.php index 15ccf72d..01f15bb2 100644 --- a/lib/init.php +++ b/lib/init.php @@ -81,7 +81,7 @@ if (!count($results)) { } /** This is the version.... fluf nothing more... **/ -$results['version'] = '3.4-Beta2 Build (001)'; +$results['version'] = '3.4-Beta2 Build (002)'; $results['int_config_version'] = '6'; $results['raw_web_path'] = $results['web_path']; diff --git a/lib/preferences.php b/lib/preferences.php index ea77ce02..7247bf63 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -49,7 +49,7 @@ function update_preferences($pref_id=0) { $name = $data['name']; $apply_to_all = "check_" . $data['name']; $id = $data['id']; - $value = Dba::escape(scrub_in($_REQUEST[$name])); + $value = scrub_in($_REQUEST[$name]); /* Some preferences require some extra checks to be performed */ switch ($name) { @@ -43,11 +43,9 @@ switch ($_REQUEST['action']) { require_once Config::get('prefix') . '/templates/show_search.inc.php'; $results = run_search($_REQUEST); Browse::set_type('song'); + Browse::set_static_content(1); Browse::save_objects($results); - - echo "<div id=\"browse_content\">"; Browse::show_objects($results); - echo "</div>"; break; case 'save_as_track': $playlist_id = save_search($_REQUEST); diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index 45cb95bc..4b81c4ff 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -63,7 +63,6 @@ $title = scrub_out($album->name) . ' (' . $album->year . ') -- ' <div id="additional_information"> </div> -<div id="browse_content"> <?php $object_ids = $album->get_songs(); Browse::set_type('song'); @@ -71,4 +70,3 @@ $title = scrub_out($album->name) . ' (' . $album->year . ') -- ' Browse::save_objects($object_ids); Browse::show_objects($object_ids); ?> -</div> diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 720e36b5..2bbb9cf5 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -24,7 +24,6 @@ $web_path = Config::get('web_path'); require Config::get('prefix') . '/templates/show_artist_box.inc.php'; ?> -<div id="browse_content"> <?php Browse::reset_filters(); Browse::set_type('album'); @@ -32,4 +31,3 @@ require Config::get('prefix') . '/templates/show_artist_box.inc.php'; Browse::save_objects($albums); Browse::show_objects($albums); ?> -</div> diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index 057fcec1..0c72526c 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -33,7 +33,6 @@ $web_path = Config::get('web_path'); </ul> </div> <?php show_box_bottom(); ?> -<div id="browse_content"> <?php $object_ids = $playlist->get_items(); Browse::set_type('playlist_song'); @@ -42,4 +41,3 @@ $web_path = Config::get('web_path'); Browse::save_objects($object_ids); Browse::show_objects($object_ids); ?> -</div> |