From: <wis...@us...> - 2012-03-25 22:42:41
|
Revision: 9189 http://xoops.svn.sourceforge.net/xoops/?rev=9189&view=rev Author: wishcraft Date: 2012-03-25 22:42:30 +0000 (Sun, 25 Mar 2012) Log Message: ----------- Karioki Song List 1.07 - complete first release final Modified Paths: -------------- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/requests.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/utf8map.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/votes.php XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/field.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsinger.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_albums_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_category_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_fieldlist.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_genre_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_requests_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_visibility.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_votes_edit.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_votes_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Added Paths: ----------- XoopsModules/songlist/releases/ XoopsModules/songlist/releases/1.07/ XoopsModules/songlist/releases/1.07/docs/ XoopsModules/songlist/releases/1.07/docs/.htaccess XoopsModules/songlist/releases/1.07/htdocs/ XoopsModules/songlist/releases/1.07/htdocs/modules/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/export.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_visibility.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/genre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/menu.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/permissions.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/requests.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/utf8map.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/votes.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/field.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/visibility.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/SonglistRequirement.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/credits.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/install.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/lang_diff.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/licence.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/docs/readme.txt XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/accept.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/cancel.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/no.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.albums.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.artists.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.category.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.field.permissions.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.fields.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.genre.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.import.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.permissions.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.requests.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.songs.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.utf8map.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/songlist.votes.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/16/yes.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.albums.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.artists.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.category.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.field.permissions.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.fields.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.genre.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.import.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.permissions.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.requests.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.songs.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.utf8map.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/32/songlist.votes.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/icons/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/left_both.gif XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/no.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/right_both.gif XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/songlist_slogo.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/xoopsxf_slogo.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/images/yes.png XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/JSON.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/formselectsinger.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/uploader.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/js/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/js/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/email.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/enum.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/mail_templates/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/mail_templates/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/mail_templates/songlist_request_created.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/mail_templates/songlist_request_updated.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/request.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/search.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.htm XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_albums_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_albums_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_artists_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_category_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_category_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_fieldlist.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_genre_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_genre_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_import_actiona.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_import_actionb.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_requests_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_requests_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_songs_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_visibility.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_votes_edit.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_cpanel_votes_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_requests_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_search.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/releases/1.07/htdocs/modules/tag/ XoopsModules/songlist/releases/1.07/htdocs/modules/tag/plugin/ XoopsModules/songlist/releases/1.07/htdocs/modules/tag/plugin/songlist.php XoopsModules/songlist/trunk/docs/.htaccess XoopsModules/songlist/trunk/htdocs/modules/songlist/images/icons/16/no.png XoopsModules/songlist/trunk/htdocs/modules/songlist/images/icons/16/yes.png XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/email.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/mail_templates/ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/mail_templates/index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/mail_templates/songlist_request_created.html XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/mail_templates/songlist_request_updated.html XoopsModules/songlist/trunk/htdocs/modules/songlist/request.php XoopsModules/songlist/trunk/htdocs/modules/songlist/search.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_import_actiona.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_import_actionb.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_requests_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search_search.html Removed Paths: ------------- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_results.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_rank.html Added: XoopsModules/songlist/releases/1.07/docs/.htaccess =================================================================== --- XoopsModules/songlist/releases/1.07/docs/.htaccess (rev 0) +++ XoopsModules/songlist/releases/1.07/docs/.htaccess 2012-03-25 22:42:30 UTC (rev 9189) @@ -0,0 +1,10 @@ + +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d + +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$4&fct=$5&id=$6&value=$7&gid=$8&cid=$9 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&id=$5&value=$6&gid=$7&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-(.*?)-([0-9]+)-([0-9]+)-(.*?).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&value=$5&gid=$6&cid=$7&singer=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$2&fct=$3&id=$4 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+).html modules/songlist/$1.php?op=$2&fct=$3 [L,NC,QSA] Added: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php (rev 0) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php 2012-03-25 22:42:30 UTC (rev 9189) @@ -0,0 +1,77 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + $aboutAdmin = new ModuleAdmin(); + $paypalitemno='SONGLIST'; + $aboutAdmin = new ModuleAdmin(); + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SONGLIST_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['xforumModule']->getVar('dirname')), strtoupper($GLOBALS['xforumModule']->getVar('dirname')). ' '.$GLOBALS['xforumModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/albums.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/albums.php (rev 0) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/albums.php 2012-03-25 22:42:30 UTC (rev 9189) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"albums"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "albums": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + + $criteria = $albums_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $albums_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($albums_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined(' '.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $albums_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $albumss = $albums_handler->getObjects($criteria, true); + foreach($albumss as $cid => $albums) { + if (is_object($albums)) + $GLOBALS['xoopsTpl']->append('albums', $albums->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_albums_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + if (isset($_REQUEST['id'])) { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + } else { + $albums = $albums_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $albums->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.html'); + break; + case "save": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $albums = $albums_handler->get($id); + } else { + $albums = $albums_handler->create(); + } + $albums->setVars($_POST[$id]); + + if (!$id=$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $albums = $albums_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($albums->getVar('image'))) + unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image')); + + $albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $albums->setVar('image', $uploader->getSavedFileName()); + @$albums_handler->insert($albums); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $albums = $albums_handler->get($id); + $albums->setVars($_POST[$id]); + if (!$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $albums = $albums_handler->get($id); + if (!$albums_handler->delete($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_DELETED); + exit(0); + } + } else { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ALBUMS_DELETE, $albums->getVar('title'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php (rev 0) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php 2012-03-25 22:42:30 UTC (rev 9189) @@ -0,0 +1,140 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"artists"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "artists": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + + $criteria = $artists_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $artists_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($artists_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $artistss = $artists_handler->getObjects($criteria, true); + foreach($artistss as $cid => $artists) { + if (is_object($artists)) + $GLOBALS['xoopsTpl']->append('artists', $artists->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + if (isset($_REQUEST['id'])) { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + } else { + $artists = $artists_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $artists->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.html'); + break; + case "save": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $artists = $artists_handler->get($id); + } else { + $artists = $artists_handler->create(); + } + $artists->setVars($_POST[$id]); + + if (!$id=$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } else { + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $artists = $artists_handler->get($id); + $artists->setVars($_POST[$id]); + if (!$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $artists = $artists_handler->get($id); + if (!$artists_handler->delete($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED); + exit(0); + } + } else { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artists->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/category.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/category.php (rev 0) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/category.php 2012-03-25 22:42:30 UTC (rev 9189) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"category"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "category": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + + $criteria = $category_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $category_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($category_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $categorys = $category_handler->getObjects($criteria, true); + foreach($categorys as $cid => $category) { + if (is_object($category)) + $GLOBALS['xoopsTpl']->append('categories', $category->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_category_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + if (isset($_REQUEST['id'])) { + $category = $category_handler->get(intval($_REQUEST['id'])); + } else { + $category = $category_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $category->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.html'); + break; + case "save": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $category = $category_handler->get($id); + } else { + $category = $category_handler->create(); + } + $category->setVars($_POST[$id]); + + if (!$id=$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $category = $category_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($category->getVar('image'))) + unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image')); + + $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $category->setVar('image', $uploader->getSavedFileName()); + @$category_handler->insert($category); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $category = $category_handler->get($id); + $category->setVars($_POST[$id]); + if (!$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + break; + case "delete": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if (isset($... [truncated message content] |
From: <wis...@us...> - 2012-03-26 01:06:02
|
Revision: 9190 http://xoops.svn.sourceforge.net/xoops/?rev=9190&view=rev Author: wishcraft Date: 2012-03-26 01:05:55 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.07 - complete first release final (sql/mysql.sql patch) Modified Paths: -------------- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php 2012-03-25 22:42:30 UTC (rev 9189) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php 2012-03-26 01:05:55 UTC (rev 9190) @@ -2,7 +2,7 @@ // XOOPS Version define('_MI_SONGLIST_NAME', 'Songlist'); - define('_MI_SONGLIST_DESCRIPTION', 'Songlist is a module for keeping karioki song lists and ranking of them.'); + define('_MI_SONGLIST_DESC', 'Karioki Songlist - a module for keeping karioki song lists and ranking of them.'); define('_MI_SONGLIST_DIRNAME', 'songlist'); // Form langauges Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql 2012-03-25 22:42:30 UTC (rev 9189) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 01:05:55 UTC (rev 9190) @@ -13,6 +13,7 @@ `votes` int(10) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', `updated` int(12) unsigned DEFAULT '0' + PRIMARY KEY (`abid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `songlist_artists` ( @@ -28,6 +29,7 @@ `hits` int(12) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', `updated` int(12) unsigned DEFAULT '0' + PRIMARY KEY (`aid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `songlist_category` ( Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/xoops_version.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/xoops_version.php 2012-03-25 22:42:30 UTC (rev 9189) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/xoops_version.php 2012-03-26 01:05:55 UTC (rev 9190) @@ -201,10 +201,12 @@ $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ARTISTS; $modversion['sub'][$i]['url'] = "artists.php"; $i++; -if ($GLOBALS['songlistModuleConfig']['album']) { - $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ALBUMS; - $modversion['sub'][$i]['url'] = "albums.php"; - $i++; +if (isset($GLOBALS['songlistModuleConfig']['album'])) { + if ($GLOBALS['songlistModuleConfig']['album']) { + $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ALBUMS; + $modversion['sub'][$i]['url'] = "albums.php"; + $i++; + } } $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_SEARCH; $modversion['sub'][$i]['url'] = "search.php"; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php 2012-03-25 22:42:30 UTC (rev 9189) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php 2012-03-26 01:05:55 UTC (rev 9190) @@ -2,7 +2,7 @@ // XOOPS Version define('_MI_SONGLIST_NAME', 'Songlist'); - define('_MI_SONGLIST_DESCRIPTION', 'Songlist is a module for keeping karioki song lists and ranking of them.'); + define('_MI_SONGLIST_DESC', 'Karioki Songlist - a module for keeping karioki song lists and ranking of them.'); define('_MI_SONGLIST_DIRNAME', 'songlist'); // Form langauges Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql 2012-03-25 22:42:30 UTC (rev 9189) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 01:05:55 UTC (rev 9190) @@ -13,6 +13,7 @@ `votes` int(10) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', `updated` int(12) unsigned DEFAULT '0' + PRIMARY KEY (`abid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `songlist_artists` ( @@ -28,6 +29,7 @@ `hits` int(12) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', `updated` int(12) unsigned DEFAULT '0' + PRIMARY KEY (`aid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `songlist_category` ( Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php 2012-03-25 22:42:30 UTC (rev 9189) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php 2012-03-26 01:05:55 UTC (rev 9190) @@ -201,10 +201,12 @@ $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ARTISTS; $modversion['sub'][$i]['url'] = "artists.php"; $i++; -if ($GLOBALS['songlistModuleConfig']['album']) { - $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ALBUMS; - $modversion['sub'][$i]['url'] = "albums.php"; - $i++; +if (isset($GLOBALS['songlistModuleConfig']['album'])) { + if ($GLOBALS['songlistModuleConfig']['album']) { + $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ALBUMS; + $modversion['sub'][$i]['url'] = "albums.php"; + $i++; + } } $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_SEARCH; $modversion['sub'][$i]['url'] = "search.php"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-03-26 01:34:00
|
Revision: 9191 http://xoops.svn.sourceforge.net/xoops/?rev=9191&view=rev Author: wishcraft Date: 2012-03-26 01:33:52 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.07 - complete first release final (sql/mysql.sql patch 2) Modified Paths: -------------- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -50,10 +50,10 @@ $criteria->setSort('`'.$GLOBALS['sort'].'`'); $criteria->setOrder($GLOBALS['order']); - $artistss = $artists_handler->getObjects($criteria, true); - foreach($artistss as $cid => $artists) { - if (is_object($artists)) - $GLOBALS['xoopsTpl']->append('artists', $artists->toArray()); + $artists = $artists_handler->getObjects($criteria, true); + foreach($artists as $cid => $artist) { + if (is_object($artist)) + $GLOBALS['xoopsTpl']->append('artists', $artist->toArray()); } $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -89,4 +89,7 @@ xoops_loadLanguage('admin', 'songlist'); $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist'); + + set_time_limit('320'); + ini_set('memory_limit', '196M'); ?> \ No newline at end of file Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -6,8 +6,11 @@ $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria_cat = new CriteriaCompo(); - foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { - $criteria_cat->add(new Criteria('`cid`', $cid, '='), 'OR'); + $cids = $category_handler->GetCatAndSubCat($_SESSION['cid']); + if (count($cids)>0) { + $criteria_cat->add(new Criteria('`cid`', '('.implode(',', $cids).')', 'IN'), 'OR'); + } else { + $criteria_cat->add(new Criteria('1', '1'), 'OR'); } $criteria_cat->setSort('`created`'); $criteria_cat->setOrder('ASC'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -6,9 +6,15 @@ $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria_cat = new CriteriaCompo(); - foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { - $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); + $cids = $category_handler->GetCatAndSubCat($_SESSION['cid']); + if (count($cids)>0) { + foreach($cids as $cid) { + $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); + } + } else { + $criteria_cat->add(new Criteria('1', '1'), 'OR'); } + $criteria_cat->setSort('`created`'); $criteria_cat->setOrder('ASC'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -219,19 +219,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -201,19 +201,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -162,19 +162,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -127,19 +127,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -275,19 +275,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + foreach($ret as $data) { + $id = array(); + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -68,8 +68,8 @@ $GLOBALS['start']=isset($_REQUEST['start'])?$_REQUEST['start']:0; $GLOBALS['limit']=isset($_REQUEST['limit'])?$_REQUEST['limit']:$GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows']; - print_r($_POST); - print_r($_GET); + set_time_limit('320'); + ini_set('memory_limit', '128M'); if (!isset($_SESSION['cid'])) $_SESSION['cid'] = $GLOBALS['cid']; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -6,7 +6,12 @@ $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria_cat = new CriteriaCompo(); - $criteria_cat->add(new Criteria('`cid`', '('.implode(',', $category_handler->GetCatAndSubCat($_SESSION['cid'])).')', 'IN'), 'OR'); + $cids = $category_handler->GetCatAndSubCat($_SESSION['cid']); + if (count($cids)>0) { + $criteria_cat->add(new Criteria('`cid`', '('.implode(',', $cids).')', 'IN'), 'OR'); + } else { + $criteria_cat->add(new Criteria('1', '1'), 'OR'); + } $criteria_cat->setSort('`created`'); $criteria_cat->setOrder('ASC'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 01:33:52 UTC (rev 9191) @@ -12,7 +12,7 @@ `rank` decimal(10,3) unsigned DEFAULT '0.000', `votes` int(10) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', - `updated` int(12) unsigned DEFAULT '0' + `updated` int(12) unsigned DEFAULT '0', PRIMARY KEY (`abid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -28,7 +28,7 @@ `votes` int(10) unsigned DEFAULT '0', `hits` int(12) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', - `updated` int(12) unsigned DEFAULT '0' + `updated` int(12) unsigned DEFAULT '0', PRIMARY KEY (`aid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -50,10 +50,10 @@ $criteria->setSort('`'.$GLOBALS['sort'].'`'); $criteria->setOrder($GLOBALS['order']); - $artistss = $artists_handler->getObjects($criteria, true); - foreach($artistss as $cid => $artists) { - if (is_object($artists)) - $GLOBALS['xoopsTpl']->append('artists', $artists->toArray()); + $artists = $artists_handler->getObjects($criteria, true); + foreach($artists as $cid => $artist) { + if (is_object($artist)) + $GLOBALS['xoopsTpl']->append('artists', $artist->toArray()); } $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -89,4 +89,7 @@ xoops_loadLanguage('admin', 'songlist'); $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist'); + + set_time_limit('320'); + ini_set('memory_limit', '196M'); ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -6,8 +6,11 @@ $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria_cat = new CriteriaCompo(); - foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { - $criteria_cat->add(new Criteria('`cid`', $cid, '='), 'OR'); + $cids = $category_handler->GetCatAndSubCat($_SESSION['cid']); + if (count($cids)>0) { + $criteria_cat->add(new Criteria('`cid`', '('.implode(',', $cids).')', 'IN'), 'OR'); + } else { + $criteria_cat->add(new Criteria('1', '1'), 'OR'); } $criteria_cat->setSort('`created`'); $criteria_cat->setOrder('ASC'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -6,9 +6,15 @@ $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria_cat = new CriteriaCompo(); - foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { - $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); + $cids = $category_handler->GetCatAndSubCat($_SESSION['cid']); + if (count($cids)>0) { + foreach($cids as $cid) { + $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); + } + } else { + $criteria_cat->add(new Criteria('1', '1'), 'OR'); } + $criteria_cat->setSort('`created`'); $criteria_cat->setOrder('ASC'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -219,19 +219,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -201,19 +201,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -162,19 +162,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -127,19 +127,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -275,19 +275,21 @@ function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { $ret = parent::getObjects($criteria, $id_as_key, $as_object); - $id = array(); - foreach($ret as $data) { - if ($as_object==true) { - if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { - $this->_objects['object'][$data->getVar($this->keyName)] = $data; - $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); - } - } else { - if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { - $this->_objects['array'][$data[$this->keyName]] = $data; - $id[$data[$this->keyName]] = $data[$this->keyName];; - } - } + if (!isset($GLOBALS['songlistAdmin'])) { + foreach($ret as $data) { + $id = array(); + if ($as_object==true) { + if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) { + $this->_objects['object'][$data->getVar($this->keyName)] = $data; + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } + } else { + if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) { + $this->_objects['array'][$data[$this->keyName]] = $data; + $id[$data[$this->keyName]] = $data[$this->keyName];; + } + } + } } if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) { $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -68,8 +68,8 @@ $GLOBALS['start']=isset($_REQUEST['start'])?$_REQUEST['start']:0; $GLOBALS['limit']=isset($_REQUEST['limit'])?$_REQUEST['limit']:$GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows']; - print_r($_POST); - print_r($_GET); + set_time_limit('320'); + ini_set('memory_limit', '128M'); if (!isset($_SESSION['cid'])) $_SESSION['cid'] = $GLOBALS['cid']; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php 2012-03-26 01:33:52 UTC (rev 9191) @@ -6,7 +6,12 @@ $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria_cat = new CriteriaCompo(); - $criteria_cat->add(new Criteria('`cid`', '('.implode(',', $category_handler->GetCatAndSubCat($_SESSION['cid'])).')', 'IN'), 'OR'); + $cids = $category_handler->GetCatAndSubCat($_SESSION['cid']); + if (count($cids)>0) { + $criteria_cat->add(new Criteria('`cid`', '('.implode(',', $cids).')', 'IN'), 'OR'); + } else { + $criteria_cat->add(new Criteria('1', '1'), 'OR'); + } $criteria_cat->setSort('`created`'); $criteria_cat->setOrder('ASC'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 01:05:55 UTC (rev 9190) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 01:33:52 UTC (rev 9191) @@ -12,7 +12,7 @@ `rank` decimal(10,3) unsigned DEFAULT '0.000', `votes` int(10) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', - `updated` int(12) unsigned DEFAULT '0' + `updated` int(12) unsigned DEFAULT '0', PRIMARY KEY (`abid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -28,7 +28,7 @@ `votes` int(10) unsigned DEFAULT '0', `hits` int(12) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', - `updated` int(12) unsigned DEFAULT '0' + `updated` int(12) unsigned DEFAULT '0', PRIMARY KEY (`aid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-03-26 02:02:32
|
Revision: 9192 http://xoops.svn.sourceforge.net/xoops/?rev=9192&view=rev Author: wishcraft Date: 2012-03-26 02:02:25 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.07 - complete first release final (Admin Warning/Notices) Modified Paths: -------------- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -18,6 +18,9 @@ $module_handler = xoops_gethandler('module'); $modules = $module_handler->getObjects(null, true); + $categories = array(); + $weights = array(); + $GLOBALS['categoryHandler'] = xoops_getmodulehandler('category'); $criteria = new CriteriaCompo(); $criteria->setSort('weight'); @@ -32,7 +35,7 @@ } $GLOBALS['xoopsTpl']->assign('categories', $categories); } - unset($categories); + $valuetypes = array(XOBJ_DTYPE_ARRAY => _AM_SONGLIST_FIELDS_ARRAY, XOBJ_DTYPE_EMAIL => _AM_SONGLIST_FIELDS_EMAIL, XOBJ_DTYPE_INT => _AM_SONGLIST_FIELDS_INT, Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -76,14 +76,15 @@ } else { $extras_handler = xoops_getmodulehandler('extras'); - $fields = $extras_handler->loadFields(); - + $fields = array_merge(array(), $extras_handler->loadFields()); + if ( $op != "search" ) { - foreach (array_keys($fields) as $i ) { - if ( $restriction == "" || $fields[$i]->getVar($restriction) ) { - $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + if (is_array($fields)&&count($fields)>0) + foreach (array_keys($fields) as $i ) { + if ( $restriction == "" || $fields[$i]->getVar($restriction) ) { + $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + } } - } } else { $searchable_types = array('textbox', 'select', @@ -93,11 +94,12 @@ 'datetime', 'timezone', 'language'); - foreach (array_keys($fields) as $i ) { - if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) { - $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + if (is_array($fields)&&count($fields)>0) + foreach (array_keys($fields) as $i ) { + if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) { + $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + } } - } } } $form->display(); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -8,11 +8,11 @@ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"import"; $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"actiona"; - $limit = strlen($_REQUEST['limit'])?intval($_REQUEST['limit']):30; - $start = strlen($_REQUEST['start'])?intval($_REQUEST['start']):0; - $order = strlen($_REQUEST['order'])?$_REQUEST['order']:'DESC'; - $sort = strlen($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; - $filter = strlen($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + $limit = isset($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = isset($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = isset($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = isset($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = isset($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; switch($op) { default: Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -101,7 +101,7 @@ function songlist_getFilterElement($filter, $field, $sort='created', $op = '', $fct = '') { $components = songlist_getFilterURLComponents($filter, $field, $sort); $ele = false; - include_once('formobjects.songlist.php'); + include_once('songlist.object.php'); switch ($field) { case 'cid': if ($op!='category') { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -334,7 +334,7 @@ return $form; } - function songlist_import_get_form() { + function songlist_import_get_form($as_array = false) { xoops_loadLanguage('forms', 'songlist'); @@ -359,7 +359,7 @@ } - function songlist_importb_get_form($file) { + function songlist_importb_get_form($file, $as_array = false) { xoops_loadLanguage('forms', 'songlist'); @@ -464,7 +464,7 @@ $ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_ARTISTS:''), $object->getVar('artists')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -537,7 +537,7 @@ $ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -604,7 +604,7 @@ $ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -686,7 +686,7 @@ $ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_ARTISTS:''), $object->getVar('artists')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -938,7 +938,8 @@ $fields = $extras_handler->loadFields(); $required = array(); - + $elements = array(); + $weights = array(); if ($object->getVar('sid')>0) $extra = $extras_handler->get($object->getVar('sid')); else @@ -984,7 +985,7 @@ } $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -41,8 +41,7 @@ define('_AM_SONGLIST_TH_UTFID', 'Map ID'); define('_AM_SONGLIST_TH_FROM', 'From'); define('_AM_SONGLIST_TH_TO', 'To'); - define('_AM_SONGLIST_TH_ABID', 'Album ID'); - + // Category define('_AM_SONGLIST_CATEGORY_H1', 'Categories'); define('_AM_SONGLIST_CATEGORY_P', 'These are the categories and child categories you have on the system.'); @@ -207,7 +206,6 @@ define('_AM_SONGLIST_FIELDS_TEXTBOX', 'Text-box'); define('_AM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select'); define('_AM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio'); - define('_AM_SONGLIST_FIELDS_DATE', 'Date'); define('_AM_SONGLIST_FIELDS_DATETIME', 'Date Time'); define('_AM_SONGLIST_FIELDS_LONGDATE', 'Long Date'); define('_AM_SONGLIST_FIELDS_THEME', 'Theme Select'); @@ -232,6 +230,7 @@ define('_AM_SONGLIST_IMPORT_ACTIONA_P', 'Select an XML File you have exported from Excel or other platform to import.'); define('_AM_SONGLIST_IMPORT_ACTIONB_H1', 'Specify Element Names'); define('_AM_SONGLIST_IMPORT_ACTIONB_P', 'You have to specify from the example the elements that exists in this XML file to import, may vary from file to file and also if you specify no element name the field type is ignored..'); + define('_AM_SONGLIST_XMLFILE_COMPLETE', 'XML File Import and Comparison Complete!'); // About Box define('_AM_SONGLIST_ABOUT_MAKEDONATE', 'Make Song List Better Donate Today!'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -160,7 +160,6 @@ define('_FRM_SONGLIST_FIELDS_TEXTBOX', 'Text-box'); define('_FRM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select'); define('_FRM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio'); - define('_FRM_SONGLIST_FIELDS_DATE', 'Date'); define('_FRM_SONGLIST_FIELDS_DATETIME', 'Date Time'); define('_FRM_SONGLIST_FIELDS_LONGDATE', 'Long Date'); define('_FRM_SONGLIST_FIELDS_THEME', 'Theme Select'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -11,9 +11,9 @@ <{$smarty.const._MN_SONGLIST_SONGS}> </div> <div class="sl_subalbum"> - <{assign item=songs value=0}> + <{assign var=songs value=0}> <{foreach from=$album.songs item=song}> - <{assign item=songs value=$songs+1}> + <{assign var=songs value=$songs+1}> <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}> <{/foreach}> </div> @@ -23,9 +23,9 @@ <{$smarty.const._MN_SONGLIST_ARTISTS}> </div> <div class="sl_subartist"> - <{assign item=artists value=0}> + <{assign var=artists value=0}> <{foreach from=$album.artists item=artist}> - <{assign item=artists value=$artists+1}> + <{assign var=artists value=$artists+1}> <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($album.artists)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -6,9 +6,9 @@ <{$smarty.const._MN_SONGLIST_SONGS}> </div> <div class="sl_subartist"> - <{assign item=songs value=0}> + <{assign var=songs value=0}> <{foreach from=$artist.songs item=song}> - <{assign item=songs value=$songs+1}> + <{assign var=songs value=$songs+1}> <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($artist.songs)}>, <{/if}> <{/foreach}> </div> @@ -18,9 +18,9 @@ <{$smarty.const._MN_SONGLIST_ALBUMS}> </div> <div class="sl_subartist"> - <{assign item=albums value=0}> + <{assign var=albums value=0}> <{foreach from=$artist.albums item=album}> - <{assign item=albums value=$albums+1}> + <{assign var=albums value=$albums+1}> <a href="<{$album.url}>"><{$album.name}></a><{if not $albums < count($artist.albums)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -3,9 +3,9 @@ </div> <{if $category.subcategories}> <div class="sl_subcat"> - <{assign item=cats value=0}> + <{assign var=cats value=0}> <{foreach from=$category.subcategories item=subcategory}> - <{assign item=cats value=$cats+1}> + <{assign var=cats value=$cats+1}> <a href="<{$subcategory.url}>"><{$subcategory.name}></a><{if not $cats < count($category.subcategories)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -20,9 +20,9 @@ <{/if}> </div> <div class="sl_mainsong"> - <{assign item=artists value=0}> + <{assign var=artists value=0}> <{foreach from=$song.album.artists item=artist}> - <{assign item=artists value=$artists+1}> + <{assign var=artists value=$artists+1}> <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($song.album.artists)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -18,6 +18,9 @@ $module_handler = xoops_gethandler('module'); $modules = $module_handler->getObjects(null, true); + $categories = array(); + $weights = array(); + $GLOBALS['categoryHandler'] = xoops_getmodulehandler('category'); $criteria = new CriteriaCompo(); $criteria->setSort('weight'); @@ -32,7 +35,7 @@ } $GLOBALS['xoopsTpl']->assign('categories', $categories); } - unset($categories); + $valuetypes = array(XOBJ_DTYPE_ARRAY => _AM_SONGLIST_FIELDS_ARRAY, XOBJ_DTYPE_EMAIL => _AM_SONGLIST_FIELDS_EMAIL, XOBJ_DTYPE_INT => _AM_SONGLIST_FIELDS_INT, Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -76,14 +76,15 @@ } else { $extras_handler = xoops_getmodulehandler('extras'); - $fields = $extras_handler->loadFields(); - + $fields = array_merge(array(), $extras_handler->loadFields()); + if ( $op != "search" ) { - foreach (array_keys($fields) as $i ) { - if ( $restriction == "" || $fields[$i]->getVar($restriction) ) { - $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + if (is_array($fields)&&count($fields)>0) + foreach (array_keys($fields) as $i ) { + if ( $restriction == "" || $fields[$i]->getVar($restriction) ) { + $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + } } - } } else { $searchable_types = array('textbox', 'select', @@ -93,11 +94,12 @@ 'datetime', 'timezone', 'language'); - foreach (array_keys($fields) as $i ) { - if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) { - $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + if (is_array($fields)&&count($fields)>0) + foreach (array_keys($fields) as $i ) { + if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) { + $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + } } - } } } $form->display(); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -8,11 +8,11 @@ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"import"; $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"actiona"; - $limit = strlen($_REQUEST['limit'])?intval($_REQUEST['limit']):30; - $start = strlen($_REQUEST['start'])?intval($_REQUEST['start']):0; - $order = strlen($_REQUEST['order'])?$_REQUEST['order']:'DESC'; - $sort = strlen($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; - $filter = strlen($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + $limit = isset($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = isset($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = isset($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = isset($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = isset($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; switch($op) { default: Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -101,7 +101,7 @@ function songlist_getFilterElement($filter, $field, $sort='created', $op = '', $fct = '') { $components = songlist_getFilterURLComponents($filter, $field, $sort); $ele = false; - include_once('formobjects.songlist.php'); + include_once('songlist.object.php'); switch ($field) { case 'cid': if ($op!='category') { Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -334,7 +334,7 @@ return $form; } - function songlist_import_get_form() { + function songlist_import_get_form($as_array = false) { xoops_loadLanguage('forms', 'songlist'); @@ -359,7 +359,7 @@ } - function songlist_importb_get_form($file) { + function songlist_importb_get_form($file, $as_array = false) { xoops_loadLanguage('forms', 'songlist'); @@ -464,7 +464,7 @@ $ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_ARTISTS:''), $object->getVar('artists')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -537,7 +537,7 @@ $ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -604,7 +604,7 @@ $ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -686,7 +686,7 @@ $ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_ARTISTS:''), $object->getVar('artists')); $ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_SONGS:''), $object->getVar('songs')); $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } @@ -938,7 +938,8 @@ $fields = $extras_handler->loadFields(); $required = array(); - + $elements = array(); + $weights = array(); if ($object->getVar('sid')>0) $extra = $extras_handler->get($object->getVar('sid')); else @@ -984,7 +985,7 @@ } $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits')); - $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10'); + $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10'); if ($object->getVar('created')>0) { $ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created'))); } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -41,8 +41,7 @@ define('_AM_SONGLIST_TH_UTFID', 'Map ID'); define('_AM_SONGLIST_TH_FROM', 'From'); define('_AM_SONGLIST_TH_TO', 'To'); - define('_AM_SONGLIST_TH_ABID', 'Album ID'); - + // Category define('_AM_SONGLIST_CATEGORY_H1', 'Categories'); define('_AM_SONGLIST_CATEGORY_P', 'These are the categories and child categories you have on the system.'); @@ -207,7 +206,6 @@ define('_AM_SONGLIST_FIELDS_TEXTBOX', 'Text-box'); define('_AM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select'); define('_AM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio'); - define('_AM_SONGLIST_FIELDS_DATE', 'Date'); define('_AM_SONGLIST_FIELDS_DATETIME', 'Date Time'); define('_AM_SONGLIST_FIELDS_LONGDATE', 'Long Date'); define('_AM_SONGLIST_FIELDS_THEME', 'Theme Select'); @@ -232,6 +230,7 @@ define('_AM_SONGLIST_IMPORT_ACTIONA_P', 'Select an XML File you have exported from Excel or other platform to import.'); define('_AM_SONGLIST_IMPORT_ACTIONB_H1', 'Specify Element Names'); define('_AM_SONGLIST_IMPORT_ACTIONB_P', 'You have to specify from the example the elements that exists in this XML file to import, may vary from file to file and also if you specify no element name the field type is ignored..'); + define('_AM_SONGLIST_XMLFILE_COMPLETE', 'XML File Import and Comparison Complete!'); // About Box define('_AM_SONGLIST_ABOUT_MAKEDONATE', 'Make Song List Better Donate Today!'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php 2012-03-26 02:02:25 UTC (rev 9192) @@ -160,7 +160,6 @@ define('_FRM_SONGLIST_FIELDS_TEXTBOX', 'Text-box'); define('_FRM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select'); define('_FRM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio'); - define('_FRM_SONGLIST_FIELDS_DATE', 'Date'); define('_FRM_SONGLIST_FIELDS_DATETIME', 'Date Time'); define('_FRM_SONGLIST_FIELDS_LONGDATE', 'Long Date'); define('_FRM_SONGLIST_FIELDS_THEME', 'Theme Select'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -1,6 +1,6 @@ <{if $block}> <{foreach from=$block item=item}> -<{assign item=topno value=$topno+1}> +<{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> <div style="font-size:1.12em; float:left;"> #<{$topno}> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -11,9 +11,9 @@ <{$smarty.const._MN_SONGLIST_SONGS}> </div> <div class="sl_subalbum"> - <{assign item=songs value=0}> + <{assign var=songs value=0}> <{foreach from=$album.songs item=song}> - <{assign item=songs value=$songs+1}> + <{assign var=songs value=$songs+1}> <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}> <{/foreach}> </div> @@ -23,9 +23,9 @@ <{$smarty.const._MN_SONGLIST_ARTISTS}> </div> <div class="sl_subartist"> - <{assign item=artists value=0}> + <{assign var=artists value=0}> <{foreach from=$album.artists item=artist}> - <{assign item=artists value=$artists+1}> + <{assign var=artists value=$artists+1}> <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($album.artists)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -6,9 +6,9 @@ <{$smarty.const._MN_SONGLIST_SONGS}> </div> <div class="sl_subartist"> - <{assign item=songs value=0}> + <{assign var=songs value=0}> <{foreach from=$artist.songs item=song}> - <{assign item=songs value=$songs+1}> + <{assign var=songs value=$songs+1}> <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($artist.songs)}>, <{/if}> <{/foreach}> </div> @@ -18,9 +18,9 @@ <{$smarty.const._MN_SONGLIST_ALBUMS}> </div> <div class="sl_subartist"> - <{assign item=albums value=0}> + <{assign var=albums value=0}> <{foreach from=$artist.albums item=album}> - <{assign item=albums value=$albums+1}> + <{assign var=albums value=$albums+1}> <a href="<{$album.url}>"><{$album.name}></a><{if not $albums < count($artist.albums)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -3,9 +3,9 @@ </div> <{if $category.subcategories}> <div class="sl_subcat"> - <{assign item=cats value=0}> + <{assign var=cats value=0}> <{foreach from=$category.subcategories item=subcategory}> - <{assign item=cats value=$cats+1}> + <{assign var=cats value=$cats+1}> <a href="<{$subcategory.url}>"><{$subcategory.name}></a><{if not $cats < count($category.subcategories)}>, <{/if}> <{/foreach}> </div> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 01:33:52 UTC (rev 9191) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 02:02:25 UTC (rev 9192) @@ -20,9 +20,9 @@ <{/if}> </div> <div class="sl_mainsong"> - <{assign item=artists value=0}> + <{assign var=artists value=0}> <{foreach from=$song.album.artists item=artist}> - <{assign item=artists value=$artists+1}> + <{assign var=artists value=$artists+1}> <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($song.album.artists)}>, <{/if}> <{/foreach}> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-03-26 02:32:14
|
Revision: 9193 http://xoops.svn.sourceforge.net/xoops/?rev=9193&view=rev Author: wishcraft Date: 2012-03-26 02:32:07 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.07 - complete first release final (Admin about.php) Modified Paths: -------------- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php Added Paths: ----------- XoopsModules/songlist/releases/1.07/htdocs/uploads/ XoopsModules/songlist/releases/1.07/htdocs/uploads/songlist/ XoopsModules/songlist/trunk/htdocs/uploads/ XoopsModules/songlist/trunk/htdocs/uploads/songlist/ Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php 2012-03-26 02:02:25 UTC (rev 9192) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/about.php 2012-03-26 02:32:07 UTC (rev 9193) @@ -61,7 +61,7 @@ for($key=0;$key<=4;$key++) { switch ($key) { case 2: - $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['xforumModule']->getVar('dirname')), strtoupper($GLOBALS['xforumModule']->getVar('dirname')). ' '.$GLOBALS['xforumModule']->getVar('name')); + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name')); break; } } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php 2012-03-26 02:02:25 UTC (rev 9192) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php 2012-03-26 02:32:07 UTC (rev 9193) @@ -61,7 +61,7 @@ for($key=0;$key<=4;$key++) { switch ($key) { case 2: - $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['xforumModule']->getVar('dirname')), strtoupper($GLOBALS['xforumModule']->getVar('dirname')). ' '.$GLOBALS['xforumModule']->getVar('name')); + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name')); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-03-26 15:05:56
|
Revision: 9200 http://xoops.svn.sourceforge.net/xoops/?rev=9200&view=rev Author: wishcraft Date: 2012-03-26 15:05:42 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.07 - complete first release final (final fixes) Modified Paths: -------------- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/trunk/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -95,11 +95,13 @@ $genre_handler = xoops_getmodulehandler('genre', 'songlist'); $category_handler = xoops_getmodulehandler('category', 'songlist'); + /* $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])); $mb = floor($filesize / 1024 / 1024); if ($mb>32) { set_ini('memory_limit', ($mb+128).'M'); } + */ set_time_limit(3600); $xmlarray = songlist_xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])), false, 'tag'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -39,10 +39,6 @@ $cat[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; } } - - $category_element = new SonglistFormSelectCategory('', 'cid', $cid); - $genre_element = new SonglistFormSelectGenre('', 'gid', $gid); - $singer_element = new SonglistFormSelectSinger('', 'singer', $singer); $albums_handler = xoops_getmodulehandler('albums', 'songlist'); switch ($op) { @@ -71,7 +67,6 @@ } } if ($col!=1) { - $col--; for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { $ret[$row][$j][$albums_handler->keyName] = 0; $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; @@ -94,8 +89,7 @@ $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css')); $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); - $GLOBALS['xoopsTpl']->assign('albums', $ret); - $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('results', $ret); $GLOBALS['xoopsTpl']->assign('categories', $cat); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']); @@ -201,13 +195,10 @@ $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css')); $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); - $GLOBALS['xoopsTpl']->assign('albums', $ret); + $GLOBALS['xoopsTpl']->assign('results', $ret); $GLOBALS['xoopsTpl']->assign('songs', false); $GLOBALS['xoopsTpl']->assign('categories', $cat); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); - $GLOBALS['xoopsTpl']->assign('category_element', $category_element->render()); - $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render()); - $GLOBALS['xoopsTpl']->assign('singer_element', $singer_element->render()); if ($_SESSION['cid']!=0) { $category = $category_handler->get($_SESSION['cid']); $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true)); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -12,7 +12,7 @@ $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); } } else { - $criteria_cat->add(new Criteria('1', '1'), 'OR'); + $criteria_cat->add(new Criteria('1', 1), 'OR'); } $criteria_cat->setSort('`created`'); @@ -42,11 +42,6 @@ $cat[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; } } - - $category_element = new SonglistFormSelectCategory('', 'cid', $cid); - $genre_element = new SonglistFormSelectGenre('', 'gid', $gid); - $singer_element = new SonglistFormSelectSinger('', 'singer', $singer); - $artists_handler = xoops_getmodulehandler('artists', 'songlist'); switch ("{$GLOBALS['op']}") { @@ -75,7 +70,6 @@ } } if ($col!=1) { - $col--; for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { $ret[$row][$j][$artists_handler->keyName] = 0; $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; @@ -98,13 +92,9 @@ $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css')); $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); - $GLOBALS['xoopsTpl']->assign('artists', $ret); - $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('results', $ret); $GLOBALS['xoopsTpl']->assign('categories', $cat); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); - $GLOBALS['xoopsTpl']->assign('category_element', $category_element->render()); - $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render()); - $GLOBALS['xoopsTpl']->assign('singer_element', $singer_element->render()); $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); if ($_SESSION['cid']!=0) { $category = $category_handler->get($_SESSION['cid']); @@ -133,9 +123,6 @@ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); $GLOBALS['xoopsTpl']->assign('songs', false); $GLOBALS['xoopsTpl']->assign('artist', $artist->toArray(true)); - $GLOBALS['xoopsTpl']->assign('category_element', $category_element->render()); - $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render()); - $GLOBALS['xoopsTpl']->assign('singer_element', $singer_element->render()); $GLOBALS['xoopsTpl']->assign('categories', $cat); $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']); include($GLOBALS['xoops']->path('/footer.php')); @@ -210,12 +197,8 @@ $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css')); $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); - $GLOBALS['xoopsTpl']->assign('artists', $ret); - $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('results', $ret); $GLOBALS['xoopsTpl']->assign('categories', $cat); - $GLOBALS['xoopsTpl']->assign('category_element', $category_element->render()); - $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render()); - $GLOBALS['xoopsTpl']->assign('singer_element', $singer_element->render()); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); if ($_SESSION['cid']!=0) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_album.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_album.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_album.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_album_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('albums', 'songlist'); $objects = $handler->getTop(1); if (is_object($objects[0])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_albums.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_albums.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_albums.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_albums_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('albums', 'songlist'); $objects = $handler->getTop($options[0]); if (count($objects)>0) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artist.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artist.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artist.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_artist_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('artists', 'songlist'); $objects = $handler->getTop(1); if (is_object($objects[0])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artists.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_artists.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php -function b_songlist_popular_artists_show($options) { + function b_songlist_popular_artists_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('artists', 'songlist'); $objects = $handler->getTop($options[0]); if (count($objects)>0) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genre.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genre.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genre.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_genre_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('genre', 'songlist'); $objects = $handler->getTop(1); if (is_object($objects[0])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genres.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genres.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_genres.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_genres_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('genre', 'songlist'); $objects = $handler->getTop($options[0]); if (count($objects)>0) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_song.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_song.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_song.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_song_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('songs', 'songlist'); $objects = $handler->getTop(1); if (is_object($objects[0])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_songs.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_songs.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/blocks/songlist_popular_songs.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,7 @@ <?php function b_songlist_popular_songs_show($options) { + xoops_loadLanguage('blocks', 'songlist'); $handler = xoops_getmodulehandler('songs', 'songlist'); $objects = $handler->getTop($options[0]); if (count($objects)>0) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistAlbums extends XoopsObject { @@ -42,7 +45,7 @@ } } $ret['picture'] = $this->getImage('image', false); - $ret['rank'] = number_format($this->getVar('rank')/$this->getVar('votes'),2)._MI_SONGLIST_OFTEN; + $ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN; $ret['url'] = $this->getURL(); if ($extra==false) @@ -59,7 +62,7 @@ $artists_handler = xoops_getmodulehandler('artists', 'songlist'); foreach($this->getVar('aids') as $aid) { $artist = $artists_handler->get($aid); - $ret['artists'][$aid] = $artist->toArray(false); + $ret['artists_array'][$aid] = $artist->toArray(false); } } @@ -68,7 +71,7 @@ $songs_handler = xoops_getmodulehandler('songs', 'songlist'); foreach($this->getVar('sids') as $sid) { $song = $songs_handler->get($sid); - $ret['songs'][$sid] = $song->toArray(false); + $ret['songs_array'][$sid] = $song->toArray(false); } } @@ -204,7 +207,7 @@ return parent::insert($obj, $force); } - var $_objects = array(); + var $_objects = array('object'=>array(), 'array'=>array()); function get($id, $fields = '*') { if (!isset($this->_objects['object'][$id])) { @@ -245,9 +248,9 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/albums/'.$start.'-item-item-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/albums/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { - return XOOPS_URL.'/modules/songlist/albums.php?op=item&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; + return XOOPS_URL.'/modules/songlist/albums.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } } Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistArtists extends XoopsObject { @@ -40,9 +43,13 @@ } } - $ret['rank'] = number_format($this->getVar('rank')/$this->getVar('votes'),2)._MI_SONGLIST_OFTEN; + $ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN; $ret['url'] = $this->getURL(); + xoops_loadLanguage('enum', 'songlist'); + if (!empty($ret['singer'])) + $ret['singer'] = constant($ret['singer']); + if ($extra==false) return $ret; @@ -50,7 +57,7 @@ $categories_handler = xoops_getmodulehandler('category', 'songlist'); foreach($this->getVar('cids') as $aid) { $category = $categories_handler->get($aid); - $ret['category'][$aid] = $category->toArray(false); + $ret['categories_array'][$aid] = $category->toArray(false); } } @@ -59,7 +66,7 @@ $artists_handler = xoops_getmodulehandler('artists', 'songlist'); foreach($this->getVar('aids') as $aid) { $artist = $artists_handler->get($aid); - $ret['artists'][$aid] = $artist->toArray(false); + $ret['artists_array'][$aid] = $artist->toArray(false); } } @@ -67,7 +74,7 @@ if (count($this->getVar('sids'))!=0) { $songs_handler = xoops_getmodulehandler('songs', 'songlist'); foreach($songs_handler->getObjects(new Criteria('`aids`', '%"'.$this->getVar('aid').'"%', 'LIKE'), true) as $sid => $song) { - $ret['songs'][$sid] = $song->toArray(false); + $ret['songs_array'][$sid] = $song->toArray(false); } } @@ -186,7 +193,7 @@ return parent::insert($obj, $force); } - var $_objects = array(); + var $_objects = array('object'=>array(), 'array'=>array()); function get($id, $fields = '*') { if (!isset($this->_objects['object'][$id])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -43,7 +43,7 @@ } } $ret['picture'] = $this->getImage('image', false); - $ret['rank'] = number_format($this->getVar('rank')/$this->getVar('votes'),2)._MI_SONGLIST_OFTEN; + $ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN; $ret['url'] = $this->getURL(); return $ret; @@ -126,11 +126,9 @@ private function TreeIDs($langs_array, $categories, $level) { foreach($categories as $catid => $category) { - if ($catid!=$ownid) { - $langs_array[$catid] = $catid; - if ($categoriesb = $this->getObjects(new Criteria('pid', $catid), true)){ - $langs_array = $this->TreeIDs($langs_array, $categoriesb, $level); - } + $langs_array[$catid] = $catid; + if ($categoriesb = $this->getObjects(new Criteria('pid', $catid), true)){ + $langs_array = $this->TreeIDs($langs_array, $categoriesb, $level); } } return ($langs_array); @@ -147,7 +145,7 @@ return parent::insert($obj, $force); } - var $_objects = array(); + var $_objects = array('object'=>array(), 'array'=>array()); function get($id, $fields = '*') { if (!isset($this->_objects['object'][$id])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistGenre extends XoopsObject { @@ -37,7 +40,7 @@ $ret[$key] = date(_DATESTRING, $this->getVar($key)); } } - $ret['rank'] = number_format($this->getVar('rank')/$this->getVar('votes'),2)._MI_SONGLIST_OFTEN; + $ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN; return $ret; } @@ -112,7 +115,7 @@ return parent::insert($obj, $force); } - var $_objects = array(); + var $_objects = array('object'=>array(), 'array'=>array()); function get($id, $fields = '*') { if (!isset($this->_objects['object'][$id])) { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/requests.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/requests.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/requests.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistRequests extends XoopsObject { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistSongs extends XoopsObject { @@ -44,7 +47,7 @@ $ret['url'] = $this->getURL(); - $ret['rank'] = number_format($this->getVar('rank')/$this->getVar('votes'),2)._MI_SONGLIST_OFTEN; + $ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN; if (file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php"))&&$GLOBALS['songlistModuleConfig']['tags']) { include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php"; @@ -55,26 +58,27 @@ $field_handler = xoops_getmodulehandler('field', 'songlist'); $visibility_handler = xoops_getmodulehandler('visibility', 'songlist'); - $extras = $extras_handler->get($post_id); - - if (is_object($GLOBALS['xoopsUser'])) - $fields_id = $visibility_handler->getVisibleFields(array(), $GLOBALS['xoopsUser']->getGroups()); - elseif (!is_object($GLOBALS['xoopsUser'])) - $fields_id = $visibility_handler->getVisibleFields(array(), array()); - - $criteria = new Criteria('field_id', '('.implode(',',$fields_id).')', 'IN'); - $criteria->setSort('field_weight'); - $fields = $field_handler->getObjects($criteria, true); - foreach($fields as $id => $field) { - if (in_array($this->getVar('cid'), $field->getVar('cids'))) { - $ret['fields'][$id]['title'] = $field->getVar('field_title'); - if (is_object($GLOBALS['xoopsUser'])) - $ret['fields'][$id]['value'] = htmlspecialchars_decode($field->getOutputValue($GLOBALS['xoopsUser'], $extras)); - elseif (!is_object($GLOBALS['xoopsUser'])) - $ret['fields'][$id]['value'] = htmlspecialchars_decode($extras->getVar($field->getVar('field_name'))); + if ($extras = $extras_handler->get($this->getVar('sid'))) { + + if (is_object($GLOBALS['xoopsUser'])) + $fields_id = $visibility_handler->getVisibleFields(array(), $GLOBALS['xoopsUser']->getGroups()); + elseif (!is_object($GLOBALS['xoopsUser'])) + $fields_id = $visibility_handler->getVisibleFields(array(), array()); + + $criteria = new Criteria('field_id', '('.implode(',',$fields_id).')', 'IN'); + $criteria->setSort('field_weight'); + $fields = $field_handler->getObjects($criteria, true); + foreach($fields as $id => $field) { + if (in_array($this->getVar('cid'), $field->getVar('cids'))) { + $ret['fields'][$id]['title'] = $field->getVar('field_title'); + if (is_object($GLOBALS['xoopsUser'])) + $ret['fields'][$id]['value'] = htmlspecialchars_decode($field->getOutputValue($GLOBALS['xoopsUser'], $extras)); + elseif (!is_object($GLOBALS['xoopsUser'])) + $ret['fields'][$id]['value'] = htmlspecialchars_decode($extras->getVar($field->getVar('field_name'))); + } } } - + if ($extra==false) return $ret; @@ -94,7 +98,7 @@ $artists_handler = xoops_getmodulehandler('artists', 'songlist'); foreach($this->getVar('aids') as $aid) { $artist = $artists_handler->get($aid); - $ret['artists'][$aid] = $artist->toArray(false); + $ret['artists_array'][$aid] = $artist->toArray(false); } } @@ -260,7 +264,7 @@ return $sid; } - var $_objects = array(); + var $_objects = array('object'=>array(), 'array'=>array()); function get($id, $fields = '*') { if (!isset($this->_objects['object'][$id])) { @@ -310,9 +314,9 @@ function getSearchURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/search/'.$start.'-'.$op.'-'.$fct.'-'.urlencode($value).'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$gid.'-'.$singer.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.urlencode($value).'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$gid.'-'.$singer.$GLOBALS['songlistModuleConfig']['endofurl']; } else { - return XOOPS_URL.'/modules/songlist/search.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.(isset($_GET['cid'])?($_GET['cid']):$cid).'&gid='.$gid.'&singer='.$singer; + return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.(isset($_GET['cid'])?($_GET['cid']):$cid).'&gid='.$gid.'&singer='.$singer; } } Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/utf8map.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/utf8map.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/utf8map.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistUtf8map extends XoopsObject { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/votes.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/votes.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/votes.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -4,6 +4,9 @@ exit(); } +include_once(dirname(dirname(__FILE__)).'/include/songlist.object.php'); +include_once(dirname(dirname(__FILE__)).'/include/songlist.form.php'); + class SonglistVotes extends XoopsObject { Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/songlist.css =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/songlist.css 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/css/songlist.css 2012-03-26 15:05:42 UTC (rev 9200) @@ -17,6 +17,15 @@ width: 100%; } +.sl_outersep { + clear:both; + height: 6px; + text-align:center; + width: 100%; + border-bottom: 2px dashed #000; + margin-bottom: 6px; +} + .sl_breadcrumb { clear:both; text-align:left; Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -40,9 +40,9 @@ } } - $category_element = new SonglistFormSelectCategory('', 'cid'); - $genre_element = new SonglistFormSelectGenre('', 'gid'); - $singer_element = new SonglistFormSelectSinger('', 'singer'); + $category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid'])?($_GET['cid']):$cid)); + $genre_element = new SonglistFormSelectGenre('', 'gid', $gid); + $singer_element = new SonglistFormSelectSinger('', 'singer', $singer); $songs_handler = xoops_getmodulehandler('songs', 'songlist'); switch ($op) { @@ -81,7 +81,7 @@ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); foreach($songs as $song) - $GLOBALS['xoopsTpl']->append('results', $song->toArray(false)); + $GLOBALS['xoopsTpl']->append('results', $song->toArray(true)); $GLOBALS['xoopsTpl']->assign('songs', true); $GLOBALS['xoopsTpl']->assign('categories', $cat); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); @@ -186,7 +186,6 @@ } $criteria = new CriteriaCompo($criteria_cat, 'AND'); - $criteria->add($browse_criteria); $criteria->add($browse_criteriab); break; @@ -205,7 +204,7 @@ break; } $albums_handler = xoops_getmodulehandler('albums', 'songlist'); - foreach($artists_handler->getObjects($browse_criteria, true) as $id => $obj) { + foreach($albums_handler->getObjects($browse_criteria, true) as $id => $obj) { $ids[$id] = $id; } @@ -238,7 +237,7 @@ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); foreach($songs as $song) - $GLOBALS['xoopsTpl']->append('results', $song->toArray(false)); + $GLOBALS['xoopsTpl']->append('results', $song->toArray(true)); $GLOBALS['xoopsTpl']->assign('songs', true); $GLOBALS['xoopsTpl']->assign('categories', $cat); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); @@ -256,6 +255,83 @@ break; + case "search": + + $songs_handler = xoops_getmodulehandler('songs', 'songlist'); + $artists_handler = xoops_getmodulehandler('artists', 'songlist'); + $utf8map_handler = xoops_getmodulehandler('utf8map', 'songlist'); + + $url = $songs_handler->getSearchURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + switch ($fct) { + default: + case "titleandlyrics": + $criteria = new CriteriaCompo(); + foreach(explode(' ' , $value) as $keyword) { + $criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE')); + $criteria->add(new Criteria('`lyrics`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE')); + } + break; + case "lyrics": + $criteria = new CriteriaCompo(); + foreach(explode(' ' , $value) as $keyword) { + $criteria->add(new Criteria('`lyrics`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE')); + } + break; + case "title": + $criteria = new CriteriaCompo(); + foreach(explode(' ' , $value) as $keyword) { + $criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE')); + } + break; + } + + if ($gid != 0 && $GLOBALS['songlistModuleConfig']['genre']) { + $criteria->add(new Criteria('`gid`', $gid)); + } + + if ($singer != 0 && $GLOBALS['songlistModuleConfig']['singer']) { + $criteria->add(new Criteria('`sid`', '('.implode(',', $artists_handler->getSIDs(new Criteria('`singer`', $singer))).')', 'IN')); + } + + if ($cid != 0) { + $criteria->add(new Criteria('`cid`', (isset($_GET['cid'])?($_GET['cid']):$cid))); + } + + $pagenav = new XoopsPageNav($songs_handler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&gid=$gid&singer=$singer&value=$value&limit=$limit"); + + $criteria->setLimit($limit); + $criteria->setStart($start); + + $songs = $songs_handler->getObjects($criteria, false); + + $xoopsOption['template_main'] = 'songlist_search_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) { + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript')); + $GLOBALS['loaded_jquery']=true; + } + $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css')); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + foreach($songs as $song) { + $GLOBALS['xoopsTpl']->append('results', $song->toArray(true)); + } + $GLOBALS['xoopsTpl']->assign('songs', true); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('category_element', $category_element->render()); + $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render()); + $GLOBALS['xoopsTpl']->assign('singer_element', $singer_element->render()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']); + include($GLOBALS['xoops']->path('/footer.php')); + break; + case "category": switch ($fct) { default: Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -51,7 +51,11 @@ define('_FRM_SONGLIST_FORM_SONGS_RANK', 'Ranking'); define('_FRM_SONGLIST_FORM_SONGS_CREATED', 'Created'); define('_FRM_SONGLIST_FORM_SONGS_UPDATED', 'Updated'); - + define('_FRM_SONGLIST_FORM_SONGS_GENRE', 'Song Genre'); + define('_FRM_SONGLIST_FORM_SONGS_GENRE_DESC', ''); + define('_FRM_SONGLIST_FORM_SONGS_ALBUM', 'Song Album'); + define('_FRM_SONGLIST_FORM_SONGS_ALBUM_DESC', ''); + // UTF8 Mapping Form define('_FRM_SONGLIST_FORM_ISNEW_UTF8MAP', 'New Chracter replacement mapping'); define('_FRM_SONGLIST_FORM_EDIT_UTF8MAP', 'Edit Chracter replacement mapping'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/main.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/main.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/main.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -7,7 +7,10 @@ define('_MN_SONGLIST_TITLE', 'Song title:-'); define('_MN_SONGLIST_SONGID', 'Song Reference ID:-'); define('_MN_SONGLIST_TAGS', 'Tags:-'); - + define('_MN_SONGLIST_SONGS', 'Song\'s'); + define('_MN_SONGLIST_ARTISTS', 'Artist\'s'); + define('_MN_SONGLIST_ALBUMS', 'Album\'s'); + // Browse By define('_MN_SONGLIST_BROWSEBY', 'Browse by Character'); define('_MN_SONGLIST_SELECTBY_TITLE', 'Browse by Title'); Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/modinfo.php 2012-03-26 15:05:42 UTC (rev 9200) @@ -76,5 +76,10 @@ define('_MI_SONGLIST_TAGS_DESC', ''); define('_MI_SONGLIST_FORCE_JQUERY', 'For JQuery Loading'); define('_MI_SONGLIST_FORCE_JQUERY_DESC', 'For themes without JQuery!'); + define('_MI_SONGLIST_COLS', 'Columns in table'); + define('_MI_SONGLIST_COLS_DESC', 'Columns in table before pagination.'); + define('_MI_SONGLIST_ROWS', 'Rows in table'); + define('_MI_SONGLIST_ROWS_DESC', 'Rows in table before pagination.'); -?> + + ?> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -12,7 +12,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.categories key=number item=category}> - <{$category.name}></a><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> @@ -29,7 +29,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> - <{$genre.name}><{if $number<sizeof($block.genres)-1}>, <{/if}> + <{$genre.name}><{if ($number<sizeof($block.genres)-1)}>, <{/if}> <{/foreach}> </div> <{elseif $block.genre}> @@ -49,7 +49,7 @@ <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.artist}> + <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ARTIST}> </div> @@ -66,7 +66,7 @@ <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.album}> + <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ALBUM}> </div> @@ -83,7 +83,7 @@ <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.song}> + <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_SONG}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -12,7 +12,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.categories key=number item=category}> - <{$category.name}></a><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> @@ -29,7 +29,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> - <{$genre.name}><{if $number<sizeof($block.genres)-1}>, <{/if}> + <{$genre.name}><{if ($number<sizeof($block.genres)-1)}>, <{/if}> <{/foreach}> </div> <{elseif $block.genre}> @@ -49,7 +49,7 @@ <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.artist}> + <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ARTIST}> </div> @@ -66,7 +66,7 @@ <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.album}> + <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ALBUM}> </div> @@ -83,7 +83,7 @@ <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.song}> + <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_SONG}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -12,7 +12,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.categories key=number item=category}> - <{$category.name}></a><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> @@ -29,7 +29,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> - <{$genre.name}><{if $number<sizeof($block.genres)-1}>, <{/if}> + <{$genre.name}><{if ($number<sizeof($block.genres)-1)}>, <{/if}> <{/foreach}> </div> <{elseif $block.genre}> @@ -49,7 +49,7 @@ <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.artist}> + <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ARTIST}> </div> @@ -66,7 +66,7 @@ <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.album}> + <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ALBUM}> </div> @@ -83,7 +83,7 @@ <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.song}> + <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_SONG}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -12,7 +12,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.categories key=number item=category}> - <{$category.name}></a><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> @@ -29,7 +29,7 @@ </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> - <{$genre.name}><{if $number<sizeof($block.genres)-1}>, <{/if}> + <{$genre.name}><{if ($number<sizeof($block.genres)-1)}>, <{/if}> <{/foreach}> </div> <{elseif $block.genre}> @@ -49,7 +49,7 @@ <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.artist}> + <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ARTIST}> </div> @@ -66,7 +66,7 @@ <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.album}> + <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_ALBUM}> </div> @@ -83,7 +83,7 @@ <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> <{/foreach}> </div> - <{elseif $block.song}> + <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> <{$smary.const._BL_SONGLIST_SONG}> </div> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,30 +1,30 @@ -<div class="sl_mainalbum"> - <a href="<{$album.url}>"><{$album.name}></a> -</div> -<{if $album.image}> +<{if $album.picture}> <div class="sl_artalbum"> - <a href="<{$album.url}>"><img src='<{$album.image}>' width="95%" border="0" /></a> + <a href="<{$album.url}>"><img src='<{$album.picture}>' width="95%" border="0" /></a> </div> <{/if}> -<{if $album.songs}> +<div class="sl_mainalbum"> + <a href="<{$album.url}>"><{$album.title}></a> +</div> +<{if $album.songs_array}> <div class="sl_subtitle"> <{$smarty.const._MN_SONGLIST_SONGS}> </div> <div class="sl_subalbum"> <{assign var=songs value=0}> - <{foreach from=$album.songs item=song}> + <{foreach from=$album.songs_array item=song}> <{assign var=songs value=$songs+1}> - <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}> + <a href="<{$song.url}>"><{$song.title}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}> <{/foreach}> </div> <{/if}> -<{if $album.artists}> +<{if $album.artists_array}> <div class="sl_subtitle"> <{$smarty.const._MN_SONGLIST_ARTISTS}> </div> <div class="sl_subartist"> <{assign var=artists value=0}> - <{foreach from=$album.artists item=artist}> + <{foreach from=$album.artists_array item=artist}> <{assign var=artists value=$artists+1}> <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($album.artists)}>, <{/if}> <{/foreach}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_list.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_list.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_list.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,4 +1,4 @@ -<{if $albums}> +<{if $results}> <{if not $pagenav eq ''}> <div style='width:100%; clear:both; height:25px;'> <div style='float:right;'> @@ -7,14 +7,12 @@ </div> <{/if}> <table> - <{foreach from=$albums key=rowkey item=row}> - <{if not $rowkey eq 'pagenav'}> + <{foreach from=$results item=row}> <tr> - <{foreach from=$row item=album}> - <td width="<{$album.width}>%"><{includeq file="db:songlist_albums_item.html" album=$album}></td> + <{foreach from=$row item=result}> + <td width="<{$result.width}>%"><{includeq file="db:songlist_albums_item.html" album=$result}></td> <{/foreach}> </tr> - <{/if}> <{/foreach}> </table> <{if not $pagenav eq ''}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_index.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_index.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_index.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,6 +1,6 @@ <div class="sl_sep"> </div> <{includeq file="db:songlist_category_list.html"}> -<div class="sl_sep"> </div> +<div class="sl_outersep"> </div> <{includeq file="db:songlist_alpha_browse.html"}> -<div class="sl_sep"> </div> +<div class="sl_outersep"> </div> <{includeq file="db:songlist_artists_list.html"}> \ No newline at end of file Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,25 +1,25 @@ <div class="sl_mainartist"> <a href="<{$artist.url}>"><{$artist.name}></a> </div> -<{if $artist.songs}> +<{if $artist.songs_array}> <div class="sl_subtitle"> <{$smarty.const._MN_SONGLIST_SONGS}> </div> <div class="sl_subartist"> <{assign var=songs value=0}> - <{foreach from=$artist.songs item=song}> + <{foreach from=$artist.songs_array item=song}> <{assign var=songs value=$songs+1}> <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($artist.songs)}>, <{/if}> <{/foreach}> </div> <{/if}> -<{if $artist.albums}> +<{if $artist.albums_array}> <div class="sl_subtitle"> <{$smarty.const._MN_SONGLIST_ALBUMS}> </div> <div class="sl_subartist"> <{assign var=albums value=0}> - <{foreach from=$artist.albums item=album}> + <{foreach from=$artist.albums_array item=album}> <{assign var=albums value=$albums+1}> <a href="<{$album.url}>"><{$album.name}></a><{if not $albums < count($artist.albums)}>, <{/if}> <{/foreach}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_list.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_list.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_list.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,4 +1,4 @@ -<{if $artists}> +<{if $results}> <{if not $pagenav eq ''}> <div style='width:100%; clear:both; height:25px;'> <div style='float:right;'> @@ -7,14 +7,12 @@ </div> <{/if}> <table> - <{foreach from=$artists key=rowkey item=row}> - <{if not $rowkey eq 'pagenav'}> + <{foreach from=$results item=row}> <tr> - <{foreach from=$row item=artist}> - <td width="<{$artist.width}>%"><{includeq file="db:songlist_artists_item.html" artist=$artist}></td> + <{foreach from=$row item=result}> + <td width="<{$result.width}>%"><{include file="db:songlist_artists_item.html" artist=$result}></td> <{/foreach}> </tr> - <{/if}> <{/foreach}> </table> <{if not $pagenav eq ''}> Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_index.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_index.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_index.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,4 +1,4 @@ <div class="sl_sep"> </div> <{includeq file="db:songlist_search_search.html"}> -<div class="sl_sep"> </div> +<div class="sl_outersep"> </div> <{includeq file="db:songlist_songs_list.html"}> \ No newline at end of file Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_search.html =================================================================== --- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_search.html 2012-03-26 11:00:43 UTC (rev 9199) +++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_search_search.html 2012-03-26 15:05:42 UTC (rev 9200) @@ -1,7 +1,7 @@ <h2><{$smarty.const._MN_SONGLIST_SEARCH}></h2> <div class="sl_search"> <div class="sl_searchdiv"> - <form action="<{$xoops_url}>/modules/songlist/search.php" method='GET'> + <form action="<{$php_self}>" method='GET'> <input type="hidden" name="op" value="search" /> <table width="100%" border='0' cellpadding="5"> <tr> Modified: XoopsModules/songlist/releases/1.07/htdo... [truncated message content] |
From: <wis...@us...> - 2012-03-26 17:46:58
|
Revision: 9201 http://xoops.svn.sourceforge.net/xoops/?rev=9201&view=rev Author: wishcraft Date: 2012-03-26 17:46:47 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.09 - complete second release - final - DB Optimization, Bottlenecks Removed, Pagination Fixed, Templating Issues Fixed. Modified Paths: -------------- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Added Paths: ----------- XoopsModules/songlist/releases/1.09/ XoopsModules/songlist/releases/1.09/docs/ XoopsModules/songlist/releases/1.09/docs/.htaccess XoopsModules/songlist/releases/1.09/htdocs/ XoopsModules/songlist/releases/1.09/htdocs/modules/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/export.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/field_visibility.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/genre.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/menu.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/permissions.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/requests.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/utf8map.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/votes.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/field.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/visibility.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/css/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/css/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/SonglistRequirement.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/credits.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/install.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/lang_diff.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/licence.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/docs/readme.txt XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/header.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/accept.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/cancel.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/no.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.albums.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.artists.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.category.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.field.permissions.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.fields.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.genre.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.import.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.permissions.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.requests.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.songs.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.utf8map.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/songlist.votes.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/16/yes.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.albums.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.artists.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.category.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.field.permissions.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.fields.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.genre.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.import.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.permissions.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.requests.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.songs.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.utf8map.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/32/songlist.votes.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/icons/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/left_both.gif XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/right_both.gif XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/songlist_slogo.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/images/xoopsxf_slogo.png XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/JSON.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectsinger.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/uploader.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/js/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/js/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/email.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/enum.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/mail_templates/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/mail_templates/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/mail_templates/songlist_request_created.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/mail_templates/songlist_request_updated.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/language/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/request.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/search.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/mysql.htm XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_albums_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_albums_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_artists_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_category_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_category_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_fieldlist.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_genre_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_genre_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_import_actiona.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_import_actionb.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_requests_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_requests_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_songs_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_visibility.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_votes_edit.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_cpanel_votes_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_requests_index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/releases/1.09/htdocs/modules/tag/ XoopsModules/songlist/releases/1.09/htdocs/modules/tag/plugin/ XoopsModules/songlist/releases/1.09/htdocs/modules/tag/plugin/songlist.php XoopsModules/songlist/releases/1.09/htdocs/uploads/ XoopsModules/songlist/releases/1.09/htdocs/uploads/songlist/ Added: XoopsModules/songlist/releases/1.09/docs/.htaccess =================================================================== --- XoopsModules/songlist/releases/1.09/docs/.htaccess (rev 0) +++ XoopsModules/songlist/releases/1.09/docs/.htaccess 2012-03-26 17:46:47 UTC (rev 9201) @@ -0,0 +1,10 @@ + +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d + +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$4&fct=$5&id=$6&value=$7&gid=$8&cid=$9 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&id=$5&value=$6&gid=$7&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-(.*?)-([0-9]+)-([0-9]+)-(.*?).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&value=$5&gid=$6&cid=$7&singer=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$2&fct=$3&id=$4 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+).html modules/songlist/$1.php?op=$2&fct=$3 [L,NC,QSA] Added: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/about.php (rev 0) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/about.php 2012-03-26 17:46:47 UTC (rev 9201) @@ -0,0 +1,77 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + $aboutAdmin = new ModuleAdmin(); + $paypalitemno='SONGLIST'; + $aboutAdmin = new ModuleAdmin(); + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SONGLIST_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/albums.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/albums.php (rev 0) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/albums.php 2012-03-26 17:46:47 UTC (rev 9201) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"albums"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "albums": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + + $criteria = $albums_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $albums_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($albums_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined(' '.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $albums_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $albumss = $albums_handler->getObjects($criteria, true); + foreach($albumss as $cid => $albums) { + if (is_object($albums)) + $GLOBALS['xoopsTpl']->append('albums', $albums->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_albums_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + if (isset($_REQUEST['id'])) { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + } else { + $albums = $albums_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $albums->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.html'); + break; + case "save": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $albums = $albums_handler->get($id); + } else { + $albums = $albums_handler->create(); + } + $albums->setVars($_POST[$id]); + + if (!$id=$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $albums = $albums_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($albums->getVar('image'))) + unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image')); + + $albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $albums->setVar('image', $uploader->getSavedFileName()); + @$albums_handler->insert($albums); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $albums = $albums_handler->get($id); + $albums->setVars($_POST[$id]); + if (!$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $albums = $albums_handler->get($id); + if (!$albums_handler->delete($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_DELETED); + exit(0); + } + } else { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ALBUMS_DELETE, $albums->getVar('title'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/artists.php (rev 0) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/artists.php 2012-03-26 17:46:47 UTC (rev 9201) @@ -0,0 +1,140 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"artists"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "artists": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + + $criteria = $artists_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $artists_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($artists_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $artists = $artists_handler->getObjects($criteria, true); + foreach($artists as $cid => $artist) { + if (is_object($artist)) + $GLOBALS['xoopsTpl']->append('artists', $artist->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + if (isset($_REQUEST['id'])) { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + } else { + $artists = $artists_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $artists->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.html'); + break; + case "save": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $artists = $artists_handler->get($id); + } else { + $artists = $artists_handler->create(); + } + $artists->setVars($_POST[$id]); + + if (!$id=$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } else { + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $artists = $artists_handler->get($id); + $artists->setVars($_POST[$id]); + if (!$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $artists = $artists_handler->get($id); + if (!$artists_handler->delete($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED); + exit(0); + } + } else { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artists->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/category.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/category.php (rev 0) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/category.php 2012-03-26 17:46:47 UTC (rev 9201) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"category"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "category": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + + $criteria = $category_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $category_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($category_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $categorys = $category_handler->getObjects($criteria, true); + foreach($categorys as $cid => $category) { + if (is_object($category)) + $GLOBALS['xoopsTpl']->append('categories', $category->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_category_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + if (isset($_REQUEST['id'])) { + $category = $category_handler->get(intval($_REQUEST['id'])); + } else { + $category = $category_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $category->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.html'); + break; + case "save": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $category = $category_handler->get($id); + } else { + $category = $category_handler->create(); + } + $category->setVars($_POST[$id]); + + if (!$id=$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $category = $category_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($category->getVar('image'))) + unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image')); + + $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $category->setVar('image', $uploader->getSavedFileName()); + @$category_handler->insert($category); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $category = $category_handler->get($id); + $category->setVars($_POST[$id]); + if (!$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + break; + case "delete": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $category = $category_handler->get($id); + if (!$category_handler->delete($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_DELETED); + exit(0); + } + } else { + $category = $category_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/dashboard.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/dashboard.php (rev 0) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/dashboard.php 2012-03-26 17:46:47 UTC (rev 9201) @@ -0,0 +1,70 @@ +<?php +// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "default")); + + switch ($op) { + case "default": + default: + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $indexAdmin = new ModuleAdmin(); + + $category_handler = xoops_getmodulehandler('category', 'songlist'); + $artists_handler = xoops_getmodulehandler('artists', 'songlist'); + $albums_handler = xoops_getmodulehandler('albums', 'songlist'); + $genre_handler = xoops_getmodulehandler('genre', 'songlist'); + $songs_handler = xoops_getmodulehandler('songs', 'songlist'); + $requests_handler = xoops_getmodulehandler('requests', 'songlist'); + $votes_handler = xoops_getmodulehandler('votes', 'songlist'); + + $indexAdmin->addInfoBox(_AM_SONGLIST_COUNT); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_CATEGORY."</label>", $category_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ARTISTS."</label>", $artists_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ALBUMS."</label>", $albums_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_GENRE."</label>", $genre_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_SONGS."</label>", $songs_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_REQUESTS."</label>", $requests_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_VOTES."</label>", $votes_handler->getCount(NULL, true), 'green'); + echo $indexAdmin->renderIndex(); + + xoops_cp_footer(); + break; + } + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/export.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/admin/export.php (rev 0) +++ XoopsModules/songlist/releases/1.09/... [truncated message content] |
From: <wis...@us...> - 2012-03-26 20:05:57
|
Revision: 9203 http://xoops.svn.sourceforge.net/xoops/?rev=9203&view=rev Author: wishcraft Date: 2012-03-26 20:05:51 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Karioki Song List 1.09 - complete second release - final - DB Optimization, Bottlenecks Removed, Pagination Fixed, Templating Issues Fixed. Modified Paths: -------------- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql Modified: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/mysql.sql =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 19:44:00 UTC (rev 9202) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 20:05:51 UTC (rev 9203) @@ -77,7 +77,7 @@ `sid` INT(12) UNSIGNED DEFAULT '0', `created` INT(12) UNSIGNED DEFAULT '0', `updated` INT(12) UNSIGNED DEFAULT '0', - PRIMARY KEY (`rid`) + PRIMARY KEY (`rid`), KEY `SORT` (`songid`(10),`sid`,`created`) ) ENGINE=INNODB DEFAULT CHARSET=utf8; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 19:44:00 UTC (rev 9202) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql 2012-03-26 20:05:51 UTC (rev 9203) @@ -77,7 +77,7 @@ `sid` INT(12) UNSIGNED DEFAULT '0', `created` INT(12) UNSIGNED DEFAULT '0', `updated` INT(12) UNSIGNED DEFAULT '0', - PRIMARY KEY (`rid`) + PRIMARY KEY (`rid`), KEY `SORT` (`songid`(10),`sid`,`created`) ) ENGINE=INNODB DEFAULT CHARSET=utf8; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-03-27 09:08:47
|
Revision: 9208 http://xoops.svn.sourceforge.net/xoops/?rev=9208&view=rev Author: wishcraft Date: 2012-03-27 09:08:36 +0000 (Tue, 27 Mar 2012) Log Message: ----------- Karioki Song List 1.09 - complete second release - production - Form Object Issues Fixed. Modified Paths: -------------- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php Modified: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectalbum.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectalbum.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectalbum.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -114,7 +114,8 @@ $_form_object_options['albums'][$id] = $obj->getVar('title'); } } - $this->addOptions($_form_object_options['albums']); + foreach($_form_object_options['albums'] as $id => $value) + $this->addOption($id, $value); } /** Modified: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectartist.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectartist.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectartist.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -113,7 +113,9 @@ foreach($artists_handler->getObjects(NULL, true) as $id => $obj) $_form_object_options['artists'][$id] = $obj->getVar('name'); } - $this->addOptions($_form_object_options['artists']); + foreach($_form_object_options['artists'] as $id => $value) + $this->addOption($id, $value); + } /** Modified: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectgenre.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectgenre.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectgenre.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -114,7 +114,9 @@ $_form_object_options['genre'][$id] = $obj->getVar('name'); } } - $this->addOptions($_form_object_options['genre']); + foreach($_form_object_options['genre'] as $id => $value) + $this->addOption($id, $value); + } Modified: XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectsong.php =================================================================== --- XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectsong.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/releases/1.09/htdocs/modules/songlist/include/formselectsong.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -123,7 +123,8 @@ } } } - $this->addOptions($_form_object_options['songs'][$field][$id]); + foreach($_form_object_options['songs'][$field][$id] as $id => $value) + $this->addOption($id, $value); } /** Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -114,7 +114,8 @@ $_form_object_options['albums'][$id] = $obj->getVar('title'); } } - $this->addOptions($_form_object_options['albums']); + foreach($_form_object_options['albums'] as $id => $value) + $this->addOption($id, $value); } /** Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -113,7 +113,9 @@ foreach($artists_handler->getObjects(NULL, true) as $id => $obj) $_form_object_options['artists'][$id] = $obj->getVar('name'); } - $this->addOptions($_form_object_options['artists']); + foreach($_form_object_options['artists'] as $id => $value) + $this->addOption($id, $value); + } /** Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -114,7 +114,9 @@ $_form_object_options['genre'][$id] = $obj->getVar('name'); } } - $this->addOptions($_form_object_options['genre']); + foreach($_form_object_options['genre'] as $id => $value) + $this->addOption($id, $value); + } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php 2012-03-27 08:22:11 UTC (rev 9207) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php 2012-03-27 09:08:36 UTC (rev 9208) @@ -123,7 +123,8 @@ } } } - $this->addOptions($_form_object_options['songs'][$field][$id]); + foreach($_form_object_options['songs'][$field][$id] as $id => $value) + $this->addOption($id, $value); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-03-30 14:32:11
|
Revision: 9215 http://xoops.svn.sourceforge.net/xoops/?rev=9215&view=rev Author: wishcraft Date: 2012-03-30 14:31:56 +0000 (Fri, 30 Mar 2012) Log Message: ----------- Karioki Song List 1.10 - complete third release - production - All Listed bugs by the client fixed. Modified Paths: -------------- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/search.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Added Paths: ----------- XoopsModules/songlist/releases/1.10/ XoopsModules/songlist/releases/1.10/docs/ XoopsModules/songlist/releases/1.10/docs/.htaccess XoopsModules/songlist/releases/1.10/htdocs/ XoopsModules/songlist/releases/1.10/htdocs/modules/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/export.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field_visibility.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/genre.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/menu.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/permissions.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/requests.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/utf8map.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/votes.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/field.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/visibility.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/SonglistRequirement.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/credits.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/install.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/lang_diff.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/licence.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/docs/readme.txt XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/header.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/accept.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/cancel.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/no.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.albums.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.artists.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.category.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.field.permissions.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.fields.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.genre.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.import.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.permissions.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.requests.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.songs.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.utf8map.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/songlist.votes.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/16/yes.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.albums.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.artists.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.category.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.field.permissions.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.fields.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.genre.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.import.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.permissions.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.requests.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.songs.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.utf8map.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/32/songlist.votes.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/icons/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/left_both.gif XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/right_both.gif XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/songlist_slogo.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/images/xoopsxf_slogo.png XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/JSON.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/formselectsinger.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/uploader.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/js/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/js/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/email.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/enum.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/mail_templates/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/mail_templates/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/mail_templates/songlist_request_created.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/mail_templates/songlist_request_updated.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/request.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/search.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/sql/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/sql/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/sql/mysql.htm XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_albums_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_albums_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_artists_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_category_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_category_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_fieldlist.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_genre_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_genre_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_import_actiona.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_import_actionb.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_requests_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_requests_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_visibility.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_votes_edit.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_votes_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_requests_index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/releases/1.10/htdocs/modules/tag/ XoopsModules/songlist/releases/1.10/htdocs/modules/tag/plugin/ XoopsModules/songlist/releases/1.10/htdocs/modules/tag/plugin/songlist.php XoopsModules/songlist/releases/1.10/htdocs/uploads/ XoopsModules/songlist/releases/1.10/htdocs/uploads/songlist/ Added: XoopsModules/songlist/releases/1.10/docs/.htaccess =================================================================== --- XoopsModules/songlist/releases/1.10/docs/.htaccess (rev 0) +++ XoopsModules/songlist/releases/1.10/docs/.htaccess 2012-03-30 14:31:56 UTC (rev 9215) @@ -0,0 +1,10 @@ + +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d + +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$4&fct=$5&id=$6&value=$7&gid=$8&cid=$9 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&id=$5&value=$6&gid=$7&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-(.*?)-([0-9]+)-([0-9]+)-(.*?).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&value=$5&gid=$6&cid=$7&singer=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$2&fct=$3&id=$4 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+).html modules/songlist/$1.php?op=$2&fct=$3 [L,NC,QSA] Added: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/about.php (rev 0) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/about.php 2012-03-30 14:31:56 UTC (rev 9215) @@ -0,0 +1,77 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + $aboutAdmin = new ModuleAdmin(); + $paypalitemno='SONGLIST'; + $aboutAdmin = new ModuleAdmin(); + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SONGLIST_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/albums.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/albums.php (rev 0) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/albums.php 2012-03-30 14:31:56 UTC (rev 9215) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"albums"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "albums": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + + $criteria = $albums_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $albums_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($albums_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $albums_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $albumss = $albums_handler->getObjects($criteria, true); + foreach($albumss as $cid => $albums) { + if (is_object($albums)) + $GLOBALS['xoopsTpl']->append('albums', $albums->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_albums_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + if (isset($_REQUEST['id'])) { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + } else { + $albums = $albums_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $albums->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.html'); + break; + case "save": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $albums = $albums_handler->get($id); + } else { + $albums = $albums_handler->create(); + } + $albums->setVars($_POST[$id]); + + if (!$id=$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $albums = $albums_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($albums->getVar('image'))) + unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image')); + + $albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $albums->setVar('image', $uploader->getSavedFileName()); + @$albums_handler->insert($albums); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $albums = $albums_handler->get($id); + $albums->setVars($_POST[$id]); + if (!$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $albums = $albums_handler->get($id); + if (!$albums_handler->delete($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_DELETED); + exit(0); + } + } else { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ALBUMS_DELETE, $albums->getVar('title'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/artists.php (rev 0) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/artists.php 2012-03-30 14:31:56 UTC (rev 9215) @@ -0,0 +1,140 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"artists"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "artists": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + + $criteria = $artists_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $artists_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($artists_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $artists = $artists_handler->getObjects($criteria, true); + foreach($artists as $cid => $artist) { + if (is_object($artist)) + $GLOBALS['xoopsTpl']->append('artists', $artist->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + if (isset($_REQUEST['id'])) { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + } else { + $artists = $artists_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $artists->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.html'); + break; + case "save": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $artists = $artists_handler->get($id); + } else { + $artists = $artists_handler->create(); + } + $artists->setVars($_POST[$id]); + + if (!$id=$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } else { + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $artists = $artists_handler->get($id); + $artists->setVars($_POST[$id]); + if (!$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $artists = $artists_handler->get($id); + if (!$artists_handler->delete($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED); + exit(0); + } + } else { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artists->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/category.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/category.php (rev 0) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/category.php 2012-03-30 14:31:56 UTC (rev 9215) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"category"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "category": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + + $criteria = $category_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $category_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($category_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $categorys = $category_handler->getObjects($criteria, true); + foreach($categorys as $cid => $category) { + if (is_object($category)) + $GLOBALS['xoopsTpl']->append('categories', $category->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_category_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + if (isset($_REQUEST['id'])) { + $category = $category_handler->get(intval($_REQUEST['id'])); + } else { + $category = $category_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $category->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.html'); + break; + case "save": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $category = $category_handler->get($id); + } else { + $category = $category_handler->create(); + } + $category->setVars($_POST[$id]); + + if (!$id=$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $category = $category_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($category->getVar('image'))) + unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image')); + + $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $category->setVar('image', $uploader->getSavedFileName()); + @$category_handler->insert($category); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $category = $category_handler->get($id); + $category->setVars($_POST[$id]); + if (!$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + break; + case "delete": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $category = $category_handler->get($id); + if (!$category_handler->delete($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_DELETED); + exit(0); + } + } else { + $category = $category_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/dashboard.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/dashboard.php (rev 0) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/dashboard.php 2012-03-30 14:31:56 UTC (rev 9215) @@ -0,0 +1,70 @@ +<?php +// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "default")); + + switch ($op) { + case "default": + default: + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $indexAdmin = new ModuleAdmin(); + + $category_handler = xoops_getmodulehandler('category', 'songlist'); + $artists_handler = xoops_getmodulehandler('artists', 'songlist'); + $albums_handler = xoops_getmodulehandler('albums', 'songlist'); + $genre_handler = xoops_getmodulehandler('genre', 'songlist'); + $songs_handler = xoops_getmodulehandler('songs', 'songlist'); + $requests_handler = xoops_getmodulehandler('requests', 'songlist'); + $votes_handler = xoops_getmodulehandler('votes', 'songlist'); + + $indexAdmin->addInfoBox(_AM_SONGLIST_COUNT); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_CATEGORY."</label>", $category_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ARTISTS."</label>", $artists_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ALBUMS."</label>", $albums_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_GENRE."</label>", $genre_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_SONGS."</label>", $songs_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_REQUESTS."</label>", $requests_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_VOTES."</label>", $votes_handler->getCount(NULL, true), 'green'); + echo $indexAdmin->renderIndex(); + + xoops_cp_footer(); + break; + } + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/export.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/export.php (rev 0) +++ XoopsModules/songlist/releases/1... [truncated message content] |
From: <wis...@us...> - 2012-04-04 21:22:40
|
Revision: 9279 http://xoops.svn.sourceforge.net/xoops/?rev=9279&view=rev Author: wishcraft Date: 2012-04-04 21:22:33 +0000 (Wed, 04 Apr 2012) Log Message: ----------- Karioki Song List 1.10 - complete third release - production - All Listed bugs by the client fixed. (mamba's tag error) Modified Paths: -------------- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/import.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/import.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/import.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -174,7 +174,6 @@ $object->setVar('singer', '_ENUM_SONGLIST_SOLO'); break; } - $object->setVar('cids', array_merge(array($cid=>$cid), $this->getVar('cids'))); $object->setVar('name', trim($data[$_POST['artist']])); $aid = $artists_handler->insert($object); $aids[$aid] = $aid; Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/albums.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/albums.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/albums.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -93,7 +93,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/'.$op.'-'.$fct.'-'.$this->getVar('abid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/'.$op.'-'.$fct.'-'.$this->getVar('abid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('abid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } @@ -248,7 +248,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/albums/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/albums.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start; } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/artists.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/artists.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/artists.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -84,7 +84,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/item-item-'.$this->getVar('aid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/item-item-'.$this->getVar('aid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/artists.php?op=item&fct=item&id='.$this->getVar('aid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } @@ -235,7 +235,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start; } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/requests.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/requests.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/requests.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -205,7 +205,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct; } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -113,7 +113,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/index/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/index/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/index.php?op=item&fct=item&id='.$this->getVar('sid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } @@ -322,7 +322,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start; } @@ -331,7 +331,7 @@ function getSearchURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.urlencode($value).'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$gid.'-'.$singer.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.urlencode($value).'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$gid.'-'.$singer.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.(isset($_GET['cid'])?($_GET['cid']):$cid).'&gid='.$gid.'&singer='.$singer.'&start='.$start; } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -37,6 +37,7 @@ define('_MN_SONGLIST_RESULTS_TITLE', 'Title'); define('_MN_SONGLIST_RESULTS_SONGID', 'Song ID'); define('_MN_SONGLIST_RESULTS_ACTIONS', 'Actions'); + define('_MN_SONGLIST_RESULTS_TAGS', 'Tags'); // Voting define('_MN_SONGLIST_10STARS', '10 Stars'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -174,7 +174,6 @@ $object->setVar('singer', '_ENUM_SONGLIST_SOLO'); break; } - $object->setVar('cids', array_merge(array($cid=>$cid), $this->getVar('cids'))); $object->setVar('name', trim($data[$_POST['artist']])); $aid = $artists_handler->insert($object); $aids[$aid] = $aid; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -93,7 +93,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/'.$op.'-'.$fct.'-'.$this->getVar('abid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/'.$op.'-'.$fct.'-'.$this->getVar('abid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('abid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } @@ -248,7 +248,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/albums/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/albums.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start; } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -84,7 +84,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/item-item-'.$this->getVar('aid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/item-item-'.$this->getVar('aid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/artists.php?op=item&fct=item&id='.$this->getVar('aid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } @@ -235,7 +235,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start; } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/requests.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/requests.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/requests.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -205,7 +205,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct; } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -113,7 +113,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/index/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/index/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/index.php?op=item&fct=item&id='.$this->getVar('sid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid; } @@ -322,7 +322,7 @@ function getURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start; } @@ -331,7 +331,7 @@ function getSearchURL() { global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit; if ($GLOBALS['songlistModuleConfig']['htaccess']) { - return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.urlencode($value).'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$gid.'-'.$singer.$GLOBALS['songlistModuleConfig']['endofurl']; + return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.urlencode($value).'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$gid.'-'.$singer.$GLOBALS['songlistModuleConfig']['endofurl']; } else { return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.(isset($_GET['cid'])?($_GET['cid']):$cid).'&gid='.$gid.'&singer='.$singer.'&start='.$start; } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-04-04 20:36:40 UTC (rev 9278) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-04-04 21:22:33 UTC (rev 9279) @@ -37,6 +37,7 @@ define('_MN_SONGLIST_RESULTS_TITLE', 'Title'); define('_MN_SONGLIST_RESULTS_SONGID', 'Song ID'); define('_MN_SONGLIST_RESULTS_ACTIONS', 'Actions'); + define('_MN_SONGLIST_RESULTS_TAGS', 'Tags'); // Voting define('_MN_SONGLIST_10STARS', '10 Stars'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-04-04 23:37:51
|
Revision: 9281 http://xoops.svn.sourceforge.net/xoops/?rev=9281&view=rev Author: wishcraft Date: 2012-04-04 23:37:44 +0000 (Wed, 04 Apr 2012) Log Message: ----------- Karioki Song List 1.10 - complete third release - production - All Listed bugs by the client fixed. (mamba's template error) Modified Paths: -------------- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 23:37:44 UTC (rev 9281) @@ -19,7 +19,7 @@ $this->initVar('abid', XOBJ_DTYPE_INT, 0, false); $this->initVar('songid', XOBJ_DTYPE_TXTBOX, null, false, 32); $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128); - $this->initVar('lyrics', XOBJ_DTYPE_TXTBOX, null, false, 650); + $this->initVar('lyrics', XOBJ_DTYPE_OTHER, null, false, 650); $this->initVar('hits', XOBJ_DTYPE_INT, 0, false); $this->initVar('rank', XOBJ_DTYPE_DECIMAL, 0, false); $this->initVar('votes', XOBJ_DTYPE_INT, 0, false); @@ -34,6 +34,9 @@ function toArray($extra = true) { $ret = parent::toArray(); + + $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true); + $form = $this->getForm(true); foreach($form as $key => $element) { $ret['form'][$key] = $form[$key]->render(); @@ -271,12 +274,14 @@ $album->setVar('sids', $arry); $albums_handler->insert($album); } - if ($obj->vars['aid']['value']>0) { - $artist = $artists_handler->get($obj->vars['aid']['value']); - $arry = $artist->getVar('sids'); - $arry[$sid] = $sid; - $artist->setVar('sids', $arry); - $artists_handler->insert($artist); + if (count($obj->getVar('aids'))>0) { + foreach($obj->getVar('aids') as $aid) { + $artist = $artists_handler->get($aid); + $arry = $artist->getVar('sids'); + $arry[$sid] = $sid; + $artist->setVar('sids', $arry); + $artists_handler->insert($artist); + } } return $sid; } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:37:44 UTC (rev 9281) @@ -152,6 +152,7 @@ clear:both; margin-left: 35px; margin-top: 3px; + margin-bottom: 10px; } .sl_subsong { @@ -166,4 +167,5 @@ border-style: dotted; border-width: 1px; clear:both; + width:320px; } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:37:44 UTC (rev 9281) @@ -9,6 +9,9 @@ define('_MN_SONGLIST_TAGS', 'Tags:-'); define('_MN_SONGLIST_SONGS', 'Song\'s:-'); define('_MN_SONGLIST_ALBUMS', 'Album\'s:-'); + define('_MN_SONGLIST_LYRICS', 'Lyric\'s:-'); + define('_MN_SONGLIST_GENRE', 'Genre:-'); + define('_MN_SONGLIST_CATEGORY', 'Category:-'); // Browse By define('_MN_SONGLIST_BROWSEBY', 'Browse by Character'); Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:37:44 UTC (rev 9281) @@ -60,7 +60,7 @@ </tr> <{/foreach}> <tr class="foot"> - <td colspan="10"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td> + <td colspan="11"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td> </tr> </table> <input type='hidden' name='op' value='category'/> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:37:44 UTC (rev 9281) @@ -1,3 +1,17 @@ +<h1><{$song.title}><{if $song.songid}> - <{$song.songid}><{/if}></h1> +<{if $song.category}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_CATEGORY}> +</div> +<{if $song.category.picture}> +<div class="sl_artsong"> + <img src='<{$song.category.picture}>' width="95%" border="0" /> +</div> +<{/if}> +<div class="sl_mainsong"> + <{$song.category.name}> +</div> +<{/if}> <{if $song.album}> <div class="sl_subtitle"> <{$smarty.const._MN_SONGLIST_ALBUM}> @@ -3,5 +17,5 @@ </div> <div class="sl_mainsong"> - <{$song.album.name}> + <{$song.album.title}> </div> <{if $song.album.picture}> @@ -11,6 +25,14 @@ </div> <{/if}> <{/if}> +<{if $song.genre}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_GENRE}> +</div> +<div class="sl_mainsong"> + <{$song.genre.name}> +</div> +<{/if}> <{if $song.artists_array}> <div class="sl_subtitle"> <{if count($song.artists_array) > 1}> @@ -47,6 +69,12 @@ <{include file="db:tag_bar.html" tagbar=$song.tagbar}> </div> <{/if}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_LYRICS}> +</div> +<div class="sl_mainsong"> + <{$song.lyrics}> +</div> <{foreach from=$song.fields item=field}> <div class="sl_subtitle"> <{$field.title}> @@ -54,4 +82,4 @@ <div class="sl_mainsong"> <{$field.value}> </div> -<{/foreach}> \ No newline at end of file +<{/foreach}> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 23:37:44 UTC (rev 9281) @@ -19,7 +19,7 @@ $this->initVar('abid', XOBJ_DTYPE_INT, 0, false); $this->initVar('songid', XOBJ_DTYPE_TXTBOX, null, false, 32); $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128); - $this->initVar('lyrics', XOBJ_DTYPE_TXTBOX, null, false, 650); + $this->initVar('lyrics', XOBJ_DTYPE_OTHER, null, false, 650); $this->initVar('hits', XOBJ_DTYPE_INT, 0, false); $this->initVar('rank', XOBJ_DTYPE_DECIMAL, 0, false); $this->initVar('votes', XOBJ_DTYPE_INT, 0, false); @@ -34,6 +34,9 @@ function toArray($extra = true) { $ret = parent::toArray(); + + $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true); + $form = $this->getForm(true); foreach($form as $key => $element) { $ret['form'][$key] = $form[$key]->render(); @@ -271,12 +274,14 @@ $album->setVar('sids', $arry); $albums_handler->insert($album); } - if ($obj->vars['aid']['value']>0) { - $artist = $artists_handler->get($obj->vars['aid']['value']); - $arry = $artist->getVar('sids'); - $arry[$sid] = $sid; - $artist->setVar('sids', $arry); - $artists_handler->insert($artist); + if (count($obj->getVar('aids'))>0) { + foreach($obj->getVar('aids') as $aid) { + $artist = $artists_handler->get($aid); + $arry = $artist->getVar('sids'); + $arry[$sid] = $sid; + $artist->setVar('sids', $arry); + $artists_handler->insert($artist); + } } return $sid; } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css 2012-04-04 23:37:44 UTC (rev 9281) @@ -152,6 +152,7 @@ clear:both; margin-left: 35px; margin-top: 3px; + margin-bottom: 10px; } .sl_subsong { @@ -166,4 +167,5 @@ border-style: dotted; border-width: 1px; clear:both; + width:320px; } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-04-04 23:37:44 UTC (rev 9281) @@ -9,6 +9,9 @@ define('_MN_SONGLIST_TAGS', 'Tags:-'); define('_MN_SONGLIST_SONGS', 'Song\'s:-'); define('_MN_SONGLIST_ALBUMS', 'Album\'s:-'); + define('_MN_SONGLIST_LYRICS', 'Lyric\'s:-'); + define('_MN_SONGLIST_GENRE', 'Genre:-'); + define('_MN_SONGLIST_CATEGORY', 'Category:-'); // Browse By define('_MN_SONGLIST_BROWSEBY', 'Browse by Character'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html 2012-04-04 23:37:44 UTC (rev 9281) @@ -60,7 +60,7 @@ </tr> <{/foreach}> <tr class="foot"> - <td colspan="10"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td> + <td colspan="11"><input type='submit' name='submit' value='<{$smarty.const._SUBMIT}>'/></td> </tr> </table> <input type='hidden' name='op' value='category'/> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:04:35 UTC (rev 9280) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:37:44 UTC (rev 9281) @@ -1,3 +1,17 @@ +<h1><{$song.title}><{if $song.songid}> - <{$song.songid}><{/if}></h1> +<{if $song.category}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_CATEGORY}> +</div> +<{if $song.category.picture}> +<div class="sl_artsong"> + <img src='<{$song.category.picture}>' width="95%" border="0" /> +</div> +<{/if}> +<div class="sl_mainsong"> + <{$song.category.name}> +</div> +<{/if}> <{if $song.album}> <div class="sl_subtitle"> <{$smarty.const._MN_SONGLIST_ALBUM}> @@ -3,5 +17,5 @@ </div> <div class="sl_mainsong"> - <{$song.album.name}> + <{$song.album.title}> </div> <{if $song.album.picture}> @@ -11,6 +25,14 @@ </div> <{/if}> <{/if}> +<{if $song.genre}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_GENRE}> +</div> +<div class="sl_mainsong"> + <{$song.genre.name}> +</div> +<{/if}> <{if $song.artists_array}> <div class="sl_subtitle"> <{if count($song.artists_array) > 1}> @@ -47,6 +69,12 @@ <{include file="db:tag_bar.html" tagbar=$song.tagbar}> </div> <{/if}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_LYRICS}> +</div> +<div class="sl_mainsong"> + <{$song.lyrics}> +</div> <{foreach from=$song.fields item=field}> <div class="sl_subtitle"> <{$field.title}> @@ -54,4 +82,4 @@ <div class="sl_mainsong"> <{$field.value}> </div> -<{/foreach}> \ No newline at end of file +<{/foreach}> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-04-05 00:49:04
|
Revision: 9282 http://xoops.svn.sourceforge.net/xoops/?rev=9282&view=rev Author: wishcraft Date: 2012-04-05 00:48:56 +0000 (Thu, 05 Apr 2012) Log Message: ----------- Karioki Song List 1.10 - complete third release - production - All Listed bugs by the client fixed. (wishcraft's errors) Modified Paths: -------------- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/field.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -70,15 +70,15 @@ $fields[$i]['canDelete'] = $fields[$i]['field_config']; $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']]; $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']]; - $categories[$i][] = $fields[$i]; + $fieldcategories[$i][] = $fields[$i]; $weights[$i] = $fields[$i]['field_weight']; } //sort fields order in categories foreach (array_keys($fields) as $i ) { - array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]), SORT_ASC, $categories[$i]); + array_multisort($weights[$i], SORT_ASC, array_keys($fieldcategories[$i]), SORT_ASC, $categories[$i]); } ksort($categories); - $GLOBALS['xoopsTpl']->assign('fieldcategories', $categories); + $GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories); $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() ); $template_main = "songlist_cpanel_fieldlist.html"; break; Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/songs.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/songs.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/admin/songs.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -100,7 +100,7 @@ if ($GLOBALS['songlistModuleConfig']['tag']&&file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) { $tag_handler = xoops_getmodulehandler('tag', 'tag'); - $tag_handler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar("dirname")); + $tag_handler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar("mid"), $songs->getVar('cid')); } redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE); Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/class/songs.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -35,6 +35,8 @@ function toArray($extra = true) { $ret = parent::toArray(); + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); + $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true); $form = $this->getForm(true); @@ -54,7 +56,7 @@ if (file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php"))&&$GLOBALS['songlistModuleConfig']['tags']) { include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php"; - $ret['tagbar'] = tagBar($this->getVar('sid'), $catid = 0); + $ret['tagbar'] = tagBar($this->getVar('sid'), $this->getVar('cid'), $GLOBALS['songlistModule']->getVar('mid')); } $extras_handler = xoops_getmodulehandler('extras', 'songlist'); @@ -129,6 +131,11 @@ { function __construct(&$db) { + $module_handler = xoops_gethandler('module'); + $config_handler = xoops_gethandler('config'); + $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist'); + $GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); + parent::__construct($db, "songlist_songs", 'SonglistSongs', "sid", "title"); } Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/songlist.form.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/songlist.form.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/include/songlist.form.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -996,7 +996,7 @@ if (!class_exists('XoopsFormTag')) { $ele['tags'] = new XoopsFormHidden('tags', $object->getVar('tags')); } else { - $ele['tags'] = new XoopsFormTag('tags', 60, 255, $object->getVar('sid')); + $ele['tags'] = new XoopsFormTag('tags', 60, 255, $object->getVar('sid'), $object->getVar('cid')); } $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits')); Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -66,7 +66,7 @@ <{$smarty.const._MN_SONGLIST_TAGS}> </div> <div class="sl_mainsong"> - <{include file="db:tag_bar.html" tagbar=$song.tagbar}> + <{includeq file="db:tag_bar.html" tagbar=$song.tagbar}> </div> <{/if}> <div class="sl_subtitle"> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_list.html =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_list.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/templates/songlist_songs_list.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -52,7 +52,7 @@ <{/if}> <{/if}> <{if $xoConfig.tags}> - <td><{include file="db:tag_bar.html" tagbar=$result.tagbar}></a></td> + <td><{includeq file="db:tag_bar.html" tagbar=$result.tagbar}></a></td> <{/if}> <td><form action="<{$xoops_url}>/modules/songlist/index.php" method='post'> <input type="hidden" name='id' value='<{$result.sid}>'/> Modified: XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/xoops_version.php =================================================================== --- XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/xoops_version.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/releases/1.10/htdocs/modules/songlist/xoops_version.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -12,12 +12,12 @@ $modversion['name'] = _MI_SONGLIST_NAME; $modversion['version'] = 1.10; $modversion['description'] = _MI_SONGLIST_DESC; -$modversion['credits'] = "Orginally Based on Newbb by phppp - adaption by (wishcraft)"; +$modversion['credits'] = "Orginally Written by wishcraft, Testing Phil and Michael Beck"; $modversion['author'] = "Simon Roberts (wishcraft)"; $modversion['license'] = "GNU General Public License (GPL) see LICENSE"; $modversion['image'] = "images/songlist_slogo.png"; $modversion['dirname'] = "songlist"; -$modversion['releasedate'] = "Sunday, 27th March 03, 2012"; +$modversion['releasedate'] = "Thursday, 05th April, 2012"; $modversion['module_status'] = "Stable"; $modversion['website'] = "www.chronolabs.coop"; @@ -25,9 +25,9 @@ $modversion['icons16'] = 'Frameworks/moduleclasses/icons/16'; $modversion['icons32'] = 'Frameworks/moduleclasses/icons/32'; -$modversion['release_info'] = "Stable 2012/03/27"; +$modversion['release_info'] = "Stable 2012/04/05"; $modversion['release_file'] = XOOPS_URL."/modules/xforum/docs/changelog.txt"; -$modversion['release_date'] = "2012/03/27"; +$modversion['release_date'] = "2012/04/05"; $modversion['author_realname'] = "Wishcraft"; $modversion['author_website_url'] = "http://www.chronolabs.coop"; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -70,15 +70,15 @@ $fields[$i]['canDelete'] = $fields[$i]['field_config']; $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']]; $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']]; - $categories[$i][] = $fields[$i]; + $fieldcategories[$i][] = $fields[$i]; $weights[$i] = $fields[$i]['field_weight']; } //sort fields order in categories foreach (array_keys($fields) as $i ) { - array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]), SORT_ASC, $categories[$i]); + array_multisort($weights[$i], SORT_ASC, array_keys($fieldcategories[$i]), SORT_ASC, $categories[$i]); } ksort($categories); - $GLOBALS['xoopsTpl']->assign('fieldcategories', $categories); + $GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories); $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() ); $template_main = "songlist_cpanel_fieldlist.html"; break; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -100,7 +100,7 @@ if ($GLOBALS['songlistModuleConfig']['tag']&&file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) { $tag_handler = xoops_getmodulehandler('tag', 'tag'); - $tag_handler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar("dirname")); + $tag_handler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar("mid"), $songs->getVar('cid')); } redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -35,6 +35,8 @@ function toArray($extra = true) { $ret = parent::toArray(); + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); + $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true); $form = $this->getForm(true); @@ -54,7 +56,7 @@ if (file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php"))&&$GLOBALS['songlistModuleConfig']['tags']) { include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php"; - $ret['tagbar'] = tagBar($this->getVar('sid'), $catid = 0); + $ret['tagbar'] = tagBar($this->getVar('sid'), $this->getVar('cid'), $GLOBALS['songlistModule']->getVar('mid')); } $extras_handler = xoops_getmodulehandler('extras', 'songlist'); @@ -129,6 +131,11 @@ { function __construct(&$db) { + $module_handler = xoops_gethandler('module'); + $config_handler = xoops_gethandler('config'); + $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist'); + $GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); + parent::__construct($db, "songlist_songs", 'SonglistSongs', "sid", "title"); } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -996,7 +996,7 @@ if (!class_exists('XoopsFormTag')) { $ele['tags'] = new XoopsFormHidden('tags', $object->getVar('tags')); } else { - $ele['tags'] = new XoopsFormTag('tags', 60, 255, $object->getVar('sid')); + $ele['tags'] = new XoopsFormTag('tags', 60, 255, $object->getVar('sid'), $object->getVar('cid')); } $ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits')); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -6,18 +6,18 @@ <{$block.name}> <{/if}> </div> - <{if count($block.categories)>0}> + <{if count($block.categories_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORIES}> + <{$smarty.const._BL_SONGLIST_CATEGORIES}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.categories key=number item=category}> - <{$category.name}><{if $number<sizeof($block.categories)-1}>, <{/if}> + <{foreach from=$block.categories_array key=number item=category}> + <{$category.name}><{if $number<sizeof($block.categories_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif $block.category}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_CATEGORY}> + <{$smarty.const._BL_SONGLIST_CATEGORY}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.category.title}> @@ -25,7 +25,7 @@ <{/if}> <{if count($block.genres)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRES}> + <{$smarty.const._BL_SONGLIST_GENRES}> </div> <div style='font-size:0.65em; clear:both;'> <{foreach from=$block.genres key=number item=genre}> @@ -34,58 +34,58 @@ </div> <{elseif $block.genre}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_GENRE}> + <{$smarty.const._BL_SONGLIST_GENRE}> </div> <div style='font-size:0.65em; clear:both;'> <{$block.genre.name}></a> </div> <{/if}> - <{if count($block.artists)>0}> + <{if count($block.artists_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTISTS}> + <{$smarty.const._BL_SONGLIST_ARTISTS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.artists key=number item=artist}> - <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>, <{/if}> + <{foreach from=$block.artists_array key=number item=artist}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.artist)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ARTIST}> + <{$smarty.const._BL_SONGLIST_ARTIST}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.artist.url}>"><{$block.artist.title}></a> </div> <{/if}> - <{if count($block.albums)>0}> + <{if count($block.albums_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUMS}> + <{$smarty.const._BL_SONGLIST_ALBUMS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.albums key=number item=album}> - <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums)-1}>, <{/if}> + <{foreach from=$block.albums_array key=number item=album}> + <a href="<{$album.url}>"><{$album.title}></a><{if $number<sizeof($block.albums_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.album)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_ALBUM}> + <{$smarty.const._BL_SONGLIST_ALBUM}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.album.url}>"><{$block.album.title}></a> </div> <{/if}> - <{if count($block.songs)>0}> + <{if count($block.songs_array)>0}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONGS}> + <{$smarty.const._BL_SONGLIST_SONGS}> </div> <div style='font-size:0.65em; clear:both;'> - <{foreach from=$block.songs key=number item=song}> - <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs)-1}>, <{/if}> + <{foreach from=$block.songs_array key=number item=song}> + <a href="<{$song.url}>"><{$song.title}></a><{if $number<sizeof($block.songs_array)-1}>, <{/if}> <{/foreach}> </div> <{elseif isset($block.song)}> <div style='font-size:0.85em; clear:both;'> - <{$smary.const._BL_SONGLIST_SONG}> + <{$smarty.const._BL_SONGLIST_SONG}> </div> <div style='font-size:0.65em; clear:both;'> <a href="<{$block.song.url}>"><{$block.song.title}></a> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -1,4 +1,5 @@ <{if $block}> +<{assign var=topno value=0}> <{foreach from=$block item=item}> <{assign var=topno value=$topno+1}> <div style='display:block; margin-bottom:4px; clear:both;'> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -66,7 +66,7 @@ <{$smarty.const._MN_SONGLIST_TAGS}> </div> <div class="sl_mainsong"> - <{include file="db:tag_bar.html" tagbar=$song.tagbar}> + <{includeq file="db:tag_bar.html" tagbar=$song.tagbar}> </div> <{/if}> <div class="sl_subtitle"> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html 2012-04-05 00:48:56 UTC (rev 9282) @@ -52,7 +52,7 @@ <{/if}> <{/if}> <{if $xoConfig.tags}> - <td><{include file="db:tag_bar.html" tagbar=$result.tagbar}></a></td> + <td><{includeq file="db:tag_bar.html" tagbar=$result.tagbar}></a></td> <{/if}> <td><form action="<{$xoops_url}>/modules/songlist/index.php" method='post'> <input type="hidden" name='id' value='<{$result.sid}>'/> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php 2012-04-04 23:37:44 UTC (rev 9281) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php 2012-04-05 00:48:56 UTC (rev 9282) @@ -12,12 +12,12 @@ $modversion['name'] = _MI_SONGLIST_NAME; $modversion['version'] = 1.10; $modversion['description'] = _MI_SONGLIST_DESC; -$modversion['credits'] = "Orginally Based on Newbb by phppp - adaption by (wishcraft)"; +$modversion['credits'] = "Orginally Written by wishcraft, Testing Phil and Michael Beck"; $modversion['author'] = "Simon Roberts (wishcraft)"; $modversion['license'] = "GNU General Public License (GPL) see LICENSE"; $modversion['image'] = "images/songlist_slogo.png"; $modversion['dirname'] = "songlist"; -$modversion['releasedate'] = "Sunday, 27th March 03, 2012"; +$modversion['releasedate'] = "Thursday, 05th April, 2012"; $modversion['module_status'] = "Stable"; $modversion['website'] = "www.chronolabs.coop"; @@ -25,9 +25,9 @@ $modversio... [truncated message content] |
From: <wis...@us...> - 2012-04-29 13:57:49
|
Revision: 9396 http://xoops.svn.sourceforge.net/xoops/?rev=9396&view=rev Author: wishcraft Date: 2012-04-29 13:57:39 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Song List 1.11 - Hymn or Karaoke Song List for XOOPS 2.5 (Production) Modified Paths: -------------- XoopsModules/songlist/trunk/docs/.htaccess XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsinger.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/trunk/htdocs/modules/songlist/search.php XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php Added Paths: ----------- XoopsModules/songlist/releases/1.11/ XoopsModules/songlist/releases/1.11/docs/ XoopsModules/songlist/releases/1.11/docs/.htaccess XoopsModules/songlist/releases/1.11/htdocs/ XoopsModules/songlist/releases/1.11/htdocs/modules/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/export.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/field_visibility.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/genre.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/menu.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/permissions.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/requests.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/utf8map.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/votes.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/field.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/visibility.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/css/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/css/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/SonglistRequirement.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/credits.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/install.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/lang_diff.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/licence.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/docs/readme.txt XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/header.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/accept.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/cancel.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/no.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.albums.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.artists.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.category.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.field.permissions.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.fields.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.genre.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.import.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.permissions.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.requests.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.songs.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.utf8map.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/songlist.votes.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/16/yes.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.albums.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.artists.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.category.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.field.permissions.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.fields.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.genre.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.import.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.permissions.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.requests.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.songs.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.utf8map.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/32/songlist.votes.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/icons/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/left_both.gif XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/right_both.gif XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/songlist_slogo.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/images/xoopsxf_slogo.png XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/JSON.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/formselectsinger.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/include/uploader.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/js/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/js/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/email.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/enum.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/mail_templates/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/mail_templates/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/mail_templates/songlist_request_created.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/mail_templates/songlist_request_updated.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/language/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/request.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/search.php XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/sql/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/sql/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/sql/mysql.htm XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_albums_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_albums_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_artists_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_category_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_category_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_fieldlist.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_genre_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_genre_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_import_actiona.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_import_actionb.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_requests_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_requests_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_songs_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_visibility.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_votes_edit.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_cpanel_votes_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_requests_index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/releases/1.11/htdocs/modules/tag/ XoopsModules/songlist/releases/1.11/htdocs/modules/tag/plugin/ XoopsModules/songlist/releases/1.11/htdocs/modules/tag/plugin/songlist.php XoopsModules/songlist/releases/1.11/htdocs/uploads/ XoopsModules/songlist/releases/1.11/htdocs/uploads/songlist/ Added: XoopsModules/songlist/releases/1.11/docs/.htaccess =================================================================== --- XoopsModules/songlist/releases/1.11/docs/.htaccess (rev 0) +++ XoopsModules/songlist/releases/1.11/docs/.htaccess 2012-04-29 13:57:39 UTC (rev 9396) @@ -0,0 +1,11 @@ + +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d + +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$3&fct=$4&id=$5 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$4&fct=$5&id=$6&value=$7&gid=$8&cid=$9 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+)-(.*?)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&id=$5&value=$6&gid=$7&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-(.*?)-([0-9]+)-([0-9]+)-(.*?).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&value=$5&gid=$6&cid=$7&singer=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$2&fct=$3&id=$4 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+).html modules/songlist/$1.php?op=$2&fct=$3 [L,NC,QSA] Added: XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/about.php (rev 0) +++ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/about.php 2012-04-29 13:57:39 UTC (rev 9396) @@ -0,0 +1,77 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + $aboutAdmin = new ModuleAdmin(); + $paypalitemno='SONGLIST'; + $aboutAdmin = new ModuleAdmin(); + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SONGLIST_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/albums.php =================================================================== --- XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/albums.php (rev 0) +++ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/albums.php 2012-04-29 13:57:39 UTC (rev 9396) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"albums"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "albums": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + + $criteria = $albums_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $albums_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($albums_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $albums_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $albumss = $albums_handler->getObjects($criteria, true); + foreach($albumss as $cid => $albums) { + if (is_object($albums)) + $GLOBALS['xoopsTpl']->append('albums', $albums->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_albums_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + if (isset($_REQUEST['id'])) { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + } else { + $albums = $albums_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $albums->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.html'); + break; + case "save": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $albums = $albums_handler->get($id); + } else { + $albums = $albums_handler->create(); + } + $albums->setVars($_POST[$id]); + + if (!$id=$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $albums = $albums_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($albums->getVar('image'))) + unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image')); + + $albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $albums->setVar('image', $uploader->getSavedFileName()); + @$albums_handler->insert($albums); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $albums = $albums_handler->get($id); + $albums->setVars($_POST[$id]); + if (!$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $albums = $albums_handler->get($id); + if (!$albums_handler->delete($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_DELETED); + exit(0); + } + } else { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ALBUMS_DELETE, $albums->getVar('title'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/artists.php (rev 0) +++ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/artists.php 2012-04-29 13:57:39 UTC (rev 9396) @@ -0,0 +1,140 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"artists"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "artists": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + + $criteria = $artists_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $artists_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($artists_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $artists = $artists_handler->getObjects($criteria, true); + foreach($artists as $cid => $artist) { + if (is_object($artist)) + $GLOBALS['xoopsTpl']->append('artists', $artist->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + if (isset($_REQUEST['id'])) { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + } else { + $artists = $artists_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $artists->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.html'); + break; + case "save": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $artists = $artists_handler->get($id); + } else { + $artists = $artists_handler->create(); + } + $artists->setVars($_POST[$id]); + + if (!$id=$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } else { + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $artists = $artists_handler->get($id); + $artists->setVars($_POST[$id]); + if (!$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $artists = $artists_handler->get($id); + if (!$artists_handler->delete($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED); + exit(0); + } + } else { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artists->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/category.php =================================================================== --- XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/category.php (rev 0) +++ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/category.php 2012-04-29 13:57:39 UTC (rev 9396) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"category"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "category": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + + $criteria = $category_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $category_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($category_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $categorys = $category_handler->getObjects($criteria, true); + foreach($categorys as $cid => $category) { + if (is_object($category)) + $GLOBALS['xoopsTpl']->append('categories', $category->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_category_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + if (isset($_REQUEST['id'])) { + $category = $category_handler->get(intval($_REQUEST['id'])); + } else { + $category = $category_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $category->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.html'); + break; + case "save": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $category = $category_handler->get($id); + } else { + $category = $category_handler->create(); + } + $category->setVars($_POST[$id]); + + if (!$id=$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $category = $category_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($category->getVar('image'))) + unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image')); + + $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $category->setVar('image', $uploader->getSavedFileName()); + @$category_handler->insert($category); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $category = $category_handler->get($id); + $category->setVars($_POST[$id]); + if (!$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + break; + case "delete": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $category = $category_handler->get($id); + if (!$category_handler->delete($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_DELETED); + exit(0); + } + } else { + $category = $category_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/dashboard.php =================================================================== --- XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/dashboard.php (rev 0) +++ XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/dashboard.php 2012-04-29 13:57:39 UTC (rev 9396) @@ -0,0 +1,70 @@ +<?php +// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "default")); + + switch ($op) { + case "default": + default: + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $indexAdmin = new ModuleAdmin(); + + $category_handler = xoops_getmodulehandler('category', 'songlist'); + $artists_handler = xoops_getmodulehandler('artists', 'songlist'); + $albums_handler = xoops_getmodulehandler('albums', 'songlist'); + $genre_handler = xoops_getmodulehandler('genre', 'songlist'); + $songs_handler = xoops_getmodulehandler('songs', 'songlist'); + $requests_handler = xoops_getmodulehandler('requests', 'songlist'); + $votes_handler = xoops_getmodulehandler('votes', 'songlist'); + + $indexAdmin->addInfoBox(_AM_SONGLIST_COUNT); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_CATEGORY."</label>", $category_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ARTISTS."</label>", $artists_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ALBUMS."</label>", $albums_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_GENRE."</label>", $genre_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_SONGS."</label>", $songs_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_REQUESTS."</label>", $requests_handler->getCount(NULL, true), 'green'); + $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_VOTES."</label>", $votes_handler->getCount(NULL, true), 'green'); + echo $indexAdmin->renderIndex(); + + xoops_cp_footer(); + break; + } + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.11/htdocs/modules/songlist/admin/export.php ===========================... [truncated message content] |
From: <wis...@us...> - 2012-08-07 12:46:15
|
Revision: 10002 http://xoops.svn.sourceforge.net/xoops/?rev=10002&view=rev Author: wishcraft Date: 2012-08-07 12:46:01 +0000 (Tue, 07 Aug 2012) Log Message: ----------- Songlist 1.13 - Major Bug Fixes (See changelog.txt) Modified Paths: -------------- XoopsModules/songlist/trunk/docs/.htaccess XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/export.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/menu.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/field.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/licence.txt XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/uploader.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/trunk/htdocs/modules/songlist/request.php XoopsModules/songlist/trunk/htdocs/modules/songlist/search.php XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/trunk/htdocs/modules/tag/plugin/songlist.php Added Paths: ----------- XoopsModules/songlist/releases/1.13/ XoopsModules/songlist/releases/1.13/docs/ XoopsModules/songlist/releases/1.13/docs/.htaccess XoopsModules/songlist/releases/1.13/htdocs/ XoopsModules/songlist/releases/1.13/htdocs/modules/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/albums.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/artists.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/category.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/dashboard.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/export.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/field.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/field_permissions.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/field_visibility.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/genre.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/menu.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/permissions.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/requests.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/utf8map.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/voice.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/votes.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/albums.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/artists.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_album.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_albums.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_artist.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_artists.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_genre.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_genres.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_song.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/blocks/songlist_popular_songs.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/category.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/extras.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/field.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/requests.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/utf8map.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/visibility.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/voice.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/class/votes.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/css/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/css/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/SonglistRequirement.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/credits.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/install.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/lang_diff.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/licence.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/docs/readme.txt XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/header.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/accept.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/cancel.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/no.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.albums.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.artists.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.category.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.field.permissions.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.fields.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.genre.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.import.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.permissions.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.requests.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.songs.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.utf8map.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.voice.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/songlist.votes.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/16/yes.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.albums.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.artists.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.category.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.field.permissions.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.fields.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.genre.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.import.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.permissions.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.requests.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.songs.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.utf8map.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.voice.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/32/songlist.votes.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/icons/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/left_both.gif XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/right_both.gif XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/songlist_slogo.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/images/xoopsxf_slogo.png XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/JSON.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/formselectalbum.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/formselectartist.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/formselectcategory.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/formselectgenre.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/formselectsong.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/formselectvoice.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/functions.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/songlist.object.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/update.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/include/uploader.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/index.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/js/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/js/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/email.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/enum.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/mail_templates/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/mail_templates/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/mail_templates/songlist_request_created.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/mail_templates/songlist_request_updated.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/english/modinfo.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/language/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/list.tag.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/request.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/search.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/sql/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/sql/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/sql/mysql.htm XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_album.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_artist.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_genre.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_song.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_albums_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_albums_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_artists_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_artists_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_category_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_category_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_fieldlist.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_genre_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_genre_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_import_actiona.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_import_actionb.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_requests_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_requests_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_songs_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_utf8map_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_visibility.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_voice_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_voice_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_votes_edit.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_cpanel_votes_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_requests_index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_search_index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_search_search.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/templates/songlist_songs_list.html XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/view.tag.php XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/xoops_version.php XoopsModules/songlist/releases/1.13/htdocs/modules/tag/ XoopsModules/songlist/releases/1.13/htdocs/modules/tag/plugin/ XoopsModules/songlist/releases/1.13/htdocs/modules/tag/plugin/songlist.php XoopsModules/songlist/releases/1.13/htdocs/uploads/ XoopsModules/songlist/releases/1.13/htdocs/uploads/songlist/ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/voice.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/voice.php XoopsModules/songlist/trunk/htdocs/modules/songlist/images/icons/16/songlist.voice.png XoopsModules/songlist/trunk/htdocs/modules/songlist/images/icons/32/songlist.voice.png XoopsModules/songlist/trunk/htdocs/modules/songlist/include/formselectvoice.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/update.php XoopsModules/songlist/trunk/htdocs/modules/songlist/list.tag.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_voice_edit.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_voice_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/view.tag.php Added: XoopsModules/songlist/releases/1.13/docs/.htaccess =================================================================== --- XoopsModules/songlist/releases/1.13/docs/.htaccess (rev 0) +++ XoopsModules/songlist/releases/1.13/docs/.htaccess 2012-08-07 12:46:01 UTC (rev 10002) @@ -0,0 +1,21 @@ + +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d + +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+).html modules/songlist/$1.php?op=$3&fct=$4&id=$5 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$3&fct=$4&id=$5&gid=$6&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([0-9]+)-([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)/(.*?).html modules/songlist/$1.php?start=$3&id=$4&op=$5&fct=$6&gid=$7&cid=$8&value=$9 +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([0-9]+)-([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$3&id=$4&op=$5&fct=$6&gid=$7&cid=$8 +RewriteRule ^songlist/([a-zA-Z0-9]+)/(.*?)/([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+)/(.*?).html modules/songlist/$1.php?op=$3&fct=$4&id=$5&value=$8&gid=$6&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+)-([0-9]+).html modules/songlist/$1.php?op=$2&fct=$3&id=$4 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)-([a-zA-Z0-9]+).html modules/songlist/$1.php?op=$2&fct=$3 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&id=3&op=$4&fct=$5&gid=$6&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&id=$5&gid=$6&vcid=$7&cid=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&gid=$5&cid=$6&vcid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+)-([0-9]+)-([0-9]+)/(.*?).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&id=$5&value=$9&gid=$6&cid=$7&vcid=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+)/(.*?).html modules/songlist/$1.php?start=$2&id=$3&op=$4&fct=$5&value=$8&gid=$6&cid=$7 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)/(.*?).html modules/songlist/$1.php?start=$2&id=3&op=$4&fct=$5&gid=$6&cid=$7&value=$8 [L,NC,QSA] +RewriteRule ^songlist/([a-zA-Z0-9]+)/([0-9]+)-([a-zA-Z]+)-([a-zA-Z]+)-([0-9]+)-([0-9]+)-([0-9]+)/(.*?).html modules/songlist/$1.php?start=$2&op=$3&fct=$4&value=$8&gid=$5&cid=$6&vcid=$7 [L,NC,QSA] + + Added: XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/about.php (rev 0) +++ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/about.php 2012-08-07 12:46:01 UTC (rev 10002) @@ -0,0 +1,41 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + xoops_cp_header(); + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + $paypalitemno='H3ADAE8U2W5U2'; + echo $indexAdmin->renderabout($paypalitemno, false); + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/albums.php =================================================================== --- XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/albums.php (rev 0) +++ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/albums.php 2012-08-07 12:46:01 UTC (rev 10002) @@ -0,0 +1,184 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"albums"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "albums": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + + $criteria = $albums_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $albums_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($albums_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $albums_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $albumss = $albums_handler->getObjects($criteria, true); + foreach($albumss as $cid => $albums) { + if (is_object($albums)) + $GLOBALS['xoopsTpl']->append('albums', $albums->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_albums_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + if (isset($_REQUEST['id'])) { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + } else { + $albums = $albums_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $albums->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.html'); + break; + case "save": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $albums = $albums_handler->get($id); + } else { + $albums = $albums_handler->create(); + } + $albums->setVars($_POST[$id]); + + if (!$id=$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $albums = $albums_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($albums->getVar('image'))) + unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image')); + + $albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $albums->setVar('image', $uploader->getSavedFileName()); + @$albums_handler->insert($albums); + + } + } else { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $albums = $albums_handler->get($id); + $albums->setVars($_POST[$id]); + if (!$albums_handler->insert($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $albums_handler =& xoops_getmodulehandler('albums', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $albums = $albums_handler->get($id); + if (!$albums_handler->delete($albums)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ALBUMS_DELETED); + exit(0); + } + } else { + $albums = $albums_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ALBUMS_DELETE, $albums->getVar('title'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/artists.php =================================================================== --- XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/artists.php (rev 0) +++ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/artists.php 2012-08-07 12:46:01 UTC (rev 10002) @@ -0,0 +1,140 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"artists"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "artists": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + + $criteria = $artists_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $artists_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($artists_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $artists = $artists_handler->getObjects($criteria, true); + foreach($artists as $cid => $artist) { + if (is_object($artist)) + $GLOBALS['xoopsTpl']->append('artists', $artist->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + if (isset($_REQUEST['id'])) { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + } else { + $artists = $artists_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $artists->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.html'); + break; + case "save": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $artists = $artists_handler->get($id); + } else { + $artists = $artists_handler->create(); + } + $artists->setVars($_POST[$id]); + + if (!$id=$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } else { + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $artists = $artists_handler->get($id); + $artists->setVars($_POST[$id]); + if (!$artists_handler->insert($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY); + exit(0); + break; + case "delete": + + $artists_handler =& xoops_getmodulehandler('artists', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $artists = $artists_handler->get($id); + if (!$artists_handler->delete($artists)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED); + exit(0); + } + } else { + $artists = $artists_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artists->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/category.php =================================================================== --- XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/category.php (rev 0) +++ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/category.php 2012-08-07 12:46:01 UTC (rev 10002) @@ -0,0 +1,185 @@ +<?php + + include('header.php'); + + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"category"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list"; + $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30; + $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0; + $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC'; + $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1'; + + switch($op) { + default: + case "category": + switch ($fct) + { + default: + case "list": + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + + $criteria = $category_handler->getFilterCriteria($GLOBALS['filter']); + $ttl = $category_handler->getCount($criteria); + $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created'; + + $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + + foreach ($category_handler->filterFields() as $id => $key) { + $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>'); + $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct'])); + } + + $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']); + $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']); + $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']); + $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']); + $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']); + $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']); + + $criteria->setStart($GLOBALS['start']); + $criteria->setLimit($GLOBALS['limit']); + $criteria->setSort('`'.$GLOBALS['sort'].'`'); + $criteria->setOrder($GLOBALS['order']); + + $categorys = $category_handler->getObjects($criteria, true); + foreach($categorys as $cid => $category) { + if (is_object($category)) + $GLOBALS['xoopsTpl']->append('categories', $category->toArray()); + } + $GLOBALS['xoopsTpl']->assign('form', songlist_category_get_form(false)); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.html'); + break; + + case "new": + case "edit": + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + if (isset($_REQUEST['id'])) { + $category = $category_handler->get(intval($_REQUEST['id'])); + } else { + $category = $category_handler->create(); + } + + $GLOBALS['xoopsTpl']->assign('form', $category->getForm()); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.html'); + break; + case "save": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if ($id=intval($_REQUEST['id'])) { + $category = $category_handler->get($id); + } else { + $category = $category_handler->create(); + } + $category->setVars($_POST[$id]); + + if (!$id=$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } else { + + if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $category = $category_handler->get($id); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('image')) { + if (!$uploader->upload()) { + + songlist_adminMenu(1); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($category->getVar('image'))) + unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image')); + + $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']); + $category->setVar('image', $uploader->getSavedFileName()); + @$category_handler->insert($category); + + } + } else { + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + echo $uploader->getErrors(); + songlist_footer_adminMenu(); + xoops_cp_footer(); + exit(0); + } + } + + if ($_REQUEST['state'][$_REQUEST['id']]=='new') + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + else + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + } + break; + case "savelist": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + foreach($_REQUEST['id'] as $id) { + $category = $category_handler->get($id); + $category->setVars($_POST[$id]); + if (!$category_handler->insert($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE); + exit(0); + } + } + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY); + exit(0); + break; + case "delete": + + $category_handler =& xoops_getmodulehandler('category', 'songlist'); + $id=0; + if (isset($_POST['id'])&&$id=intval($_POST['id'])) { + $category = $category_handler->get($id); + if (!$category_handler->delete($category)) { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE); + exit(0); + } else { + redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_DELETED); + exit(0); + } + } else { + $category = $category_handler->get(intval($_REQUEST['id'])); + xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name'))); + } + break; + } + break; + + } + + xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/dashboard.php =================================================================== --- XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/dashboard.php (rev 0) +++ XoopsModules/songlist/releases/1.13/htdocs/modules/songlist/admin/dashboard.php 2012-08-07 12:46:01 UTC (rev 10002) @@ -0,0 +1,72 @@ +<?php +// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'songlist'); + + xoops_cp_header(); + + $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "default")); + + switch ($op) { + case "default": + default: + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + + $indexAdmin = new ModuleAdmin(); + + $category_handler = xoops_getmodulehandler('category', 'songlist'); + $artists_handler = xoops_getmodulehandler('artists', 'songlist'); + $albums_handler = xoops_getmodulehandler('albums', 'songlist'); + $genre_handler = xoops_getmodulehandler('genre', 'songlist'); + $voice_handler = xoops_getmodulehandler('voice', 'songlist'); + $songs_handler = xoops_getmodulehandler('songs', 'songlist'); + $requests_handler = xoops_get... [truncated message content] |