From: <wis...@us...> - 2012-03-21 15:51:47
|
Revision: 9162 http://xoops.svn.sourceforge.net/xoops/?rev=9162&view=rev Author: wishcraft Date: 2012-03-21 15:51:36 +0000 (Wed, 21 Mar 2012) Log Message: ----------- Karioki Songlist Manifest (Backup Only - Incomplete) - Still to do, user search, class filler, language, bug testing - Prealpha 1.03 Modified Paths: -------------- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlists.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_alpha_browse.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_list.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html Added Paths: ----------- XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_search.html Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -36,7 +36,9 @@ define ("_CHARSET","UTF-8"); if (!defined('_CHARSET_ISO')) define ("_CHARSET_ISO","ISO-8859-1"); - + + $GLOBALS['songlistAdmin'] = true; + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); $module_handler = xoops_gethandler('module'); @@ -84,7 +86,7 @@ include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS['songlistModule']->getVar("dirname")."/include/songlist.objects.php"; include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS['songlistModule']->getVar("dirname")."/include/songlist.forms.php"; - xoops_loadLanguage('main', 'songlist'); + xoops_loadLanguage('admin', 'songlist'); $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist'); ?> \ No newline at end of file Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,203 @@ +<?php + + include (dirname(__FILE__).'/header.php'); + + $category_handler = xoops_getmodulehandler('category', 'handler'); + $criteria_cat = new CriteriaCompo(); + foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { + $criteria_cat->add(new Criteria('`cid`', $cid, '='), 'OR'); + } + $criteria_cat->setSort('`created`'); + $criteria_cat->setOrder('ASC'); + + $criteria = new Criteria('pid', $_SESSION['cid']); + $criteria->setSort('`weight`'); + $criteria->setOrder('ASC'); + $categories = $category_handler->getObjects($criteria, false); + + $cat = array(); + $col = 1; + $row = 1; + foreach($categories as $category) { + $cat[$row][$col] = $category->toArray(true); + $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $cat[$row][$j][$category_handler->keyName] = 0; + $cat[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $albums_handler = xoops_getmodulehandler('albums', 'handler'); + switch ($op) { + default: + case "item": + switch ($fct) { + default: + case "list": + break; + $pagenav = new XoopsPageNav($albums_handler->getCount($criteria_cat), $limit, $start, 'start', "?op=$op&fct=$fct&id=$id&value=$value&limit=$limit"); + + $criteria_cat->setLimit($limit); + $criteria_cat->setStart($start); + + $albums = $albums_handler->getObjects($criteria_cat, false); + + $ret = array(); + $col = 1; + $row = 1; + foreach($albums as $album) { + $ret[$row][$col] = $album->toArray(true); + $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $ret[$row][$j][$albums_handler->keyName] = 0; + $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $url = $albums_handler->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_albums_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('albums', $ret); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + if ($_SESSION['cid']!=0) { + $category = $category_handler->get($_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('category', $category->getVar('name')); + } + include($GLOBALS['xoops']->path('/footer.php')); + break; + case "item": + $album = $albums_handler->get($id); + + $url = $album->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_albums_item.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('album', $album->toArray()); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + include($GLOBALS['xoops']->path('/footer.php')); + break; + } + break; + case "browseby": + switch ($fct) { + default: + case "title": + case "lyrics": + case "albums": + case "albums": + + $browse_criteria = new CriteriaCompo(); + switch ($value) { + case '0': + for($u=0;$u<10;$u++) { + $browse_criteria->add(new Criteria('`name`', $u.'%', 'LIKE'), 'OR'); + } + break; + default: + $browse_criteria->add(new Criteria('`name`', strtoupper($value).'%', 'LIKE'), 'OR'); + $browse_criteria->add(new Criteria('`name`', strtolower($value).'%', 'LIKE'), 'OR'); + break; + } + $criteria = CriteriaCompo($criteria_cat, 'AND'); + $criteria->add($browse_criteria); + + } + + $pagenav = new XoopsPageNav($albums_handler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&id=$id&value=$value&limit=$limit"); + + $criteria->setLimit($limit); + $criteria->setStart($start); + + $albums = $albums_handler->getObjects($criteria, false); + + $ret = array(); + $col = 1; + $row = 1; + foreach($albums as $album) { + $ret[$row][$col] = $album->toArray(true); + $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $ret[$row][$j][$albums_handler->keyName] = 0; + $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $url = $albums_handler->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_albums_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('albums', $ret); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + if ($_SESSION['cid']!=0) { + $category = $category_handler->get($_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('category', $category->getVar('name')); + } + include($GLOBALS['xoops']->path('/footer.php')); + break; + + break; + + case "category": + switch ($fct) { + default: + case "set": + $_SESSION['cid'] = $id; + break; + case "home": + $_SESSION['cid'] = 0; + break; + } + redirect($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_CATEGORYCHANGED); + exit; + } +?> \ No newline at end of file Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,203 @@ +<?php + + include (dirname(__FILE__).'/header.php'); + + $category_handler = xoops_getmodulehandler('category', 'handler'); + $criteria_cat = new CriteriaCompo(); + foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { + $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); + } + $criteria_cat->setSort('`created`'); + $criteria_cat->setOrder('ASC'); + + $criteria = new Criteria('pid', $_SESSION['cid']); + $criteria->setSort('`weight`'); + $criteria->setOrder('ASC'); + $categories = $category_handler->getObjects($criteria, false); + + $cat = array(); + $col = 1; + $row = 1; + foreach($categories as $category) { + $cat[$row][$col] = $category->toArray(true); + $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $cat[$row][$j][$category_handler->keyName] = 0; + $cat[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $artists_handler = xoops_getmodulehandler('artists', 'handler'); + switch ($op) { + default: + case "item": + switch ($fct) { + default: + case "list": + break; + $pagenav = new XoopsPageNav($artists_handler->getCount($criteria_cat), $limit, $start, 'start', "?op=$op&fct=$fct&id=$id&value=$value&limit=$limit"); + + $criteria_cat->setLimit($limit); + $criteria_cat->setStart($start); + + $artists = $artists_handler->getObjects($criteria_cat, false); + + $ret = array(); + $col = 1; + $row = 1; + foreach($artists as $artist) { + $ret[$row][$col] = $artist->toArray(true); + $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $ret[$row][$j][$artists_handler->keyName] = 0; + $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $url = $artists_handler->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_artists_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('artists', $ret); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + if ($_SESSION['cid']!=0) { + $category = $category_handler->get($_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('category', $category->getVar('name')); + } + include($GLOBALS['xoops']->path('/footer.php')); + break; + case "item": + $artist = $artists_handler->get($id); + + $url = $artist->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_artists_item.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('artist', $artist->toArray()); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + include($GLOBALS['xoops']->path('/footer.php')); + break; + } + break; + case "browseby": + switch ($fct) { + default: + case "title": + case "lyrics": + case "artists": + case "albums": + + $browse_criteria = new CriteriaCompo(); + switch ($value) { + case '0': + for($u=0;$u<10;$u++) { + $browse_criteria->add(new Criteria('`name`', $u.'%', 'LIKE'), 'OR'); + } + break; + default: + $browse_criteria->add(new Criteria('`name`', strtoupper($value).'%', 'LIKE'), 'OR'); + $browse_criteria->add(new Criteria('`name`', strtolower($value).'%', 'LIKE'), 'OR'); + break; + } + $criteria = CriteriaCompo($criteria_cat, 'AND'); + $criteria->add($browse_criteria); + + } + + $pagenav = new XoopsPageNav($artists_handler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&id=$id&value=$value&limit=$limit"); + + $criteria->setLimit($limit); + $criteria->setStart($start); + + $artists = $artists_handler->getObjects($criteria, false); + + $ret = array(); + $col = 1; + $row = 1; + foreach($artists as $artist) { + $ret[$row][$col] = $artist->toArray(true); + $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $ret[$row][$j][$artists_handler->keyName] = 0; + $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $url = $artists_handler->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_artists_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('artists', $ret); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + if ($_SESSION['cid']!=0) { + $category = $category_handler->get($_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('category', $category->getVar('name')); + } + include($GLOBALS['xoops']->path('/footer.php')); + break; + + break; + + case "category": + switch ($fct) { + default: + case "set": + $_SESSION['cid'] = $id; + break; + case "home": + $_SESSION['cid'] = 0; + break; + } + redirect($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_CATEGORYCHANGED); + exit; + } +?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -163,5 +163,30 @@ return parent::insert($obj, $force); } + function get($id, $fields = '*') { + $ret = parent::get($id, $fields); + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$ret->getVar($this->keyName); + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } + + function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { + $ret = parent::getObjects($criteria, $id_as_key, $as_object); + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } else { + $id[$data[$this->keyName]] = $data[$this->keyName]; + } + } + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } } ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -142,6 +142,31 @@ return parent::insert($obj, $force); } + function get($id, $fields = '*') { + $ret = parent::get($id, $fields); + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$ret->getVar($this->keyName); + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } + function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { + $ret = parent::getObjects($criteria, $id_as_key, $as_object); + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } else { + $id[$data[$this->keyName]] = $data[$this->keyName]; + } + } + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } + } ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -106,6 +106,24 @@ return ' '; } + function GetCatAndSubCat($pid=0){ + $categories = $this->getObjects(new Criteria('pid', $pid), true); + $langs_array = $this->TreeIDs(array(), $categories, -1); + return $langs_array; + } + + private function TreeIDs($langs_array, $categories, $level) { + foreach($categories as $catid => $category) { + if ($catid!=$ownid) { + $langs_array[$catid] = $catid; + if ($categoriesb = $this->getObjects(new Criteria('pid', $catid), true)){ + $langs_array = $this->TreeIDs($langs_array, $categoriesb, $level); + } + } + } + return ($langs_array); + } + function insert($obj, $force=true) { if ($obj->isNew()) { $obj->setVar('created', time()); @@ -115,5 +133,30 @@ return parent::insert($obj, $force); } + function get($id, $fields = '*') { + $ret = parent::get($id, $fields); + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$ret->getVar($this->keyName); + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } + + function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { + $ret = parent::getObjects($criteria, $id_as_key, $as_object); + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } else { + $id[$data[$this->keyName]] = $data[$this->keyName]; + } + } + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } } ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -99,5 +99,30 @@ return parent::insert($obj, $force); } + function get($id, $fields = '*') { + $ret = parent::get($id, $fields); + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$ret->getVar($this->keyName); + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } + + function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { + $ret = parent::getObjects($criteria, $id_as_key, $as_object); + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } else { + $id[$data[$this->keyName]] = $data[$this->keyName]; + } + } + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } } ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -188,5 +188,30 @@ return $sid; } + function get($id, $fields = '*') { + $ret = parent::get($id, $fields); + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$ret->getVar($this->keyName); + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } + + function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) { + $ret = parent::getObjects($criteria, $id_as_key, $as_object); + $id = array(); + foreach($ret as $data) { + if ($as_object==true) { + $id[$data->getVar($this->keyName)] = $data->getVar($this->keyName); + } else { + $id[$data[$this->keyName]] = $data[$this->keyName]; + } + } + if (!isset($GLOBALS['songlistAdmin'])) { + $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')'; + $GLOBALS['xoopsDB']->queryF($sql); + } + return $ret; + } } ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/css/songlist.css 2012-03-21 15:51:36 UTC (rev 9162) @@ -60,4 +60,60 @@ #sl_resulttable thead { -} \ No newline at end of file +} + +#sl_mainartist { + font-size:1.23em; + clear:both; +} + +#sl_subartist { + margin-left:13px; + font-size:0.90em; + clear:both; +} + +#sl_mainalbum { + font-size:1.23em; + clear:both; +} + +#sl_subalbum { + margin-left:13px; + font-size:0.90em; + clear:both; +} + +#sl_artalbum { + margin:5px 5px 5px 5px; + font-size:0.75em; + border-style: dotted; + border-width: 1px; + clear:both; +} + +#sl_subtitle { + font-size:1.15em; + font-weight: bold; +} + +#sl_mainsong { + font-size:1.23em; + clear:both; + margin-left: 7px; + margin-top: 3px; +} + +#sl_subsong { + margin-left:13px; + font-size:0.90em; + clear:both; +} + +#sl_artsong { + margin:5px 5px 5px 5px; + font-size:0.75em; + border-style: dotted; + border-width: 1px; + clear:both; +} Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,60 @@ +<?php + +// $Id: admin_header.php,v 4.03 2008/06/05 15:35:32 wishcraft Exp $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.chronolabs.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License 2.0 as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: Kazumi Ono (AKA onokazu) // +// URL: http://www.myweb.ne.jp/, http://www.chronolabs.org/, http://jp.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + require_once (dirname(dirname(__FILE__)).'/mainfile.php'); + + if (!defined('_CHARSET')) + define ("_CHARSET","UTF-8"); + if (!defined('_CHARSET_ISO')) + define ("_CHARSET_ISO","ISO-8859-1"); + + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); + + $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')); + + xoops_load('pagenav'); + xoops_load('xoopslists'); + xoops_load('xoopsformloader'); + include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php'); + + xoops_loadLanguage('user'); + + include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS['songlistModule']->getVar("dirname")."/include/functions.php"; + include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS['songlistModule']->getVar("dirname")."/include/songlist.objects.php"; + include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS['songlistModule']->getVar("dirname")."/include/songlist.forms.php"; + + xoops_loadLanguage('main', 'songlist'); + +?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlists.form.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlists.form.php 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlists.form.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -450,7 +450,7 @@ $ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC:'')); $ele['image'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']); $ele['image']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:'')); - if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('poster')))) { + if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) { $ele['image_preview'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />' ); $ele['image_preview']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:'')); } @@ -599,7 +599,7 @@ $ele['description']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC:'')); $ele['image'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']); $ele['image']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:'')); - if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('poster')))) { + if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) { $ele['image_preview'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />' ); $ele['image_preview']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:'')); } Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,203 @@ +<?php + + include (dirname(__FILE__).'/header.php'); + + $category_handler = xoops_getmodulehandler('category', 'handler'); + $criteria_cat = new CriteriaCompo(); + foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) { + $criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR'); + } + $criteria_cat->setSort('`created`'); + $criteria_cat->setOrder('ASC'); + + $criteria = new Criteria('pid', $_SESSION['cid']); + $criteria->setSort('`weight`'); + $criteria->setOrder('ASC'); + $categories = $category_handler->getObjects($criteria, false); + + $cat = array(); + $col = 1; + $row = 1; + foreach($categories as $category) { + $cat[$row][$col] = $category->toArray(true); + $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $cat[$row][$j][$category_handler->keyName] = 0; + $cat[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $artists_handler = xoops_getmodulehandler('artists', 'handler'); + switch ($op) { + default: + case "item": + switch ($fct) { + default: + case "list": + break; + $pagenav = new XoopsPageNav($artists_handler->getCount($criteria_cat), $limit, $start, 'start', "?op=$op&fct=$fct&id=$id&value=$value&limit=$limit"); + + $criteria_cat->setLimit($limit); + $criteria_cat->setStart($start); + + $artists = $artists_handler->getObjects($criteria, false); + + $ret = array(); + $col = 1; + $row = 1; + foreach($artists as $artist) { + $ret[$row][$col] = $artist->toArray(true); + $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $ret[$row][$j][$artists_handler->keyName] = 0; + $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $url = $artists_handler->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_artists_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('artists', $ret); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + if ($_SESSION['cid']!=0) { + $category = $category_handler->get($_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('category', $category->getVar('name')); + } + include($GLOBALS['xoops']->path('/footer.php')); + break; + case "item": + $artist = $artists_handler->get($id); + + $url = $artist->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_artists_item.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('artist', $artist->toArray()); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + include($GLOBALS['xoops']->path('/footer.php')); + break; + } + break; + case "browseby": + switch ($fct) { + default: + case "title": + case "lyrics": + case "artists": + case "albums": + + $browse_criteria = new CriteriaCompo(); + switch ($value) { + case '0': + for($u=0;$u<10;$u++) { + $browse_criteria->add(new Criteria('`name`', $u.'%', 'LIKE'), 'OR'); + } + break; + default: + $browse_criteria->add(new Criteria('`name`', strtoupper($value).'%', 'LIKE'), 'OR'); + $browse_criteria->add(new Criteria('`name`', strtolower($value).'%', 'LIKE'), 'OR'); + break; + } + $criteria = CriteriaCompo($criteria_cat, 'AND'); + $criteria->add($browse_criteria); + + } + + $pagenav = new XoopsPageNav($artists_handler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&id=$id&value=$value&limit=$limit"); + + $criteria->setLimit($limit); + $criteria->setStart($start); + + $artists = $artists_handler->getObjects($criteria, false); + + $ret = array(); + $col = 1; + $row = 1; + foreach($artists as $artist) { + $ret[$row][$col] = $artist->toArray(true); + $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + $col++; + if ($col>$GLOBALS['songlistModuleConfig']['cols']) { + $row++; + $col=1; + } + } + if ($col!=1) { + $col--; + for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) { + $ret[$row][$j][$artists_handler->keyName] = 0; + $ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%'; + } + } + + $url = $artists_handler->getURL(); + if (!strpos($url, $_SERVER['REQUEST_URI'])) { + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$url); + exit(0); + } + + $xoopsOption['template_main'] = 'songlist_artists_index.html'; + include($GLOBALS['xoops']->path('/header.php')); + $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']); + $GLOBALS['xoopsTpl']->assign('artists', $ret); + $GLOBALS['xoopsTpl']->assign('songs', false); + $GLOBALS['xoopsTpl']->assign('categories', $cat); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav()); + $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']); + if ($_SESSION['cid']!=0) { + $category = $category_handler->get($_SESSION['cid']); + $GLOBALS['xoopsTpl']->assign('category', $category->getVar('name')); + } + include($GLOBALS['xoops']->path('/footer.php')); + break; + + break; + + case "category": + switch ($fct) { + default: + case "set": + $_SESSION['cid'] = $id; + break; + case "home": + $_SESSION['cid'] = 0; + break; + } + redirect($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_CATEGORYCHANGED); + exit; + } +?> \ No newline at end of file Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_index.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,3 @@ +<{includeq file="db:songlist_category_list.html"}> +<{includeq file="db:songlist_alpha_browse.html"}> +<{includeq file="db:songlist_albums_list.html"}> \ No newline at end of file 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-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_item.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,32 @@ +<div class="sl_mainalbum"> + <a href="<{$album.url}>"><{$album.name}></a> +</div> +<{if $album.image}> +<div class="sl_artalbum"> + <a href="<{$album.url}>"><img src='<{$album.image}>' width="95%" border="0" /></a> +</div> +<{/if}> +<{if $album.songs}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_SONGS}> +</div> +<div class="sl_subalbum"> + <{assign item=songs value=0}> + <{foreach from=$album.songs item=song}> + <{assign item=songs value=$songs+1}> + <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($album.songs)}>, <{/if}> + <{/foreach}> +</div> +<{/if}> +<{if $album.artists}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_ARTISTS}> +</div> +<div class="sl_subartist"> + <{assign item=artists value=0}> + <{foreach from=$album.artists item=artist}> + <{assign item=artists value=$artists+1}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($album.artists)}>, <{/if}> + <{/foreach}> +</div> +<{/if}> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_albums_list.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,27 @@ +<{if $albums}> +<{if not $albums.pagenav eq ''}> +<div style='width:100%; clear:both; height:25px;'> + <div style='float:right;'> + <{$albums.pagenav}> + </div> +</div> +<{/if}> +<table> + <{foreach from=$albums key=$rowkey item=row}> + <{if not $rowkey eq 'pagenav'}> + <tr> + <{foreach from=$row item=album}> + <td width="<{$album.width}>%"><{includeq file="db:songlist_albums_item.html" album=$album}></td> + <{/foreach}> + </tr> + <{/if}> + <{/foreach}> +</table> +<{/if}> +<{if not $albums.pagenav eq ''}> +<div style='width:100%; clear:both; height:25px;'> + <div style='float:left;'> + <{$albums.pagenav}> + </div> +</div> +<{/if} \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_alpha_browse.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_alpha_browse.html 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_alpha_browse.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -3,11 +3,13 @@ <div class="sl_alphasubdiva"> <select id='browsetype' name='browsetype'> <option value="title"<{if $smarty.get.fct eq 'title' or $smarty.get.fct eq ''}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_SELECTBY_TITLE}></option> + <{if $songs}> <option value="lyrics"<{if $smarty.get.fct eq 'lyrics'}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_SELECTBY_LYRICS}></option> <option value="artist"<{if $smarty.get.fct eq 'artist'}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_SELECTBY_ARTIST}></option> <{if $xoConfig.album}> <option value="album"<{if $smarty.get.fct eq 'album'}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_SELECTBY_ALBUM}></option> <{/if}> + <{/if}> </select> </div> <div class="sl_alphasubdivb"> Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_index.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,3 @@ +<{includeq file="db:songlist_category_list.html"}> +<{includeq file="db:songlist_alpha_browse.html"}> +<{includeq file="db:songlist_artists_list.html"}> \ No newline at end of file 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-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_item.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,27 @@ +<div class="sl_mainartist"> + <a href="<{$artist.url}>"><{$artist.name}></a> +</div> +<{if $artist.songs}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_SONGS}> +</div> +<div class="sl_subartist"> + <{assign item=songs value=0}> + <{foreach from=$artist.songs item=song}> + <{assign item=songs value=$songs+1}> + <a href="<{$song.url}>"><{$song.name}> [<{$song.songid}>]</a><{if not $songs < count($artist.songs)}>, <{/if}> + <{/foreach}> +</div> +<{/if}> +<{if $artist.albums}> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_ALBUMS}> +</div> +<div class="sl_subartist"> + <{assign item=albums value=0}> + <{foreach from=$artist.albums item=album}> + <{assign item=albums value=$albums+1}> + <a href="<{$album.url}>"><{$album.name}></a><{if not $albums < count($artist.albums)}>, <{/if}> + <{/foreach}> +</div> +<{/if}> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_artists_list.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,27 @@ +<{if $artists}> +<{if not $artists.pagenav eq ''}> +<div style='width:100%; clear:both; height:25px;'> + <div style='float:right;'> + <{$artists.pagenav}> + </div> +</div> +<{/if}> +<table> + <{foreach from=$artists key=$rowkey item=row}> + <{if not $rowkey eq 'pagenav'}> + <tr> + <{foreach from=$row item=artist}> + <td width="<{$artist.width}>%"><{includeq file="db:songlist_artists_item.html" artist=$artist}></td> + <{/foreach}> + </tr> + <{/if}> + <{/foreach}> +</table> +<{/if}> +<{if not $artists.pagenav eq ''}> +<div style='width:100%; clear:both; height:25px;'> + <div style='float:left;'> + <{$artists.pagenav}> + </div> +</div> +<{/if} \ No newline at end of file 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-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_item.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -1,5 +1,5 @@ <div class="sl_maincat"> - <a href="<{$category.url}>"><{$category.name}></a> + <a href="<{$category.url}>"><{$category.name}></a><{if $category.parenturl}> <a href="<{$category.parenturl}>"><em><{$smarty.const._MN_SONGLIST_GOTOPARENT}></em></a><{/if}> </div> <{if $category.subcategories}> <div class="sl_subcat"> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_list.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_list.html 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_category_list.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -3,7 +3,7 @@ <{foreach from=$categories item=row}> <tr> <{foreach from=$row item=category}> - <td><{includeq file="db:songlist_category_item.html" category=$category}></td> + <td width="<{$category.width}>%"><{includeq file="db:songlist_category_item.html" category=$category}></td> <{/foreach}> </tr> <{/foreach}> Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_index.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,4 @@ +<{includeq file="db:songlist_category_list.html"}> +<{includeq file="db:songlist_alpha_browse.html"}> +<{includeq file="db:songlist_search.html"}> +<{includeq file="db:songlist_songs_list.html"}> \ No newline at end of file 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-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_item.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,45 @@ +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_ALBUM}> +</div> +<div class="sl_mainsong"> + <{$song.album.name}> +</div> +<{if $song.album.image}> +<div class="sl_artsong"> + <img src='<{$song.album.image}>' width="95%" border="0" /> +</div> +<{/if}> +<div class="sl_subtitle"> + <{if count($song.album.artists) > 1}> + <{$smarty.const._MN_SONGLIST_ARTISTS}> + <{else}> + <{$smarty.const._MN_SONGLIST_ARTIST}> + <{/if}> +</div> +<div class="sl_mainsong"> + <{assign item=artists value=0}> + <{foreach from=$song.album.artists item=artist}> + <{assign item=artists value=$artists+1}> + <a href="<{$artist.url}>"><{$artist.name}></a><{if not $artists < count($song.album.artists)}>, <{/if}> + <{/foreach}> +</div> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_TITLE}> +</div> +<div class="sl_mainsong"> + <{$song.title}> +</div> +<div class="sl_subtitle"> + <{$smarty.const._MN_SONGLIST_SONGID}> +</div> +<div class="sl_mainsong"> + <{$song.songid}> +</div> +<{foreach from=$song.fields item=field}> +<div class="sl_subtitle"> + <{$field.name}> +</div> +<div class="sl_mainsong"> + <{$field.value}> +</div> +<{/foreach}> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html 2012-03-21 08:34:54 UTC (rev 9161) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_list.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,72 @@ +<{if $results}> +<div class="sl_pagenav"> + <{$pagenav}> +</div> +<h2><{$smarty.const._MN_SONGLIST_RESULTS}></h2> +<table class="sl_resulttable" cellpadding="3"> + <thead> + <tr> + <td><{$smarty.const._MN_SONGLIST_RESULTS_ARTIST}></td> + <{if not $wurlf_mobile}> + <{if $xoConfig.album}> + <td><{$smarty.const._MN_SONGLIST_RESULTS_ALBUM}></td> + <{/if}> + <{if $xoConfig.genre}> + <td><{$smarty.const._MN_SONGLIST_RESULTS_GENRE}></td> + <{/if}> + <{if $xoConfig.singer}> + <td><{$smarty.const._MN_SONGLIST_RESULTS_SINGER}></td> + <{/if}> + <{/if}> + <td><{$smarty.const._MN_SONGLIST_RESULTS_TITLE}></td> + <td><{$smarty.const._MN_SONGLIST_RESULTS_SONGID}></td> + <td><{$smarty.const._MN_SONGLIST_RESULTS_ACTIONS}></td> + </tr> + </thead> + <tbody> + <{foreach item=result from=$results}> + <tr class="<{cycle values="even,odd"}>"> + <td><a href="<{$result.url}>"><{$result.artist}></a></td> + <{if not $wurlf_mobile}> + <{if $xoConfig.album}> + <td><a href="<{$result.url}>"><{$result.album}></a></td> + <{/if}> + <{if $xoConfig.genre}> + <td><a href="<{$result.url}>"><{$result.genre}></a></td> + <{/if}> + <{if $xoConfig.singer}> + <td><a href="<{$result.url}>"><{$result.singer}></a></td> + <{/if}> + <{/if}> + <td><a href="<{$result.url}>"><{$result.title}></a></td> + <td><a href="<{$result.url}>"><{$result.songid}></a></td> + <td><form action="<{$php_self}>?op=vote&id=<{$result.id}>&uri=<{$uri}>" method='post'> + <select name='value' id='value'> + <option value="10"><{$smarty.const._MN_SONGLIST_10STARS}></option> + <option value="9"><{$smarty.const._MN_SONGLIST_9STARS}></option> + <option value="8"><{$smarty.const._MN_SONGLIST_8STARS}></option> + <option value="7"><{$smarty.const._MN_SONGLIST_7STARS}></option> + <option value="6"><{$smarty.const._MN_SONGLIST_6STARS}></option> + <option value="5"><{$smarty.const._MN_SONGLIST_5STARS}></option> + <option value="6"><{$smarty.const._MN_SONGLIST_6STARS}></option> + <option value="5"><{$smarty.const._MN_SONGLIST_5STARS}></option> + <option value="4"><{$smarty.const._MN_SONGLIST_4STARS}></option> + <option value="3"><{$smarty.const._MN_SONGLIST_3STARS}></option> + <option value="2"><{$smarty.const._MN_SONGLIST_2STARS}></option> + <option value="1"><{$smarty.const._MN_SONGLIST_1STARS}></option> + </select> + &nsbp;<input type="submit" name='vote' value="<{$smarty.const._MN_SONGLIST_VOTE}>"/> + </form> + </td> + </tr> + <{if not $wurlf_mobile}> + <{if $xoConfig.lyrics}> + <tr class="<{cycle values="even,odd"}>"> + <td colspan='7'><{$result.lyrics}></td> + </tr> + <{/if}> + <{/if}> + <{/foreach}> + </tbody> +</table> +<{/if}> \ No newline at end of file Added: XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_search.html =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_search.html (rev 0) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_songs_search.html 2012-03-21 15:51:36 UTC (rev 9162) @@ -0,0 +1,47 @@ +<h2><{$smarty.const._MN_SONGLIST_SEARCH}></h2> +<div class="sl_search"> + <div class="sl_searchdiv"> + <form action="<{$php_self}>" method='get'> + <input type="hidden" name="op" value="search" /> + <table width="38%" border='0' cellpadding="5"> + <tr> + <td class="head"><{$smarty.const._MN_SONGLIST_FILTER_KEYWORD}>: </td> + <td class="foot"><input type="textbox" max="128" size="35" name="value" id="value" value="<{$smarty.get.keywords}>" /></td> + </tr> + <tr> + <td class="head"><{$smarty.const._MN_SONGLIST_FILTER_SEARCHBY}>: </td> + <td class="foot"> + <select id='fct' name='fct'> + <option value="title"<{if $smarty.get.fct eq 'title' or $smarty.get.fct eq ''}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_FILTER_TITLE}></option> + <option value="lyrics"<{if $smarty.get.fct eq 'lyrics'}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_FILTER_LYRICS}></option> + <option value="titleandlyrics"<{if $smarty.get.fct eq 'titleandlyrics'}> selected="selected"<{/if}>><{$smarty.const._MN_SONGLIST_FILTER_ARTISTANDLYRICS}></option> + </select> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._MN_SONGLIST_FILTER_CATEGORY}>: </td> + <td class="foot"><{$category_element}></td> + </tr> + <{if $xoConfig.genre}> + <tr> + <td class="head"><{$smarty.const._MN_SONGLIST_FILTER_GENRE}>: </td> + <td class="foot"><{$genre_element}></td> + </tr> + <{else}> + <input type="hidden" name="genre" value="0" /> + <{/if}> + <{if $xoConfig.singer}> + <tr> + <td class="head"><{$smarty.const._MN_SONGLIST_FILTER_SINGER}>: </td> + <td class="foot"><{$singer_element}></td> + </tr> + <{else}> + <input type="hidden" name="singer" value="0" /> + <{/if}> + <tr> + <td colspan="2" class="foot"><input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /></td> + </tr> + </table> + </form> + </div> +</div> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-08-15 16:26:50
|
Revision: 10081 http://xoops.svn.sourceforge.net/xoops/?rev=10081&view=rev Author: wishcraft Date: 2012-08-15 16:26:42 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Songlist 1.14 - MP3 Playback and Upload/Import Modified Paths: -------------- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/changelog.txt XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php XoopsModules/songlist/trunk/htdocs/modules/songlist/include/update.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/blocks.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql XoopsModules/songlist/trunk/htdocs/modules/songlist/templates/songlist_cpanel_songs_list.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/trunk/htdocs/modules/songlist/admin/about.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/about.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -31,11 +31,47 @@ include ('header.php'); xoops_loadLanguage('admin', 'songlist'); + xoops_cp_header(); + $indexAdmin = new ModuleAdmin(); echo $indexAdmin->addNavigation(basename(__FILE__)); - $paypalitemno='H3ADAE8U2W5U2'; - echo $indexAdmin->renderabout($paypalitemno, false); + $aboutAdmin = new ModuleAdmin(); + $paypalitemno='SONGLIST'; + $aboutAdmin = new ModuleAdmin(); + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SONGLIST_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + xoops_cp_footer(); ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -33,9 +33,9 @@ require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php'); if (!defined('_CHARSET')) - define("_CHARSET","UTF-8"); + define ("_CHARSET","UTF-8"); if (!defined('_CHARSET_ISO')) - define("_CHARSET_ISO","ISO-8859-1"); + define ("_CHARSET_ISO","ISO-8859-1"); $GLOBALS['songlistAdmin'] = true; Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/import.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -232,6 +232,7 @@ $object->setVar('traxid', trim($data[$_POST['traxid']])); $object->setVar('title', trim($data[$_POST['title']])); $object->setVar('tags', trim($data[$_POST['tags']])); + $object->setVar('mp3', trim($data[$_POST['mp3']])); $object->setVar('lyrics', str_replace("\n", "<br/>\n", trim($data[$_POST['lyrics']]))); $sid = $songs_handler->insert($object); @@ -379,6 +380,7 @@ $object->setVar('songid', trim($data[$_POST['songid']])); $object->setVar('traxid', trim($data[$_POST['traxid']])); $object->setVar('tags', trim($data[$_POST['tags']])); + $object->setVar('mp3', trim($data[$_POST['mp3']])); $object->setVar('title', trim($data[$_POST['title']])); $object->setVar('lyrics', str_replace("\n", "<br/>\n", trim($data[$_POST['lyrics']]))); $sid = $songs_handler->insert($object); @@ -538,6 +540,7 @@ $object->setVar('traxid', trim($data[$_POST['traxid']])); $object->setVar('title', trim($data[$_POST['title']])); $object->setVar('tags', trim($data[$_POST['tags']])); + $object->setVar('mp3', trim($data[$_POST['mp3']])); $object->setVar('lyrics', str_replace("\n", "<br/>\n", trim($data[$_POST['lyrics']]))); $sid = $songs_handler->insert($object); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/songs.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -80,7 +80,7 @@ $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_songs_edit.html'); break; case "save": - + $songs_handler =& xoops_getmodulehandler('songs', 'songlist'); $extras_handler = xoops_getmodulehandler('extras', 'songlist'); $id=0; @@ -91,6 +91,45 @@ } $songs->setVars($_POST[$id]); + if (isset($_FILES['mp3'.$id])&&!empty($_FILES['mp3'.$id]['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']), $GLOBALS['songlistModuleConfig']['mp3_filesize'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('mp3'.$id)) { + if (!$uploader->upload()) { + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + echo $uploader->getErrors(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($songs->getVar('mp3'))) + unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3'))); + + $songs->setVar('mp3', XOOPS_URL.'/'.str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']).$uploader->getSavedFileName()); + + } + } else { + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + echo $uploader->getErrors(); + xoops_cp_footer(); + exit(0); + } + } if (!$id=$songs_handler->insert($songs)) { 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); exit(0); @@ -105,6 +144,7 @@ $tag_handler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar("dirname"), $songs->getVar('cid')); } + if ($_REQUEST['state'][$_REQUEST['id']]=='new') redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY); else @@ -113,11 +153,51 @@ } break; case "savelist": - + print_r($_FILES); + exit; $songs_handler =& xoops_getmodulehandler('songs', 'songlist'); foreach($_REQUEST['id'] as $id) { $songs = $songs_handler->get($id); $songs->setVars($_POST[$id]); + if (isset($_FILES['mp3'.$id])&&!empty($_FILES['mp3'.$id]['title'])) { + + if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) { + foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) + foreach(explode('/', $folders) as $folder) { + $path .= DS . $folder; + mkdir($path, 0777); + } + } + + include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php')); + $uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']), $GLOBALS['songlistModuleConfig']['mp3_filesize'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])); + $uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13)); + + if ($uploader->fetchMedia('mp3'.$id)) { + if (!$uploader->upload()) { + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + echo $uploader->getErrors(); + xoops_cp_footer(); + exit(0); + } else { + + if (strlen($songs->getVar('mp3'))) + unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3'))); + + $songs->setVar('mp3', XOOPS_URL.'/'.str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']).$uploader->getSavedFileName()); + + } + } else { + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation(basename(__FILE__)); + echo $uploader->getErrors(); + xoops_cp_footer(); + exit(0); + } + } if (!$songs_handler->insert($songs)) { 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); exit(0); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -26,6 +26,7 @@ $this->initVar('rank', XOBJ_DTYPE_DECIMAL, 0, false); $this->initVar('votes', XOBJ_DTYPE_INT, 0, false); $this->initVar('tags', XOBJ_DTYPE_TXTBOX, null, false, 255); + $this->initVar('mp3', XOBJ_DTYPE_OTHER, null, false, 500); $this->initVar('created', XOBJ_DTYPE_INT, 0, false); $this->initVar('updated', XOBJ_DTYPE_INT, 0, false); } @@ -56,6 +57,10 @@ $ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN; + if (!empty($ret['mp3'])) { + $ret['mp3'] = "<embed flashvars=\"playerID=1&bg=0xf8f8f8&leftbg=0x3786b3&lefticon=0x78bee3&rightbg=0x3786b3&rightbghover=0x78bee3&righticon=0x78bee3&righticonhover=0x3786b3&text=0x666666&slider=0x3786b3&track=0xcccccc&border=0x666666&loader=0x78bee3&loop=no&soundFile=".$ret['mp3']."\" quality='high' menu='false' wmode='transparent' pluginspage='http://www.macromedia.com/go/getflashplayer' src='" . XOOPS_URL . "/images/form/player.swf' width=290 height=24 type='application/x-shockwave-flash'></embed>"; + } + 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'), $this->getVar('cid')); @@ -155,7 +160,7 @@ } function filterFields() { - return array('sid', 'cid', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'); + return array('sid', 'cid', 'mp3', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'); } function getFilterCriteria($filter) { Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/changelog.txt =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/changelog.txt 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/docs/changelog.txt 2012-08-15 16:26:42 UTC (rev 10081) @@ -1,15 +1,4 @@ ========================================== - 2012/08/07 21:56:01 Version 1.13 STABLE -========================================== -Changed: /admin/import.php - Tags, track no added to import feature (wishcraft) -Changed: /class/albums.php - SEO Path fixed (wishcraft) -Changed: /class/artists.php - SEO Path fixed (wishcraft) -Changed: /class/songs.php - SEO Path fixed (wishcraft) -Changed: /docs/.htaccess - SEO Path fixed (wishcraft) - Added: /class/songs.php - Field `traxid` added (wishcraft) - - -========================================== 2012/03/26 09:16:01 Version 1.07 STABLE ========================================== - First Release Package Was Finalised (wishcraft) \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -33,9 +33,9 @@ require_once (dirname(dirname(dirname(__FILE__))).'/mainfile.php'); if (!defined('_CHARSET')) - define("_CHARSET","UTF-8"); + define ("_CHARSET","UTF-8"); if (!defined('_CHARSET_ISO')) - define("_CHARSET_ISO","ISO-8859-1"); + define ("_CHARSET_ISO","ISO-8859-1"); $GLOBALS['myts'] = MyTextSanitizer::getInstance(); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/songlist.form.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -417,6 +417,8 @@ $ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC:'')); $ele['tags'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TAGS:''), 'tags', 32, 128, 'tags'); $ele['tags']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TAGS_DESC:'')); + $ele['mp3'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_MP3:''), 'mp3', 32, 128, 'mp3'); + $ele['mp3']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_MP3_DESC:'')); $extras_handler = xoops_getmodulehandler('extras', 'songlist'); $fields = $extras_handler->getFields(NULL); foreach($fields as $field) { @@ -1011,7 +1013,8 @@ $description_configs['height'] = "400px"; $ele['lyrics'] = new XoopsFormEditor(_FRM_SONGLIST_FORM_SONGS_LYRICS, $GLOBALS['songlistModuleConfig']['editor'], $description_configs); $ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_LYRICS_DESC:'')); - + $ele['mp3'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_SONGS_MP3:''), 'mp3'.$id, $GLOBALS['songlistModuleConfig']['mp3_filesize']); + $ele['mp3']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_MP3_DESC:'')); $category_handler = xoops_getmodulehandler('category', 'songlist'); $criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):$object->getVar('cid'))); $all_categories = $category_handler->getObjects($criteria, true, false); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/include/update.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/include/update.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/include/update.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -8,7 +8,9 @@ $sql[] = "CREATE TABLE `".$GLOBALS['xoopsDB']->prefix('songlist_voice')."` ( `vcid` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(128) DEFAULT NULL, `artists` int(12) unsigned DEFAULT '0', `albums` int(12) unsigned DEFAULT '0', `songs` int(12) unsigned DEFAULT '0', `rank` decimal(10,3) unsigned DEFAULT '0.000', `votes` int(10) unsigned DEFAULT '0', `created` int(12) unsigned DEFAULT '0', `updated` int(12) unsigned DEFAULT '0', PRIMARY KEY (`vcid`), KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8"; $sql[] = "ALTER TABLE `".$GLOBALS['xoopsDB']->prefix('songlist_songs')."` ADD COLUMN `vcid` int(12) unsigned DEFAULT '0'"; $sql[] = "ALTER TABLE `".$GLOBALS['xoopsDB']->prefix('songlist_songs')."` CHANGE COLUMN `lyrics` `lyrics` longtext"; - + $sql[] = "ALTER TABLE `".$GLOBALS['xoopsDB']->prefix('songlist_songs')."` ADD COLUMN `mp3` varchar(500) DEFAULT ''"; + $sql[] = "ALTER TABLE `".$GLOBALS['xoopsDB']->prefix('songlist_songs')."` CHANGE COLUMN `traxid` `traxid` int(4) unsigned zerofill DEFAULT NULL"; + return xoops_module_update_vs_executesql($sql); } Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/admin.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -1,257 +1,258 @@ <?php // Dashboard - define('_AM_SONGLIST_COUNT','Number of items counted'); - define('_AM_SONGLIST_NUMBER_OF_CATEGORY','Number of Categories: %s'); - define('_AM_SONGLIST_NUMBER_OF_ARTISTS','Number of Artists: %s'); - define('_AM_SONGLIST_NUMBER_OF_ALBUMS','Number of Albums: %s'); - define('_AM_SONGLIST_NUMBER_OF_GENRE','Number of Genre: %s'); - define('_AM_SONGLIST_NUMBER_OF_VOICE','Number of Voice: %s'); - define('_AM_SONGLIST_NUMBER_OF_SONGS','Number of Songs: %s'); - define('_AM_SONGLIST_NUMBER_OF_REQUESTS','Number of Request: %s'); - define('_AM_SONGLIST_NUMBER_OF_VOTES','Number of Votes: %s'); + define('_AM_SONGLIST_COUNT', 'Number of items counted'); + define('_AM_SONGLIST_NUMBER_OF_CATEGORY', 'Number of Categories: %s'); + define('_AM_SONGLIST_NUMBER_OF_ARTISTS', 'Number of Artists: %s'); + define('_AM_SONGLIST_NUMBER_OF_ALBUMS', 'Number of Albums: %s'); + define('_AM_SONGLIST_NUMBER_OF_GENRE', 'Number of Genre: %s'); + define('_AM_SONGLIST_NUMBER_OF_VOICE', 'Number of Voice: %s'); + define('_AM_SONGLIST_NUMBER_OF_SONGS', 'Number of Songs: %s'); + define('_AM_SONGLIST_NUMBER_OF_REQUESTS', 'Number of Request: %s'); + define('_AM_SONGLIST_NUMBER_OF_VOTES', 'Number of Votes: %s'); // Table Headers - define('_AM_SONGLIST_TH_GID','Genre ID'); - define('_AM_SONGLIST_TH_CID','Category ID'); - define('_AM_SONGLIST_TH_PID','Parent ID'); - define('_AM_SONGLIST_TH_NAME','Name'); - define('_AM_SONGLIST_TH_ARTISTS','Artists'); - define('_AM_SONGLIST_TH_ALBUMS','Album\'s'); - define('_AM_SONGLIST_TH_SONGS','Song\'s'); - define('_AM_SONGLIST_TH_HITS','Hit\'s'); - define('_AM_SONGLIST_TH_RANK','Rank'); - define('_AM_SONGLIST_TH_CREATED','Created'); - define('_AM_SONGLIST_TH_UPDATED','Updated'); - define('_AM_SONGLIST_TH_ACTIONS','Actions'); - define('_AM_SONGLIST_TH_SINGER','Singer'); - define('_AM_SONGLIST_TH_AID','Artist ID'); - define('_AM_SONGLIST_TH_SID','Song ID'); - define('_AM_SONGLIST_TH_ABID','Album'); - define('_AM_SONGLIST_TH_SONGID','Song Ref.'); - define('_AM_SONGLIST_TH_TITLE','Title'); - define('_AM_SONGLIST_TH_VID','Vote ID'); - define('_AM_SONGLIST_TH_UID','User'); - define('_AM_SONGLIST_TH_IP','IP Address'); - define('_AM_SONGLIST_TH_NETADDY','NetBIOS Address'); - define('_AM_SONGLIST_TH_RID','Request ID'); - define('_AM_SONGLIST_TH_ARTIST','Artist'); - define('_AM_SONGLIST_TH_ALBUM','Album'); - define('_AM_SONGLIST_TH_LYRICS','Lyrics'); - define('_AM_SONGLIST_TH_EMAIL','Email'); - define('_AM_SONGLIST_TH_UTFID','Map ID'); - define('_AM_SONGLIST_TH_FROM','From'); - define('_AM_SONGLIST_TH_TO','To'); - define('_AM_SONGLIST_TH_VCID','Voice ID'); + define('_AM_SONGLIST_TH_GID', 'Genre ID'); + define('_AM_SONGLIST_TH_CID', 'Category ID'); + define('_AM_SONGLIST_TH_PID', 'Parent ID'); + define('_AM_SONGLIST_TH_NAME', 'Name'); + define('_AM_SONGLIST_TH_ARTISTS', 'Artists'); + define('_AM_SONGLIST_TH_ALBUMS', 'Album\'s'); + define('_AM_SONGLIST_TH_SONGS', 'Song\'s'); + define('_AM_SONGLIST_TH_HITS', 'Hit\'s'); + define('_AM_SONGLIST_TH_RANK', 'Rank'); + define('_AM_SONGLIST_TH_CREATED', 'Created'); + define('_AM_SONGLIST_TH_UPDATED', 'Updated'); + define('_AM_SONGLIST_TH_ACTIONS', 'Actions'); + define('_AM_SONGLIST_TH_SINGER', 'Singer'); + define('_AM_SONGLIST_TH_AID', 'Artist ID'); + define('_AM_SONGLIST_TH_SID', 'Song ID'); + define('_AM_SONGLIST_TH_ABID', 'Album'); + define('_AM_SONGLIST_TH_SONGID', 'Song Ref.'); + define('_AM_SONGLIST_TH_TITLE', 'Title'); + define('_AM_SONGLIST_TH_VID', 'Vote ID'); + define('_AM_SONGLIST_TH_UID', 'User'); + define('_AM_SONGLIST_TH_IP', 'IP Address'); + define('_AM_SONGLIST_TH_NETADDY', 'NetBIOS Address'); + define('_AM_SONGLIST_TH_RID', 'Request ID'); + define('_AM_SONGLIST_TH_ARTIST', 'Artist'); + define('_AM_SONGLIST_TH_ALBUM', 'Album'); + define('_AM_SONGLIST_TH_LYRICS', 'Lyrics'); + define('_AM_SONGLIST_TH_EMAIL', 'Email'); + define('_AM_SONGLIST_TH_UTFID', 'Map ID'); + define('_AM_SONGLIST_TH_FROM', 'From'); + define('_AM_SONGLIST_TH_TO', 'To'); + define('_AM_SONGLIST_TH_VCID', 'Voice ID'); + define('_AM_SONGLIST_TH_MP3', 'MP3'); // Category - define('_AM_SONGLIST_CATEGORY_H1','Categories'); - define('_AM_SONGLIST_CATEGORY_P','These are the categories and child categories you have on the system.'); - define('_AM_SONGLIST_NEW_CATEGORY_H1','New Category'); - define('_AM_SONGLIST_NEW_CATEGORY_P','Create a new Category from here'); - define('_AM_SONGLIST_EDIT_CATEGORY_H1','Edit Category'); - define('_AM_SONGLIST_EDIT_CATEGORY_P','Edit an existing Category from here'); + define('_AM_SONGLIST_CATEGORY_H1', 'Categories'); + define('_AM_SONGLIST_CATEGORY_P', 'These are the categories and child categories you have on the system.'); + define('_AM_SONGLIST_NEW_CATEGORY_H1', 'New Category'); + define('_AM_SONGLIST_NEW_CATEGORY_P', 'Create a new Category from here'); + define('_AM_SONGLIST_EDIT_CATEGORY_H1', 'Edit Category'); + define('_AM_SONGLIST_EDIT_CATEGORY_P', 'Edit an existing Category from here'); // Category Redirection Messages - define('_AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY','Category Saved Okey!'); - define('_AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE','Category Failed to Save!'); - define('_AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE','Category Failed to Delete!'); - define('_AM_SONGLIST_MSG_CATEGORY_DELETED','Category Deleted Fine!'); - define('_AM_SONGLIST_MSG_CATEGORY_DELETE','Are you sure you wish to delete the Category "%s"?'); + define('_AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY', 'Category Saved Okey!'); + define('_AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE', 'Category Failed to Save!'); + define('_AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE', 'Category Failed to Delete!'); + define('_AM_SONGLIST_MSG_CATEGORY_DELETED', 'Category Deleted Fine!'); + define('_AM_SONGLIST_MSG_CATEGORY_DELETE', 'Are you sure you wish to delete the Category "%s"?'); // Artist - define('_AM_SONGLIST_ARTISTS_H1','Artists'); - define('_AM_SONGLIST_ARTISTS_P','These are the artists you have on the system.'); - define('_AM_SONGLIST_NEW_ARTISTS_H1','New Artist'); - define('_AM_SONGLIST_NEW_ARTISTS_P','Create a new Artist from here'); - define('_AM_SONGLIST_EDIT_ARTISTS_H1','Edit Artist'); - define('_AM_SONGLIST_EDIT_ARTISTS_P','Edit an existing Artist from here'); + define('_AM_SONGLIST_ARTISTS_H1', 'Artists'); + define('_AM_SONGLIST_ARTISTS_P', 'These are the artists you have on the system.'); + define('_AM_SONGLIST_NEW_ARTISTS_H1', 'New Artist'); + define('_AM_SONGLIST_NEW_ARTISTS_P', 'Create a new Artist from here'); + define('_AM_SONGLIST_EDIT_ARTISTS_H1', 'Edit Artist'); + define('_AM_SONGLIST_EDIT_ARTISTS_P', 'Edit an existing Artist from here'); // Artist Redirection Messages - define('_AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY','Artist Saved Okey!'); - define('_AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE','Artist Failed to Save!'); - define('_AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE','Artist Failed to Delete!'); - define('_AM_SONGLIST_MSG_ARTISTS_DELETED','Artist Deleted Fine!'); - define('_AM_SONGLIST_MSG_ARTISTS_DELETE','Are you sure you wish to delete the Artist "%s"?'); + define('_AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY', 'Artist Saved Okey!'); + define('_AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE', 'Artist Failed to Save!'); + define('_AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE', 'Artist Failed to Delete!'); + define('_AM_SONGLIST_MSG_ARTISTS_DELETED', 'Artist Deleted Fine!'); + define('_AM_SONGLIST_MSG_ARTISTS_DELETE', 'Are you sure you wish to delete the Artist "%s"?'); // Album - define('_AM_SONGLIST_ALBUMS_H1','Albums'); - define('_AM_SONGLIST_ALBUMS_P','These are the albums you have on the system.'); - define('_AM_SONGLIST_NEW_ALBUMS_H1','New Album'); - define('_AM_SONGLIST_NEW_ALBUMS_P','Create a new Album from here'); - define('_AM_SONGLIST_EDIT_ALBUMS_H1','Edit Album'); - define('_AM_SONGLIST_EDIT_ALBUMS_P','Edit an existing Album from here'); + define('_AM_SONGLIST_ALBUMS_H1', 'Albums'); + define('_AM_SONGLIST_ALBUMS_P', 'These are the albums you have on the system.'); + define('_AM_SONGLIST_NEW_ALBUMS_H1', 'New Album'); + define('_AM_SONGLIST_NEW_ALBUMS_P', 'Create a new Album from here'); + define('_AM_SONGLIST_EDIT_ALBUMS_H1', 'Edit Album'); + define('_AM_SONGLIST_EDIT_ALBUMS_P', 'Edit an existing Album from here'); // Album Redirection Messages - define('_AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY','Album Saved Okey!'); - define('_AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE','Album Failed to Save!'); - define('_AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE','Album Failed to Delete!'); - define('_AM_SONGLIST_MSG_ALBUMS_DELETED','Album Deleted Fine!'); - define('_AM_SONGLIST_MSG_ALBUMS_DELETE','Are you sure you wish to delete the Album "%s"?'); + define('_AM_SONGLIST_MSG_ALBUMS_SAVEDOKEY', 'Album Saved Okey!'); + define('_AM_SONGLIST_MSG_ALBUMS_FAILEDTOSAVE', 'Album Failed to Save!'); + define('_AM_SONGLIST_MSG_ALBUMS_FAILEDTODELETE', 'Album Failed to Delete!'); + define('_AM_SONGLIST_MSG_ALBUMS_DELETED', 'Album Deleted Fine!'); + define('_AM_SONGLIST_MSG_ALBUMS_DELETE', 'Are you sure you wish to delete the Album "%s"?'); // Genre - define('_AM_SONGLIST_GENRE_H1','Genres'); - define('_AM_SONGLIST_GENRE_P','These are the genre you have on the system.'); - define('_AM_SONGLIST_NEW_GENRE_H1','New Genre'); - define('_AM_SONGLIST_NEW_GENRE_P','Create a new Genre from here'); - define('_AM_SONGLIST_EDIT_GENRE_H1','Edit Genre'); - define('_AM_SONGLIST_EDIT_GENRE_P','Edit an existing Genre from here'); + define('_AM_SONGLIST_GENRE_H1', 'Genres'); + define('_AM_SONGLIST_GENRE_P', 'These are the genre you have on the system.'); + define('_AM_SONGLIST_NEW_GENRE_H1', 'New Genre'); + define('_AM_SONGLIST_NEW_GENRE_P', 'Create a new Genre from here'); + define('_AM_SONGLIST_EDIT_GENRE_H1', 'Edit Genre'); + define('_AM_SONGLIST_EDIT_GENRE_P', 'Edit an existing Genre from here'); // Voice - define('_AM_SONGLIST_VOICE_H1','Voices'); - define('_AM_SONGLIST_VOICE_P','These are the Voice you have on the system.'); - define('_AM_SONGLIST_NEW_VOICE_H1','New Voice'); - define('_AM_SONGLIST_NEW_VOICE_P','Create a new Voice from here'); - define('_AM_SONGLIST_EDIT_VOICE_H1','Edit voice'); - define('_AM_SONGLIST_EDIT_VOICE_P','Edit an existing Voice from here'); + define('_AM_SONGLIST_VOICE_H1', 'Voices'); + define('_AM_SONGLIST_VOICE_P', 'These are the Voice you have on the system.'); + define('_AM_SONGLIST_NEW_VOICE_H1', 'New Voice'); + define('_AM_SONGLIST_NEW_VOICE_P', 'Create a new Voice from here'); + define('_AM_SONGLIST_EDIT_VOICE_H1', 'Edit voice'); + define('_AM_SONGLIST_EDIT_VOICE_P', 'Edit an existing Voice from here'); // Genre Redirection Messages - define('_AM_SONGLIST_MSG_GENRE_SAVEDOKEY','Genre Saved Okey!'); - define('_AM_SONGLIST_MSG_GENRE_FAILEDTOSAVE','Genre Failed to Save!'); - define('_AM_SONGLIST_MSG_GENRE_FAILEDTODELETE','Genre Failed to Delete!'); - define('_AM_SONGLIST_MSG_GENRE_DELETED','Genre Deleted Fine!'); - define('_AM_SONGLIST_MSG_GENRE_DELETE','Are you sure you wish to delete the Genre "%s"?'); + define('_AM_SONGLIST_MSG_GENRE_SAVEDOKEY', 'Genre Saved Okey!'); + define('_AM_SONGLIST_MSG_GENRE_FAILEDTOSAVE', 'Genre Failed to Save!'); + define('_AM_SONGLIST_MSG_GENRE_FAILEDTODELETE', 'Genre Failed to Delete!'); + define('_AM_SONGLIST_MSG_GENRE_DELETED', 'Genre Deleted Fine!'); + define('_AM_SONGLIST_MSG_GENRE_DELETE', 'Are you sure you wish to delete the Genre "%s"?'); // Voice Redirection Messages - define('_AM_SONGLIST_MSG_VOICE_SAVEDOKEY','Voice Saved Okey!'); - define('_AM_SONGLIST_MSG_VOICE_FAILEDTOSAVE','Voice Failed to Save!'); - define('_AM_SONGLIST_MSG_VOICE_FAILEDTODELETE','Voice Failed to Delete!'); - define('_AM_SONGLIST_MSG_VOICE_DELETED','Voice Deleted Fine!'); - define('_AM_SONGLIST_MSG_VOICE_DELETE','Are you sure you wish to delete the Voice "%s"?'); + define('_AM_SONGLIST_MSG_VOICE_SAVEDOKEY', 'Voice Saved Okey!'); + define('_AM_SONGLIST_MSG_VOICE_FAILEDTOSAVE', 'Voice Failed to Save!'); + define('_AM_SONGLIST_MSG_VOICE_FAILEDTODELETE', 'Voice Failed to Delete!'); + define('_AM_SONGLIST_MSG_VOICE_DELETED', 'Voice Deleted Fine!'); + define('_AM_SONGLIST_MSG_VOICE_DELETE', 'Are you sure you wish to delete the Voice "%s"?'); // Request - define('_AM_SONGLIST_REQUESTS_H1','Requests'); - define('_AM_SONGLIST_REQUESTS_P','These are the user requests you have on the system.'); - define('_AM_SONGLIST_NEW_REQUESTS_H1','New Request'); - define('_AM_SONGLIST_NEW_REQUESTS_P','Create a new Request from here'); - define('_AM_SONGLIST_EDIT_REQUESTS_H1','Edit Request'); - define('_AM_SONGLIST_EDIT_REQUESTS_P','Edit an existing Request from here'); + define('_AM_SONGLIST_REQUESTS_H1', 'Requests'); + define('_AM_SONGLIST_REQUESTS_P', 'These are the user requests you have on the system.'); + define('_AM_SONGLIST_NEW_REQUESTS_H1', 'New Request'); + define('_AM_SONGLIST_NEW_REQUESTS_P', 'Create a new Request from here'); + define('_AM_SONGLIST_EDIT_REQUESTS_H1', 'Edit Request'); + define('_AM_SONGLIST_EDIT_REQUESTS_P', 'Edit an existing Request from here'); // Request Redirection Messages - define('_AM_SONGLIST_MSG_REQUESTS_SAVEDOKEY','Request Saved Okey!'); - define('_AM_SONGLIST_MSG_REQUESTS_FAILEDTOSAVE','Request Failed to Save!'); - define('_AM_SONGLIST_MSG_REQUESTS_FAILEDTODELETE','Request Failed to Delete!'); - define('_AM_SONGLIST_MSG_REQUESTS_DELETED','Request Deleted Fine!'); - define('_AM_SONGLIST_MSG_REQUESTS_DELETE','Are you sure you wish to delete the Request "%s"?'); + define('_AM_SONGLIST_MSG_REQUESTS_SAVEDOKEY', 'Request Saved Okey!'); + define('_AM_SONGLIST_MSG_REQUESTS_FAILEDTOSAVE', 'Request Failed to Save!'); + define('_AM_SONGLIST_MSG_REQUESTS_FAILEDTODELETE', 'Request Failed to Delete!'); + define('_AM_SONGLIST_MSG_REQUESTS_DELETED', 'Request Deleted Fine!'); + define('_AM_SONGLIST_MSG_REQUESTS_DELETE', 'Are you sure you wish to delete the Request "%s"?'); // Song - define('_AM_SONGLIST_SONGS_H1','Songs'); - define('_AM_SONGLIST_SONGS_P','These are the songs you have on the system.'); - define('_AM_SONGLIST_NEW_SONGS_H1','New Song'); - define('_AM_SONGLIST_NEW_SONGS_P','Create a new Song from here'); - define('_AM_SONGLIST_EDIT_SONGS_H1','Edit Song'); - define('_AM_SONGLIST_EDIT_SONGS_P','Edit an existing Song from here'); + define('_AM_SONGLIST_SONGS_H1', 'Songs'); + define('_AM_SONGLIST_SONGS_P', 'These are the songs you have on the system.'); + define('_AM_SONGLIST_NEW_SONGS_H1', 'New Song'); + define('_AM_SONGLIST_NEW_SONGS_P', 'Create a new Song from here'); + define('_AM_SONGLIST_EDIT_SONGS_H1', 'Edit Song'); + define('_AM_SONGLIST_EDIT_SONGS_P', 'Edit an existing Song from here'); // Song Redirection Messages - define('_AM_SONGLIST_MSG_SONGS_SAVEDOKEY','Song Saved Okey!'); - define('_AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE','Song Failed to Save!'); - define('_AM_SONGLIST_MSG_SONGS_FAILEDTODELETE','Song Failed to Delete!'); - define('_AM_SONGLIST_MSG_SONGS_DELETED','Song Deleted Fine!'); - define('_AM_SONGLIST_MSG_SONGS_DELETE','Are you sure you wish to delete the Song "%s"?'); + define('_AM_SONGLIST_MSG_SONGS_SAVEDOKEY', 'Song Saved Okey!'); + define('_AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE', 'Song Failed to Save!'); + define('_AM_SONGLIST_MSG_SONGS_FAILEDTODELETE', 'Song Failed to Delete!'); + define('_AM_SONGLIST_MSG_SONGS_DELETED', 'Song Deleted Fine!'); + define('_AM_SONGLIST_MSG_SONGS_DELETE', 'Are you sure you wish to delete the Song "%s"?'); // Character Conversion Mapping - define('_AM_SONGLIST_UTF8MAP_H1','Character Conversion Mappings'); - define('_AM_SONGLIST_UTF8MAP_P','These are the character conversion mapping for search and keyboards you have on the system.'); - define('_AM_SONGLIST_NEW_UTF8MAP_H1','New Character Conversion Mapping'); - define('_AM_SONGLIST_NEW_UTF8MAP_P','Create a new Character Conversion Mapping from here'); - define('_AM_SONGLIST_EDIT_UTF8MAP_H1','Edit Character Conversion Mapping '); - define('_AM_SONGLIST_EDIT_UTF8MAP_P','Edit an existing Character Conversion Mapping from here'); + define('_AM_SONGLIST_UTF8MAP_H1', 'Character Conversion Mappings'); + define('_AM_SONGLIST_UTF8MAP_P', 'These are the character conversion mapping for search and keyboards you have on the system.'); + define('_AM_SONGLIST_NEW_UTF8MAP_H1', 'New Character Conversion Mapping'); + define('_AM_SONGLIST_NEW_UTF8MAP_P', 'Create a new Character Conversion Mapping from here'); + define('_AM_SONGLIST_EDIT_UTF8MAP_H1', 'Edit Character Conversion Mapping '); + define('_AM_SONGLIST_EDIT_UTF8MAP_P', 'Edit an existing Character Conversion Mapping from here'); // Character Conversion Mapping Redirection Messages - define('_AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY','Character Conversion Mapping Saved Okey!'); - define('_AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE','Character Conversion Mapping Failed to Save!'); - define('_AM_SONGLIST_MSG_UTF8MAP_FAILEDTODELETE','Character Conversion Mapping Failed to Delete!'); - define('_AM_SONGLIST_MSG_UTF8MAP_DELETED','Character Conversion Mapping Deleted Fine!'); - define('_AM_SONGLIST_MSG_UTF8MAP_DELETE','Are you sure you wish to delete the Character Conversion Mapping "%s"?'); + define('_AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY', 'Character Conversion Mapping Saved Okey!'); + define('_AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE', 'Character Conversion Mapping Failed to Save!'); + define('_AM_SONGLIST_MSG_UTF8MAP_FAILEDTODELETE', 'Character Conversion Mapping Failed to Delete!'); + define('_AM_SONGLIST_MSG_UTF8MAP_DELETED', 'Character Conversion Mapping Deleted Fine!'); + define('_AM_SONGLIST_MSG_UTF8MAP_DELETE', 'Are you sure you wish to delete the Character Conversion Mapping "%s"?'); // Vote - define('_AM_SONGLIST_VOTES_H1','Votes'); - define('_AM_SONGLIST_VOTES_P','These are the votes you have on the system.'); - define('_AM_SONGLIST_NEW_VOTES_H1','New Vote'); - define('_AM_SONGLIST_NEW_VOTES_P','Create a new Vote from here'); - define('_AM_SONGLIST_EDIT_VOTES_H1','Edit Vote'); - define('_AM_SONGLIST_EDIT_VOTES_P','Edit an existing Vote from here'); + define('_AM_SONGLIST_VOTES_H1', 'Votes'); + define('_AM_SONGLIST_VOTES_P', 'These are the votes you have on the system.'); + define('_AM_SONGLIST_NEW_VOTES_H1', 'New Vote'); + define('_AM_SONGLIST_NEW_VOTES_P', 'Create a new Vote from here'); + define('_AM_SONGLIST_EDIT_VOTES_H1', 'Edit Vote'); + define('_AM_SONGLIST_EDIT_VOTES_P', 'Edit an existing Vote from here'); // Vote Redirection Messages - define('_AM_SONGLIST_MSG_VOTES_SAVEDOKEY','Vote Saved Okey!'); - define('_AM_SONGLIST_MSG_VOTES_FAILEDTOSAVE','Vote Failed to Save!'); - define('_AM_SONGLIST_MSG_VOTES_FAILEDTODELETE','Vote Failed to Delete!'); - define('_AM_SONGLIST_MSG_VOTES_DELETED','Vote Deleted Fine!'); - define('_AM_SONGLIST_MSG_VOTES_DELETE','Are you sure you wish to delete the Vote "%s"?'); + define('_AM_SONGLIST_MSG_VOTES_SAVEDOKEY', 'Vote Saved Okey!'); + define('_AM_SONGLIST_MSG_VOTES_FAILEDTOSAVE', 'Vote Failed to Save!'); + define('_AM_SONGLIST_MSG_VOTES_FAILEDTODELETE', 'Vote Failed to Delete!'); + define('_AM_SONGLIST_MSG_VOTES_DELETED', 'Vote Deleted Fine!'); + define('_AM_SONGLIST_MSG_VOTES_DELETE', 'Are you sure you wish to delete the Vote "%s"?'); // Fields - define('_AM_SONGLIST_FIELDS_FIELDS','Fields'); - define('_AM_SONGLIST_FIELDS_FIELD','Field'); - define('_AM_SONGLIST_FIELDS_NAME','Name'); - define('_AM_SONGLIST_FIELDS_TITLE','Title'); - define('_AM_SONGLIST_FIELDS_DESCRIPTION','Description'); - define('_AM_SONGLIST_FIELDS_TYPE','Type'); - define('_AM_SONGLIST_FIELDS_CATEGORIES','Categories'); - define('_AM_SONGLIST_FIELDS_WEIGHT','Weight'); - define('_AM_SONGLIST_FIELDS_CATEGORY','Category'); - define('_AM_SONGLIST_FIELDS_DEFAULT','Default'); - define('_AM_SONGLIST_FIELDS_ADD','Add Field'); - define('_AM_SONGLIST_FIELDS_EDIT','Edit Field'); - define('_AM_SONGLIST_FIELDS_PROF_EDITABLE','Songs Field Editable?'); + define('_AM_SONGLIST_FIELDS_FIELDS', 'Fields'); + define('_AM_SONGLIST_FIELDS_FIELD', 'Field'); + define('_AM_SONGLIST_FIELDS_NAME', 'Name'); + define('_AM_SONGLIST_FIELDS_TITLE', 'Title'); + define('_AM_SONGLIST_FIELDS_DESCRIPTION', 'Description'); + define('_AM_SONGLIST_FIELDS_TYPE', 'Type'); + define('_AM_SONGLIST_FIELDS_CATEGORIES', 'Categories'); + define('_AM_SONGLIST_FIELDS_WEIGHT', 'Weight'); + define('_AM_SONGLIST_FIELDS_CATEGORY', 'Category'); + define('_AM_SONGLIST_FIELDS_DEFAULT', 'Default'); + define('_AM_SONGLIST_FIELDS_ADD', 'Add Field'); + define('_AM_SONGLIST_FIELDS_EDIT', 'Edit Field'); + define('_AM_SONGLIST_FIELDS_PROF_EDITABLE', 'Songs Field Editable?'); //Field Redirection Messages - define('_AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE','Field not Configurable!'); - define('_AM_SONGLIST_FIELDS_SAVEDSUCCESS','%s Saved Successfully!'); - define('_AM_SONGLIST_FIELDS_DELETEDSUCCESS','%s Deleted Sucessfully!'); + define('_AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE', 'Field not Configurable!'); + define('_AM_SONGLIST_FIELDS_SAVEDSUCCESS', '%s Saved Successfully!'); + define('_AM_SONGLIST_FIELDS_DELETEDSUCCESS', '%s Deleted Sucessfully!'); //Field value types - define('_AM_SONGLIST_FIELDS_ARRAY','Array'); - define('_AM_SONGLIST_FIELDS_EMAIL','eMail'); - define('_AM_SONGLIST_FIELDS_INT','Integer'); - define('_AM_SONGLIST_FIELDS_TXTAREA','Text Area'); - define('_AM_SONGLIST_FIELDS_TXTBOX','Text-box'); - define('_AM_SONGLIST_FIELDS_URL','URL'); - define('_AM_SONGLIST_FIELDS_OTHER','Other'); - define('_AM_SONGLIST_FIELDS_DATE','Date'); + define('_AM_SONGLIST_FIELDS_ARRAY', 'Array'); + define('_AM_SONGLIST_FIELDS_EMAIL', 'eMail'); + define('_AM_SONGLIST_FIELDS_INT', 'Integer'); + define('_AM_SONGLIST_FIELDS_TXTAREA', 'Text Area'); + define('_AM_SONGLIST_FIELDS_TXTBOX', 'Text-box'); + define('_AM_SONGLIST_FIELDS_URL', 'URL'); + define('_AM_SONGLIST_FIELDS_OTHER', 'Other'); + define('_AM_SONGLIST_FIELDS_DATE', 'Date'); //Field element types - define('_AM_SONGLIST_FIELDS_CHECKBOX','Checkboxes'); - define('_AM_SONGLIST_FIELDS_GROUP','Single Groups'); - define('_AM_SONGLIST_FIELDS_GROUPMULTI','Multiple Groups'); - define('_AM_SONGLIST_FIELDS_LANGUAGE','Language Select'); - define('_AM_SONGLIST_FIELDS_RADIO','Radio Buttons'); - define('_AM_SONGLIST_FIELDS_SELECT','Single Select'); - define('_AM_SONGLIST_FIELDS_SELECTMULTI','Multiple Select'); - define('_AM_SONGLIST_FIELDS_TEXTAREA','Text Area'); - define('_AM_SONGLIST_FIELDS_DHTMLTEXTAREA','DHTML Text Editor'); - define('_AM_SONGLIST_FIELDS_EDITOR','Editor'); - 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_DATETIME','Date Time'); - define('_AM_SONGLIST_FIELDS_LONGDATE','Long Date'); - define('_AM_SONGLIST_FIELDS_THEME','Theme Select'); - define('_AM_SONGLIST_FIELDS_AUTOTEXT','Autotext'); - define('_AM_SONGLIST_FIELDS_RANK','Rank'); + define('_AM_SONGLIST_FIELDS_CHECKBOX', 'Checkboxes'); + define('_AM_SONGLIST_FIELDS_GROUP', 'Single Groups'); + define('_AM_SONGLIST_FIELDS_GROUPMULTI', 'Multiple Groups'); + define('_AM_SONGLIST_FIELDS_LANGUAGE', 'Language Select'); + define('_AM_SONGLIST_FIELDS_RADIO', 'Radio Buttons'); + define('_AM_SONGLIST_FIELDS_SELECT', 'Single Select'); + define('_AM_SONGLIST_FIELDS_SELECTMULTI', 'Multiple Select'); + define('_AM_SONGLIST_FIELDS_TEXTAREA', 'Text Area'); + define('_AM_SONGLIST_FIELDS_DHTMLTEXTAREA', 'DHTML Text Editor'); + define('_AM_SONGLIST_FIELDS_EDITOR', 'Editor'); + 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_DATETIME', 'Date Time'); + define('_AM_SONGLIST_FIELDS_LONGDATE', 'Long Date'); + define('_AM_SONGLIST_FIELDS_THEME', 'Theme Select'); + define('_AM_SONGLIST_FIELDS_AUTOTEXT', 'Autotext'); + define('_AM_SONGLIST_FIELDS_RANK', 'Rank'); // Field Visibility - define('_AM_SONGLIST_FIELDNOTVISIBLE','-- Field Not Visible --'); - define('_AM_SONGLIST_FIELDVISIBLEFOR',' Visible For '); - define('_AM_SONGLIST_FIELDVISIBLEON',' On '); - define('_AM_SONGLIST_FIELDVISIBLE','Field Visible: '); + define('_AM_SONGLIST_FIELDNOTVISIBLE', '-- Field Not Visible --'); + define('_AM_SONGLIST_FIELDVISIBLEFOR', ' Visible For '); + define('_AM_SONGLIST_FIELDVISIBLEON', ' On '); + define('_AM_SONGLIST_FIELDVISIBLE', 'Field Visible: '); // Field Permissions - define('_AM_SONGLIST_PROF_VISIBLE','Field Visiblity'); - define('_AM_SONGLIST_PROF_EDITABLE','Field Editable'); - define('_AM_SONGLIST_PROF_POST','Field Post'); - define('_AM_SONGLIST_PROF_SEARCH','Field Searchable'); + define('_AM_SONGLIST_PROF_VISIBLE', 'Field Visiblity'); + define('_AM_SONGLIST_PROF_EDITABLE', 'Field Editable'); + define('_AM_SONGLIST_PROF_POST', 'Field Post'); + define('_AM_SONGLIST_PROF_SEARCH', 'Field Searchable'); // Import Wizards - define('_AM_SONGLIST_IMPORT_NOFILE','No File Specified!'); - define('_AM_SONGLIST_IMPORT_ACTIONA_H1','Upload XML File to Import'); - 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!'); - define('_AM_SONGLIST_XMLFILE_COPIED','The source XML File has been copied for importing!'); + define('_AM_SONGLIST_IMPORT_NOFILE', 'No File Specified!'); + define('_AM_SONGLIST_IMPORT_ACTIONA_H1', 'Upload XML File to Import'); + 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!'); + define('_AM_SONGLIST_XMLFILE_COPIED', 'The source XML File has been copied for importing!'); // About Box - define('_AM_SONGLIST_ABOUT_MAKEDONATE','Make Song List Better Donate Today!'); + define('_AM_SONGLIST_ABOUT_MAKEDONATE', 'Make Song List Better Donate Today!'); ?> \ No newline at end of file Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/blocks.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/blocks.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/blocks.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -1,18 +1,18 @@ <?php // blocks - define('_BL_SONGLIST_NUMBEROFITEMS','Number of items: '); + define('_BL_SONGLIST_NUMBEROFITEMS', 'Number of items: '); // Titles - define('_BL_SONGLIST_CATEGORIES','Categories'); - define('_BL_SONGLIST_CATEGORY','Category'); - define('_BL_SONGLIST_GENRES','Genre\'s'); - define('_BL_SONGLIST_GENRE','Genre'); - define('_BL_SONGLIST_ARTISTS','Artist\'s'); - define('_BL_SONGLIST_ARTIST','Artist'); - define('_BL_SONGLIST_ALBUMS','Album\'s'); - define('_BL_SONGLIST_ALBUM','Album'); - define('_BL_SONGLIST_SONGS','Song\'s'); - define('_BL_SONGLIST_SONG','Song'); + define('_BL_SONGLIST_CATEGORIES', 'Categories'); + define('_BL_SONGLIST_CATEGORY', 'Category'); + define('_BL_SONGLIST_GENRES', 'Genre\'s'); + define('_BL_SONGLIST_GENRE', 'Genre'); + define('_BL_SONGLIST_ARTISTS', 'Artist\'s'); + define('_BL_SONGLIST_ARTIST', 'Artist'); + define('_BL_SONGLIST_ALBUMS', 'Album\'s'); + define('_BL_SONGLIST_ALBUM', 'Album'); + define('_BL_SONGLIST_SONGS', 'Song\'s'); + define('_BL_SONGLIST_SONG', 'Song'); ?> Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/forms.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -59,7 +59,9 @@ define('_FRM_SONGLIST_FORM_SONGS_VOICE_DESC', ''); define('_FRM_SONGLIST_FORM_SONGS_ALBUM', 'Song Album'); define('_FRM_SONGLIST_FORM_SONGS_ALBUM_DESC', ''); - + define('_FRM_SONGLIST_FORM_SONGS_MP3', 'MP3 File'); + define('_FRM_SONGLIST_FORM_SONGS_MP3_DESC', ''); + // UTF8 Mapping Form define('_FRM_SONGLIST_FORM_ISNEW_UTF8MAP', 'New Chracter replacement mapping'); define('_FRM_SONGLIST_FORM_EDIT_UTF8MAP', 'Edit Chracter replacement mapping'); @@ -224,6 +226,8 @@ define('_FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC', 'Lyrics data is contained in this element'); define('_FRM_SONGLIST_FORM_ELEMENT_TAGS', 'Song Tags Element Is'); define('_FRM_SONGLIST_FORM_ELEMENT_TAGS_DESC', 'Tags is contained in this element'); + define('_FRM_SONGLIST_FORM_ELEMENT_MP3', 'Song MP3 URL'); + define('_FRM_SONGLIST_FORM_ELEMENT_MP3_DESC', 'URL for MP3 is contained in this element'); define('_FRM_SONGLIST_FORM_IMPORT_LIMITING', 'Import Sessioning Limitations?'); define('_FRM_SONGLIST_FORM_IMPORT_LIMITING_DESC', 'If this is enabled every number of records the process will sleep for a certain amount of seconds.'); define('_FRM_SONGLIST_FORM_IMPORT_RECORDS', 'Import Sessioning Record Count'); Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php =================================================================== --- XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-08-15 16:26:29 UTC (rev 10080) +++ XoopsModules/songlist/trunk/htdocs/modules/songlist/language/english/main.php 2012-08-15 16:26:42 UTC (rev 10081) @@ -1,86 +1,87 @@ <?php // Song Item Index - define('_MN_SONGLIST_ALBUM','Album: '); - define('_MN_SONGLIST_ARTISTS','Artists: '); - define('_MN_SONGLIST_ARTIST','Artist: '); - define('_MN_SONGLIST_TITLE','Title: '); - define('_MN_SONGLIST_SONGID','Song ID: '); - define('_MN_SONGLIST_TRAXID','Track Number: '); - define('_MN_SONGLIST_TAGS','Tags: '); - define('_MN_SONGLIST_SONGS','Song: '); - define('_MN_SONGLIST_ALBUMS','Album: '); - define('_MN_SONGLIST_LYRICS','Lyric: '); - define('_MN_SONGLIST_GENRE','Genre: '); - define('_MN_SONGLIST_VOICE','Voice: '); - define('_MN_SONGLIST_CATEGORY','Company: '); + define('_MN_SONGLIST_ALBUM', 'Album: '); + define('_MN_SONGLIST_ARTISTS', 'Artists: '); + define('_MN_SONGLIST_ARTIST', 'Artist: '); + define('_MN_SONGLIST_TITLE', 'Title: '); + define('_MN_SONGLIST_SONGID', 'Song ID: '); + define('_MN_SONGLIST_TRAXID', 'Track Number: '); + define('_MN_SONGLIST_TAGS', 'Tags: '); + define('_MN_SONGLIST_SONGS', 'Song: '); + define('_MN_SONGLIST_ALBUMS', 'Album: '); + define('_MN_SONGLIST_LYRICS', 'Lyric: '); + define('_MN_SONGLIST_GENRE', 'Genre: '); + define('_MN_SONGLIST_VOICE', 'Voice: '); + define('_MN_SONGLIST_CATEGORY', 'Company: '); // Browse By - define('_MN_SONGLIST_BROWSEBY','Browse by Character'); - define('_MN_SONGLIST_BROWSEBY1','Browse'); - define('_MN_SONGLIST_BROWSEBY2','by Character'); - define('_MN_SONGLIST_SELECTBY_TITLE','Title'); - define('_MN_SONGLIST_SELECTBY_LYRICS','Lyrics'); - define('_MN_SONGLIST_SELECTBY_ARTIST','Artist'); - define('_MN_SONGLIST_SELECTBY_ALBUM','Album'); + define('_MN_SONGLIST_BROWSEBY', 'Browse by Character'); + define('_MN_SONGLIST_BROWSEBY1', 'Browse'); + define('_MN_SONGLIST_BROWSEBY2', 'by Character'); + define('_MN_SONGLIST_SELECTBY_TITLE', 'Title'); + define('_MN_SONGLIST_SELECTBY_LYRICS', 'Lyrics'); + define('_MN_SONGLIST_SELECTBY_ARTIST', 'Artist'); + define('_MN_SONGLIST_SELECTBY_ALBUM', 'Album'); // Search - define('_MN_SONGLIST_SEARCH','Search Database'); - define('_MN_SONGLIST_FILTER_KEYWORD','Keywords'); - define('_MN_SONGLIST_FILTER_SEARCHBY','Search'); - define('_MN_SONGLIST_FILTER_ALBUM','Album'); - define('_MN_SONGLIST_FILTER_ARTIST','Artist'); - define('_MN_SONGLIST_FILTER_TITLE','Title'); - define('_MN_SONGLIST_FILTER_LYRICS','Lyrics'); - define('_MN_SONGLIST_FILTER_ARTISTANDLYRICS','Title & Lyrics'); - define('_MN_SONGLIST_FILTER_CATEGORY','Company'); - define('_MN_SONGLIST_FILTER_GENRE','Genre'); - define('_MN_SONGLIST_FILTER_VOICE','Voice'); + define('_MN_SONGLIST_SEARCH', 'Search Database'); + define('_MN_SONGLIST_FILTER_KEYWORD', 'Keywords'); + define('_MN_SONGLIST_FILTER_SEARCHBY', 'Search'); + define('_MN_SONGLIST_FILTER_ALBUM', 'Album'); + define('_MN_SONGLIST_FILTER_ARTIST', 'Artist'); + define('_MN_SONGLIST_FILTER_TITLE', 'Title'); + define('_MN_SONGLIST_FILTER_LYRICS', 'Lyrics'); + define('_MN_SONGLIST_FILTER_ARTISTANDLYRICS', 'Title & Lyrics'); + define('_MN_SONGLIST_FILTER_CATEGORY', 'Company'); + define('_MN_SONGLIST_FILTER_GENRE', 'Genre'); + define('_MN_SONGLIST_FILTER_VOICE', 'Voice'); // Results - define('_MN_SONGLIST_RESULTS','Songs'); - define('_MN_SONGLIST_RESULTS_ARTIST','Artist'); - define('_MN_SONGLIST_RESULTS_ALBUM','Album'); - define('_MN_SONGLIST_RESULTS_GENRE','Genre'); - define('_MN_SONGLIST_RESULTS_SINGER','Singer'); - define('_MN_SONGLIST_RESULTS_TITLE','Title'); - define('_MN_SONGLIST_RESULTS_SONGID','ID'); - define('_MN_SONGLIST_RESULTS_ACTIONS','Actions'); - define('_MN_SONGLIST_RESULTS_TAGS','Tags'); - define('_MN_SONGLIST_RESULTS_VOICE','Voice'); - define('_MN_SONGLIST_RESULTS_TRAXNO','Track No.'); + define('_MN_SONGLIST_RESULTS', 'Songs'); + define('_MN_SONGLIST_RESULTS_ARTIST', 'Artist'); + define('_MN_SONGLIST_RESULTS_ALBUM', 'Album'); + define('_MN_SONGLIST_RESULTS_GENRE', 'Genre'); + define('_MN_SONGLIST_RESULTS_SINGER', 'Singer'); + define('_MN_SONGLIST_RESULTS_TITLE', 'Title'); + define('_MN_SONGLIST_RESULTS_SONGID', 'ID'); + define('_MN_SONGLIST_RESULTS_ACTIONS', 'Actions'); + define('_MN_SONGLIST_RESULTS_TAGS', 'Tags'); + define('_MN_SONGLIST_RESULTS_VOICE', 'Voice'); + define('_MN_SONGLIST_RESULTS_TRAXNO', 'Track No.'); + define('_MN_SONGLIST_RESULTS_MP3', 'MP3'); // Voting - define('_MN_SONGLIST_10STARS','10 Stars'); - define('_MN_SONGLIST_9STARS','9 Stars'); - define('_MN_SONGLIST_8STARS','8 Stars'); - define('_MN_SONGLIST_7STARS','7 Stars'); - define('_MN_SONGLIST_6STARS','6 Stars'); - define('_MN_SONGLIST_5STARS','5 Stars'); - define('_MN_SONGLIST_4STARS','4 Stars'); - define('_MN_SONGLIST_3STARS','3 Stars'); - define('_MN_SONGLIST_2STARS','2 Stars'); - define('_MN_SONGLIST_1STARS','1 Stars'); - define('_MN_SONGLIST_VOTE','Vote!'); + define('_MN_SONGLIST_10STARS', '10 Stars'); + define('_MN_SONGLIST_9STARS', '9 Stars'); + define('_MN_SONGLIST_8STARS', '8 Stars'); + define('_MN_SONGLIST_7STARS', '7 Stars'); + define('_MN_SONGLIST_6STARS', '6 Stars'); + define('_MN_SONGLIST_5STARS', '5 Stars'); + define('_MN_SONGLIST_4STARS', '4 Stars'); + define('_MN_SONGLIST_3STARS', '3 Stars'); + define('_MN_SONGLIST_2STARS', '2 Stars'); + define('_MN_SONGLIST_1STARS', '1 Stars'); + define('_MN_SONGLIST_VOTE', 'Vote!'); // Categories - define('_MN_SONGLIST_CATEGORIES','Company'); - define('_MN_SONGLIST_HOME','Company Index'); - define('_MN_SONGLIST_MSG_CATEGORYCHANGED','Company Changed!'); + define('_MN_SONGLIST_CATEGORIES', 'Company'); + define('_MN_SONGLIST_HOME', 'Company Index'); + define('_MN_SONGLIST_MSG_CATEGORYCHANGED', 'Company Changed!'); //Votes - define('_MN_SONGLIST_MSG_VOTED_ALREADY','You have already voted for this item, you can only vote once on an item!'); - define('_MN_SONGLIST_MSG_VOTED_FINISHED','Thanks for the vote for this item, you not be able to vote again on this item!'); - define('_MN_SONGLIST_MSG_VOTED_SOMETHINGWRONG','Something is wrong with taking the vote, we where unable to rate the items for you!'); + define('_MN_SONGLIST_MSG_VOTED_ALREADY', 'You have already voted for this item, you can only vote once on an item!'); + define('_MN_SONGLIST_MSG_VOTED_FINISHED', 'Thanks for the vote for this item, you not be able to vote again on this item!'); + define('_MN_SONGLIST_MSG_VOTED_SOMETHINGWRONG', 'Something is wrong with taking the vote, we where unable to rate the items for you!'); // Requests - define('_MN_SONGLIST_MSG_REQUESTSENT','Request to Admin has been sent for this song to be added!'); - define('_MN_SONGLIST_MSG_REQUESTNOTSENT','Request to Admin has not been sent you may have been missing a field like `email`!'); - define('_MN_SONGLIST_REQUEST_H1','Make a request for a song to be added!'); - define('_MN_SONGLIST_REQUEST_P','Fill out this form to email the webmasters, so that a song will be added to the site, you will need to include as much information as possible including your name and email addresses so we can tell you when we have found the song!'); + define('_MN_SONGLIST_MSG_REQUESTSENT', 'Request to Admin has been sent for this song to be added!'); + define('_MN_SONGLIST_MSG_REQUESTNOTSENT', 'Request to Admin has not been sent you may have been missing a field like `email`!'); + define('_MN_SONGLIST_REQUEST_H1', 'Make a request for a song to be added!'); + define('_MN_SONGLIST_REQUEST_P', 'Fill out this form to email the webmasters, so that a song will be added to the site, you will need to include as much information as possible including your name and email addresses so we can tell you when we have found the song!'); // Version 1.13 // Error - define('_MN_SONGLIST_MSG_EMAILNOTSET','The email you entered is either invalid or blank, please try again!'); + define('_MN_SONGLIST_MSG_EMAILNOTSET', 'The email you en... [truncated message content] |