Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9282] XoopsModules/songlist
|
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] |
