Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9192] XoopsModules/songlist
|
From: <wis...@us...> - 2012-03-26 02:02:32
|
Revision: 9192
http://xoops.svn.sourceforge.net/xoops/?rev=9192&view=rev
Author: wishcraft
Date: 2012-03-26 02:02:25 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Karioki Song List 1.07 - complete first release final (Admin Warning/Notices)
Modified Paths:
--------------
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html
XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html
XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -18,6 +18,9 @@
$module_handler = xoops_gethandler('module');
$modules = $module_handler->getObjects(null, true);
+ $categories = array();
+ $weights = array();
+
$GLOBALS['categoryHandler'] = xoops_getmodulehandler('category');
$criteria = new CriteriaCompo();
$criteria->setSort('weight');
@@ -32,7 +35,7 @@
}
$GLOBALS['xoopsTpl']->assign('categories', $categories);
}
- unset($categories);
+
$valuetypes = array(XOBJ_DTYPE_ARRAY => _AM_SONGLIST_FIELDS_ARRAY,
XOBJ_DTYPE_EMAIL => _AM_SONGLIST_FIELDS_EMAIL,
XOBJ_DTYPE_INT => _AM_SONGLIST_FIELDS_INT,
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -76,14 +76,15 @@
} else {
$extras_handler = xoops_getmodulehandler('extras');
- $fields = $extras_handler->loadFields();
-
+ $fields = array_merge(array(), $extras_handler->loadFields());
+
if ( $op != "search" ) {
- foreach (array_keys($fields) as $i ) {
- if ( $restriction == "" || $fields[$i]->getVar($restriction) ) {
- $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ if (is_array($fields)&&count($fields)>0)
+ foreach (array_keys($fields) as $i ) {
+ if ( $restriction == "" || $fields[$i]->getVar($restriction) ) {
+ $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ }
}
- }
} else {
$searchable_types = array('textbox',
'select',
@@ -93,11 +94,12 @@
'datetime',
'timezone',
'language');
- foreach (array_keys($fields) as $i ) {
- if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) {
- $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ if (is_array($fields)&&count($fields)>0)
+ foreach (array_keys($fields) as $i ) {
+ if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) {
+ $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ }
}
- }
}
}
$form->display();
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/import.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -8,11 +8,11 @@
$op = isset($_REQUEST['op'])?$_REQUEST['op']:"import";
$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"actiona";
- $limit = strlen($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
- $start = strlen($_REQUEST['start'])?intval($_REQUEST['start']):0;
- $order = strlen($_REQUEST['order'])?$_REQUEST['order']:'DESC';
- $sort = strlen($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
- $filter = strlen($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+ $limit = isset($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = isset($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = isset($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = isset($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+ $filter = isset($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
switch($op) {
default:
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/functions.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -101,7 +101,7 @@
function songlist_getFilterElement($filter, $field, $sort='created', $op = '', $fct = '') {
$components = songlist_getFilterURLComponents($filter, $field, $sort);
$ele = false;
- include_once('formobjects.songlist.php');
+ include_once('songlist.object.php');
switch ($field) {
case 'cid':
if ($op!='category') {
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -334,7 +334,7 @@
return $form;
}
- function songlist_import_get_form() {
+ function songlist_import_get_form($as_array = false) {
xoops_loadLanguage('forms', 'songlist');
@@ -359,7 +359,7 @@
}
- function songlist_importb_get_form($file) {
+ function songlist_importb_get_form($file, $as_array = false) {
xoops_loadLanguage('forms', 'songlist');
@@ -464,7 +464,7 @@
$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_ARTISTS:''), $object->getVar('artists'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -537,7 +537,7 @@
$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -604,7 +604,7 @@
$ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -686,7 +686,7 @@
$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_ARTISTS:''), $object->getVar('artists'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -938,7 +938,8 @@
$fields = $extras_handler->loadFields();
$required = array();
-
+ $elements = array();
+ $weights = array();
if ($object->getVar('sid')>0)
$extra = $extras_handler->get($object->getVar('sid'));
else
@@ -984,7 +985,7 @@
}
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/admin.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -41,8 +41,7 @@
define('_AM_SONGLIST_TH_UTFID', 'Map ID');
define('_AM_SONGLIST_TH_FROM', 'From');
define('_AM_SONGLIST_TH_TO', 'To');
- define('_AM_SONGLIST_TH_ABID', 'Album ID');
-
+
// Category
define('_AM_SONGLIST_CATEGORY_H1', 'Categories');
define('_AM_SONGLIST_CATEGORY_P', 'These are the categories and child categories you have on the system.');
@@ -207,7 +206,6 @@
define('_AM_SONGLIST_FIELDS_TEXTBOX', 'Text-box');
define('_AM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select');
define('_AM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio');
- define('_AM_SONGLIST_FIELDS_DATE', 'Date');
define('_AM_SONGLIST_FIELDS_DATETIME', 'Date Time');
define('_AM_SONGLIST_FIELDS_LONGDATE', 'Long Date');
define('_AM_SONGLIST_FIELDS_THEME', 'Theme Select');
@@ -232,6 +230,7 @@
define('_AM_SONGLIST_IMPORT_ACTIONA_P', 'Select an XML File you have exported from Excel or other platform to import.');
define('_AM_SONGLIST_IMPORT_ACTIONB_H1', 'Specify Element Names');
define('_AM_SONGLIST_IMPORT_ACTIONB_P', 'You have to specify from the example the elements that exists in this XML file to import, may vary from file to file and also if you specify no element name the field type is ignored..');
+ define('_AM_SONGLIST_XMLFILE_COMPLETE', 'XML File Import and Comparison Complete!');
// About Box
define('_AM_SONGLIST_ABOUT_MAKEDONATE', 'Make Song List Better Donate Today!');
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/language/english/forms.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -160,7 +160,6 @@
define('_FRM_SONGLIST_FIELDS_TEXTBOX', 'Text-box');
define('_FRM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select');
define('_FRM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio');
- define('_FRM_SONGLIST_FIELDS_DATE', 'Date');
define('_FRM_SONGLIST_FIELDS_DATETIME', 'Date Time');
define('_FRM_SONGLIST_FIELDS_LONGDATE', 'Long Date');
define('_FRM_SONGLIST_FIELDS_THEME', 'Theme Select');
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -11,9 +11,9 @@
<{$smarty.const._MN_SONGLIST_SONGS}>
</div>
<div class="sl_subalbum">
- <{assign item=songs value=0}>
+ <{assign var=songs value=0}>
<{foreach from=$album.songs item=song}>
- <{assign item=songs value=$songs+1}>
+ <{assign var=songs value=$songs+1}>
<a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}>
<{/foreach}>
</div>
@@ -23,9 +23,9 @@
<{$smarty.const._MN_SONGLIST_ARTISTS}>
</div>
<div class="sl_subartist">
- <{assign item=artists value=0}>
+ <{assign var=artists value=0}>
<{foreach from=$album.artists item=artist}>
- <{assign item=artists value=$artists+1}>
+ <{assign var=artists value=$artists+1}>
<a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($album.artists)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -6,9 +6,9 @@
<{$smarty.const._MN_SONGLIST_SONGS}>
</div>
<div class="sl_subartist">
- <{assign item=songs value=0}>
+ <{assign var=songs value=0}>
<{foreach from=$artist.songs item=song}>
- <{assign item=songs value=$songs+1}>
+ <{assign var=songs value=$songs+1}>
<a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($artist.songs)}>, <{/if}>
<{/foreach}>
</div>
@@ -18,9 +18,9 @@
<{$smarty.const._MN_SONGLIST_ALBUMS}>
</div>
<div class="sl_subartist">
- <{assign item=albums value=0}>
+ <{assign var=albums value=0}>
<{foreach from=$artist.albums item=album}>
- <{assign item=albums value=$albums+1}>
+ <{assign var=albums value=$albums+1}>
<a href="<{$album.url}>"><{$album.name}></a><{if not $albums < count($artist.albums)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -3,9 +3,9 @@
</div>
<{if $category.subcategories}>
<div class="sl_subcat">
- <{assign item=cats value=0}>
+ <{assign var=cats value=0}>
<{foreach from=$category.subcategories item=subcategory}>
- <{assign item=cats value=$cats+1}>
+ <{assign var=cats value=$cats+1}>
<a href="<{$subcategory.url}>"><{$subcategory.name}></a><{if not $cats < count($category.subcategories)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -20,9 +20,9 @@
<{/if}>
</div>
<div class="sl_mainsong">
- <{assign item=artists value=0}>
+ <{assign var=artists value=0}>
<{foreach from=$song.album.artists item=artist}>
- <{assign item=artists value=$artists+1}>
+ <{assign var=artists value=$artists+1}>
<a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($song.album.artists)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -18,6 +18,9 @@
$module_handler = xoops_gethandler('module');
$modules = $module_handler->getObjects(null, true);
+ $categories = array();
+ $weights = array();
+
$GLOBALS['categoryHandler'] = xoops_getmodulehandler('category');
$criteria = new CriteriaCompo();
$criteria->setSort('weight');
@@ -32,7 +35,7 @@
}
$GLOBALS['xoopsTpl']->assign('categories', $categories);
}
- unset($categories);
+
$valuetypes = array(XOBJ_DTYPE_ARRAY => _AM_SONGLIST_FIELDS_ARRAY,
XOBJ_DTYPE_EMAIL => _AM_SONGLIST_FIELDS_EMAIL,
XOBJ_DTYPE_INT => _AM_SONGLIST_FIELDS_INT,
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/field_permissions.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -76,14 +76,15 @@
} else {
$extras_handler = xoops_getmodulehandler('extras');
- $fields = $extras_handler->loadFields();
-
+ $fields = array_merge(array(), $extras_handler->loadFields());
+
if ( $op != "search" ) {
- foreach (array_keys($fields) as $i ) {
- if ( $restriction == "" || $fields[$i]->getVar($restriction) ) {
- $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ if (is_array($fields)&&count($fields)>0)
+ foreach (array_keys($fields) as $i ) {
+ if ( $restriction == "" || $fields[$i]->getVar($restriction) ) {
+ $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ }
}
- }
} else {
$searchable_types = array('textbox',
'select',
@@ -93,11 +94,12 @@
'datetime',
'timezone',
'language');
- foreach (array_keys($fields) as $i ) {
- if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) {
- $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ if (is_array($fields)&&count($fields)>0)
+ foreach (array_keys($fields) as $i ) {
+ if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) {
+ $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+ }
}
- }
}
}
$form->display();
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -8,11 +8,11 @@
$op = isset($_REQUEST['op'])?$_REQUEST['op']:"import";
$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"actiona";
- $limit = strlen($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
- $start = strlen($_REQUEST['start'])?intval($_REQUEST['start']):0;
- $order = strlen($_REQUEST['order'])?$_REQUEST['order']:'DESC';
- $sort = strlen($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
- $filter = strlen($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+ $limit = isset($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = isset($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = isset($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = isset($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+ $filter = isset($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
switch($op) {
default:
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/functions.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -101,7 +101,7 @@
function songlist_getFilterElement($filter, $field, $sort='created', $op = '', $fct = '') {
$components = songlist_getFilterURLComponents($filter, $field, $sort);
$ele = false;
- include_once('formobjects.songlist.php');
+ include_once('songlist.object.php');
switch ($field) {
case 'cid':
if ($op!='category') {
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -334,7 +334,7 @@
return $form;
}
- function songlist_import_get_form() {
+ function songlist_import_get_form($as_array = false) {
xoops_loadLanguage('forms', 'songlist');
@@ -359,7 +359,7 @@
}
- function songlist_importb_get_form($file) {
+ function songlist_importb_get_form($file, $as_array = false) {
xoops_loadLanguage('forms', 'songlist');
@@ -464,7 +464,7 @@
$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_ARTISTS:''), $object->getVar('artists'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -537,7 +537,7 @@
$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -604,7 +604,7 @@
$ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -686,7 +686,7 @@
$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_ARTISTS:''), $object->getVar('artists'));
$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_SONGS:''), $object->getVar('songs'));
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
@@ -938,7 +938,8 @@
$fields = $extras_handler->loadFields();
$required = array();
-
+ $elements = array();
+ $weights = array();
if ($object->getVar('sid')>0)
$extra = $extras_handler->get($object->getVar('sid'));
else
@@ -984,7 +985,7 @@
}
$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits'));
- $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+ $ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
if ($object->getVar('created')>0) {
$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
}
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -41,8 +41,7 @@
define('_AM_SONGLIST_TH_UTFID', 'Map ID');
define('_AM_SONGLIST_TH_FROM', 'From');
define('_AM_SONGLIST_TH_TO', 'To');
- define('_AM_SONGLIST_TH_ABID', 'Album ID');
-
+
// Category
define('_AM_SONGLIST_CATEGORY_H1', 'Categories');
define('_AM_SONGLIST_CATEGORY_P', 'These are the categories and child categories you have on the system.');
@@ -207,7 +206,6 @@
define('_AM_SONGLIST_FIELDS_TEXTBOX', 'Text-box');
define('_AM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select');
define('_AM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio');
- define('_AM_SONGLIST_FIELDS_DATE', 'Date');
define('_AM_SONGLIST_FIELDS_DATETIME', 'Date Time');
define('_AM_SONGLIST_FIELDS_LONGDATE', 'Long Date');
define('_AM_SONGLIST_FIELDS_THEME', 'Theme Select');
@@ -232,6 +230,7 @@
define('_AM_SONGLIST_IMPORT_ACTIONA_P', 'Select an XML File you have exported from Excel or other platform to import.');
define('_AM_SONGLIST_IMPORT_ACTIONB_H1', 'Specify Element Names');
define('_AM_SONGLIST_IMPORT_ACTIONB_P', 'You have to specify from the example the elements that exists in this XML file to import, may vary from file to file and also if you specify no element name the field type is ignored..');
+ define('_AM_SONGLIST_XMLFILE_COMPLETE', 'XML File Import and Comparison Complete!');
// About Box
define('_AM_SONGLIST_ABOUT_MAKEDONATE', 'Make Song List Better Donate Today!');
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php 2012-03-26 02:02:25 UTC (rev 9192)
@@ -160,7 +160,6 @@
define('_FRM_SONGLIST_FIELDS_TEXTBOX', 'Text-box');
define('_FRM_SONGLIST_FIELDS_TIMEZONE', 'Timezone Select');
define('_FRM_SONGLIST_FIELDS_YESNO', 'Yes/No Radio');
- define('_FRM_SONGLIST_FIELDS_DATE', 'Date');
define('_FRM_SONGLIST_FIELDS_DATETIME', 'Date Time');
define('_FRM_SONGLIST_FIELDS_LONGDATE', 'Long Date');
define('_FRM_SONGLIST_FIELDS_THEME', 'Theme Select');
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_albums.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_artists.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_genres.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/blocks/songlist_popular_songs.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -1,6 +1,6 @@
<{if $block}>
<{foreach from=$block item=item}>
-<{assign item=topno value=$topno+1}>
+<{assign var=topno value=$topno+1}>
<div style='display:block; margin-bottom:4px; clear:both;'>
<div style="font-size:1.12em; float:left;">
#<{$topno}>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -11,9 +11,9 @@
<{$smarty.const._MN_SONGLIST_SONGS}>
</div>
<div class="sl_subalbum">
- <{assign item=songs value=0}>
+ <{assign var=songs value=0}>
<{foreach from=$album.songs item=song}>
- <{assign item=songs value=$songs+1}>
+ <{assign var=songs value=$songs+1}>
<a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}>
<{/foreach}>
</div>
@@ -23,9 +23,9 @@
<{$smarty.const._MN_SONGLIST_ARTISTS}>
</div>
<div class="sl_subartist">
- <{assign item=artists value=0}>
+ <{assign var=artists value=0}>
<{foreach from=$album.artists item=artist}>
- <{assign item=artists value=$artists+1}>
+ <{assign var=artists value=$artists+1}>
<a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($album.artists)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -6,9 +6,9 @@
<{$smarty.const._MN_SONGLIST_SONGS}>
</div>
<div class="sl_subartist">
- <{assign item=songs value=0}>
+ <{assign var=songs value=0}>
<{foreach from=$artist.songs item=song}>
- <{assign item=songs value=$songs+1}>
+ <{assign var=songs value=$songs+1}>
<a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($artist.songs)}>, <{/if}>
<{/foreach}>
</div>
@@ -18,9 +18,9 @@
<{$smarty.const._MN_SONGLIST_ALBUMS}>
</div>
<div class="sl_subartist">
- <{assign item=albums value=0}>
+ <{assign var=albums value=0}>
<{foreach from=$artist.albums item=album}>
- <{assign item=albums value=$albums+1}>
+ <{assign var=albums value=$albums+1}>
<a href="<{$album.url}>"><{$album.name}></a><{if not $albums < count($artist.albums)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -3,9 +3,9 @@
</div>
<{if $category.subcategories}>
<div class="sl_subcat">
- <{assign item=cats value=0}>
+ <{assign var=cats value=0}>
<{foreach from=$category.subcategories item=subcategory}>
- <{assign item=cats value=$cats+1}>
+ <{assign var=cats value=$cats+1}>
<a href="<{$subcategory.url}>"><{$subcategory.name}></a><{if not $cats < count($category.subcategories)}>, <{/if}>
<{/foreach}>
</div>
Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 01:33:52 UTC (rev 9191)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-26 02:02:25 UTC (rev 9192)
@@ -20,9 +20,9 @@
<{/if}>
</div>
<div class="sl_mainsong">
- <{assign item=artists value=0}>
+ <{assign var=artists value=0}>
<{foreach from=$song.album.artists item=artist}>
- <{assign item=artists value=$artists+1}>
+ <{assign var=artists value=$artists+1}>
<a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($song.album.artists)}>, <{/if}>
<{/foreach}>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
