[xoops-svn] SF.net SVN: xoops:[9200] XoopsModules/songlist

[<wis...@us...>]

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}>,&nbsp;<{/if}>
+			<{$category.name}><{if $number<sizeof($block.categories)-1}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$genre.name}><{if ($number<sizeof($block.genres)-1)}>,&nbsp;<{/if}>
 		<{/foreach}>
 	</div>
 	<{elseif $block.genre}>
@@ -49,7 +49,7 @@
 			<a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$category.name}><{if $number<sizeof($block.categories)-1}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$genre.name}><{if ($number<sizeof($block.genres)-1)}>,&nbsp;<{/if}>
 		<{/foreach}>
 	</div>
 	<{elseif $block.genre}>
@@ -49,7 +49,7 @@
 			<a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$category.name}><{if $number<sizeof($block.categories)-1}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$genre.name}><{if ($number<sizeof($block.genres)-1)}>,&nbsp;<{/if}>
 		<{/foreach}>
 	</div>
 	<{elseif $block.genre}>
@@ -49,7 +49,7 @@
 			<a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$category.name}><{if $number<sizeof($block.categories)-1}>,&nbsp;<{/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}>,&nbsp;<{/if}>
+			<{$genre.name}><{if ($number<sizeof($block.genres)-1)}>,&nbsp;<{/if}>
 		<{/foreach}>
 	</div>
 	<{elseif $block.genre}>
@@ -49,7 +49,7 @@
 			<a href="<{$artist.url}>"><{$artist.name}></a><{if $number<sizeof($block.artists)-1}>,&nbsp;<{/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}>,&nbsp;<{/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}>,&nbsp;<{/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)}>,&nbsp;<{/if}>
+	<a href="<{$song.url}>"><{$song.title}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>,&nbsp;<{/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)}>,&nbsp;<{/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">&nbsp;</div>
 <{includeq file="db:songlist_category_list.html"}>
-<div class="sl_sep">&nbsp;</div>
+<div class="sl_outersep">&nbsp;</div>
 <{includeq file="db:songlist_alpha_browse.html"}>
-<div class="sl_sep">&nbsp;</div>
+<div class="sl_outersep">&nbsp;</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)}>,&nbsp;<{/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)}>,&nbsp;<{/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">&nbsp;</div>
 <{includeq file="db:songlist_search_search.html"}>
-<div class="sl_sep">&nbsp;</div>
+<div class="sl_outersep">&nbsp;</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]