yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 19:41:55 +02:00
Code Issues Releases Wiki Activity

Add preference subcategory

Browse source
This commit is contained in:
Afterster 2015-12-27 16:06:13 +01:00
parent 435500ee66
commit 9d9f7a2711
34 changed files with 270 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/class/preference.class.php
View file

@ -263,16 +263,16 @@ class Preference extends database_object
$user_limit = "AND `preference`.`catagory` != 'system'"; $user_limit = "AND `preference`.`catagory` != 'system'";
} }
$sql = "SELECT `preference`.`name`,`preference`.`description`,`user_preference`.`value` FROM `preference` " . $sql = "SELECT `preference`.`name`,`preference`.`description`,`preference`.`subcatagory`,`user_preference`.`value` FROM `preference` " .
" INNER JOIN `user_preference` ON `user_preference`.`preference`=`preference`.`id` " . " INNER JOIN `user_preference` ON `user_preference`.`preference`=`preference`.`id` " .
" WHERE `user_preference`.`user`='$user_id' AND `preference`.`catagory` != 'internal' $user_limit " . " WHERE `user_preference`.`user`='$user_id' AND `preference`.`catagory` != 'internal' $user_limit " .
" ORDER BY `preference`.`description`"; " ORDER BY `preference`.`subcatagory`,`preference`.`description`";
$db_results = Dba::read($sql); $db_results = Dba::read($sql);
$results = array(); $results = array();
while ($row = Dba::fetch_assoc($db_results)) { while ($row = Dba::fetch_assoc($db_results)) {
$results[] = array('name'=>$row['name'],'level'=>$row['level'],'description'=>$row['description'],'value'=>$row['value']); $results[] = array('name'=>$row['name'],'level'=>$row['level'],'description'=>$row['description'],'value'=>$row['value'],'subcategory'=>$row['subcatagory']);
} }
return $results; return $results;
@ -283,11 +283,14 @@ class Preference extends database_object
* This inserts a new preference into the preference table * This inserts a new preference into the preference table
* it does NOT sync up the users, that should be done independently * it does NOT sync up the users, that should be done independently
*/ */
public static function insert($name,$description,$default,$level,$type,$catagory) public static function insert($name,$description,$default,$level,$type,$catagory,$subcatagory=null)
{ {
$sql = "INSERT INTO `preference` (`name`,`description`,`value`,`level`,`type`,`catagory`) " . if ($subcatagory !== null) {
"VALUES (?, ?, ?, ?, ?, ?)"; $subcatagory = strtolower($subcatagory);
$db_results = Dba::write($sql, array($name, $description, $default, intval($level), $type, $catagory)); }
$sql = "INSERT INTO `preference` (`name`,`description`,`value`,`level`,`type`,`catagory`,`subcatagory`) " .
"VALUES (?, ?, ?, ?, ?, ?, ?)";
$db_results = Dba::write($sql, array($name, $description, $default, intval($level), $type, $catagory, $subcatagory));
if (!$db_results) { if (!$db_results) {
return false; return false;

26
lib/class/update.class.php
View file

@ -532,6 +532,9 @@ class Update
$update_string = "- Add unique constraint on tag_map table.<br />"; $update_string = "- Add unique constraint on tag_map table.<br />";
$version[] = array('version' => '380003', 'description' => $update_string); $version[] = array('version' => '380003', 'description' => $update_string);
$update_string = "- Add preference subcategory.<br />";
$version[] = array('version' => '380004', 'description' => $update_string);
return $version; return $version;
} }
@ -2297,7 +2300,7 @@ class Update
$retval &= Dba::write($sql); $retval &= Dba::write($sql);
$sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
"VALUES ('share','0','Allow Share',100,'boolean','system')"; "VALUES ('share','0','Allow Share',100,'boolean','options')";
$retval &= Dba::write($sql); $retval &= Dba::write($sql);
$id = Dba::insert_id(); $id = Dba::insert_id();
$sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')";
@ -2725,7 +2728,7 @@ class Update
$retval &= Dba::write($sql, array($id)); $retval &= Dba::write($sql, array($id));
$sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
"VALUES ('allow_upload','0','Allow users to upload media',75,'boolean','system')"; "VALUES ('allow_upload','0','Allow users to upload media',75,'boolean','options')";
$retval &= Dba::write($sql); $retval &= Dba::write($sql);
$id = Dba::insert_id(); $id = Dba::insert_id();
$sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')";
@ -2941,7 +2944,7 @@ class Update
$retval &= Dba::write($sql); $retval &= Dba::write($sql);
$sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
"VALUES ('allow_video','1','Allow video features',75,'integer','system')"; "VALUES ('allow_video','1','Allow video features',75,'integer','options')";
$retval &= Dba::write($sql); $retval &= Dba::write($sql);
$id = Dba::insert_id(); $id = Dba::insert_id();
$sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')";
@ -3702,7 +3705,7 @@ class Update
"`description` varchar(4096) CHARACTER SET utf8 NULL , " . "`description` varchar(4096) CHARACTER SET utf8 NULL , " .
"`author` varchar(64) NULL , " . "`author` varchar(64) NULL , " .
"`category` varchar(64) NULL , " . "`category` varchar(64) NULL , " .
"`played` tinyint(1) unsigned DEFAULT '0' NOT NULL , " . "`played` tinyint(1) UNSIGNED DEFAULT '0' NOT NULL , " .
"`pubdate` int(11) UNSIGNED NOT NULL , " . "`pubdate` int(11) UNSIGNED NOT NULL , " .
"`addition_time` int(11) UNSIGNED NOT NULL" . "`addition_time` int(11) UNSIGNED NOT NULL" .
") ENGINE = MYISAM"; ") ENGINE = MYISAM";
@ -3765,4 +3768,19 @@ class Update
return $retval; return $retval;
} }
/**
* update_380004
*
* Add preference subcategory
*/
public static function update_380004()
{
$retval = true;
$sql = "ALTER TABLE `preference` ADD `subcatagory` varchar(128) CHARACTER SET utf8 DEFAULT NULL AFTER `catagory`";
$retval &= Dba::write($sql);
return $retval;
}
} }

6
lib/class/user.class.php
View file

@ -372,10 +372,10 @@ class User extends database_object
} }
$sql = "SELECT preference.name, preference.description, preference.catagory, preference.level, user_preference.value " . $sql = "SELECT preference.name, preference.description, preference.catagory, preference.subcatagory, preference.level, user_preference.value " .
"FROM preference INNER JOIN user_preference ON user_preference.preference=preference.id " . "FROM preference INNER JOIN user_preference ON user_preference.preference=preference.id " .
"WHERE user_preference.user='$user_id' " . $user_limit . "WHERE user_preference.user='$user_id' " . $user_limit .
" ORDER BY preference.catagory, preference.description"; " ORDER BY preference.catagory, preference.subcatagory, preference.description";
$db_results = Dba::read($sql); $db_results = Dba::read($sql);
$results = array(); $results = array();
@ -387,7 +387,7 @@ class User extends database_object
if ($type == 'system') { if ($type == 'system') {
$admin = true; $admin = true;
} }
$type_array[$type][$r['name']] = array('name'=>$r['name'],'level'=>$r['level'],'description'=>$r['description'],'value'=>$r['value']); $type_array[$type][$r['name']] = array('name'=>$r['name'],'level'=>$r['level'],'description'=>$r['description'],'value'=>$r['value'],'subcategory'=>$r['subcatagory']);
$results[$type] = array ('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]); $results[$type] = array ('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]);
} // end while } // end while

2
modules/localplay/httpq/httpq.controller.php
View file

@ -95,7 +95,7 @@ class AmpacheHttpq extends localplay_controller
$db_results = Dba::write($sql); $db_results = Dba::write($sql);
// Add an internal preference for the users current active instance // Add an internal preference for the users current active instance
Preference::insert('httpq_active','HTTPQ Active Instance','0','25','integer','internal'); Preference::insert('httpq_active','HTTPQ Active Instance','0','25','integer','internal','httpq');
return true; return true;
} // install } // install

2
modules/localplay/mpd/mpd.controller.php
View file

@ -97,7 +97,7 @@ class AmpacheMpd extends localplay_controller
$db_results = Dba::write($sql); $db_results = Dba::write($sql);
// Add an internal preference for the users current active instance // Add an internal preference for the users current active instance
Preference::insert('mpd_active','MPD Active Instance','0','25','integer','internal'); Preference::insert('mpd_active','MPD Active Instance','0','25','integer','internal','mpd');
return true; return true;
} // install } // install

2
modules/localplay/upnp/upnp.controller.php
View file

@ -93,7 +93,7 @@ class AmpacheUPnP extends localplay_controller
$db_results = Dba::query($sql); $db_results = Dba::query($sql);
// Add an internal preference for the users current active instance // Add an internal preference for the users current active instance
Preference::insert('upnp_active', 'UPnP Active Instance', '0', '25', 'integer', 'internal'); Preference::insert('upnp_active', 'UPnP Active Instance', '0', '25', 'integer', 'internal','upnp');
return true; return true;
} }

2
modules/localplay/vlc/vlc.controller.php
View file

@ -95,7 +95,7 @@ class AmpacheVlc extends localplay_controller
$db_results = Dba::query($sql); $db_results = Dba::query($sql);
// Add an internal preference for the users current active instance // Add an internal preference for the users current active instance
Preference::insert('vlc_active','VLC Active Instance','0','25','integer','internal'); Preference::insert('vlc_active','VLC Active Instance','0','25','integer','internal','vlc');
return true; return true;
} // install } // install

2
modules/localplay/xbmc/xbmc.controller.php
View file

@ -101,7 +101,7 @@ class AmpacheXbmc extends localplay_controller
$db_results = Dba::query($sql); $db_results = Dba::query($sql);
// Add an internal preference for the users current active instance // Add an internal preference for the users current active instance
Preference::insert('xbmc_active','XBMC Active Instance','0','25','integer','internal'); Preference::insert('xbmc_active','XBMC Active Instance','0','25','integer','internal','xbmc');
return true; return true;
} // install } // install

4
modules/plugins/7Digital/7Digital.plugin.php
View file

@ -54,8 +54,8 @@ class Ampache7digital
if (Preference::exists('7digital_api_key')) { if (Preference::exists('7digital_api_key')) {
return false; return false;
} }
Preference::insert('7digital_api_key','7digital consumer key','','75','string','plugins'); Preference::insert('7digital_api_key','7digital consumer key','','75','string','plugins',$this->name);
Preference::insert('7digital_secret_api_key','7digital secret','','75','string','plugins'); Preference::insert('7digital_secret_api_key','7digital secret','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

10
modules/plugins/Amazon/Amazon.plugin.php
View file

@ -55,11 +55,11 @@ class AmpacheAmazon
return false; return false;
} }
Preference::insert('amazon_base_url', 'Amazon base url', 'http://webservices.amazon.com', '75', 'string', 'plugins'); Preference::insert('amazon_base_url', 'Amazon base url', 'http://webservices.amazon.com', '75', 'string', 'plugins',$this->name);
Preference::insert('amazon_max_results_pages', 'Amazon max results pages', '1', '75', 'integer', 'plugins'); Preference::insert('amazon_max_results_pages', 'Amazon max results pages', '1', '75', 'integer', 'plugins',$this->name);
Preference::insert('amazon_developer_public_key', 'Amazon Access Key ID', '', '75', 'string', 'plugins'); Preference::insert('amazon_developer_public_key', 'Amazon Access Key ID', '', '75', 'string', 'plugins',$this->name);
Preference::insert('amazon_developer_private_api_key', 'Amazon Secret Access Key', '', '75', 'string', 'plugins'); Preference::insert('amazon_developer_private_api_key', 'Amazon Secret Access Key', '', '75', 'string', 'plugins',$this->name);
Preference::insert('amazon_developer_associate_tag', 'Amazon associate tag', '', '75', 'string', 'plugins'); Preference::insert('amazon_developer_associate_tag', 'Amazon associate tag', '', '75', 'string', 'plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/Bitly/Bitly.plugin.php
View file

@ -57,8 +57,8 @@ class AmpacheBitly
return false; return false;
} }
Preference::insert('bitly_username','Bit.ly username','','75','string','plugins'); Preference::insert('bitly_username','Bit.ly username','','75','string','plugins',$this->name);
Preference::insert('bitly_api_key','Bit.ly api key','','75','string','plugins'); Preference::insert('bitly_api_key','Bit.ly api key','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
View file

@ -55,8 +55,8 @@ class AmpacheCatalogFavorites
return false; return false;
} }
Preference::insert('catalogfav_max_items','Catalog favorites max items','5','25','integer','plugins'); Preference::insert('catalogfav_max_items','Catalog favorites max items','5','25','integer','plugins',$this->name);
Preference::insert('catalogfav_columns','Catalog favorites columns','1','25','integer','plugins'); Preference::insert('catalogfav_columns','Catalog favorites columns','1','25','integer','plugins',$this->name);
return true; return true;
} }

4
modules/plugins/Discogs/Discogs.plugin.php
View file

@ -51,8 +51,8 @@ class AmpacheDiscogs
if (Preference::exists('discogs_api_key')) { if (Preference::exists('discogs_api_key')) {
return false; return false;
} }
Preference::insert('discogs_api_key','Discogs consumer key','','75','string','plugins'); Preference::insert('discogs_api_key','Discogs consumer key','','75','string','plugins',$this->name);
Preference::insert('discogs_secret_api_key','Discogs secret','','75','string','plugins'); Preference::insert('discogs_secret_api_key','Discogs secret','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

2
modules/plugins/Flattr/Flattr.plugin.php
View file

@ -56,7 +56,7 @@ class AmpacheFlattr
return false; return false;
} }
Preference::insert('flattr_user_id','Flattr User ID','',25,'string','plugins'); Preference::insert('flattr_user_id','Flattr User ID','',25,'string','plugins',$this->name);
return true; return true;
} }

2
modules/plugins/Flickr/Flickr.plugin.php
View file

@ -51,7 +51,7 @@ class Ampacheflickr
if (Preference::exists('flickr_api_key')) { if (Preference::exists('flickr_api_key')) {
return false; return false;
} }
Preference::insert('flickr_api_key','Flickr api key','','75','string','plugins'); Preference::insert('flickr_api_key','Flickr api key','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

2
modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
View file

@ -55,7 +55,7 @@ class AmpacheFriendsTimeline
return false; return false;
} }
Preference::insert('ftl_max_items','Friends timeline max items','5','25','integer','plugins'); Preference::insert('ftl_max_items','Friends timeline max items','5','25','integer','plugins',$this->name);
return true; return true;
} }

2
modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
View file

@ -55,7 +55,7 @@ class AmpacheGoogleAnalytics
return false; return false;
} }
Preference::insert('googleanalytics_tracking_id','Google Analytics Tracking ID','',100,'string','plugins'); Preference::insert('googleanalytics_tracking_id','Google Analytics Tracking ID','',100,'string','plugins',$this->name);
return true; return true;
} }

2
modules/plugins/GoogleMaps/GoogleMaps.plugin.php
View file

@ -51,7 +51,7 @@ class AmpacheGoogleMaps
if (Preference::exists('gmaps_api_key')) { if (Preference::exists('gmaps_api_key')) {
return false; return false;
} }
Preference::insert('gmaps_api_key','GoogleMaps api key','','75','string','plugins'); Preference::insert('gmaps_api_key','GoogleMaps api key','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/Headphones/Headphones.plugin.php
View file

@ -57,8 +57,8 @@ class AmpacheHeadphones
return false; return false;
} }
Preference::insert('headphones_api_url','Headphones url','','25','string','plugins'); Preference::insert('headphones_api_url','Headphones url','','25','string','plugins',$this->name);
Preference::insert('headphones_api_key','Headphones api key','','25','string','plugins'); Preference::insert('headphones_api_key','Headphones api key','','25','string','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/Lastfm/Lastfm.plugin.php
View file

@ -63,8 +63,8 @@ class AmpacheLastfm
return false; return false;
} }
Preference::insert('lastfm_challenge','Last.FM Submit Challenge','','25','string','internal'); Preference::insert('lastfm_challenge','Last.FM Submit Challenge','','25','string','internal',$this->name);
Preference::insert('lastfm_grant_link','Last.FM Grant URL','','25','string','plugins'); Preference::insert('lastfm_grant_link','Last.FM Grant URL','','25','string','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/Librefm/Librefm.plugin.php
View file

@ -63,8 +63,8 @@ class Ampachelibrefm
return false; return false;
} }
Preference::insert('librefm_challenge','Libre.FM Submit Challenge','','25','string','internal'); Preference::insert('librefm_challenge','Libre.FM Submit Challenge','','25','string','internal',$this->name);
Preference::insert('librefm_grant_link','Libre.FM Grant URL','','25','string','plugins'); Preference::insert('librefm_grant_link','Libre.FM Grant URL','','25','string','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/Paypal/Paypal.plugin.php
View file

@ -57,8 +57,8 @@ class AmpachePaypal
return false; return false;
} }
Preference::insert('paypal_business','Paypal ID','',25,'string','plugins'); Preference::insert('paypal_business','Paypal ID','',25,'string','plugins',$this->name);
Preference::insert('paypal_currency_code','Paypal Currency Code','USD',25,'string','plugins'); Preference::insert('paypal_currency_code','Paypal Currency Code','USD',25,'string','plugins',$this->name);
return true; return true;
} }

4
modules/plugins/Piwik/Piwik.plugin.php
View file

@ -56,8 +56,8 @@ class AmpachePiwik
return false; return false;
} }
Preference::insert('piwik_site_id','Piwik Site ID','1',100,'string','plugins'); Preference::insert('piwik_site_id','Piwik Site ID','1',100,'string','plugins','piwik');
Preference::insert('piwik_url','Piwik URL', AmpConfig::get('web_path') . '/piwik/',100,'string','plugins'); Preference::insert('piwik_url','Piwik URL', AmpConfig::get('web_path') . '/piwik/',100,'string','plugins',$this->name);
return true; return true;
} }

4
modules/plugins/RSSView/RSSView.plugin.php
View file

@ -56,8 +56,8 @@ class AmpacheRSSView
return false; return false;
} }
Preference::insert('rssview_feed_url','RSS Feed url','','25','string','plugins'); Preference::insert('rssview_feed_url','RSS Feed url','','25','string','plugins',$this->name);
Preference::insert('rssview_max_items','RSS Feed max items','5','25','integer','plugins'); Preference::insert('rssview_max_items','RSS Feed max items','5','25','integer','plugins',$this->name);
return true; return true;
} }

2
modules/plugins/ShoutHome/ShoutHome.plugin.php
View file

@ -55,7 +55,7 @@ class AmpacheShoutHome
return false; return false;
} }
Preference::insert('shouthome_max_items','Shoutbox on homepage max items','5','25','integer','plugins'); Preference::insert('shouthome_max_items','Shoutbox on homepage max items','5','25','integer','plugins',$this->name);
return true; return true;
} }

4
modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
View file

@ -53,8 +53,8 @@ class AmpacheStreamBandwidth
if (Preference::exists('stream_control_bandwidth_max')) { if (Preference::exists('stream_control_bandwidth_max')) {
return false; return false;
} }
Preference::insert('stream_control_bandwidth_max','Stream control maximal bandwidth (Mo)','1024','50','integer','plugins'); Preference::insert('stream_control_bandwidth_max','Stream control maximal bandwidth (Mo)','1024','50','integer','plugins',$this->name);
Preference::insert('stream_control_bandwidth_days','Stream control bandwidth history (days)','30','50','integer','plugins'); Preference::insert('stream_control_bandwidth_days','Stream control bandwidth history (days)','30','50','integer','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/StreamHits/StreamHits.plugin.php
View file

@ -53,8 +53,8 @@ class AmpacheStreamHits
if (Preference::exists('stream_control_hits_max')) { if (Preference::exists('stream_control_hits_max')) {
return false; return false;
} }
Preference::insert('stream_control_hits_max','Stream control maximal hits','-1','50','integer','plugins'); Preference::insert('stream_control_hits_max','Stream control maximal hits','-1','50','integer','plugins',$this->name);
Preference::insert('stream_control_hits_days','Stream control hits history (days)','30','50','integer','plugins'); Preference::insert('stream_control_hits_days','Stream control hits history (days)','30','50','integer','plugins',$this->name);
return true; return true;
} // install } // install

4
modules/plugins/StreamTime/StreamTime.plugin.php
View file

@ -53,8 +53,8 @@ class AmpacheStreamTime
if (Preference::exists('stream_control_time_max')) { if (Preference::exists('stream_control_time_max')) {
return false; return false;
} }
Preference::insert('stream_control_time_max','Stream control maximal time (Minutes)','-1','50','integer','plugins'); Preference::insert('stream_control_time_max','Stream control maximal time (Minutes)','-1','50','integer','plugins',$this->name);
Preference::insert('stream_control_time_days','Stream control time history (days)','30','50','integer','plugins'); Preference::insert('stream_control_time_days','Stream control time history (days)','30','50','integer','plugins',$this->name);
return true; return true;
} // install } // install

2
modules/plugins/TheAudioDb/TheAudioDb.plugin.php
View file

@ -54,7 +54,7 @@ class AmpacheTheaudiodb
} }
// API Key requested in TheAudioDB forum, see http://www.theaudiodb.com/forum/viewtopic.php?f=6&t=8&start=140 // API Key requested in TheAudioDB forum, see http://www.theaudiodb.com/forum/viewtopic.php?f=6&t=8&start=140
Preference::insert('tadb_api_key','TheAudioDb api key','41214789306c4690752dfb','75','string','plugins'); Preference::insert('tadb_api_key','TheAudioDb api key','41214789306c4690752dfb','75','string','plugins',$this->name);
return true; return true;
} // install } // install

2
modules/plugins/Tmdb/Tmdb.plugin.php
View file

@ -53,7 +53,7 @@ class AmpacheTmdb
return false; return false;
} }
Preference::insert('tmdb_api_key','Tmdb api key','','75','string','plugins'); Preference::insert('tmdb_api_key','Tmdb api key','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

2
modules/plugins/Tvdb/Tvdb.plugin.php
View file

@ -53,7 +53,7 @@ class AmpacheTvdb
return false; return false;
} }
Preference::insert('tvdb_api_key','Tvdb api key','','75','string','plugins'); Preference::insert('tvdb_api_key','Tvdb api key','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

6
modules/plugins/Yourls/Yourls.plugin.php
View file

@ -58,9 +58,9 @@ class AmpacheYourls
return false; return false;
} }
Preference::insert('yourls_domain','YOURLS domain name','','75','string','plugins'); Preference::insert('yourls_domain','YOURLS domain name','','75','string','plugins',$this->name);
Preference::insert('yourls_use_idn','YOURLS use IDN','0','75','boolean','plugins'); Preference::insert('yourls_use_idn','YOURLS use IDN','0','75','boolean','plugins',$this->name);
Preference::insert('yourls_api_key','YOURLS api key','','75','string','plugins'); Preference::insert('yourls_api_key','YOURLS api key','','75','string','plugins',$this->name);
return true; return true;
} // install } // install

263
sql/ampache.sql
View file

@ -115,6 +115,25 @@ CREATE TABLE IF NOT EXISTS `artist` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `bookmark`
--
DROP TABLE IF EXISTS `bookmark`;
CREATE TABLE IF NOT EXISTS `bookmark` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`user` int(11) NOT NULL,
`position` int(11) unsigned DEFAULT '0' NOT NULL,
`comment` varchar(255) CHARACTER SET utf8 NOT NULL,
`object_type` varchar(64) NOT NULL,
`object_id` int(11) unsigned NOT NULL,
`creation_date` int(11) unsigned DEFAULT '0' NOT NULL,
`update_date` int(11) unsigned DEFAULT '0' NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
-- --
-- Table structure for table `broadcast` -- Table structure for table `broadcast`
-- --
@ -543,6 +562,55 @@ CREATE TABLE IF NOT EXISTS `playlist_data` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `podcast`
--
DROP TABLE IF EXISTS `podcast`;
CREATE TABLE IF NOT EXISTS `podcast` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`feed` varchar(4096) NOT NULL,
`catalog` int(11) NOT NULL,
`title` varchar(255) CHARACTER SET utf8 NOT NULL,
`website` varchar(255) NULL,
`description` varchar(4096) CHARACTER SET utf8 NULL,
`language` varchar(5) NULL,
`copyright` varchar(64) NULL,
`generator` varchar(64) NULL,
`lastbuilddate` int(11) unsigned DEFAULT '0' NOT NULL,
`lastsync` int(11) unsigned DEFAULT '0' NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Table structure for table `podcast_episode`
--
DROP TABLE IF EXISTS `podcast_episode`;
CREATE TABLE IF NOT EXISTS `podcast_episode` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`title` varchar(255) CHARACTER SET utf8 NOT NULL,
`guid` varchar(255) NOT NULL,
`podcast` int(11) NOT NULL,
`state` varchar(32) NOT NULL,
`file` varchar(4096) CHARACTER SET utf8 NULL,
`source` varchar(4096) NULL,
`size` bigint(20) unsigned DEFAULT '0' NOT NULL,
`time` smallint(5) unsigned DEFAULT '0' NOT NULL,
`website` varchar(255) NULL,
`description` varchar(4096) CHARACTER SET utf8 NULL,
`author` varchar(64) NULL,
`category` varchar(64) NULL,
`played` tinyint(1) unsigned DEFAULT '0' NOT NULL,
`pubdate` int(11) unsigned NOT NULL,
`addition_time` int(11) unsigned NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
-- --
-- Table structure for table `preference` -- Table structure for table `preference`
-- --
@ -556,6 +624,7 @@ CREATE TABLE IF NOT EXISTS `preference` (
`level` int(11) unsigned NOT NULL DEFAULT '100', `level` int(11) unsigned NOT NULL DEFAULT '100',
`type` varchar(128) CHARACTER SET utf8 DEFAULT NULL, `type` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
`catagory` varchar(128) CHARACTER SET utf8 DEFAULT NULL, `catagory` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
`subcatagory` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `catagory` (`catagory`), KEY `catagory` (`catagory`),
KEY `name` (`name`) KEY `name` (`name`)
@ -565,95 +634,97 @@ CREATE TABLE IF NOT EXISTS `preference` (
-- Dumping data for table `preference` -- Dumping data for table `preference`
-- --
INSERT INTO `preference` (`id`, `name`, `value`, `description`, `level`, `type`, `catagory`) VALUES INSERT INTO `preference` (`id`, `name`, `value`, `description`, `level`, `type`, `catagory`, `subcatagory`) VALUES
(1, 'download', '1', 'Allow Downloads', 100, 'boolean', 'options'), (1, 'download', '1', 'Allow Downloads', 100, 'boolean', 'options', 'feature'),
(4, 'popular_threshold', '10', 'Popular Threshold', 25, 'integer', 'interface'), (4, 'popular_threshold', '10', 'Popular Threshold', 25, 'integer', 'interface', 'query'),
(19, 'transcode_bitrate', '64', 'Transcode Bitrate', 25, 'string', 'streaming'), (19, 'transcode_bitrate', '64', 'Transcode Bitrate', 25, 'string', 'streaming', 'transcoding'),
(22, 'site_title', 'Ampache :: For the love of Music', 'Website Title', 100, 'string', 'system'), (22, 'site_title', 'Ampache :: For the love of Music', 'Website Title', 100, 'string', 'interface', 'custom'),
(23, 'lock_songs', '0', 'Lock Songs', 100, 'boolean', 'system'), (23, 'lock_songs', '0', 'Lock Songs', 100, 'boolean', 'system', null),
(24, 'force_http_play', '0', 'Forces Http play regardless of port', 100, 'boolean', 'system'), (24, 'force_http_play', '0', 'Forces Http play regardless of port', 100, 'boolean', 'system', null),
(41, 'localplay_controller', '0', 'Localplay Type', 100, 'special', 'options'), (41, 'localplay_controller', '0', 'Localplay Type', 100, 'special', 'options', 'localplay'),
(29, 'play_type', 'web_player', 'Type of Playback', 25, 'special', 'streaming'), (29, 'play_type', 'web_player', 'Type of Playback', 25, 'special', 'streaming', null),
(31, 'lang', 'fr_FR', 'Language', 100, 'special', 'interface'), (31, 'lang', 'fr_FR', 'Language', 100, 'special', 'interface', null),
(32, 'playlist_type', 'm3u', 'Playlist Type', 100, 'special', 'playlist'), (32, 'playlist_type', 'm3u', 'Playlist Type', 100, 'special', 'playlist', null),
(33, 'theme_name', 'reborn', 'Theme', 0, 'special', 'interface'), (33, 'theme_name', 'reborn', 'Theme', 0, 'special', 'interface', 'theme'),
(51, 'offset_limit', '50', 'Offset Limit', 5, 'integer', 'interface'), (51, 'offset_limit', '50', 'Offset Limit', 5, 'integer', 'interface', 'query'),
(40, 'localplay_level', '0', 'Localplay Access', 100, 'special', 'options'), (40, 'localplay_level', '0', 'Localplay Access', 100, 'special', 'options', 'localplay'),
(44, 'allow_stream_playback', '1', 'Allow Streaming', 100, 'boolean', 'system'), (44, 'allow_stream_playback', '1', 'Allow Streaming', 100, 'boolean', 'options', 'feature'),
(45, 'allow_democratic_playback', '0', 'Allow Democratic Play', 100, 'boolean', 'system'), (45, 'allow_democratic_playback', '0', 'Allow Democratic Play', 100, 'boolean', 'options', 'feature'),
(46, 'allow_localplay_playback', '0', 'Allow Localplay Play', 100, 'boolean', 'system'), (46, 'allow_localplay_playback', '0', 'Allow Localplay Play', 100, 'boolean', 'options', 'localplay'),
(47, 'stats_threshold', '7', 'Statistics Day Threshold', 25, 'integer', 'interface'), (47, 'stats_threshold', '7', 'Statistics Day Threshold', 25, 'integer', 'interface', 'query'),
(52, 'rate_limit', '8192', 'Rate Limit', 100, 'integer', 'streaming'), (52, 'rate_limit', '8192', 'Rate Limit', 100, 'integer', 'streaming', 'transcoding'),
(53, 'playlist_method', 'default', 'Playlist Method', 5, 'string', 'playlist'), (53, 'playlist_method', 'default', 'Playlist Method', 5, 'string', 'playlist', null),
(55, 'transcode', 'default', 'Transcoding', 25, 'string', 'streaming'), (55, 'transcode', 'default', 'Transcoding', 25, 'string', 'streaming', 'transcoding'),
(69, 'show_lyrics', '0', 'Show Lyrics', 0, 'boolean', 'interface'), (69, 'show_lyrics', '0', 'Show Lyrics', 0, 'boolean', 'interface', 'player'),
(70, 'mpd_active', '0', 'MPD Active Instance', 25, 'integer', 'internal'), (70, 'mpd_active', '0', 'MPD Active Instance', 25, 'integer', 'internal', 'mpd'),
(71, 'httpq_active', '0', 'HTTPQ Active Instance', 25, 'integer', 'internal'), (71, 'httpq_active', '0', 'HTTPQ Active Instance', 25, 'integer', 'internal', 'httpq'),
(72, 'shoutcast_active', '0', 'Shoutcast Active Instance', 25, 'integer', 'internal'), (72, 'shoutcast_active', '0', 'Shoutcast Active Instance', 25, 'integer', 'internal', 'shoutcast'),
(77, 'lastfm_grant_link', '', 'Last.FM Grant URL', 25, 'string', 'internal'), (77, 'lastfm_grant_link', '', 'Last.FM Grant URL', 25, 'string', 'internal', 'lastfm'),
(78, 'lastfm_challenge', '', 'Last.FM Submit Challenge', 25, 'string', 'internal'), (78, 'lastfm_challenge', '', 'Last.FM Submit Challenge', 25, 'string', 'internal', 'lastfm'),
(102, 'share', '0', 'Allow Share', 100, 'boolean', 'system'), (102, 'share', '0', 'Allow Share', 100, 'boolean', 'options', 'feature'),
(123, 'ajax_load', '1', 'Ajax page load', 25, 'boolean', 'interface'), (123, 'ajax_load', '1', 'Ajax page load', 25, 'boolean', 'interface', null),
(82, 'now_playing_per_user', '1', 'Now playing filtered per user', 50, 'boolean', 'interface'), (82, 'now_playing_per_user', '1', 'Now playing filtered per user', 50, 'boolean', 'interface', 'home'),
(83, 'album_sort', '0', 'Album Default Sort', 25, 'string', 'interface'), (83, 'album_sort', '0', 'Album Default Sort', 25, 'string', 'interface', 'library'),
(84, 'show_played_times', '0', 'Show # played', 25, 'string', 'interface'), (84, 'show_played_times', '0', 'Show # played', 25, 'string', 'interface', 'library'),
(85, 'song_page_title', '1', 'Show current song in Web player page title', 25, 'boolean', 'interface'), (85, 'song_page_title', '1', 'Show current song in Web player page title', 25, 'boolean', 'interface', 'player'),
(86, 'subsonic_backend', '1', 'Use SubSonic backend', 100, 'boolean', 'system'), (86, 'subsonic_backend', '1', 'Use SubSonic backend', 100, 'boolean', 'system', 'backend'),
(87, 'plex_backend', '0', 'Use Plex backend', 100, 'boolean', 'system'), (87, 'plex_backend', '0', 'Use Plex backend', 100, 'boolean', 'system', 'backend'),
(88, 'webplayer_flash', '1', 'Authorize Flash Web Player(s)', 25, 'boolean', 'streaming'), (88, 'webplayer_flash', '1', 'Authorize Flash Web Player(s)', 25, 'boolean', 'streaming', 'player'),
(89, 'webplayer_html5', '1', 'Authorize HTML5 Web Player(s)', 25, 'boolean', 'streaming'), (89, 'webplayer_html5', '1', 'Authorize HTML5 Web Player(s)', 25, 'boolean', 'streaming', 'player'),
(90, 'allow_personal_info_now', '1', 'Personal information visibility - Now playing', 25, 'boolean', 'interface'), (90, 'allow_personal_info_now', '1', 'Personal information visibility - Now playing', 25, 'boolean', 'interface', 'privacy'),
(91, 'allow_personal_info_recent', '1', 'Personal information visibility - Recently played', 25, 'boolean', 'interface'), (91, 'allow_personal_info_recent', '1', 'Personal information visibility - Recently played', 25, 'boolean', 'interface', 'privacy'),
(92, 'allow_personal_info_time', '1', 'Personal information visibility - Recently played - Allow to show streaming date/time', 25, 'boolean', 'interface'), (92, 'allow_personal_info_time', '1', 'Personal information visibility - Recently played - Allow to show streaming date/time', 25, 'boolean', 'interface', 'privacy'),
(93, 'allow_personal_info_agent', '1', 'Personal information visibility - Recently played - Allow to show streaming agent', 25, 'boolean', 'interface'), (93, 'allow_personal_info_agent', '1', 'Personal information visibility - Recently played - Allow to show streaming agent', 25, 'boolean', 'interface', 'privacy'),
(94, 'ui_fixed', '0', 'Fix header position on compatible themes', 25, 'boolean', 'interface'), (94, 'ui_fixed', '0', 'Fix header position on compatible themes', 25, 'boolean', 'interface', 'theme'),
(95, 'autoupdate', '1', 'Check for Ampache updates automatically', 25, 'boolean', 'system'), (95, 'autoupdate', '1', 'Check for Ampache updates automatically', 25, 'boolean', 'system', 'update'),
(96, 'autoupdate_lastcheck', '', 'AutoUpdate last check time', 25, 'string', 'internal'), (96, 'autoupdate_lastcheck', '', 'AutoUpdate last check time', 25, 'string', 'internal', 'update'),
(97, 'autoupdate_lastversion', '', 'AutoUpdate last version from last check', 25, 'string', 'internal'), (97, 'autoupdate_lastversion', '', 'AutoUpdate last version from last check', 25, 'string', 'internal', 'update'),
(98, 'autoupdate_lastversion_new', '', 'AutoUpdate last version from last check is newer', 25, 'boolean', 'internal'), (98, 'autoupdate_lastversion_new', '', 'AutoUpdate last version from last check is newer', 25, 'boolean', 'internal', 'update'),
(99, 'webplayer_confirmclose', '0', 'Confirmation when closing current playing window', 25, 'boolean', 'interface'), (99, 'webplayer_confirmclose', '0', 'Confirmation when closing current playing window', 25, 'boolean', 'interface', 'player'),
(100, 'webplayer_pausetabs', '1', 'Auto-pause betweens tabs', 25, 'boolean', 'interface'), (100, 'webplayer_pausetabs', '1', 'Auto-pause betweens tabs', 25, 'boolean', 'interface', 'player'),
(101, 'stream_beautiful_url', '0', 'Enable url rewriting', 100, 'boolean', 'streaming'), (101, 'stream_beautiful_url', '0', 'Enable url rewriting', 100, 'boolean', 'streaming', null),
(103, 'share_expire', '7', 'Share links default expiration days (0=never)', 100, 'integer', 'system'), (103, 'share_expire', '7', 'Share links default expiration days (0=never)', 100, 'integer', 'system', 'share'),
(104, 'slideshow_time', '0', 'Artist slideshow inactivity time', 25, 'integer', 'interface'), (104, 'slideshow_time', '0', 'Artist slideshow inactivity time', 25, 'integer', 'interface', 'player'),
(105, 'broadcast_by_default', '0', 'Broadcast web player by default', 25, 'boolean', 'streaming'), (105, 'broadcast_by_default', '0', 'Broadcast web player by default', 25, 'boolean', 'streaming', 'player'),
(106, 'concerts_limit_future', '0', 'Limit number of future events', 25, 'integer', 'interface'), (106, 'concerts_limit_future', '0', 'Limit number of future events', 25, 'integer', 'interface', 'query'),
(107, 'concerts_limit_past', '0', 'Limit number of past events', 25, 'integer', 'interface'), (107, 'concerts_limit_past', '0', 'Limit number of past events', 25, 'integer', 'interface', 'query'),
(108, 'album_group', '0', 'Album - Group multiple disks', 25, 'boolean', 'interface'), (108, 'album_group', '0', 'Album - Group multiple disks', 25, 'boolean', 'interface', 'library'),
(109, 'topmenu', '0', 'Top menu', 25, 'boolean', 'interface'), (109, 'topmenu', '0', 'Top menu', 25, 'boolean', 'interface', 'theme'),
(110, 'demo_clear_sessions', '0', 'Clear democratic votes of expired user sessions', 25, 'boolean', 'playlist'), (110, 'demo_clear_sessions', '0', 'Clear democratic votes of expired user sessions', 25, 'boolean', 'playlist', null),
(111, 'show_donate', '1', 'Show donate button in footer', 25, 'boolean', 'interface'), (111, 'show_donate', '1', 'Show donate button in footer', 25, 'boolean', 'interface', null),
(112, 'upload_catalog', '-1', 'Uploads catalog destination', 75, 'integer', 'system'), (112, 'upload_catalog', '-1', 'Uploads catalog destination', 75, 'integer', 'system', 'upload'),
(113, 'allow_upload', '0', 'Allow users to upload media', 75, 'boolean', 'system'), (113, 'allow_upload', '0', 'Allow users to upload media', 75, 'boolean', 'system', 'upload'),
(114, 'upload_subdir', '1', 'Upload: create a subdirectory per user (recommended)', 75, 'boolean', 'system'), (114, 'upload_subdir', '1', 'Upload: create a subdirectory per user (recommended)', 75, 'boolean', 'system', 'upload'),
(115, 'upload_user_artist', '0', 'Upload: consider the user sender as the track''s artist', 75, 'boolean', 'system'), (115, 'upload_user_artist', '0', 'Upload: consider the user sender as the track''s artist', 75, 'boolean', 'system', 'upload'),
(116, 'upload_script', '', 'Upload: run the following script after upload (current directory = upload target directory)', 75, 'string', 'system'), (116, 'upload_script', '', 'Upload: run the following script after upload (current directory = upload target directory)', 75, 'string', 'system', 'upload'),
(117, 'upload_allow_edit', '1', 'Upload: allow users to edit uploaded songs', 75, 'boolean', 'system'), (117, 'upload_allow_edit', '1', 'Upload: allow users to edit uploaded songs', 75, 'boolean', 'system', 'upload'),
(118, 'daap_backend', '0', 'Use DAAP backend', 100, 'boolean', 'system'), (118, 'daap_backend', '0', 'Use DAAP backend', 100, 'boolean', 'system', 'backend'),
(119, 'daap_pass', '', 'DAAP backend password', 100, 'string', 'system'), (119, 'daap_pass', '', 'DAAP backend password', 100, 'string', 'system', 'backend'),
(120, 'upnp_backend', '0', 'Use UPnP backend', 100, 'boolean', 'system'), (120, 'upnp_backend', '0', 'Use UPnP backend', 100, 'boolean', 'system', 'backend'),
(121, 'allow_video', '1', 'Allow video features', 75, 'integer', 'system'), (121, 'allow_video', '1', 'Allow video features', 75, 'integer', 'options', 'feature'),
(122, 'album_release_type', '1', 'Album - Group per release type', 25, 'boolean', 'interface'), (122, 'album_release_type', '1', 'Album - Group per release type', 25, 'boolean', 'interface', 'library'),
(124, 'direct_play_limit', '0', 'Limit direct play to maximum media count', 25, 'integer', 'interface'), (124, 'direct_play_limit', '0', 'Limit direct play to maximum media count', 25, 'integer', 'interface', 'player'),
(125, 'home_moment_albums', '1', 'Show Albums of the moment at home page', 25, 'integer', 'interface'), (125, 'home_moment_albums', '1', 'Show Albums of the moment at home page', 25, 'integer', 'interface', 'home'),
(126, 'home_moment_videos', '1', 'Show Videos of the moment at home page', 25, 'integer', 'interface'), (126, 'home_moment_videos', '1', 'Show Videos of the moment at home page', 25, 'integer', 'interface', 'home'),
(127, 'home_recently_played', '1', 'Show Recently Played at home page', 25, 'integer', 'interface'), (127, 'home_recently_played', '1', 'Show Recently Played at home page', 25, 'integer', 'interface', 'home'),
(128, 'home_now_playing', '1', 'Show Now Playing at home page', 25, 'integer', 'interface'), (128, 'home_now_playing', '1', 'Show Now Playing at home page', 25, 'integer', 'interface', 'home'),
(129, 'custom_logo', '', 'Custom logo url', 25, 'string', 'interface'), (129, 'custom_logo', '', 'Custom logo url', 25, 'string', 'interface', 'custom'),
(130, 'album_release_type_sort', 'album,ep,live,single', 'Album - Group per release type Sort', 25, 'string', 'interface'), (130, 'album_release_type_sort', 'album,ep,live,single', 'Album - Group per release type Sort', 25, 'string', 'interface', 'library'),
(131, 'browser_notify', '1', 'WebPlayer browser notifications', 25, 'integer', 'interface'), (131, 'browser_notify', '1', 'WebPlayer browser notifications', 25, 'integer', 'interface', 'notification'),
(132, 'browser_notify_timeout', '10', 'WebPlayer browser notifications timeout (seconds)', 25, 'integer', 'interface'), (132, 'browser_notify_timeout', '10', 'WebPlayer browser notifications timeout (seconds)', 25, 'integer', 'interface', 'notification'),
(133, 'geolocation', '0', 'Allow geolocation', 25, 'integer', 'options'), (133, 'geolocation', '0', 'Allow geolocation', 25, 'integer', 'options', 'feature'),
(134, 'webplayer_aurora', '1', 'Authorize JavaScript decoder (Aurora.js) in Web Player(s)', 25, 'boolean', 'streaming'), (134, 'webplayer_aurora', '1', 'Authorize JavaScript decoder (Aurora.js) in Web Player(s)', 25, 'boolean', 'streaming', 'player'),
(135, 'upload_allow_remove', '1', 'Upload: allow users to remove uploaded songs', 75, 'boolean', 'system'), (135, 'upload_allow_remove', '1', 'Upload: allow users to remove uploaded songs', 75, 'boolean', 'system', 'upload'),
(136, 'custom_login_logo', '', 'Custom login page logo url', 75, 'string', 'interface'), (136, 'custom_login_logo', '', 'Custom login page logo url', 75, 'string', 'interface', 'custom'),
(137, 'custom_favicon', '', 'Custom favicon url', 75, 'string', 'interface'), (137, 'custom_favicon', '', 'Custom favicon url', 75, 'string', 'interface', 'custom'),
(138, 'custom_text_footer', '', 'Custom text footer', 75, 'string', 'interface'), (138, 'custom_text_footer', '', 'Custom text footer', 75, 'string', 'interface', 'custom'),
(139, 'webdav_backend', '0', 'Use WebDAV backend', 100, 'boolean', 'system'), (139, 'webdav_backend', '0', 'Use WebDAV backend', 100, 'boolean', 'system', 'backend'),
(140, 'notify_email', '0', 'Receive notifications by email (shouts, private messages, ...)', 25, 'boolean', 'options'), (140, 'notify_email', '0', 'Receive notifications by email (shouts, private messages, ...)', 25, 'boolean', 'options', null),
(141, 'theme_color', 'dark', 'Theme color', 0, 'special', 'interface'), (141, 'theme_color', 'dark', 'Theme color', 0, 'special', 'interface', 'theme'),
(142, 'disabled_custom_metadata_fields', '', 'Disable custom metadata fields (ctrl / shift click to select multiple)', 100, 'string', 'system'), (142, 'disabled_custom_metadata_fields', '', 'Disable custom metadata fields (ctrl / shift click to select multiple)', 100, 'string', 'system', 'metadata'),
(143, 'disabled_custom_metadata_fields_input', '', 'Disable custom metadata fields. Insert them in a comma separated list. They will add to the fields selected above.', 100, 'string', 'system'); (143, 'disabled_custom_metadata_fields_input', '', 'Disable custom metadata fields. Insert them in a comma separated list. They will add to the fields selected above.', 100, 'string', 'system', 'metadata'),
(144, 'podcast_keep', '10', 'Podcast: # latest episodes to keep', 100, 'integer', 'system', 'podcast'),
(145, 'podcast_new_download', '1', 'Podcast: # episodes to download when new episodes are available', 100, 'integer', 'system', 'podcast');
-- -------------------------------------------------------- -- --------------------------------------------------------
@ -665,7 +736,7 @@ DROP TABLE IF EXISTS `rating`;
CREATE TABLE IF NOT EXISTS `rating` ( CREATE TABLE IF NOT EXISTS `rating` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT, `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`user` int(11) NOT NULL, `user` int(11) NOT NULL,
`object_type` enum('artist','album','song','stream','video','playlist','tvshow','tvshow_season') CHARACTER SET utf8 DEFAULT NULL, `object_type` enum('artist','album','song','stream','video','playlist','tvshow','tvshow_season','podcast','podcast_episode') CHARACTER SET utf8 DEFAULT NULL,
`object_id` int(11) unsigned NOT NULL DEFAULT '0', `object_id` int(11) unsigned NOT NULL DEFAULT '0',
`rating` tinyint(4) NOT NULL, `rating` tinyint(4) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
@ -940,10 +1011,8 @@ CREATE TABLE IF NOT EXISTS `tag_map` (
`object_type` varchar(16) CHARACTER SET utf8 DEFAULT NULL, `object_type` varchar(16) CHARACTER SET utf8 DEFAULT NULL,
`user` int(11) NOT NULL, `user` int(11) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `object_id` (`object_id`), KEY `tag_id` (`tag_id`),
KEY `object_type` (`object_type`), UNIQUE KEY `unique_tag_map` (`object_id`, `object_type`, `user`)
KEY `user_id` (`user`),
KEY `tag_id` (`tag_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-- -------------------------------------------------------- -- --------------------------------------------------------
@ -1073,7 +1142,7 @@ CREATE TABLE IF NOT EXISTS `update_info` (
-- --
INSERT INTO `update_info` (`key`, `value`) VALUES INSERT INTO `update_info` (`key`, `value`) VALUES
('db_version', '370041'), ('db_version', '380004'),
('Plugin_Last.FM', '000005'); ('Plugin_Last.FM', '000005');
-- -------------------------------------------------------- -- --------------------------------------------------------
@ -1252,7 +1321,9 @@ INSERT INTO `user_preference` (`user`, `preference`, `value`) VALUES
(-1, 143, ''), (-1, 143, ''),
(-1, 96, ''), (-1, 96, ''),
(-1, 97, ''), (-1, 97, ''),
(-1, 98, ''); (-1, 98, ''),
(-1, 144, '10'),
(-1, 145, '1');
-- -------------------------------------------------------- -- --------------------------------------------------------

20
templates/show_preference_box.inc.php
View file

@ -54,10 +54,22 @@ if (Access::check('interface','100') && $_REQUEST['action'] == 'admin') {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($preferences['prefs'] as $pref) { <?php
$lastsubcat = '';
foreach ($preferences['prefs'] as $pref) {
if ($pref['subcategory'] != $lastsubcat) {
$lastsubcat = $pref['subcategory'];
$fsubcat = $lastsubcat;
if (!empty($fsubcat)) {
$fsubcat = ucwords($fsubcat);
?> ?>
<tr class="<?php echo UI::flip_class(); <tr class="<?php echo UI::flip_class() ?>"><td colspan="4"><h5><?php echo T_($fsubcat) ?></h5></td></tr>
?>"> <?php
}
}
?>
<tr class="<?php echo UI::flip_class() ?>">
<td class="cel_preference"><?php echo T_($pref['description']); <td class="cel_preference"><?php echo T_($pref['description']);
?></td> ?></td>
<td class="cel_value"> <td class="cel_value">
@ -98,7 +110,7 @@ if (Access::check('interface','100') && $_REQUEST['action'] == 'admin') {
?> ?>
</tr> </tr>
<?php <?php
} // End foreach ($preferences['prefs'] as $pref) ?> } // End foreach ($preferences['prefs'] as $pref) ?>
</tbody> </tbody>
<tfoot> <tfoot>
<tr class="th-bottom"> <tr class="th-bottom">